Generate files in good order.

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@7406 48e7efb5-ca39-0410-a469-dd3cf9ba447f

diff --git a/buildtools/Cmake/src/CMakeFLEXml.txt b/buildtools/Cmake/src/CMakeFLEXml.txt
index 3a354e4..84d1d32 100644 (file)
--- a/buildtools/Cmake/src/CMakeFLEXml.txt
+++ b/buildtools/Cmake/src/CMakeFLEXml.txt
@@ -4,13 +4,11 @@ message("_______________________________________________________________________
 message("________________________________________________________________________________ FLEXMl")
 find_program(FLEX_EXE NAMES flex)
 find_program(FLEXML_EXE NAMES flexml)
-find_program(LEX_EXE NAMES lex)
 find_program(SED_EXE NAMES sed)
 
 message("  FLEX :      ${FLEX_EXE}")
 message("FLEXML :      ${FLEXML_EXE}")
-message("   LEX :      ${LEX_EXE}")
-message("   SED :      ${SED_EXE}")
+message("   SED :      ${SED_EXE}\n")
 
 set(top_srcdir "${PROJECT_DIRECTORY}")
 set(srcdir "${PROJECT_DIRECTORY}/src")
@@ -23,31 +21,7 @@ IF(FLEXML_EXE)
        set(HAVE_FLEXML 1)
 ENDIF(FLEXML_EXE)
 
-IF(LEX_EXE)
-       set(HAVE_LEX 1)
-ENDIF(LEX_EXE)
-
-exec_program("${LEX_EXE} -o gras/DataDesc/ddt_parse.yy.c -Pgras_ddt_parse_ --noline gras/DataDesc/ddt_parse.yy.l" "${PROJECT_DIRECTORY}/src/")
-
-#surf/simgrid_dtd.c: surf/simgrid_dtd.l
-exec_program("mkdir -p `dirname surf/simgrid_dtd.c`" "${PROJECT_DIRECTORY}/src/")
-exec_program("${LEX_EXE} -o surf/simgrid_dtd.c -Psurf_parse_ --noline surf/simgrid_dtd.l" "${PROJECT_DIRECTORY}/src/")
-set(CHAINE "'s/#include <unistd.h>/#if defined(_WIN32) || defined(__WIN32__) || defined(WIN32) || defined(__TOS_WIN__)\n#  ifndef __STRICT_ANSI__\\n#    include <io.h>\\n#    include <process.h>\\n#  endif\\n#else\\n#  include <unistd.h>\\n#endif/g' -i surf/simgrid_dtd.c")      
-exec_program("${SED_EXE} ${CHAINE}" "${PROJECT_DIRECTORY}/src/")
-
-#xbt/graphxml.c: xbt/graphxml.l
-exec_program("mkdir -p `dirname xbt/graphxml.c`" "${PROJECT_DIRECTORY}/src/")
-exec_program("${LEX_EXE} -o xbt/graphxml.c -Pxbt_graph_parse_ --noline xbt/graphxml.l" "${PROJECT_DIRECTORY}/src/")
-set(CHAINE "'s/#include <unistd.h>/#if defined(_WIN32) || defined(__WIN32__) || defined(WIN32) || defined(__TOS_WIN__)\\n#  ifndef __STRICT_ANSI__\\n#    include <io.h>\\n#    include <process.h>\\n#  endif\\n#else\\n#  include <unistd.h>\\n#endif/g' -i xbt/graphxml.c")                 
-exec_program("${SED_EXE} ${CHAINE}" "${PROJECT_DIRECTORY}/src/")
-
-#simdag/dax_dtd.c: simdag/dax_dtd.l
-exec_program("mkdir -p `dirname simdag/dax_dtd.c`" "${PROJECT_DIRECTORY}/src/")
-exec_program("${LEX_EXE} -o simdag/dax_dtd.c -Pdax_ --noline simdag/dax_dtd.l" "${PROJECT_DIRECTORY}/src/")
-set(CHAINE "'s/#include <unistd.h>/#if defined(_WIN32) || defined(__WIN32__) || defined(WIN32) || defined(__TOS_WIN__)\\n#  ifndef __STRICT_ANSI__\\n#    include <io.h>\\n#    include <process.h>\\n#  endif\\n#else\\n#  include <unistd.h>\\n#endif/g' -i simdag/dax_dtd.c")       
-exec_program("${SED_EXE} ${CHAINE}" "${PROJECT_DIRECTORY}/src/")
-
-if(HAVE_FLEXML AND HAVE_FLEX)
+if(HAVE_FLEXML AND HAVE_FLEX AND SED_EXE)
 
 #surf/simgrid_dtd.l: $(srcdir)/surf/simgrid.dtd
 exec_program("mkdir -p surf")
@@ -87,12 +61,32 @@ exec_program("${SED_EXE} ${CHAINE} -i simdag/dax_dtd.h" "${PROJECT_DIRECTORY}/sr
 set(CHAINE "'s/XBT_PUBLIC_DATA(\\([^)]*\\)) *\\([^(]*\\)(/XBT_PUBLIC(\\1) \\2(/'")     
 exec_program("${SED_EXE} ${CHAINE} -i simdag/dax_dtd.h" "${PROJECT_DIRECTORY}/src/")
 
+exec_program("${FLEX_EXE} -o gras/DataDesc/ddt_parse.yy.c -Pgras_ddt_parse_ --noline gras/DataDesc/ddt_parse.yy.l" "${PROJECT_DIRECTORY}/src/")
+
+#surf/simgrid_dtd.c: surf/simgrid_dtd.l
+exec_program("mkdir -p `dirname surf/simgrid_dtd.c`" "${PROJECT_DIRECTORY}/src/")
+exec_program("${FLEX_EXE} -o surf/simgrid_dtd.c -Psurf_parse_ --noline surf/simgrid_dtd.l" "${PROJECT_DIRECTORY}/src/")
+set(CHAINE "'s/#include <unistd.h>/#if defined(_WIN32) || defined(__WIN32__) || defined(WIN32) || defined(__TOS_WIN__)\\n#  ifndef __STRICT_ANSI__\\n#    include <io.h>\\n#    include <process.h>\\n#  endif\\n#else\\n#  include <unistd.h>\\n#endif/g' -i surf/simgrid_dtd.c")     
+exec_program("${SED_EXE} ${CHAINE}" "${PROJECT_DIRECTORY}/src/")
+
+#xbt/graphxml.c: xbt/graphxml.l
+exec_program("mkdir -p `dirname xbt/graphxml.c`" "${PROJECT_DIRECTORY}/src/")
+exec_program("${FLEX_EXE} -o xbt/graphxml.c -Pxbt_graph_parse_ --noline xbt/graphxml.l" "${PROJECT_DIRECTORY}/src/")
+set(CHAINE "'s/#include <unistd.h>/#if defined(_WIN32) || defined(__WIN32__) || defined(WIN32) || defined(__TOS_WIN__)\\n#  ifndef __STRICT_ANSI__\\n#    include <io.h>\\n#    include <process.h>\\n#  endif\\n#else\\n#  include <unistd.h>\\n#endif/g' -i xbt/graphxml.c")                 
+exec_program("${SED_EXE} ${CHAINE}" "${PROJECT_DIRECTORY}/src/")
+
+#simdag/dax_dtd.c: simdag/dax_dtd.l
+exec_program("mkdir -p `dirname simdag/dax_dtd.c`" "${PROJECT_DIRECTORY}/src/")
+exec_program("${FLEX_EXE} -o simdag/dax_dtd.c -Pdax_ --noline simdag/dax_dtd.l" "${PROJECT_DIRECTORY}/src/")
+set(CHAINE "'s/#include <unistd.h>/#if defined(_WIN32) || defined(__WIN32__) || defined(WIN32) || defined(__TOS_WIN__)\\n#  ifndef __STRICT_ANSI__\\n#    include <io.h>\\n#    include <process.h>\\n#  endif\\n#else\\n#  include <unistd.h>\\n#endif/g' -i simdag/dax_dtd.c")       
+exec_program("${SED_EXE} ${CHAINE}" "${PROJECT_DIRECTORY}/src/")
 
-elseif(HAVE_FLEXML AND HAVE_FLEX)
-       message("HAVE_FLEX ${HAVE_FLEX}")
-       message("HAVE_FLEXML ${HAVE_FLEXML}")
-       message(FATAL_ERROR "Install flex and flexml before use maintainer mode")
-endif(HAVE_FLEXML AND HAVE_FLEX)
+elseif(HAVE_FLEXML AND HAVE_FLEX  AND SED_EXE)
+       message("  FLEX :       ${FLEX_EXE}")
+       message("FLEXML :       ${FLEXML_EXE}")
+       message("   SED :       ${SED_EXE}")
+       message(FATAL_ERROR "Install flex or flexml or sed before use maintainer mode")
+endif(HAVE_FLEXML AND HAVE_FLEX  AND SED_EXE)
 
 #include $(top_srcdir)/acmacro/dist-files.mk