X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/217557096673710f29ebe590ffcf76329ddd87de..9fd6cbc6c3b06f4b09e3c3339ffb3cc8a68f9bfa:/tools/cmake/MaintainerMode.cmake diff --git a/tools/cmake/MaintainerMode.cmake b/tools/cmake/MaintainerMode.cmake index fbedec0268..a277ad00ff 100644 --- a/tools/cmake/MaintainerMode.cmake +++ b/tools/cmake/MaintainerMode.cmake @@ -10,22 +10,20 @@ set(FLEX_MIN_PATCH 39) # the rest should only be changed if you understand what you're doing if(enable_maintainer_mode AND NOT WIN32) - find_program(PYTHON_EXE NAMES python) - mark_as_advanced(PYTHON_EXE) - if (PYTHON_EXE) + if (PYTHON_EXECUTABLE) add_custom_command( OUTPUT ${CMAKE_HOME_DIRECTORY}/src/simix/popping_generated.cpp ${CMAKE_HOME_DIRECTORY}/src/simix/popping_bodies.cpp ${CMAKE_HOME_DIRECTORY}/src/simix/popping_enum.h - ${CMAKE_HOME_DIRECTORY}/src/simix/popping_accessors.h + ${CMAKE_HOME_DIRECTORY}/src/simix/popping_accessors.hpp DEPENDS ${CMAKE_HOME_DIRECTORY}/src/simix/simcalls.py ${CMAKE_HOME_DIRECTORY}/src/simix/simcalls.in COMMENT "Generating simcalls source files" - COMMAND ${PYTHON_EXE} simcalls.py + COMMAND ${PYTHON_EXECUTABLE} simcalls.py WORKING_DIRECTORY ${CMAKE_HOME_DIRECTORY}/src/simix/ ) @@ -34,15 +32,42 @@ if(enable_maintainer_mode AND NOT WIN32) ${CMAKE_HOME_DIRECTORY}/src/simix/popping_generated.cpp ${CMAKE_HOME_DIRECTORY}/src/simix/popping_bodies.cpp ${CMAKE_HOME_DIRECTORY}/src/simix/popping_enum.h - ${CMAKE_HOME_DIRECTORY}/src/simix/popping_accessors.h + ${CMAKE_HOME_DIRECTORY}/src/simix/popping_accessors.hpp ) SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES - "${CMAKE_HOME_DIRECTORY}/src/simix/popping_enum.h;${CMAKE_HOME_DIRECTORY}/src/simix/popping_generated.cpp;${CMAKE_HOME_DIRECTORY}/src/simix/popping_bodies.cpp;${CMAKE_HOME_DIRECTORY}/src/simix/popping_accessors.h" + "${CMAKE_HOME_DIRECTORY}/src/simix/popping_enum.h;${CMAKE_HOME_DIRECTORY}/src/simix/popping_generated.cpp;${CMAKE_HOME_DIRECTORY}/src/simix/popping_bodies.cpp;${CMAKE_HOME_DIRECTORY}/src/simix/popping_accessors.hpp" ) endif() endif() +# Let's generate header files required by SMPI when the call location tracing +# has been activated. +if(enable_maintainer_mode AND NOT WIN32) + add_custom_command(OUTPUT ${CMAKE_HOME_DIRECTORY}/include/smpi/smpi_extended_traces.h + ${CMAKE_HOME_DIRECTORY}/include/smpi/smpi_extended_traces_fortran.h + DEPENDS + ${CMAKE_HOME_DIRECTORY}/tools/smpi/generate_smpi_defines.pl + ${CMAKE_HOME_DIRECTORY}/include/smpi/smpi.h + + COMMENT "Generating header files for call-location tracing with SMPI" + # Make sure there is no space after the redirection operator (>). I received + # error messages in that case on my Debian system. + COMMAND "${CMAKE_HOME_DIRECTORY}/tools/smpi/generate_smpi_defines.pl" "${CMAKE_HOME_DIRECTORY}/include/smpi/smpi.h >${CMAKE_HOME_DIRECTORY}/include/smpi/smpi_extended_traces.h" + COMMAND "${CMAKE_HOME_DIRECTORY}/tools/smpi/generate_smpi_defines.pl" "-f" "${CMAKE_HOME_DIRECTORY}/include/smpi/smpi.h >${CMAKE_HOME_DIRECTORY}/include/smpi/smpi_extended_traces_fortran.h" + ) + + add_custom_target(smpi_generated_headers_call_location_tracing + DEPENDS + ${CMAKE_HOME_DIRECTORY}/include/smpi/smpi_extended_traces.h + ${CMAKE_HOME_DIRECTORY}/include/smpi/smpi_extended_traces_fortran.h + ) + + SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES + "${CMAKE_HOME_DIRECTORY}/include/smpi/smpi_extended_traces.h;${CMAKE_HOME_DIRECTORY}/include/smpi/smpi_extended_traces_fortran.h" + ) +endif() + if(enable_maintainer_mode AND NOT WIN32) find_program(FLEX_EXE NAMES flex) find_program(FLEXML_EXE NAMES flexml) @@ -85,7 +110,7 @@ if(enable_maintainer_mode AND NOT WIN32) message(STATUS "Found flex: ${FLEX_EXE}") IF(FLEX_EXE) set(HAVE_FLEX 1) - exec_program("${FLEX_EXE} --version" OUTPUT_VARIABLE FLEX_VERSION) + execute_process(COMMAND ${FLEX_EXE} --version OUTPUT_VARIABLE FLEX_VERSION) string(REGEX MATCH "[0-9]+[.]+[0-9]+[.]+[0-9]+" FLEX_VERSION "${FLEX_VERSION}") string(REGEX MATCH "^[0-9]+" FLEX_MAJOR_VERSION "${FLEX_VERSION}") string(REGEX MATCH "[0-9]+[.]+[0-9]+$" FLEX_VERSION "${FLEX_VERSION}") @@ -96,7 +121,7 @@ if(enable_maintainer_mode AND NOT WIN32) message(STATUS "Found flexml: ${FLEXML_EXE}") IF(FLEXML_EXE) set(HAVE_FLEXML 1) - exec_program("${FLEXML_EXE} --version" OUTPUT_VARIABLE FLEXML_VERSION) + execute_process(COMMAND ${FLEXML_EXE} --version OUTPUT_VARIABLE FLEXML_VERSION) if (FLEXML_VERSION MATCHES "version Id:") message(FATAL_ERROR "You have an ancient flexml version (${FLEXML_VERSION}). You need at least v${FLEXML_MIN_MAJOR}.${FLEXML_MIN_MINOR}.${FLEXML_MIN_PATCH} to compile in maintainer mode. Upgrade your flexml, or disable the Maintainer mode option in cmake.") endif() @@ -135,57 +160,41 @@ if(enable_maintainer_mode AND NOT WIN32) ENDIF() - set(string1 "'s/extern *\\([^(]*\\)\\( \\|\\( \\*\\)\\)/XBT_PUBLIC_DATA(\\1\\3) /'") - set(string2 "'s/XBT_PUBLIC_DATA(\\([^)]*\\)) *\\([^(]*\\)(/XBT_PUBLIC(\\1) \\2(/'") + set(string1 "'s/extern /XBT_PUBLIC_DATA /'") + set(string2 "'s/XBT_PUBLIC_DATA \\([^(]*\\)(/XBT_PUBLIC \\1(/'") set(string5 "'s/SET(DOCTYPE)/SET(ROOT_dax__adag)/'") - set(string8 "'s/#if defined(_WIN32)/#if defined(_XBT_WIN32)/g'") - set(string9 "'s/#include /#if defined(_XBT_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'") + set(string9 "'s/#include /#if defined(_WIN32)\\n# ifndef __STRICT_ANSI__\\n# include \\n# include \\n# endif\\n#else\\n# include \\n#endif/g'") set(string14 "'\\!^ \\* Generated [0-9/]\\{10\\} [0-9:]\\{8\\}\\.$$!d'") - set(string15 "'s/FAIL(\"Premature EOF/if(!ETag_surfxml_include_state()) FAIL(\"Premature EOF/'") ADD_CUSTOM_COMMAND( - OUTPUT ${CMAKE_HOME_DIRECTORY}/include/surf/simgrid_dtd.h - ${CMAKE_HOME_DIRECTORY}/include/xbt/graphxml.h - ${CMAKE_HOME_DIRECTORY}/src/simdag/dax_dtd.h - ${CMAKE_HOME_DIRECTORY}/src/surf/simgrid_dtd.c - ${CMAKE_HOME_DIRECTORY}/src/xbt/graphxml.c - ${CMAKE_HOME_DIRECTORY}/src/simdag/dax_dtd.c - - DEPENDS ${CMAKE_HOME_DIRECTORY}/src/surf/simgrid.dtd - ${CMAKE_HOME_DIRECTORY}/src/xbt/graphxml.dtd - ${CMAKE_HOME_DIRECTORY}/src/simdag/dax.dtd - - #${CMAKE_HOME_DIRECTORY}/src/surf/simgrid_dtd.l: ${CMAKE_HOME_DIRECTORY}/src/surf/simgrid.dtd - COMMAND ${FLEXML_EXE} --root-tags platform -b 1000000 -P surfxml --sysid=http://simgrid.gforge.inria.fr/simgrid.dtd -S src/surf/simgrid_dtd.l -L src/surf/simgrid.dtd - COMMAND ${SED_EXE} -i ${string14} src/surf/simgrid_dtd.l - COMMAND ${CMAKE_COMMAND} -E echo "src/surf/simgrid_dtd.l" - - #${CMAKE_HOME_DIRECTORY}/src/xbt/graphxml.l: ${CMAKE_HOME_DIRECTORY}/src/xbt/graphxml.dtd - COMMAND ${FLEXML_EXE} -b 1000000 -P graphxml --sysid=graphxml.dtd -S src/xbt/graphxml.l -L src/xbt/graphxml.dtd - COMMAND ${SED_EXE} -i ${string14} src/xbt/graphxml.l - COMMAND ${CMAKE_COMMAND} -E echo "src/xbt/graphxml.l" + OUTPUT ${CMAKE_HOME_DIRECTORY}/src/surf/xml/simgrid_dtd.h + ${CMAKE_HOME_DIRECTORY}/src/simdag/dax_dtd.h + ${CMAKE_HOME_DIRECTORY}/src/surf/xml/simgrid_dtd.c + ${CMAKE_HOME_DIRECTORY}/src/simdag/dax_dtd.c + + DEPENDS ${CMAKE_HOME_DIRECTORY}/src/surf/xml/simgrid.dtd + ${CMAKE_HOME_DIRECTORY}/src/simdag/dax.dtd + + #${CMAKE_HOME_DIRECTORY}/src/surf/xml/simgrid_dtd.l: ${CMAKE_HOME_DIRECTORY}/src/surf/xml/simgrid.dtd + COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_HOME_DIRECTORY}/src/surf/xml + COMMAND ${FLEXML_EXE} --root-tags platform -b 1000000 -P surfxml --sysid=http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd -S src/surf/xml/simgrid_dtd.l -L src/surf/xml/simgrid.dtd + COMMAND ${SED_EXE} -i ${string14} src/surf/xml/simgrid_dtd.l + COMMAND ${SED_EXE} -i "'s/FAIL(\"Bad declaration %s.\",yytext)/FAIL(\"Bad declaration %s.\\\\nIf your are using a XML v3 file (check the version attribute in ), please update it with tools\\/simgrid_update_xml.pl\",yytext)/'" src/surf/xml/simgrid_dtd.l + COMMAND ${CMAKE_COMMAND} -E echo " Generated src/surf/xml/simgrid_dtd.l" #${CMAKE_HOME_DIRECTORY}/src/simdag/dax_dtd.l: ${CMAKE_HOME_DIRECTORY}/src/simdag/dax.dtd COMMAND ${FLEXML_EXE} -b 1000000 --root-tags adag -P dax_ --sysid=dax.dtd -S src/simdag/dax_dtd.l -L src/simdag/dax.dtd COMMAND ${SED_EXE} -i ${string5} src/simdag/dax_dtd.l COMMAND ${SED_EXE} -i ${string14} src/simdag/dax_dtd.l - COMMAND ${CMAKE_COMMAND} -E echo "src/simdag/dax_dtd.l" + COMMAND ${CMAKE_COMMAND} -E echo " Generated src/simdag/dax_dtd.l" - #${CMAKE_HOME_DIRECTORY}/include/surf/simgrid_dtd.h: ${CMAKE_HOME_DIRECTORY}/src/surf/simgrid.dtd + #${CMAKE_HOME_DIRECTORY}/src/surf/xml/simgrid_dtd.h: ${CMAKE_HOME_DIRECTORY}/src/surf/xml/simgrid.dtd COMMAND ${CMAKE_COMMAND} -E remove -f ${CMAKE_HOME_DIRECTORY}/include/surf/simgrid.h - COMMAND ${FLEXML_EXE} --root-tags platform -P surfxml --sysid=http://simgrid.gforge.inria.fr/simgrid.dtd -H include/surf/simgrid_dtd.h -L src/surf/simgrid.dtd - COMMAND ${SED_EXE} -i ${string1} include/surf/simgrid_dtd.h - COMMAND ${SED_EXE} -i ${string2} include/surf/simgrid_dtd.h - COMMAND ${SED_EXE} -i ${string14} include/surf/simgrid_dtd.h - COMMAND ${CMAKE_COMMAND} -E echo "include/surf/simgrid_dtd.h" - - #${CMAKE_HOME_DIRECTORY}/include/xbt/graphxml.h: ${CMAKE_HOME_DIRECTORY}/src/xbt/graphxml.dtd - COMMAND ${CMAKE_COMMAND} -E remove -f ${CMAKE_HOME_DIRECTORY}/include/xbt/graphxml.h - COMMAND ${FLEXML_EXE} -P graphxml --sysid=graphxml.dtd -H include/xbt/graphxml.h -L src/xbt/graphxml.dtd - COMMAND ${SED_EXE} -i ${string1} include/xbt/graphxml.h - COMMAND ${SED_EXE} -i ${string2} include/xbt/graphxml.h - COMMAND ${SED_EXE} -i ${string14} include/xbt/graphxml.h - COMMAND ${CMAKE_COMMAND} -E echo "include/xbt/graphxml.h" + COMMAND ${FLEXML_EXE} --root-tags platform -P surfxml --sysid=http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd -H src/surf/xml/simgrid_dtd.h -L src/surf/xml/simgrid.dtd + COMMAND ${SED_EXE} -i ${string1} src/surf/xml/simgrid_dtd.h + COMMAND ${SED_EXE} -i ${string2} src/surf/xml/simgrid_dtd.h + COMMAND ${SED_EXE} -i ${string14} src/surf/xml/simgrid_dtd.h + COMMAND ${CMAKE_COMMAND} -E echo " Generated src/surf/xml/simgrid_dtd.h" #${CMAKE_HOME_DIRECTORY}/src/simdag/dax_dtd.h: ${CMAKE_HOME_DIRECTORY}/src/simdag/dax.dtd COMMAND ${CMAKE_COMMAND} -E remove -f ${CMAKE_HOME_DIRECTORY}/src/simdag/dax_dtd.h @@ -193,32 +202,26 @@ if(enable_maintainer_mode AND NOT WIN32) COMMAND ${SED_EXE} -i ${string1} src/simdag/dax_dtd.h COMMAND ${SED_EXE} -i ${string2} src/simdag/dax_dtd.h COMMAND ${SED_EXE} -i ${string14} src/simdag/dax_dtd.h - COMMAND ${CMAKE_COMMAND} -E echo "src/simdag/dax_dtd.h" - - #surf/simgrid_dtd.c: surf/simgrid_dtd.l - COMMAND ${CMAKE_COMMAND} -E remove -f ${CMAKE_HOME_DIRECTORY}/src/surf/simgrid_dtd.c - COMMAND ${SED_EXE} -i ${string8} src/surf/simgrid_dtd.l - COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_HOME_DIRECTORY}/src/surf - COMMAND ${FLEX_EXE} -o src/surf/simgrid_dtd.c -Psurf_parse_ --noline src/surf/simgrid_dtd.l - COMMAND ${SED_EXE} -i ${string9} src/surf/simgrid_dtd.c - COMMAND ${SED_EXE} -i ${string15} src/surf/simgrid_dtd.c - COMMAND ${CMAKE_COMMAND} -E echo "surf/simgrid_dtd.c" - - #xbt/graphxml.c: xbt/graphxml.l - COMMAND ${CMAKE_COMMAND} -E remove -f ${CMAKE_HOME_DIRECTORY}/src/xbt/graphxml.c - COMMAND ${SED_EXE} -i ${string8} src/xbt/graphxml.l - COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_HOME_DIRECTORY}/src/xbt - COMMAND ${FLEX_EXE} -o src/xbt/graphxml.c -Pxbt_graph_parse_ --noline src/xbt/graphxml.l - COMMAND ${SED_EXE} -i ${string9} src/xbt/graphxml.c - COMMAND ${CMAKE_COMMAND} -E echo "xbt/graphxml.c" + COMMAND ${CMAKE_COMMAND} -E echo " Generated src/simdag/dax_dtd.h" + + #surf/xml/simgrid_dtd.c: surf/xml/simgrid_dtd.l + COMMAND ${CMAKE_COMMAND} -E remove -f ${CMAKE_HOME_DIRECTORY}/src/surf/xml/simgrid_dtd.c + COMMAND ${FLEX_EXE} -o src/surf/xml/simgrid_dtd.c -Psurf_parse_ --noline src/surf/xml/simgrid_dtd.l + COMMAND ${SED_EXE} -i ${string9} src/surf/xml/simgrid_dtd.c + COMMAND ${SED_EXE} -i 's/int yyl\;/unsigned int yyl\;/' src/surf/xml/simgrid_dtd.c + COMMAND ${SED_EXE} -i 's/int surf_parse_leng\;/unsigned int surf_parse_leng\;/' src/surf/xml/simgrid_dtd.c + COMMAND ${SED_EXE} -i 's/n = 0\; n < max_size/n = 0\; n < (size_t) max_size/' src/surf/xml/simgrid_dtd.c + COMMAND ${SED_EXE} -i "s/register //" src/surf/xml/simgrid_dtd.c + COMMAND ${CMAKE_COMMAND} -E echo " Generated surf/xml/simgrid_dtd.c" #simdag/dax_dtd.c: simdag/dax_dtd.l COMMAND ${CMAKE_COMMAND} -E remove -f ${CMAKE_HOME_DIRECTORY}/src/simdag/dax_dtd.c - COMMAND ${SED_EXE} -i ${string8} src/simdag/dax_dtd.l COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_HOME_DIRECTORY}/src/simdag COMMAND ${FLEX_EXE} -o src/simdag/dax_dtd.c -Pdax_ --noline src/simdag/dax_dtd.l - COMMAND ${SED_EXE} -i ${string9} src/simdag/dax_dtd.c - COMMAND ${CMAKE_COMMAND} -E echo "simdag/dax_dtd.c" + COMMAND ${SED_EXE} -i ${string9} src/simdag/dax_dtd.c + COMMAND ${SED_EXE} -i 's/int yyl\;/unsigned int yyl\;/' src/simdag/dax_dtd.c + COMMAND ${SED_EXE} -i 's/int dax_leng\;/unsigned int dax_leng\;/' src/simdag/dax_dtd.c + COMMAND ${CMAKE_COMMAND} -E echo " Generated src/simdag/dax_dtd.c" WORKING_DIRECTORY ${CMAKE_HOME_DIRECTORY} COMMENT "Generating files in maintainer mode..." @@ -226,10 +229,10 @@ if(enable_maintainer_mode AND NOT WIN32) else() if(NOT HAVE_FLEXML) - message(STATUS "Error : Install flexml before use maintainer mode.") + message(STATUS "Error : Install flexml to use the maintainer mode.") endif() if(NOT HAVE_FLEX) - message(STATUS "Error : Install flex before use maintainer mode.") + message(STATUS "Error : Install flex to use the maintainer mode.") endif() if(NOT SED_EXE) message(STATUS "Error : Install sed before use maintainer mode.") @@ -241,10 +244,8 @@ if(enable_maintainer_mode AND NOT WIN32) endif() add_custom_target(maintainer_files - DEPENDS ${CMAKE_HOME_DIRECTORY}/include/surf/simgrid_dtd.h - ${CMAKE_HOME_DIRECTORY}/include/xbt/graphxml.h - ${CMAKE_HOME_DIRECTORY}/src/simdag/dax_dtd.h - ${CMAKE_HOME_DIRECTORY}/src/surf/simgrid_dtd.c - ${CMAKE_HOME_DIRECTORY}/src/xbt/graphxml.c - ${CMAKE_HOME_DIRECTORY}/src/simdag/dax_dtd.c + DEPENDS ${CMAKE_HOME_DIRECTORY}/src/surf/xml/simgrid_dtd.h + ${CMAKE_HOME_DIRECTORY}/src/surf/xml/simgrid_dtd.c + ${CMAKE_HOME_DIRECTORY}/src/simdag/dax_dtd.h + ${CMAKE_HOME_DIRECTORY}/src/simdag/dax_dtd.c )