From ea07feaa52a8efee7a96a1d4322dcf1105bc0df3 Mon Sep 17 00:00:00 2001 From: navarrop Date: Wed, 3 Feb 2010 16:38:38 +0000 Subject: [PATCH] Add maintainer mode with flex and flexml git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@7053 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- buildtools/CPACK/prog_test/prog_stacksetup.c | 2 + buildtools/CPACK/src/CMakeCompleteInFiles.txt | 10 +++-- buildtools/CPACK/src/CMakeFLEXml.txt | 44 +++++++++++++++++++ buildtools/CPACK/src/CMakeMakeExeLib.txt | 7 ++- buildtools/CPACK/src/CMakeOption.txt | 2 + buildtools/CPACK/src/CMakePrintArgs.txt | 3 ++ 6 files changed, 63 insertions(+), 5 deletions(-) create mode 100644 buildtools/CPACK/src/CMakeFLEXml.txt diff --git a/buildtools/CPACK/prog_test/prog_stacksetup.c b/buildtools/CPACK/prog_test/prog_stacksetup.c index bf7b5690a4..72f95bdc67 100644 --- a/buildtools/CPACK/prog_test/prog_stacksetup.c +++ b/buildtools/CPACK/prog_test/prog_stacksetup.c @@ -1,4 +1,6 @@ +#if defined OSX #define _XOPEN_SOURCE +#endif #include #include #include diff --git a/buildtools/CPACK/src/CMakeCompleteInFiles.txt b/buildtools/CPACK/src/CMakeCompleteInFiles.txt index 72a47aca1b..67fe25f93b 100644 --- a/buildtools/CPACK/src/CMakeCompleteInFiles.txt +++ b/buildtools/CPACK/src/CMakeCompleteInFiles.txt @@ -311,13 +311,16 @@ message("HAVE_MAKECONTEXT ${HAVE_MAKECONTEXT}") if(HAVE_MAKECONTEXT) set(makecontext_CPPFLAGS "-DTEST_makecontext") + if(CMAKE_SYSTEM_NAME MATCHES "Darwin") + set(makecontext_CPPFLAGS_2 "-DOSX") + message("SYSTEM OSX") + endif(CMAKE_SYSTEM_NAME MATCHES "Darwin") try_run(RUN_makecontext_VAR COMPILE_makecontext_VAR ${PROJECT_DIRECTORY} ${PROJECT_DIRECTORY}/CPACK/prog_test/prog_stacksetup.c - COMPILE_DEFINITIONS ${makecontext_CPPFLAGS} + COMPILE_DEFINITIONS ${makecontext_CPPFLAGS} ${makecontext_CPPFLAGS_2} ) find_program(CAT_EXE NAMES cat) - exec_program("${CAT_EXE}" ARGS "${PROJECT_SOURCE_DIRECTORY}/conftestval" OUTPUT_VARIABLE "ac_cv_stacksetup_makecontext") if(COMPILE_makecontext_VAR) set(makecontext_type "ok") @@ -327,7 +330,8 @@ if(HAVE_MAKECONTEXT) exec_program("${SED_EXE}" ARGS "-e 's;,.*$;;' ${PROJECT_DIRECTORY}/conftestval" OUTPUT_VARIABLE "makecontext_addr") exec_program("${SED_EXE}" ARGS "-e 's;^.*,;;' ${PROJECT_DIRECTORY}/conftestval" OUTPUT_VARIABLE "makecontext_size") - + message("${makecontext_addr}") + message("${makecontext_size}") set(pth_skaddr_makecontext "#define pth_skaddr_makecontext(skaddr,sksize) (${makecontext_addr})") set(pth_sksize_makecontext "#define pth_sksize_makecontext(skaddr,sksize) (${makecontext_size})") diff --git a/buildtools/CPACK/src/CMakeFLEXml.txt b/buildtools/CPACK/src/CMakeFLEXml.txt new file mode 100644 index 0000000000..0334d3835b --- /dev/null +++ b/buildtools/CPACK/src/CMakeFLEXml.txt @@ -0,0 +1,44 @@ +if(MAINTAINER_MODE) + +find_program(FLEX_EXE NAMES flex) +find_program(FLEXML_EXE NAMES flexml) + +IF(FLEX_EXE) + set(HAVE_FLEX 1) +ENDIF(FLEX_EXE) + +IF(FLEXML_EXE) + set(HAVE_FLEXML 1) +ENDIF(FLEXML_EXE) + +message("HAVE_FLEX ${HAVE_FLEX}") +message("HAVE_FLEXML ${HAVE_FLEXML}") + + file(REMOVE "${PROJECT_DIRECTORY}/src/gras/DataDesc/ddt_parse.yy.c ${PROJECT_DIRECTORY}/src/surf/simgrid_dtd.c ${PROJECT_DIRECTORY}/src/xbt/graphxml.c ${PROJECT_DIRECTORY}/src/simdag/dax_dtd.c ${PROJECT_DIRECTORY}/include/surf/simgrid_dtd.h ${PROJECT_DIRECTORY}/include/xbt/graphxml.h ${PROJECT_DIRECTORY}/src/simdag/dax_dtd.h") + + if(HAVE_FLEXML AND HAVE_FLEX) + + 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" OUTPUT_VARIABLE "FLEX_OK") + 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" OUTPUT_VARIABLE "FLEX_OK") + + 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" OUTPUT_VARIABLE "FLEX_OK") + exec_program("${FLEXML_EXE} -P graphxml --sysid=graphxml.dtd -H ${PROJECT_DIRECTORY}/include/xbt/graphxml.h -L ${PROJECT_DIRECTORY}/src/xbt/graphxml.dtd" OUTPUT_VARIABLE "FLEX_OK") + + 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" OUTPUT_VARIABLE "FLEX_OK") + 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" OUTPUT_VARIABLE "FLEX_OK") + + exec_program("${FLEX_EXE} -o ${PROJECT_DIRECTORY}/src/surf/simgrid_dtd.c -Psurf_parse_ --noline ${PROJECT_DIRECTORY}/src/surf/simgrid_dtd.l" + OUTPUT_VARIABLE "FLEX_OK") + exec_program("${FLEX_EXE} -o ${PROJECT_DIRECTORY}/src/xbt/graphxml.c -Pxbt_graph_parse_ --noline ${PROJECT_DIRECTORY}/xbt/graphxml.l" + OUTPUT_VARIABLE "FLEX_OK") + exec_program("${FLEX_EXE} -o ${PROJECT_DIRECTORY}/src/simdag/dax_dtd.c -Pdax_ --noline ${PROJECT_DIRECTORY}/simdag/dax_dtd.l" + OUTPUT_VARIABLE "FLEX_OK") + + 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" OUTPUT_VARIABLE "FLEX_OK") + + elseif(HAVE_FLEXML AND HAVE_FLEX) + message(FATAL_ERROR "Install flex and flexml before use maintainer mode") + endif(HAVE_FLEXML AND HAVE_FLEX) + +endif(MAINTAINER_MODE) + diff --git a/buildtools/CPACK/src/CMakeMakeExeLib.txt b/buildtools/CPACK/src/CMakeMakeExeLib.txt index 084ca7d2ca..051be866dd 100644 --- a/buildtools/CPACK/src/CMakeMakeExeLib.txt +++ b/buildtools/CPACK/src/CMakeMakeExeLib.txt @@ -1,4 +1,7 @@ ### Make Libs + +include(${PROJECT_DIRECTORY}/CPACK/src/CMakeFLEXml.txt) + add_library(simgrid SHARED ${simgrid_sources}) add_library(gras SHARED ${gras_sources}) add_library(smpi SHARED ${SMPI_SRC}) @@ -23,7 +26,7 @@ if(HAVE_LUA) endif(HAVE_LUA) if(HAVE_GTNETS) - SET(SIMGRID_DEP_GTNETS "gtnets") + SET(SIMGRID_DEP_GTNETS "gtnets ") endif(HAVE_GTNETS) message("SIMGRID_DEP \"${SIMGRID_DEP}\"") @@ -32,7 +35,7 @@ message("GRAS_DEP \"${GRAS_DEP}\"") ### Add definitions for compile set(CMAKE_CXX_FLAGS "-fprofile-arcs -ftest-coverage") add_definitions (${INCLUDES} -fprofile-arcs -ftest-coverage) -target_link_libraries(simgrid ${SIMGRID_DEP} ${SIMGRID_DEP_GTNETS} -fprofile-arcs) +target_link_libraries(simgrid ${SIMGRID_DEP} ${SIMGRID_DEP_GTNETS}-fprofile-arcs) target_link_libraries(gras ${GRAS_DEP} pthread -fprofile-arcs) target_link_libraries(smpi -fprofile-arcs) diff --git a/buildtools/CPACK/src/CMakeOption.txt b/buildtools/CPACK/src/CMakeOption.txt index c9a3ed9b62..6078d11077 100644 --- a/buildtools/CPACK/src/CMakeOption.txt +++ b/buildtools/CPACK/src/CMakeOption.txt @@ -7,6 +7,7 @@ #SET(disable_context ON) #SET(disable_lua ON) #SET(init OFF) +#SET(MAINTAINER_MODE OFF) option(init "Set ON for make _*.c with gras_stub_generator" OFF) option(disable_java "This variable set the java context." ON) @@ -14,3 +15,4 @@ option(disable_gtnets "This variable set the gtnets context." ON) option(disable_threads "This variable set the thread context." ON) option(disable_context "This variable set the context." ON) option(disable_lua "This variable set lua use." ON) +option(MAINTAINER_MODE "Permit to make flex and flexml files." OFF) diff --git a/buildtools/CPACK/src/CMakePrintArgs.txt b/buildtools/CPACK/src/CMakePrintArgs.txt index 014f8995c6..4495d9e4b6 100644 --- a/buildtools/CPACK/src/CMakePrintArgs.txt +++ b/buildtools/CPACK/src/CMakePrintArgs.txt @@ -18,5 +18,8 @@ message(" -> with_context \"${with_context}\"") message("disable_lua ${disable_lua}") +message("init ${init}") +message("MAINTAINER_MODE ${MAINTAINER_MODE}") + message("_______END_ARGS_______") #-------------------------------------------------------------------------------------------------- -- 2.20.1