Add debug to flexml.

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7f4bbbe..d3272c1 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -63,7 +63,7 @@ include(${PROJECT_DIRECTORY}/buildtools/Cmake/src/CMakePrintArgs.txt)
 
 ### Make Docs
 if(enable_maintainer_mode)
-       include(${PROJECT_DIRECTORY}/buildtools/Cmake/src/CMakeDocs.txt)
+       #include(${PROJECT_DIRECTORY}/buildtools/Cmake/src/CMakeDocs.txt)
 endif(enable_maintainer_mode)
 
 INCLUDE(Dart)

diff --git a/buildtools/Cmake/src/CMakeDistrib.txt b/buildtools/Cmake/src/CMakeDistrib.txt
index 725f4a2..53cf30c 100644 (file)
--- a/buildtools/Cmake/src/CMakeDistrib.txt
+++ b/buildtools/Cmake/src/CMakeDistrib.txt
@@ -110,11 +110,10 @@ add_custom_target(distcheck
 COMMAND make package
 COMMAND rm -rf ${PROJECT_DIRECTORY}/_CPack_Packages
 COMMAND tar xvf ${CPACK_PACKAGE_FILE_NAME}.tar.bz2
-COMMAND cd ${CPACK_PACKAGE_FILE_NAME}
-COMMAND cd ${CPACK_PACKAGE_FILE_NAME} && cmake .
-COMMAND cd ${CPACK_PACKAGE_FILE_NAME} && make
-COMMAND cd ${CPACK_PACKAGE_FILE_NAME} && make test
-COMMAND rm -rf ${CPACK_PACKAGE_FILE_NAME}
+COMMAND cd ${PROJECT_DIRECTORY}/${CPACK_PACKAGE_FILE_NAME} && cmake .
+COMMAND cd ${PROJECT_DIRECTORY}/${CPACK_PACKAGE_FILE_NAME} && make
+COMMAND cd ${PROJECT_DIRECTORY}/${CPACK_PACKAGE_FILE_NAME} && make test
+COMMAND rm -rf ${PROJECT_DIRECTORY}/${CPACK_PACKAGE_FILE_NAME}
 WORKING_DIRECTORY "${PROJECT_DIRECTORY}"
 )
 

diff --git a/buildtools/Cmake/src/CMakeFLEXml.txt b/buildtools/Cmake/src/CMakeFLEXml.txt
index 633b118..2346a28 100644 (file)
--- a/buildtools/Cmake/src/CMakeFLEXml.txt
+++ b/buildtools/Cmake/src/CMakeFLEXml.txt
@@ -1,5 +1,7 @@
 if(enable_maintainer_mode)
-
+message("")
+message("________________________________________________________________________________")
+message("________________________________________________________________________________ FLEXMl")
 find_program(FLEX_EXE NAMES flex)
 find_program(FLEXML_EXE NAMES flexml)
 
@@ -15,29 +17,31 @@ ENDIF(FLEXML_EXE)
 
                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")
 
-               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} --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 -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} -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 -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} -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} -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("${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/")
+               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("${FLEX_EXE} -o ${PROJECT_DIRECTORY}/src/surf/simgrid_dtd.c -Psurf_parse_ --noline ${PROJECT_DIRECTORY}/src/surf/simgrid_dtd.l"
-               OUTPUT_VARIABLE "FLEX_OK")              
+               "${PROJECT_DIRECTORY}/src/")            
                exec_program("${FLEX_EXE} -o ${PROJECT_DIRECTORY}/src/xbt/graphxml.c -Pxbt_graph_parse_ --noline ${PROJECT_DIRECTORY}/src/xbt/graphxml.l"
-               OUTPUT_VARIABLE "FLEX_OK")
+               "${PROJECT_DIRECTORY}/src/")
                exec_program("${FLEX_EXE} -o ${PROJECT_DIRECTORY}/src/simdag/dax_dtd.c -Pdax_ --noline ${PROJECT_DIRECTORY}/src/simdag/dax_dtd.l"
-               OUTPUT_VARIABLE "FLEX_OK")
+               "${PROJECT_DIRECTORY}/src/")
 
-               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")
+               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/")
        
        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)
-
+message("")
+message("________________________________________________________________________________")
+message("________________________________________________________________________________ FLEXML END")
 endif(enable_maintainer_mode)
 

diff --git a/buildtools/Cmake/src/CMakePrintArgs.txt b/buildtools/Cmake/src/CMakePrintArgs.txt
index 8ca7bf9..f231287 100644 (file)
--- a/buildtools/Cmake/src/CMakePrintArgs.txt
+++ b/buildtools/Cmake/src/CMakePrintArgs.txt
@@ -50,7 +50,7 @@ if(print_message)
        message("LUALIB.H:                      ${HAVE_LUA5_1_LUALIB_H}")
        message("LAUXLIB.H:                     ${HAVE_LUA5_1_LAUXLIB_H}")
        message("________________________________________________________________________________")
-       message("________________________________________________________________________________ END")
+       message("________________________________________________________________________________ DEBUG END")
        message("")
 endif(print_message)