From 002fa55cdbafce4694f72c55715ba204c622cf53 Mon Sep 17 00:00:00 2001 From: Jean-Paul Chaput Date: Tue, 18 May 2010 12:53:04 +0000 Subject: [PATCH] * All tools: - Change: adopt a tree layout compliant with the UNIX FHS. * includes under TOP/include/coriolis2. * shared datas under TOP/shared/coriolis2. * docs under TOP/share/doc/coriolis2. * configuration under TOP/etc/coriolis2 * ./crlcore: - Change: In Environment, comply to the new tree layout, search configuration files under TOP/etc/coriolis2/. * ./knik: - Change: In flute, comply to the new tree layout, get the "POW*.dat" files from TOP/share/coriolis2/flute-2.4. --- crlcore/CMakeLists.txt | 4 ++-- crlcore/cmake_modules/CMakeLists.txt | 2 +- crlcore/cmake_modules/FindCORIOLIS.cmake | 10 +--------- crlcore/etc/CMakeLists.txt | 14 +++++++------- crlcore/etc/environment.alliance.xml | 10 +++++----- crlcore/src/ccore/CMakeLists.txt | 5 +++-- crlcore/src/ccore/Environment.cpp | 6 +++--- crlcore/src/ccore/agds/AgdsDriver.cpp | 6 +++--- crlcore/src/ccore/cif/CifDriver.cpp | 4 ++-- 9 files changed, 27 insertions(+), 34 deletions(-) diff --git a/crlcore/CMakeLists.txt b/crlcore/CMakeLists.txt index e104df2a..8e59daf6 100644 --- a/crlcore/CMakeLists.txt +++ b/crlcore/CMakeLists.txt @@ -13,13 +13,13 @@ ENDIF(COMMAND CMAKE_POLICY) MACRO(SETUP_PROJECT_PATHS project) IF( NOT("$ENV{${project}_TOP}" STREQUAL "") ) MESSAGE("-- ${project}_TOP is set to $ENV{${project}_TOP}") - SET(PROJECT_MODULE_PATH "$ENV{${project}_TOP}/share/cmake_modules/") + SET(PROJECT_MODULE_PATH "$ENV{${project}_TOP}/share/cmake/Modules/") LIST(INSERT CMAKE_MODULE_PATH 0 "${PROJECT_MODULE_PATH}") ENDIF( NOT("$ENV{${project}_TOP}" STREQUAL "") ) IF( NOT("$ENV{${project}_USER_TOP}" STREQUAL "") ) MESSAGE("-- ${project}_USER_TOP is set to $ENV{${project}_USER_TOP}") - SET(PROJECT_MODULE_PATH "$ENV{${project}_USER_TOP}/share/cmake_modules/") + SET(PROJECT_MODULE_PATH "$ENV{${project}_USER_TOP}/share/cmake/Modules/") LIST(INSERT CMAKE_MODULE_PATH 0 "${PROJECT_MODULE_PATH}") ENDIF( NOT("$ENV{${project}_USER_TOP}" STREQUAL "") ) diff --git a/crlcore/cmake_modules/CMakeLists.txt b/crlcore/cmake_modules/CMakeLists.txt index c9334541..96455ade 100644 --- a/crlcore/cmake_modules/CMakeLists.txt +++ b/crlcore/cmake_modules/CMakeLists.txt @@ -1,4 +1,4 @@ install ( FILES FindCORIOLIS.cmake FindOPENACCESS.cmake FindLEFDEF.cmake - DESTINATION share/cmake_modules ) + DESTINATION share/cmake/Modules ) diff --git a/crlcore/cmake_modules/FindCORIOLIS.cmake b/crlcore/cmake_modules/FindCORIOLIS.cmake index 5090cf18..ef565436 100644 --- a/crlcore/cmake_modules/FindCORIOLIS.cmake +++ b/crlcore/cmake_modules/FindCORIOLIS.cmake @@ -36,7 +36,7 @@ IF(UNIX) FIND_PATH(CRLCORE_INCLUDE_PATH NAMES crlcore/ToolEngine.h PATHS # Look in other places. ${CORIOLIS_DIR_SEARCH} - PATH_SUFFIXES include/coriolis + PATH_SUFFIXES include/coriolis2 include # Help the user find it if we cannot. DOC "The ${CORIOLIS_INCLUDE_PATH_DESCRIPTION}" ) @@ -49,14 +49,6 @@ IF(UNIX) DOC "The ${CORIOLIS_INCLUDE_PATH_DESCRIPTION}" ) - FIND_LIBRARY(CRLCORE_STATIC_LIBRARY_PATH - NAMES crlcore-static - PATHS ${CORIOLIS_DIR_SEARCH} - PATH_SUFFIXES lib - # Help the user find it if we cannot. - DOC "The ${CORIOLIS_INCLUDE_PATH_DESCRIPTION}" - ) - SET_LIBRARIES_PATH(CORIOLIS CRLCORE) HURRICANE_CHECK_LIBRARIES(CORIOLIS) diff --git a/crlcore/etc/CMakeLists.txt b/crlcore/etc/CMakeLists.txt index 03d2df7e..3c48a7a5 100644 --- a/crlcore/etc/CMakeLists.txt +++ b/crlcore/etc/CMakeLists.txt @@ -1,7 +1,7 @@ - install ( FILES environment.alliance.xml DESTINATION share/etc ) - install ( FILES technology.symbolic.xml DESTINATION share/etc ) - install ( FILES technology.hcmos9.s2r.xml DESTINATION share/etc ) - install ( FILES technology.cmos065.s2r.xml DESTINATION share/etc ) - install ( FILES technology.freePDK45.s2r.xml DESTINATION share/etc ) - install ( FILES technology.fake.s2r.xml DESTINATION share/etc ) - install ( FILES display.xml DESTINATION share/etc ) + install ( FILES environment.alliance.xml DESTINATION etc/coriolis2 ) + install ( FILES technology.symbolic.xml DESTINATION etc/coriolis2 ) + install ( FILES technology.hcmos9.s2r.xml DESTINATION etc/coriolis2 ) + install ( FILES technology.cmos065.s2r.xml DESTINATION etc/coriolis2 ) + install ( FILES technology.freePDK45.s2r.xml DESTINATION etc/coriolis2 ) + install ( FILES technology.fake.s2r.xml DESTINATION etc/coriolis2 ) + install ( FILES display.xml DESTINATION etc/coriolis2 ) diff --git a/crlcore/etc/environment.alliance.xml b/crlcore/etc/environment.alliance.xml index cda8e4b4..3a9401a0 100644 --- a/crlcore/etc/environment.alliance.xml +++ b/crlcore/etc/environment.alliance.xml @@ -3,16 +3,16 @@ - ${CORIOLIS_TOP}/share/etc/technology.symbolic.xml + ${CORIOLIS_TOP}/etc/coriolis2/technology.symbolic.xml - ${CORIOLIS_TOP}/share/etc/technology.hcmos9.s2r.xml + ${CORIOLIS_TOP}/etc/coriolis2/technology.hcmos9.s2r.xml - ${CORIOLIS_TOP}/share/etc/cmos.lef + ${CORIOLIS_TOP}/etc/coriolis2/cmos.lef - ${CORIOLIS_TOP}/share/etc/display.xml + ${CORIOLIS_TOP}/etc/coriolis2/display.xml @@ -45,6 +45,6 @@ vdd vss - ^ck$ + ^do_not_find_ck$ diff --git a/crlcore/src/ccore/CMakeLists.txt b/crlcore/src/ccore/CMakeLists.txt index 5ca6f12e..26991f83 100644 --- a/crlcore/src/ccore/CMakeLists.txt +++ b/crlcore/src/ccore/CMakeLists.txt @@ -1,7 +1,8 @@ include ( ${QT_USE_FILE} ) - include_directories ( ${HURRICANE_INCLUDE_DIR} ) + include_directories ( ${CIF_INCLUDE_DIR} + ${HURRICANE_INCLUDE_DIR} ) include_directories ( ${CRLCORE_SOURCE_DIR}/src/fonts ${CRLCORE_SOURCE_DIR}/src/ccore ${CRLCORE_SOURCE_DIR}/src/ccore/properties @@ -209,7 +210,7 @@ qt4_wrap_cpp ( moc_cpps ${mocincludes} ) - install ( FILES ${includes} ${mocincludes} DESTINATION include/coriolis/crlcore ) + install ( FILES ${includes} ${mocincludes} DESTINATION include/coriolis2/crlcore ) add_library ( crlcore ${ccore_cpps} ${moc_cpps} diff --git a/crlcore/src/ccore/Environment.cpp b/crlcore/src/ccore/Environment.cpp index 0850f3ea..402ffb91 100644 --- a/crlcore/src/ccore/Environment.cpp +++ b/crlcore/src/ccore/Environment.cpp @@ -211,7 +211,7 @@ namespace { string envPath = path; if ( path.empty() ) - envPath = env.getCORIOLIS_TOP() + "/share/etc/environment.alliance.xml" ; + envPath = env.getCORIOLIS_TOP() + "/etc/coriolis2/environment.alliance.xml" ; return ep._load ( envPath, warnNotFound ); } @@ -525,9 +525,9 @@ namespace CRL { : _CORIOLIS_TOP (CORIOLIS_TOP) , _displayStyle () , _SCALE_X (10) - , _SYMBOLIC_TECHNOLOGY(CORIOLIS_TOP "/share/etc/technology.symbolic.xml") + , _SYMBOLIC_TECHNOLOGY(CORIOLIS_TOP "/etc/coriolis2/technology.symbolic.xml") , _LEF_TECHNOLOGY ("") - , _DISPLAY (CORIOLIS_TOP "/share/etc/display.xml") + , _DISPLAY (CORIOLIS_TOP "/etc/coriolis2/display.xml") , _IN_LO ("vst") , _IN_PH ("ap") , _OUT_LO ("vst") diff --git a/crlcore/src/ccore/agds/AgdsDriver.cpp b/crlcore/src/ccore/agds/AgdsDriver.cpp index d44b724d..c142276f 100644 --- a/crlcore/src/ccore/agds/AgdsDriver.cpp +++ b/crlcore/src/ccore/agds/AgdsDriver.cpp @@ -21,9 +21,9 @@ using namespace std; #include "hurricane/Query.h" using namespace Hurricane; -#include "io/agds/GdsLibrary.h" -#include "io/agds/GdsStructure.h" -#include "io/agds/GdsRectangle.h" +#include "agds/GdsLibrary.h" +#include "agds/GdsStructure.h" +#include "agds/GdsRectangle.h" using namespace IO; #include "Agds.h" diff --git a/crlcore/src/ccore/cif/CifDriver.cpp b/crlcore/src/ccore/cif/CifDriver.cpp index 926f5cc8..ad7c991e 100644 --- a/crlcore/src/ccore/cif/CifDriver.cpp +++ b/crlcore/src/ccore/cif/CifDriver.cpp @@ -21,8 +21,8 @@ using namespace std; #include "hurricane/Query.h" using namespace Hurricane; -#include "io/cif/CifCircuit.h" -#include "io/cif/CifPolygon.h" +#include "cif/CifCircuit.h" +#include "cif/CifPolygon.h" using namespace IO; #include "Cif.h"