Set sources files generated.

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

diff --git a/buildtools/Cmake/src/CMakeDefinePackages.txt b/buildtools/Cmake/src/CMakeDefinePackages.txt
index 51cbe1f..dd1638d 100644 (file)
--- a/buildtools/Cmake/src/CMakeDefinePackages.txt
+++ b/buildtools/Cmake/src/CMakeDefinePackages.txt
@@ -84,8 +84,6 @@ set(SMPI_SRC
        ${PROJECT_DIRECTORY}/src/smpi/smpi_bench.c
        ${PROJECT_DIRECTORY}/src/smpi/smpi_global.c
        ${PROJECT_DIRECTORY}/src/smpi/smpi_mpi.c
-       #${PROJECT_DIRECTORY}/src/smpi/smpi_sender.c
-       #${PROJECT_DIRECTORY}/src/smpi/smpi_receiver.c
        ${PROJECT_DIRECTORY}/src/smpi/smpi_comm.c
        ${PROJECT_DIRECTORY}/src/smpi/smpi_group.c
        ${PROJECT_DIRECTORY}/src/smpi/smpi_util.c
@@ -99,8 +97,6 @@ set(JMSG_C_SRC
        ${PROJECT_DIRECTORY}/src/java/jxbt_utilities.h
        ${PROJECT_DIRECTORY}/src/java/jmsg.c 
        ${PROJECT_DIRECTORY}/src/java/jmsg.h
-       #${PROJECT_DIRECTORY}/src/java/jmsg_channel.c
-       #${PROJECT_DIRECTORY}/src/java/jmsg_channel.h
        ${PROJECT_DIRECTORY}/src/java/jmsg_host.c
        ${PROJECT_DIRECTORY}/src/java/jmsg_host.h
        ${PROJECT_DIRECTORY}/src/java/jmsg_process.c

diff --git a/buildtools/Cmake/src/CMakeDistrib.txt b/buildtools/Cmake/src/CMakeDistrib.txt
index 5b59258..2af6359 100644 (file)
--- a/buildtools/Cmake/src/CMakeDistrib.txt
+++ b/buildtools/Cmake/src/CMakeDistrib.txt
@@ -40,7 +40,9 @@ set(to_svg
        ${PROJECT_DIRECTORY}/./README.IEEE
        ${PROJECT_DIRECTORY}/./TODO
        ${PROJECT_DIRECTORY}/./src/smpi/smpicc.in
+       ${PROJECT_DIRECTORY}/./src/smpi/smpicc
        ${PROJECT_DIRECTORY}/./src/smpi/smpirun.in
+       ${PROJECT_DIRECTORY}/./src/smpi/smpirun
        ${PROJECT_DIRECTORY}/./src/bindings/ruby/simgrid_ruby.c
        ${PROJECT_DIRECTORY}/./src/bindings/ruby_bindings.h
        ${PROJECT_DIRECTORY}/./src/simix/smx_context_sysv_private.h
@@ -58,6 +60,7 @@ install(DIRECTORY "${PROJECT_DIRECTORY}/doc/"
 DESTINATION "/doc/"
 PATTERN ".svn" EXCLUDE 
 PATTERN ".git" EXCLUDE 
+PATTERN "*.o" EXCLUDE
 PATTERN "*~" EXCLUDE
 )
 
@@ -65,7 +68,8 @@ PATTERN "*~" EXCLUDE
 install(DIRECTORY "${PROJECT_DIRECTORY}/buildtools/Cmake/"
 DESTINATION "/buildtools/Cmake/"
 PATTERN ".svn" EXCLUDE 
-PATTERN ".git" EXCLUDE 
+PATTERN ".git" EXCLUDE
+PATTERN "*.o" EXCLUDE
 PATTERN "*~" EXCLUDE
 )
 

diff --git a/buildtools/Cmake/src/CMakeFLEXml.txt b/buildtools/Cmake/src/CMakeFLEXml.txt
index 4e6afcc..efd332f 100644 (file)
--- a/buildtools/Cmake/src/CMakeFLEXml.txt
+++ b/buildtools/Cmake/src/CMakeFLEXml.txt
@@ -5,6 +5,7 @@ message("_______________________________________________________________________
 find_program(FLEX_EXE NAMES flex)
 find_program(FLEXML_EXE NAMES flexml)
 find_program(SED_EXE NAMES sed)
+find_program(PERL_EXE NAMES perl)
 
 message("  FLEX :      ${FLEX_EXE}")
 message("FLEXML :      ${FLEXML_EXE}")
@@ -98,24 +99,28 @@ message("")
 message("________________________________________________________________________________")
 message("________________________________________________________________________________ SG_UNIT_EXTRACTOR")
 
-exec_program("rm -f simgrid_units_main.c *_unit.c ${PROJECT_DIRECTORY}/src/simgrid_units_main.c ${PROJECT_DIRECTORY}/src/*_unit.c" "${PROJECT_DIRECTORY}/src/" OUTPUT_VARIABLE OKITOKI)
-
-#$(TEST_UNITS): $(TEST_CFILES)
-string(REPLACE ";" " " TEST_CFILES "${TEST_CFILES}")
-exec_program("${PROJECT_DIRECTORY}/tools/sg_unit_extractor.pl ${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/")
-
-#clean-units:
-foreach(file ${TEST_UNITS})
-       exec_program("echo ${file}|sed -e 's|.c$$|.Po|' -e 's|[^/]*/||' -e 's|^|.deps/|'" "${PROJECT_DIRECTORY}/src/" OUTPUT_VARIABLE dep)
-        exec_program("echo \"Removing dependency tracker of ${file} (${dep} ${PROJECT_DIRECTORY}/src/${dep})\"" OUTPUT_VARIABLE OKITOKI)
-       message("${OKITOKI}")
-       exec_program("rm -vf ${dep} ${PROJECT_DIRECTORY}/src/${dep}" "${PROJECT_DIRECTORY}/src/" OUTPUT_VARIABLE OKITOKI)
-       exec_program("touch ${dep}" "${PROJECT_DIRECTORY}/src/" OUTPUT_VARIABLE OKITOKI)
-endforeach(file ${TEST_UNITS})
-
+if(PERL_EXE)
+       exec_program("rm -f simgrid_units_main.c *_unit.c ${PROJECT_DIRECTORY}/src/simgrid_units_main.c ${PROJECT_DIRECTORY}/src/*_unit.c" "${PROJECT_DIRECTORY}/src/" OUTPUT_VARIABLE OKITOKI)
+
+       #$(TEST_UNITS): $(TEST_CFILES)
+       string(REPLACE ";" " " TEST_CFILES "${TEST_CFILES}")
+       exec_program("${PROJECT_DIRECTORY}/tools/sg_unit_extractor.pl ${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/")
+
+       #clean-units:
+       foreach(file ${TEST_UNITS})
+               exec_program("echo ${file}|sed -e 's|.c$$|.Po|' -e 's|[^/]*/||' -e 's|^|.deps/|'" "${PROJECT_DIRECTORY}/src/" OUTPUT_VARIABLE dep)
+               exec_program("echo \"Removing dependency tracker of ${file} (${dep} ${PROJECT_DIRECTORY}/src/${dep})\"" OUTPUT_VARIABLE OKITOKI)
+               message("${OKITOKI}")
+               exec_program("rm -vf ${dep} ${PROJECT_DIRECTORY}/src/${dep}" "${PROJECT_DIRECTORY}/src/" OUTPUT_VARIABLE OKITOKI)
+               exec_program("touch ${dep}" "${PROJECT_DIRECTORY}/src/" OUTPUT_VARIABLE OKITOKI)
+       endforeach(file ${TEST_UNITS})
+else(PERL_EXE)
+       message("   PERL :      ${PERL_EXE}")
+       message(FATAL_ERROR "Install perl before use maintainer mode")
+endif(PERL_EXE)
 message("")
 message("________________________________________________________________________________")
 message("________________________________________________________________________________ SG_UNIT_EXTRACTOR END")
@@ -125,7 +130,7 @@ message("_______________________________________________________________________
 message("________________________________________________________________________________ LOOKED FILES")
 foreach(file ${SRC_TO_LOOK})
        message("FILE : ${file}")
-       configure_file(${file} ${file} @ONLY)
+       #configure_file(${file} ${file} @ONLY)
 endforeach(file ${SRC_TO_LOOK})
 message("")
 message("________________________________________________________________________________")

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index be55ea8..350f38e 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -4,8 +4,9 @@ set_source_files_properties(${PROJECT_DIRECTORY}/src/simgrid_units_main.c
 PROPERTIES GENERATED true)
 
 foreach(file ${TEST_UNITS})
-       set_source_files_properties(${PROJECT_DIRECTORY}/src/${file}
+       set_source_files_properties(${file}
 PROPERTIES GENERATED true)
+       message("Generated file :  ${file}")
 endforeach(file ${TEST_UNITS})