compilation

chamsin/CMakeLists.txt

@@ -8,9 +8,6 @@ FIND_PACKAGE(BISON REQUIRED)
 FIND_PACKAGE(FLEX REQUIRED)
 FIND_PACKAGE(HURRICANE REQUIRED)
 FIND_PACKAGE(CORIOLIS REQUIRED)
-#FIND_PACKAGE(Doxygen)
+FIND_PACKAGE(LibXml2 REQUIRED)
 
 ADD_SUBDIRECTORY(src)
-#IF(DOXYGEN_FOUND)
-#  ADD_SUBDIRECTORY(doc)
-#ENDIF(DOXYGEN_FOUND)

chamsin/src/technology/ATechnologyXmlParser.cpp

@@ -4,7 +4,7 @@
 #include "Technology.h"
 using namespace Hurricane;
 
-#include "TechnologyXmlParser.h"
+#include "ATechnologyXmlParser.h"
 
 namespace {
 

chamsin/src/technology/ATechnologyXmlParser.h

@@ -1,5 +1,5 @@
-#ifndef TECHNOLOGYXMLPARSER_H_
-#define TECHNOLOGYXMLPARSER_H_
+#ifndef ATECHNOLOGYXMLPARSER_H_
+#define ATECHNOLOGYXMLPARSER_H_
 
 namespace Hurricane {
     class Technology;
@@ -7,9 +7,9 @@ namespace Hurricane {
 
 class ATechnology;
 
-class TechnologyXmlParser {
+class ATechnologyXmlParser {
     public:
         static ATechnology* parseTechnologyFromXml(const char* filePath, Hurricane::Technology* technology);
 };
 
-#endif /*TECHNOLOGYXMLPARSER_H_*/
+#endif /*ATECHNOLOGYXMLPARSER_H_*/

chamsin/src/technology/CMakeLists.txt

@@ -1,7 +1,7 @@
 INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${HURRICANE_INCLUDE_DIR})
 
-ADD_LIBRARY(atechnology SHARED 
-ATechnology.cpp TechnologyXmlParser.cpp)
+ADD_LIBRARY(atechnology SHARED
+AEnv.cpp ATechnology.cpp ATechnologyXmlParser.cpp)
 
 TARGET_LINK_LIBRARIES(atechnology ${HURRICANE_LIBRARIES} ${LIBXML2_LIBRARIES})
 

chamsin/src/tests/AnalogicTest.cpp

@@ -3,8 +3,7 @@
 #include "Warning.h"
 using namespace Hurricane;
 
-#include "crlcore/CDataBase.h"
-using namespace CRL;
+#include "AEnv.h"
 
 #include "TrMos.h"
 using namespace DEVICE;
@@ -12,9 +11,10 @@ using namespace DEVICE;
 int main() {
     try {
       cout << "simple analogic test" << endl;
-      CDataBase* db = CDataBase::create();
-      Library* workLibrary = Library::create(db->getRootLibrary(), Name("WorkLibrary"));
-      TrMos* trmos = TrMos::create(workLibrary, Name("MosTr"));
+      //CDataBase* db = CDataBase::create();
+      //Library* workLibrary = Library::create(db->getRootLibrary(), Name("WorkLibrary"));
+      //TrMos* trmos = TrMos::create(workLibrary, Name("MosTr"));
+      AEnv::create("toto");
       exit(0);
     } catch (Hurricane::Warning& w) {
         cerr << w.what() << endl;

chamsin/src/tests/CMakeLists.txt

@@ -1,9 +1,9 @@
 INCLUDE_DIRECTORIES(${HURRICANE_INCLUDE_DIR} ${CORIOLIS_INCLUDE_DIR}
+${CHAMSIN_SOURCE_DIR}/src/technology
 ${CHAMSIN_SOURCE_DIR}/src/analogic ${CHAMSIN_SOURCE_DIR}/src/device)
 
 ADD_EXECUTABLE(atest AnalogicTest.cpp)
 
-TARGET_LINK_LIBRARIES(atest analogic device ${HURRICANE_LIBRARIES}
-${CORIOLIS_LIBRARIES})
+TARGET_LINK_LIBRARIES(atest atechnology ${HURRICANE_LIBRARIES})
 
 INSTALL(TARGETS atest DESTINATION /bin)