diff --git a/chamsin/CMakeLists.txt b/chamsin/CMakeLists.txt index 48f849c6..82785ea6 100644 --- a/chamsin/CMakeLists.txt +++ b/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) diff --git a/chamsin/src/technology/TechnologyXmlParser.cpp b/chamsin/src/technology/ATechnologyXmlParser.cpp similarity index 96% rename from chamsin/src/technology/TechnologyXmlParser.cpp rename to chamsin/src/technology/ATechnologyXmlParser.cpp index 40fc79ac..cfe1bc49 100644 --- a/chamsin/src/technology/TechnologyXmlParser.cpp +++ b/chamsin/src/technology/ATechnologyXmlParser.cpp @@ -4,7 +4,7 @@ #include "Technology.h" using namespace Hurricane; -#include "TechnologyXmlParser.h" +#include "ATechnologyXmlParser.h" namespace { diff --git a/chamsin/src/technology/TechnologyXmlParser.h b/chamsin/src/technology/ATechnologyXmlParser.h similarity index 60% rename from chamsin/src/technology/TechnologyXmlParser.h rename to chamsin/src/technology/ATechnologyXmlParser.h index d4ad5345..0561f441 100644 --- a/chamsin/src/technology/TechnologyXmlParser.h +++ b/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_*/ diff --git a/chamsin/src/technology/CMakeLists.txt b/chamsin/src/technology/CMakeLists.txt index 4ee31e95..d5790dcf 100644 --- a/chamsin/src/technology/CMakeLists.txt +++ b/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}) diff --git a/chamsin/src/tests/AnalogicTest.cpp b/chamsin/src/tests/AnalogicTest.cpp index 05855b86..a2e3910e 100644 --- a/chamsin/src/tests/AnalogicTest.cpp +++ b/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; diff --git a/chamsin/src/tests/CMakeLists.txt b/chamsin/src/tests/CMakeLists.txt index 005369ce..fd7dd8ce 100644 --- a/chamsin/src/tests/CMakeLists.txt +++ b/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)