From: navarrop Date: Thu, 17 Jun 2010 17:22:38 +0000 (+0000) Subject: Dont set full path. X-Git-Tag: v3_5~912 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/fbbdaee1a6ec8a0c52dbf47b187190de987c9ad2 Dont set full path. git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@7897 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- diff --git a/buildtools/Cmake/DefinePackages.cmake b/buildtools/Cmake/DefinePackages.cmake index 15421ead90..8bee2f22d4 100755 --- a/buildtools/Cmake/DefinePackages.cmake +++ b/buildtools/Cmake/DefinePackages.cmake @@ -421,17 +421,17 @@ ${PROJECT_DIRECTORY}/src/xbt_synchro_unit.c ) set(TEST_CFILES -${PROJECT_DIRECTORY}/src/xbt/cunit.c -${PROJECT_DIRECTORY}/src/xbt/ex.c -${PROJECT_DIRECTORY}/src/xbt/dynar.c -${PROJECT_DIRECTORY}/src/xbt/dict.c -${PROJECT_DIRECTORY}/src/xbt/set.c -${PROJECT_DIRECTORY}/src/xbt/swag.c -${PROJECT_DIRECTORY}/src/xbt/xbt_str.c -${PROJECT_DIRECTORY}/src/xbt/xbt_strbuff.c -${PROJECT_DIRECTORY}/src/xbt/xbt_sha.c -${PROJECT_DIRECTORY}/src/xbt/config.c -${PROJECT_DIRECTORY}/src/xbt/xbt_synchro.c +xbt/cunit.c +xbt/ex.c +xbt/dynar.c +xbt/dict.c +xbt/set.c +xbt/swag.c +xbt/xbt_str.c +xbt/xbt_strbuff.c +xbt/xbt_sha.c +xbt/config.c +xbt/xbt_synchro.c ) #Here must have all files which permit to generate source files diff --git a/buildtools/Cmake/MaintainerMode.cmake b/buildtools/Cmake/MaintainerMode.cmake index ce3259e857..9fec712c61 100644 --- a/buildtools/Cmake/MaintainerMode.cmake +++ b/buildtools/Cmake/MaintainerMode.cmake @@ -26,57 +26,57 @@ if(HAVE_FLEXML AND HAVE_FLEX AND SED_EXE) #${PROJECT_DIRECTORY}/src/surf/simgrid_dtd.l: ${PROJECT_DIRECTORY}/src/surf/simgrid.dtd exec_program("${CMAKE_COMMAND} -E make_directory ${PROJECT_DIRECTORY}/src/surf") -exec_program("${FLEXML_EXE} --root-tags platform -b 1000000 -P surfxml --sysid=simgrid.dtd -S ${PROJECT_DIRECTORY}/src/surf/simgrid_dtd.l -L ${PROJECT_DIRECTORY}/src/surf/simgrid.dtd" "${PROJECT_DIRECTORY}/src/") +exec_program("${FLEXML_EXE} --root-tags platform -b 1000000 -P surfxml --sysid=simgrid.dtd -S src/surf/simgrid_dtd.l -L src/surf/simgrid.dtd" "${PROJECT_DIRECTORY}") #$(PROJECT_DIRECTORY)/include/surf/simgrid_dtd.h: ${PROJECT_DIRECTORY}/src/surf/simgrid.dtd file(REMOVE "${PROJECT_DIRECTORY}/include/surf/simgrid.h") -exec_program("${FLEXML_EXE} --root-tags platform -P surfxml --sysid=simgrid.dtd -H ${PROJECT_DIRECTORY}/include/surf/simgrid_dtd.h -L ${PROJECT_DIRECTORY}/src/surf/simgrid.dtd" "${PROJECT_DIRECTORY}/src/") +exec_program("${FLEXML_EXE} --root-tags platform -P surfxml --sysid=simgrid.dtd -H include/surf/simgrid_dtd.h -L src/surf/simgrid.dtd" "${PROJECT_DIRECTORY}") set(CHAINE "'s/extern *\\([^ ]*[ \\*]*\\)/XBT_PUBLIC_DATA(\\1) /'") -exec_program("${SED_EXE} ${CHAINE} -i ${PROJECT_DIRECTORY}/include/surf/simgrid_dtd.h" "${PROJECT_DIRECTORY}/src/") +exec_program("${SED_EXE} ${CHAINE} -i include/surf/simgrid_dtd.h" "${PROJECT_DIRECTORY}") set(CHAINE "'s/XBT_PUBLIC_DATA(\\([^)]*\\)) *\\([^(]*\\)(/XBT_PUBLIC(\\1) \\2(/'") -exec_program("${SED_EXE} ${CHAINE} -i ${PROJECT_DIRECTORY}/include/surf/simgrid_dtd.h" "${PROJECT_DIRECTORY}/src/") +exec_program("${SED_EXE} ${CHAINE} -i include/surf/simgrid_dtd.h" "${PROJECT_DIRECTORY}") #${PROJECT_DIRECTORY}/src/xbt/graphxml.l: ${PROJECT_DIRECTORY}/src/xbt/graphxml.dtd -exec_program("${FLEXML_EXE} -b 1000000 -P graphxml --sysid=graphxml.dtd -S ${PROJECT_DIRECTORY}/src/xbt/graphxml.l -L ${PROJECT_DIRECTORY}/src/xbt/graphxml.dtd" "${PROJECT_DIRECTORY}/src/") +exec_program("${FLEXML_EXE} -b 1000000 -P graphxml --sysid=graphxml.dtd -S src/xbt/graphxml.l -L src/xbt/graphxml.dtd" "${PROJECT_DIRECTORY}") #$(PROJECT_DIRECTORY)/include/xbt/graphxml.h: ${PROJECT_DIRECTORY}/src/xbt/graphxml.dtd -exec_program("${FLEXML_EXE} -P graphxml --sysid=graphxml.dtd -H ${PROJECT_DIRECTORY}/include/xbt/graphxml.h -L ${PROJECT_DIRECTORY}/src/xbt/graphxml.dtd" "${PROJECT_DIRECTORY}/src/") +exec_program("${FLEXML_EXE} -P graphxml --sysid=graphxml.dtd -H include/xbt/graphxml.h -L src/xbt/graphxml.dtd" "${PROJECT_DIRECTORY}") set(CHAINE "'s/extern *\\([^ ]*[ \\*]*\\)/XBT_PUBLIC_DATA(\\1) /'") -exec_program("${SED_EXE} ${CHAINE} -i ${PROJECT_DIRECTORY}/include/xbt/graphxml.h" "${PROJECT_DIRECTORY}/src/") +exec_program("${SED_EXE} ${CHAINE} -i include/xbt/graphxml.h" "${PROJECT_DIRECTORY}") set(CHAINE "'s/XBT_PUBLIC_DATA(\\([^)]*\\)) *\\([^(]*\\)(/XBT_PUBLIC(\\1) \\2(/'") -exec_program("${SED_EXE} ${CHAINE} -i ${PROJECT_DIRECTORY}/include/xbt/graphxml.h" "${PROJECT_DIRECTORY}/src/") +exec_program("${SED_EXE} ${CHAINE} -i include/xbt/graphxml.h" "${PROJECT_DIRECTORY}") #${PROJECT_DIRECTORY}/src/simdag/dax_dtd.l: ${PROJECT_DIRECTORY}/src/simdag/dax.dtd exec_program("${FLEXML_EXE} -b 1000000 --root-tags adag -P dax_ --sysid=dax.dtd -S ${PROJECT_DIRECTORY}/src/simdag/dax_dtd.l -L ${PROJECT_DIRECTORY}/src/simdag/dax.dtd" "${PROJECT_DIRECTORY}/src/") set(CHAINE "'s/SET(DOCTYPE)/SET(ROOT_dax__adag)/'") -exec_program("${SED_EXE} -i ${CHAINE} ${PROJECT_DIRECTORY}/src/simdag/dax_dtd.l" "${PROJECT_DIRECTORY}/src/") # DOCTYPE not mandatory +exec_program("${SED_EXE} -i ${CHAINE} src/simdag/dax_dtd.l" "${PROJECT_DIRECTORY}") # DOCTYPE not mandatory #${PROJECT_DIRECTORY}/src/simdag/dax_dtd.h: ${PROJECT_DIRECTORY}/src/simdag/dax.dtd -exec_program("${FLEXML_EXE} --root-tags adag -P dax_ --sysid=dax.dtd -H ${PROJECT_DIRECTORY}/src/simdag/dax_dtd.h -L ${PROJECT_DIRECTORY}/src/simdag/dax.dtd" "${PROJECT_DIRECTORY}/src/") +exec_program("${FLEXML_EXE} --root-tags adag -P dax_ --sysid=dax.dtd -H src/simdag/dax_dtd.h -L src/simdag/dax.dtd" "${PROJECT_DIRECTORY}") set(CHAINE "'s/extern *\\([^ ]*[ \\*]*\\)/XBT_PUBLIC_DATA(\\1) /'") -exec_program("${SED_EXE} ${CHAINE} -i ${PROJECT_DIRECTORY}/src/simdag/dax_dtd.h" "${PROJECT_DIRECTORY}/src/") +exec_program("${SED_EXE} ${CHAINE} -i src/simdag/dax_dtd.h" "${PROJECT_DIRECTORY}") set(CHAINE "'s/XBT_PUBLIC_DATA(\\([^)]*\\)) *\\([^(]*\\)(/XBT_PUBLIC(\\1) \\2(/'") -exec_program("${SED_EXE} ${CHAINE} -i ${PROJECT_DIRECTORY}/src/simdag/dax_dtd.h" "${PROJECT_DIRECTORY}/src/") +exec_program("${SED_EXE} ${CHAINE} -i src/simdag/dax_dtd.h" "${PROJECT_DIRECTORY}") -exec_program("${FLEX_EXE} -o ${PROJECT_DIRECTORY}/src/gras/DataDesc/ddt_parse.yy.c -Pgras_ddt_parse_ --noline ${PROJECT_DIRECTORY}/src/gras/DataDesc/ddt_parse.yy.l" "${PROJECT_DIRECTORY}/src/") +exec_program("${FLEX_EXE} -o src/gras/DataDesc/ddt_parse.yy.c -Pgras_ddt_parse_ --noline src/gras/DataDesc/ddt_parse.yy.l" "${PROJECT_DIRECTORY}") #surf/simgrid_dtd.c: surf/simgrid_dtd.l exec_program("${CMAKE_COMMAND} -E make_directory ${PROJECT_DIRECTORY}/src/surf") -exec_program("${FLEX_EXE} -o ${PROJECT_DIRECTORY}/src/surf/simgrid_dtd.c -Psurf_parse_ --noline ${PROJECT_DIRECTORY}/src/surf/simgrid_dtd.l" "${PROJECT_DIRECTORY}/src/") -set(CHAINE "'s/#include /#if defined(_WIN32) || defined(__WIN32__) || defined(WIN32) || defined(__TOS_WIN__)\\n# ifndef __STRICT_ANSI__\\n# include \\n# include \\n# endif\\n#else\\n# include \\n#endif/g' -i ${PROJECT_DIRECTORY}/src/surf/simgrid_dtd.c") -exec_program("${SED_EXE} ${CHAINE}" "${PROJECT_DIRECTORY}/src/") +exec_program("${FLEX_EXE} -o src/surf/simgrid_dtd.c -Psurf_parse_ --noline src/surf/simgrid_dtd.l" "${PROJECT_DIRECTORY}/") +set(CHAINE "'s/#include /#if defined(_WIN32) || defined(__WIN32__) || defined(WIN32) || defined(__TOS_WIN__)\\n# ifndef __STRICT_ANSI__\\n# include \\n# include \\n# endif\\n#else\\n# include \\n#endif/g' -i src/surf/simgrid_dtd.c") +exec_program("${SED_EXE} ${CHAINE}" "${PROJECT_DIRECTORY}") #xbt/graphxml.c: xbt/graphxml.l exec_program("${CMAKE_COMMAND} -E make_directory ${PROJECT_DIRECTORY}/src/xbt") -exec_program("${FLEX_EXE} -o ${PROJECT_DIRECTORY}/src/xbt/graphxml.c -Pxbt_graph_parse_ --noline ${PROJECT_DIRECTORY}/src/xbt/graphxml.l" "${PROJECT_DIRECTORY}/src/") -set(CHAINE "'s/#include /#if defined(_WIN32) || defined(__WIN32__) || defined(WIN32) || defined(__TOS_WIN__)\\n# ifndef __STRICT_ANSI__\\n# include \\n# include \\n# endif\\n#else\\n# include \\n#endif/g' -i ${PROJECT_DIRECTORY}/src/xbt/graphxml.c") -exec_program("${SED_EXE} ${CHAINE}" "${PROJECT_DIRECTORY}/src/") +exec_program("${FLEX_EXE} -o src/xbt/graphxml.c -Pxbt_graph_parse_ --noline src/xbt/graphxml.l" "${PROJECT_DIRECTORY}") +set(CHAINE "'s/#include /#if defined(_WIN32) || defined(__WIN32__) || defined(WIN32) || defined(__TOS_WIN__)\\n# ifndef __STRICT_ANSI__\\n# include \\n# include \\n# endif\\n#else\\n# include \\n#endif/g' -i src/xbt/graphxml.c") +exec_program("${SED_EXE} ${CHAINE}" "${PROJECT_DIRECTORY}") #simdag/dax_dtd.c: simdag/dax_dtd.l exec_program("${CMAKE_COMMAND} -E make_directory ${PROJECT_DIRECTORY}/src/simdag") -exec_program("${FLEX_EXE} -o ${PROJECT_DIRECTORY}/src/simdag/dax_dtd.c -Pdax_ --noline ${PROJECT_DIRECTORY}/src/simdag/dax_dtd.l" "${PROJECT_DIRECTORY}/src/") -set(CHAINE "'s/#include /#if defined(_WIN32) || defined(__WIN32__) || defined(WIN32) || defined(__TOS_WIN__)\\n# ifndef __STRICT_ANSI__\\n# include \\n# include \\n# endif\\n#else\\n# include \\n#endif/g' -i ${PROJECT_DIRECTORY}/src/simdag/dax_dtd.c") -exec_program("${SED_EXE} ${CHAINE}" "${PROJECT_DIRECTORY}/src/") +exec_program("${FLEX_EXE} -o src/simdag/dax_dtd.c -Pdax_ --noline src/simdag/dax_dtd.l" "${PROJECT_DIRECTORY}") +set(CHAINE "'s/#include /#if defined(_WIN32) || defined(__WIN32__) || defined(WIN32) || defined(__TOS_WIN__)\\n# ifndef __STRICT_ANSI__\\n# include \\n# include \\n# endif\\n#else\\n# include \\n#endif/g' -i src/simdag/dax_dtd.c") +exec_program("${SED_EXE} ${CHAINE}" "${PROJECT_DIRECTORY}") elseif(HAVE_FLEXML AND HAVE_FLEX AND SED_EXE) message(" FLEX : ${FLEX_EXE}") @@ -98,22 +98,19 @@ message("_______________________________________________________________________ if(PERL_EXE) message(" PERL : ${PERL_EXE}\n") - exec_program("${CMAKE_COMMAND} -E remove ${PROJECT_DIRECTORY}/src/simgrid_units_main.c") - exec_program("${CMAKE_COMMAND} -E remove src/simgrid_units_main.c") + exec_program("${CMAKE_COMMAND} -E remove ${PROJECT_DIRECTORY}/src/simgrid_units_main.c") foreach(file ${TEST_UNITS}) - exec_program("${CMAKE_COMMAND} -E remove ${PROJECT_DIRECTORY}/src/${file}") - exec_program("${CMAKE_COMMAND} -E remove src/${file}") + exec_program("${CMAKE_COMMAND} -E remove ${file}") endforeach(file ${TEST_UNITS}) #$(TEST_UNITS): $(TEST_CFILES) - string(REPLACE ";" " " USE_TEST_CFILES "${TEST_CFILES}") - + string(REPLACE ";" " " USE_TEST_CFILES "${TEST_CFILES}") exec_program("chmod a=rwx ${PROJECT_DIRECTORY}/tools/sg_unit_extractor.pl") exec_program("${PROJECT_DIRECTORY}/tools/sg_unit_extractor.pl ${USE_TEST_CFILES}" "${PROJECT_DIRECTORY}/src") #@builddir@/simgrid_units_main.c: $(TEST_UNITS) - exec_program("${PROJECT_DIRECTORY}/tools/sg_unit_extractor.pl ${PROJECT_DIRECTORY}/src/xbt/cunit.c" "${PROJECT_DIRECTORY}/src") + exec_program("${PROJECT_DIRECTORY}/tools/sg_unit_extractor.pl xbt/cunit.c" "${PROJECT_DIRECTORY}/src") else(PERL_EXE) message(FATAL_ERROR "Install perl before use maintainer mode")