* 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.
This commit is contained in:
Jean-Paul Chaput 2010-05-18 12:53:06 +00:00
parent 002fa55cdb
commit f2ee5ec804
4 changed files with 7 additions and 7 deletions

View File

@ -18,13 +18,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 "") )

View File

@ -1 +1 @@
install ( FILES FindKNIK.cmake DESTINATION share/cmake_modules )
install ( FILES FindKNIK.cmake DESTINATION share/cmake/Modules )

View File

@ -57,6 +57,6 @@
install ( FILES ${includes}
${mocIncludes}
${fluteIncludes} DESTINATION include/coriolis/knik )
${fluteIncludes} DESTINATION include/coriolis2/knik )
install ( FILES flute-2.4/etc/POST9.dat
flute-2.4/etc/POWV9.dat DESTINATION share/etc/flute-2.4 )
flute-2.4/etc/POWV9.dat DESTINATION share/coriolis2/flute-2.4 )

View File

@ -75,7 +75,7 @@ void readLUT()
Environment* env = AllianceFramework::get()->getEnvironment();
string POWVFILE_string = env->getCORIOLIS_TOP();
POWVFILE_string += "/share/etc/flute-2.4/";
POWVFILE_string += "/share/coriolis2/flute-2.4/";
POWVFILE_string += POWVFILE;
fpwv=fopen(POWVFILE_string.c_str(), "r");
@ -87,7 +87,7 @@ void readLUT()
#if ROUTING==1
string POSTFILE_string = env->getCORIOLIS_TOP();
POSTFILE_string += "/share/etc/flute-2.4/";
POSTFILE_string += "/share/coriolis2/flute-2.4/";
POSTFILE_string += POSTFILE;
fprt=fopen(POSTFILE_string.c_str(), "r");
if (fprt == NULL)