Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid
authorSamuel Lepetit <samuel.lepetit@inria.fr>
Thu, 14 Jun 2012 20:49:26 +0000 (22:49 +0200)
committerSamuel Lepetit <samuel.lepetit@inria.fr>
Thu, 14 Jun 2012 20:49:26 +0000 (22:49 +0200)
84 files changed:
buildtools/Cmake/AddTestsWin.cmake [deleted file]
buildtools/Cmake/CompleteInFiles.cmake
buildtools/Cmake/DefinePackages.cmake
buildtools/Cmake/Distrib.cmake
buildtools/Cmake/MakeExe.cmake
buildtools/Cmake/Modules/FindValgrind.cmake
buildtools/Cmake/Scripts/Diff.pm [moved from buildtools/Cmake/Diff.pm with 100% similarity]
buildtools/Cmake/Scripts/Makefile.default [moved from buildtools/Cmake/Makefile.default with 100% similarity]
buildtools/Cmake/Scripts/SimGrid.packproj [moved from buildtools/Cmake/SimGrid.packproj with 100% similarity]
buildtools/Cmake/Scripts/generate_memcheck_tests.pl [moved from buildtools/Cmake/generate_memcheck_tests.pl with 100% similarity]
buildtools/Cmake/Scripts/generate_new_tests.pl [moved from buildtools/Cmake/generate_new_tests.pl with 100% similarity]
buildtools/Cmake/Scripts/my_valgrind.pl [moved from buildtools/Cmake/my_valgrind.pl with 100% similarity]
buildtools/Cmake/Scripts/postinstall.sh [moved from buildtools/Cmake/postinstall.sh with 100% similarity]
buildtools/Cmake/Scripts/preinstall.sh [moved from buildtools/Cmake/preinstall.sh with 100% similarity]
buildtools/Cmake/Scripts/tesh.pl [moved from buildtools/Cmake/tesh.pl with 100% similarity]
buildtools/Cmake/Scripts/test_java.sh [moved from buildtools/Cmake/test_java.sh with 100% similarity]
buildtools/Cmake/Scripts/update_tesh.pl [moved from buildtools/Cmake/update_tesh.pl with 100% similarity]
buildtools/Cmake/src/gras_config.h.in [moved from buildtools/Cmake/gras_config.h.in with 100% similarity]
buildtools/Cmake/src/simgrid.nsi.in [moved from buildtools/Cmake/simgrid.nsi.in with 100% similarity]
examples/amok/bandwidth/CMakeLists.txt
examples/amok/saturate/CMakeLists.txt
examples/gras/all2all/CMakeLists.txt
examples/gras/chrono/CMakeLists.txt
examples/gras/console/CMakeLists.txt
examples/gras/mmrpc/CMakeLists.txt
examples/gras/mutual_exclusion/simple_token/CMakeLists.txt
examples/gras/ping/CMakeLists.txt
examples/gras/pmm/CMakeLists.txt
examples/gras/properties/CMakeLists.txt
examples/gras/rpc/CMakeLists.txt
examples/gras/spawn/CMakeLists.txt
examples/gras/synchro/CMakeLists.txt
examples/gras/timer/CMakeLists.txt
examples/lua/CMakeLists.txt [new file with mode: 0644]
examples/msg/CMakeLists.txt [new file with mode: 0644]
examples/msg/actions/CMakeLists.txt
examples/msg/chord/CMakeLists.txt
examples/msg/cloud/CMakeLists.txt
examples/msg/gpu/CMakeLists.txt
examples/msg/gtnets/CMakeLists.txt
examples/msg/icomms/CMakeLists.txt
examples/msg/io/CMakeLists.txt
examples/msg/masterslave/CMakeLists.txt
examples/msg/mc/CMakeLists.txt
examples/msg/migration/CMakeLists.txt
examples/msg/ns3/CMakeLists.txt
examples/msg/parallel_task/CMakeLists.txt
examples/msg/pmm/CMakeLists.txt
examples/msg/priority/CMakeLists.txt
examples/msg/properties/CMakeLists.txt
examples/msg/sendrecv/CMakeLists.txt
examples/msg/start_kill_time/CMakeLists.txt
examples/msg/suspend/CMakeLists.txt
examples/msg/token_ring/CMakeLists.txt
examples/msg/tracing/CMakeLists.txt
examples/simdag/CMakeLists.txt
examples/simdag/dax/CMakeLists.txt
examples/simdag/dot/CMakeLists.txt
examples/simdag/goal/CMakeLists.txt
examples/simdag/metaxml/CMakeLists.txt
examples/simdag/properties/CMakeLists.txt
examples/simdag/scheduling/CMakeLists.txt
examples/smpi/CMakeLists.txt
examples/xbt/CMakeLists.txt [new file with mode: 0644]
include/simdag/simdag.h
src/instr/instr_config.c
src/msg/msg_vm.c
src/simdag/sd_task.c
src/xbt/ex.c
teshsuite/CMakeLists.txt [new file with mode: 0644]
teshsuite/gras/CMakeLists.txt [new file with mode: 0644]
teshsuite/gras/datadesc/CMakeLists.txt
teshsuite/gras/empty_main/CMakeLists.txt
teshsuite/gras/msg_handle/CMakeLists.txt
teshsuite/gras/small_sleep/CMakeLists.txt
teshsuite/msg/CMakeLists.txt
teshsuite/msg/trace/CMakeLists.txt
teshsuite/simdag/CMakeLists.txt
teshsuite/simdag/network/CMakeLists.txt
teshsuite/simdag/network/mxn/CMakeLists.txt
teshsuite/simdag/network/p2p/CMakeLists.txt
teshsuite/simdag/partask/CMakeLists.txt
teshsuite/simdag/platforms/CMakeLists.txt
teshsuite/xbt/CMakeLists.txt

diff --git a/buildtools/Cmake/AddTestsWin.cmake b/buildtools/Cmake/AddTestsWin.cmake
deleted file mode 100644 (file)
index 013db55..0000000
+++ /dev/null
@@ -1,153 +0,0 @@
-if(enable_memcheck)\r
-       exec_program("valgrind --version " OUTPUT_VARIABLE "VALGRIND_VERSION")\r
-       if(VALGRIND_VERSION)\r
-               string(REGEX MATCH "[0-9].[0-9].[0-9]" NEW_VALGRIND_VERSION "${VALGRIND_VERSION}")\r
-               if(NEW_VALGRIND_VERSION)\r
-                       exec_program("${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/generate_memcheck_tests.pl ${CMAKE_HOME_DIRECTORY} ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/AddTests.cmake > ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/memcheck_tests.cmake")\r
-               else(NEW_VALGRIND_VERSION)\r
-                       set(enable_memcheck false)\r
-                       message("Command valgrind not found --> enable_memcheck autoset to false.")\r
-               endif(NEW_VALGRIND_VERSION)\r
-       else(VALGRIND_VERSION)\r
-               set(enable_memcheck false)\r
-               message(FATAL_ERROR "Command valgrind not found --> enable_memcheck autoset to false.")\r
-       endif(VALGRIND_VERSION)\r
-endif(enable_memcheck)\r
-\r
-### For code coverage\r
-### Set some variables\r
-SET(UPDATE_TYPE "svn")\r
-SET(DROP_METHOD "http")\r
-SET(DROP_SITE "cdash.inria.fr/CDash")\r
-SET(DROP_LOCATION "/submit.php?project=${PROJECT_NAME}")\r
-SET(DROP_SITE_CDASH TRUE)\r
-SET(TRIGGER_SITE "http://cdash.inria.fr/CDash/cgi-bin/Submit-Random-TestingResults.cgi")\r
-set(MEMORYCHECK_COMMAND_OPTIONS "--trace-children=yes --leak-check=full --show-reachable=yes --track-origins=yes --read-var-info=no")\r
-SET(VALGRIND_COMMAND "${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/my_valgrind.pl")\r
-SET(MEMORYCHECK_COMMAND "${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/my_valgrind.pl")\r
-#If you use the --read-var-info option Memcheck will run more slowly but may give a more detailed description of any illegal address.\r
-\r
-INCLUDE(CTest)\r
-ENABLE_TESTING()\r
-\r
-ADD_TEST(tesh-msg-get-sender               perl ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl ${CMAKE_HOME_DIRECTORY}/teshsuite msg/get_sender.tesh)\r
-ADD_TEST(tesh-simdag-reinit-costs              perl ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl ${CMAKE_HOME_DIRECTORY}/teshsuite simdag/network/test_reinit_costs.tesh)\r
-ADD_TEST(tesh-simdag-parser                        perl ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/platforms basic_parsing_test.tesh)\r
-\r
-IF(enable_debug)\r
-ADD_TEST(tesh-simdag-parser-bogus-symmetric perl ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/platforms two_hosts_asymetric.tesh)\r
-ENDIF(enable_debug)\r
-\r
-ADD_TEST(tesh-simdag-parser-sym-full           perl ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/platforms basic_parsing_test_sym_full.tesh)\r
-ADD_TEST(tesh-simdag-flatifier                 perl ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/platforms flatifier.tesh)\r
-ADD_TEST(tesh-simdag-full-links                        perl ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/platforms get_full_link.tesh)\r
-ADD_TEST(tesh-simdag-basic0    perl ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl ${CMAKE_HOME_DIRECTORY}/teshsuite simdag/basic0.tesh)\r
-ADD_TEST(tesh-simdag-basic1    perl ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl ${CMAKE_HOME_DIRECTORY}/teshsuite simdag/basic1.tesh)\r
-ADD_TEST(tesh-simdag-basic2    perl ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl ${CMAKE_HOME_DIRECTORY}/teshsuite simdag/basic2.tesh)\r
-ADD_TEST(tesh-simdag-basic3    perl ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl ${CMAKE_HOME_DIRECTORY}/teshsuite simdag/basic3.tesh)\r
-ADD_TEST(tesh-simdag-basic4    perl ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl ${CMAKE_HOME_DIRECTORY}/teshsuite simdag/basic4.tesh)\r
-ADD_TEST(tesh-simdag-basic5    perl ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl ${CMAKE_HOME_DIRECTORY}/teshsuite simdag/basic5.tesh)\r
-ADD_TEST(tesh-simdag-basic6    perl ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl ${CMAKE_HOME_DIRECTORY}/teshsuite simdag/basic6.tesh)\r
-ADD_TEST(tesh-simdag-p2p-1     perl ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl ${CMAKE_HOME_DIRECTORY}/teshsuite simdag/network/p2p/test_latency1.tesh)\r
-ADD_TEST(tesh-simdag-p2p-2     perl ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl ${CMAKE_HOME_DIRECTORY}/teshsuite simdag/network/p2p/test_latency2.tesh)\r
-ADD_TEST(tesh-simdag-p2p-3     perl ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl ${CMAKE_HOME_DIRECTORY}/teshsuite simdag/network/p2p/test_latency3.tesh)\r
-ADD_TEST(tesh-simdag-p2p-4     perl ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl ${CMAKE_HOME_DIRECTORY}/teshsuite simdag/network/p2p/test_latency_bound.tesh)\r
-ADD_TEST(tesh-simdag-mxn-1     perl ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl ${CMAKE_HOME_DIRECTORY}/teshsuite simdag/network/mxn/test_intra_all2all.tesh)\r
-ADD_TEST(tesh-simdag-mxn-2     perl ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl ${CMAKE_HOME_DIRECTORY}/teshsuite simdag/network/mxn/test_intra_independent_comm.tesh)\r
-ADD_TEST(tesh-simdag-mxn-3     perl ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl ${CMAKE_HOME_DIRECTORY}/teshsuite simdag/network/mxn/test_intra_scatter.tesh)\r
-ADD_TEST(tesh-simdag-par-1     perl ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl ${CMAKE_HOME_DIRECTORY}/teshsuite simdag/partask/test_comp_only_seq.tesh)\r
-ADD_TEST(tesh-simdag-par-2     perl ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl ${CMAKE_HOME_DIRECTORY}/teshsuite simdag/partask/test_comp_only_par.tesh)\r
-\r
-# MSG examples\r
-ADD_TEST(msg-suspend           perl ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl ${CMAKE_HOME_DIRECTORY}/examples/msg suspend/suspend.tesh)\r
-ADD_TEST(msg-masterslave       perl ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl ${CMAKE_HOME_DIRECTORY}/examples/msg masterslave/masterslave.tesh)\r
-ADD_TEST(msg-masterslave-forwarder     perl ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl ${CMAKE_HOME_DIRECTORY}/examples/msg masterslave/masterslave_forwarder.tesh)\r
-ADD_TEST(msg-masterslave-failure       perl ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl ${CMAKE_HOME_DIRECTORY}/examples/msg masterslave/masterslave_failure.tesh)\r
-ADD_TEST(msg-masterslave-bypass        perl ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl ${CMAKE_HOME_DIRECTORY}/examples/msg masterslave/masterslave_bypass.tesh)\r
-ADD_TEST(msg-masterslave-mailbox       perl ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl ${CMAKE_HOME_DIRECTORY}/examples/msg masterslave/masterslave_mailbox.tesh)\r
-ADD_TEST(msg-masterslave-vivaldi       perl ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl ${CMAKE_HOME_DIRECTORY}/examples/msg masterslave/masterslave_vivaldi.tesh)\r
-ADD_TEST(msg-migration         perl ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl ${CMAKE_HOME_DIRECTORY}/examples/msg migration/migration.tesh)\r
-ADD_TEST(msg-ptask             perl ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl ${CMAKE_HOME_DIRECTORY}/examples/msg parallel_task/parallel_task.tesh)\r
-ADD_TEST(msg-priority          ${CMAKE_HOME_DIRECTORY}/examples/msg/priority/priority.exe ${CMAKE_HOME_DIRECTORY}/examples/msg/small_platform.xml  ${CMAKE_HOME_DIRECTORY}/examples/msg/priority/deployment_priority.xml)\r
-ADD_TEST(msg-properties                perl ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl ${CMAKE_HOME_DIRECTORY}/examples/msg properties/msg_prop.tesh)\r
-ADD_TEST(msg-trace             perl ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl ${CMAKE_HOME_DIRECTORY}/examples/msg trace/trace.tesh)\r
-ADD_TEST(msg-masterslave-cpu-ti        perl ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl ${CMAKE_HOME_DIRECTORY}/examples/msg masterslave/masterslave_cpu_ti.tesh)\r
-ADD_TEST(msg-icomms perl ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl ${CMAKE_HOME_DIRECTORY}/examples/msg/icomms peer.tesh)\r
-ADD_TEST(msg-icomms-waitany ${CMAKE_HOME_DIRECTORY}/examples/msg/icomms/peer3 ${CMAKE_HOME_DIRECTORY}/examples/msg/icomms/small_platform.xml ${CMAKE_HOME_DIRECTORY}/examples/msg/icomms/deployment_peer05.xml)\r
-\r
-IF(HAVE_TRACING)\r
-  ADD_TEST(tracing-ms perl ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl ${CMAKE_HOME_DIRECTORY}/examples/msg tracing/ms.tesh)\r
-  ADD_TEST(tracing-trace_platform perl ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl ${CMAKE_HOME_DIRECTORY}/examples/msg tracing/trace_platform.tesh)\r
-  ADD_TEST(tracing-categories perl ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl ${CMAKE_HOME_DIRECTORY}/examples/msg tracing/categories.tesh)\r
-  ADD_TEST(tracing-process-migration perl ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl ${CMAKE_HOME_DIRECTORY}/examples/msg tracing/procmig.tesh)\r
-ENDIF(HAVE_TRACING)\r
-\r
-IF(${ARCH_32_BITS})\r
-  ADD_TEST(gras-ping-sg-32     perl ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl ${CMAKE_HOME_DIRECTORY}/examples/gras/ping test_sg_32.tesh)\r
-  ADD_TEST(gras-rpc-sg-32      perl ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl ${CMAKE_HOME_DIRECTORY}/examples/gras/rpc test_sg_32.tesh)\r
-  ADD_TEST(gras-spawn-sg-32    perl ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl ${CMAKE_HOME_DIRECTORY}/examples/gras/spawn test_sg_32.tesh)\r
-  ADD_TEST(gras-timer-sg-32    perl ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl ${CMAKE_HOME_DIRECTORY}/examples/gras/timer test_sg_32.tesh)\r
-  ADD_TEST(gras-chrono-sg-32   perl ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl ${CMAKE_HOME_DIRECTORY}/examples/gras/chrono test_sg_32.tesh)\r
-  ADD_TEST(gras-simple-token-sg-32     perl ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl ${CMAKE_HOME_DIRECTORY}/examples/gras/mutual_exclusion/simple-token test_sg_32.tesh)\r
-  ADD_TEST(gras-mmrpc-sg-32    perl ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl ${CMAKE_HOME_DIRECTORY}/examples/gras/mmrpc test_sg_32.tesh)\r
-  ADD_TEST(gras-all2all-sg-32  perl ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl ${CMAKE_HOME_DIRECTORY}/examples/gras/all2all test_sg_32.tesh)\r
-  ADD_TEST(gras-pmm-sg-32      perl ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl ${CMAKE_HOME_DIRECTORY}/examples/gras/pmm test_sg_32.tesh)\r
-  ADD_TEST(gras-synchro-sg-32  perl ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl ${CMAKE_HOME_DIRECTORY}/examples/gras/synchro test_sg_32.tesh)\r
-ELSE(${ARCH_32_BITS})\r
-  ADD_TEST(gras-ping-sg-64     perl ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl ${CMAKE_HOME_DIRECTORY}/examples/gras/ping test_sg_64.tesh)\r
-  ADD_TEST(gras-rpc-sg-64      perl ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl ${CMAKE_HOME_DIRECTORY}/examples/gras/rpc test_sg_64.tesh)\r
-  ADD_TEST(gras-spawn-sg-64    perl ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl ${CMAKE_HOME_DIRECTORY}/examples/gras/spawn test_sg_64.tesh)\r
-  ADD_TEST(gras-timer-sg-64    perl ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl ${CMAKE_HOME_DIRECTORY}/examples/gras/timer test_sg_64.tesh)\r
-  ADD_TEST(gras-chrono-sg-64   perl ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl ${CMAKE_HOME_DIRECTORY}/examples/gras/chrono test_sg_64.tesh)\r
-  ADD_TEST(gras-simple-token-sg-64     perl ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl ${CMAKE_HOME_DIRECTORY}/examples/gras/mutual_exclusion/simple_token test_sg_64.tesh)\r
-  ADD_TEST(gras-mmrpc-sg-64    perl ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl ${CMAKE_HOME_DIRECTORY}/examples/gras/mmrpc test_sg_64.tesh)\r
-  ADD_TEST(gras-all2all-sg-64  perl ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl ${CMAKE_HOME_DIRECTORY}/examples/gras/all2all test_sg_64.tesh)\r
-  ADD_TEST(gras-pmm-sg-64      perl ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl ${CMAKE_HOME_DIRECTORY}/examples/gras/pmm test_sg_64.tesh)\r
-  ADD_TEST(gras-synchro-sg-64  perl ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl ${CMAKE_HOME_DIRECTORY}/examples/gras/synchro test_sg_64.tesh)\r
-ENDIF(${ARCH_32_BITS})\r
-ADD_TEST(gras-properties-sg    perl ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl ${CMAKE_HOME_DIRECTORY}/examples/gras/properties test_sg.tesh)\r
-\r
-# simdag examples\r
-ADD_TEST(simdag-test-simdag    perl ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl ${CMAKE_HOME_DIRECTORY}/examples/simdag test_simdag.tesh)\r
-ADD_TEST(simdag-test-simdag2   perl ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl ${CMAKE_HOME_DIRECTORY}/examples/simdag test_simdag2.tesh)\r
-ADD_TEST(simdag-test-simdag-seq-access perl ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl ${CMAKE_HOME_DIRECTORY}/examples/simdag test_simdag_seq_access.tesh)\r
-ADD_TEST(simdag-test-prop      perl ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl ${CMAKE_HOME_DIRECTORY}/examples/simdag properties/test_prop.tesh)\r
-ADD_TEST(simdag-metaxml-test   perl ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl ${CMAKE_HOME_DIRECTORY}/examples/simdag metaxml/metaxml_test.tesh)\r
-set_tests_properties(simdag-metaxml_test PROPERTIES WILL_FAIL true)\r
-ADD_TEST(simdag-minmin-test    perl ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl ${CMAKE_HOME_DIRECTORY}/examples/simdag/scheduling test_minmin.tesh)\r
-\r
-if(enable_smpi)\r
-# smpi examples\r
-ADD_TEST(smpi-bcast    perl ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl ${CMAKE_BINARY_DIR}/examples/smpi ${CMAKE_HOME_DIRECTORY}/examples/smpi/bcast.tesh)\r
-ADD_TEST(smpi-reduce   perl ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl ${CMAKE_BINARY_DIR}/examples/smpi ${CMAKE_HOME_DIRECTORY}/examples/smpi/reduce.tesh)\r
-if(HAVE_TRACING)\r
-  ADD_TEST(smpi-tracing-ptp perl ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl ${CMAKE_BINARY_DIR}/examples/smpi ${CMAKE_HOME_DIRECTORY}/examples/smpi/tracing/smpi_traced.tesh)\r
-endif(HAVE_TRACING)\r
-endif(enable_smpi)\r
-                                                               \r
-# examples/msg/mc\r
-if(HAVE_MC)\r
-ADD_TEST(mc-bugged1                    perl ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl ${CMAKE_HOME_DIRECTORY}/examples/msg/mc bugged1.tesh)\r
-ADD_TEST(mc-bugged2                    perl ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl ${CMAKE_HOME_DIRECTORY}/examples/msg/mc bugged2.tesh)\r
-ADD_TEST(mc-centralized                perl ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl ${CMAKE_HOME_DIRECTORY}/examples/msg/mc centralized.tesh)\r
-endif(HAVE_MC)\r
-\r
-ADD_TEST(tesh-simdag-full-links01              ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/platforms/basic_parsing_test ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/platforms/two_clusters.xml FULL_LINK)\r
-ADD_TEST(tesh-simdag-full-links02              ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/platforms/basic_parsing_test ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/platforms/two_clusters_one_name.xml FULL_LINK)\r
-ADD_TEST(tesh-simdag-one-link-g5k              ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/platforms/basic_parsing_test ${CMAKE_HOME_DIRECTORY}/examples/platforms/g5k.xml ONE_LINK)\r
-ADD_TEST(msg-icomms-waitany                    ${CMAKE_HOME_DIRECTORY}/examples/msg/icomms/peer3 ${CMAKE_HOME_DIRECTORY}/examples/msg/icomms/small_platform.xml ${CMAKE_HOME_DIRECTORY}/examples/msg/icomms/deployment_peer05.xml)\r
-\r
-# testsuite directory\r
-add_test(test-xbt-log          ${CMAKE_HOME_DIRECTORY}/testsuite/xbt/log_usage)\r
-add_test(test-xbt-graphxml     ${CMAKE_HOME_DIRECTORY}/testsuite/xbt/graphxml_usage ${CMAKE_HOME_DIRECTORY}/testsuite/xbt/graph.xml)\r
-add_test(test-xbt-heap         ${CMAKE_HOME_DIRECTORY}/testsuite/xbt/heap_bench)\r
-\r
-add_test(test-surf-lmm         ${CMAKE_HOME_DIRECTORY}/testsuite/surf/lmm_usage)\r
-add_test(test-surf-maxmin      ${CMAKE_HOME_DIRECTORY}/testsuite/surf/maxmin_bench)\r
-add_test(test-surf-usage       ${CMAKE_HOME_DIRECTORY}/testsuite/surf/surf_usage  --cfg=path:${CMAKE_HOME_DIRECTORY}/testsuite/surf/ platform.xml)\r
-add_test(test-surf-usage2      ${CMAKE_HOME_DIRECTORY}/testsuite/surf/surf_usage2  --cfg=path:${CMAKE_HOME_DIRECTORY}/testsuite/surf/ platform.xml)\r
-add_test(test-surf-trace       ${CMAKE_HOME_DIRECTORY}/testsuite/surf/trace_usage --cfg=path:${CMAKE_HOME_DIRECTORY}/testsuite/surf/)\r
-\r
-add_test(testall               ${CMAKE_HOME_DIRECTORY}/src/testall)\r
-\r
-\r
index 0da9a0a..5a0bf0c 100644 (file)
@@ -835,7 +835,7 @@ endif(APPLE)
 configure_file("${CMAKE_HOME_DIRECTORY}/src/context_sysv_config.h.in"                  "${CMAKE_BINARY_DIR}/src/context_sysv_config.h" @ONLY IMMEDIATE)
 
 SET( CMAKEDEFINE "#cmakedefine" )
-configure_file("${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/gras_config.h.in"     "${CMAKE_BINARY_DIR}/src/gras_config.h" @ONLY IMMEDIATE)
+configure_file("${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/src/gras_config.h.in"         "${CMAKE_BINARY_DIR}/src/gras_config.h" @ONLY IMMEDIATE)
 configure_file("${CMAKE_BINARY_DIR}/src/gras_config.h"                         "${CMAKE_BINARY_DIR}/src/gras_config.h" @ONLY IMMEDIATE)
 configure_file("${CMAKE_HOME_DIRECTORY}/include/simgrid_config.h.in"           "${CMAKE_BINARY_DIR}/include/simgrid_config.h" @ONLY IMMEDIATE)
 
@@ -912,4 +912,4 @@ IF(${ARCH_32_BITS})
 ELSE(${ARCH_32_BITS})
     set(WIN_ARCH "64")
 ENDIF(${ARCH_32_BITS})
-configure_file("${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/simgrid.nsi.in"       "${CMAKE_BINARY_DIR}/simgrid.nsi" @ONLY IMMEDIATE)
+configure_file("${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/src/simgrid.nsi.in"   "${CMAKE_BINARY_DIR}/simgrid.nsi" @ONLY IMMEDIATE)
index 5765fe7..50cfb56 100644 (file)
@@ -85,21 +85,6 @@ set(EXTRA_DIST
        src/smpi/README
        src/mk_supernovae.pl
        
-       examples/gras/ping/ping.h
-       examples/gras/console/ping.h
-       examples/gras/mmrpc/mmrpc.h
-       
-    examples/msg/mc/parserPromela.yacc
-    examples/msg/mc/parserPromela.lex
-    examples/msg/mc/automaton.h
-    examples/msg/mc/bugged1_liveness.h
-    examples/msg/mc/centralized_liveness.h
-    examples/msg/mc/automatonparse_promela.h
-    examples/msg/mc/bugged2_liveness.h
-    examples/msg/mc/y.tab.h
-
-    examples/platforms/content/storage_content.txt
-
        tools/gras/gras_stub_generator.h
        tools/tesh/run_context.h  
        tools/tesh/tesh.h
@@ -566,20 +551,6 @@ elseif(${HAVE_LUA})
                ${LUA_SRC}
        )
 endif(${HAVE_LUA})
-
-file(GLOB_RECURSE examples_to_install_in_doc
-"examples/*.c"
-"examples/*.h"
-"examples/*yacc"
-"examples/*lex"
-"examples/*.cxx"
-"examples/*.hpp"
-"examples/*.rb"
-"examples/*.lua"
-"examples/*.java"
-"examples/*.xml"
-"examples/*README"
-)
     
 set(DOC_SOURCES
        doc/install.doc
@@ -688,20 +659,12 @@ set(DOC_FIGS
 )
 
 file(GLOB_RECURSE add_src_files
-"teshsuite/*.c"
-"teshsuite/*.cxx"
-"teshsuite/*CMakeLists.txt"
 "testsuite/*.c"
 "testsuite/*.cxx"
 "testsuite/*CMakeLists.txt"
 "tools/*.c"
 "tools/*.cxx"
 "tools/*CMakeLists.txt"
-"examples/*.c"
-"examples/*.cxx"
-"examples/*.lua"
-"examples/*.rb"
-"examples/*CMakeLists.txt"
 "src/bindings/*.lua"
 "src/bindings/*.rb"
 "src/bindings/*.c"
@@ -710,7 +673,6 @@ file(GLOB_RECURSE add_src_files
 )
 set(add_src_files
        ${add_src_files}
-        CMakeLists.txt
        src/smpi/smpicc.in
        src/smpi/smpif2c.in
        src/smpi/smpiff.in
@@ -718,163 +680,166 @@ set(add_src_files
 )
 
 file(GLOB_RECURSE xml_files
-"examples/*.xml"
 "include/*.xml"
 "src/*.xml"
-"teshsuite/*.xml"
 "testsuite/*.xml"
 "tools/*.xml"
 )
 
 file(GLOB_RECURSE tesh_files
-"examples/*.tesh"
 "include/*.tesh"
 "src/*.tesh"
-"teshsuite/*.tesh"
 "testsuite/*.tesh"
 "tools/*.tesh"
 )
 
 set(txt_files
-"testsuite/surf/trace_A_failure.txt"
-"testsuite/surf/trace_A.txt"
-"testsuite/surf/trace_B.txt"
-"examples/smpi/hostfile"
-"examples/msg/link5_state.trace"
-"examples/msg/fafard_state.trace"
-"examples/msg/jupiter_state.trace"
-"examples/msg/actions/actions_allReduce.txt"
-"examples/msg/actions/actions_reduce.txt"
-"examples/msg/actions/actions.txt"
-"examples/msg/actions/actions_barrier.txt"
-"examples/msg/actions/actions_split_p0.txt"
-"examples/msg/actions/actions_with_isend.txt"
-"examples/msg/actions/actions_bcast.txt"
-"examples/msg/actions/actions_split_p1.txt"
-"examples/msg/actions/CMakeLists.txt"
-"examples/msg/migration/migration.deploy"
-"teshsuite/gras/datadesc/datadesc.little32_4"
-"teshsuite/gras/datadesc/datadesc.little64"
-"teshsuite/gras/datadesc/datadesc.big32_8_4"
-"teshsuite/gras/datadesc/mk_datadesc_structs.pl"
-"teshsuite/gras/msg_handle/test_rl.tesh"
-"teshsuite/gras/msg_handle/test_sg_32.tesh"
-"teshsuite/gras/msg_handle/test_sg_64.tesh"
-"teshsuite/gras/empty_main/test_rl.tesh"
-"teshsuite/gras/empty_main/test_sg.tesh"
-"teshsuite/gras/small_sleep/test_sg_32.tesh"
-"teshsuite/gras/small_sleep/test_sg_64.tesh"
-"teshsuite/msg/trace/file.trace"
-"teshsuite/simdag/platforms/bob.fail"
-"teshsuite/simdag/platforms/bob.trace"
-"teshsuite/simdag/platforms/bob0_availability_file.trace"
-"teshsuite/simdag/platforms/bob0_state_file.trace"
-"teshsuite/simdag/platforms/bob2_availability_file.trace"
-"teshsuite/simdag/platforms/bob2_state_file.trace"
-"teshsuite/simdag/platforms/link1.bw"
-"teshsuite/simdag/platforms/link1.fail"
-"teshsuite/simdag/platforms/link1.lat"
-"examples/gras/ping/test_rl.tesh"
-"examples/gras/rpc/test_rl.tesh"
-"examples/gras/spawn/test_rl.tesh"
-"examples/gras/timer/test_rl.tesh"
-"examples/gras/chrono/test_rl.tesh"
-"examples/gras/mutual_exclusion/simple_token/test_rl.tesh"
-"examples/gras/mmrpc/test_rl.tesh"
-"examples/gras/all2all/test_rl.tesh"
-"examples/gras/pmm/test_rl.tesh"
-"examples/gras/synchro/test_rl.tesh"
-"examples/gras/properties/test_rl.tesh"
-"examples/gras/ping/test_sg_32.tesh"
-"examples/gras/rpc/test_sg_32.tesh"
-"examples/gras/spawn/test_sg_32.tesh"
-"examples/gras/timer/test_sg_32.tesh"
-"examples/gras/chrono/test_sg_32.tesh"
-"examples/gras/mutual_exclusion/simple_token/test_sg_32.tesh"
-"examples/gras/mmrpc/test_sg_32.tesh"
-"examples/gras/all2all/test_sg_32.tesh"
-"examples/gras/pmm/test_sg_32.tesh"
-"examples/gras/synchro/test_sg_32.tesh"
-"examples/gras/ping/test_sg_64.tesh"
-"examples/gras/rpc/test_sg_64.tesh"
-"examples/gras/spawn/test_sg_64.tesh"
-"examples/gras/timer/test_sg_64.tesh"
-"examples/gras/chrono/test_sg_64.tesh"
-"examples/gras/mutual_exclusion/simple_token/test_sg_64.tesh"
-"examples/gras/mmrpc/test_sg_64.tesh"
-"examples/gras/all2all/test_sg_64.tesh"
-"examples/gras/pmm/test_sg_64.tesh"
-"examples/gras/synchro/test_sg_64.tesh"
-"examples/gras/properties/test_sg.tesh"
-)
-
-set(txt_files
-       ${txt_files}
-       AUTHORS
-       ChangeLog
-       COPYING
-       LICENSE-LGPL-2.1
-       NEWS
-       TODO
-       configure
-       INSTALL
-)
-
-file(GLOB_RECURSE README_files
-"*README"
-)
-       
-string(REPLACE "${CMAKE_HOME_DIRECTORY}/" "" README_files "${README_files}")
-
-file(GLOB_RECURSE CMAKE_SOURCE_FILES
-"buildtools/Cmake/Makefile.default"
-"buildtools/Cmake/test_java.sh"
-"buildtools/Cmake/*.cmake"
-"buildtools/Cmake/*.h.in"
-"buildtools/Cmake/*.pl"
-"buildtools/Cmake/*.sh"
-"buildtools/Cmake/test_prog/*.c"
-"buildtools/Cmake/test_prog/*.cpp"
+${txt_files}
+  "testsuite/surf/trace_A_failure.txt"
+  "testsuite/surf/trace_A.txt"
+  "testsuite/surf/trace_B.txt"
+  AUTHORS
+  ChangeLog
+  COPYING
+  LICENSE-LGPL-2.1
+  NEWS
+  TODO
+  configure
+  INSTALL
 )
 
 set(bin_files
-tools/MSG_visualization/colorize.pl
-tools/sg_unit_extractor.pl
-tools/simgrid_update_xml.pl
-buildtools/Cmake/tesh.pl
-)
-
-# This is the complete list of what will be added to the source archive
-set(source_to_pack     
-       ${headers_to_install}
-       ${source_of_generated_headers}
-       ${XBT_RL_SRC}
-       ${EXTRA_DIST}
-       ${SMPI_SRC}
-       ${GRAS_RL_SRC}
-       ${XBT_SRC}
-       ${GTNETS_SRC}
-       ${NS3_SRC}
-       ${SURF_SRC}
-       ${SIMIX_SRC}
-       ${TRACING_SRC}
-       ${MSG_SRC}
-       ${SIMDAG_SRC}
-       ${GRAS_COMMON_SRC}
-       ${GRAS_SG_SRC}
-       ${AMOK_SRC}
-       ${LUA_SRC}
-       ${MC_SRC}
-       ${JEDULE_SRC}
-       ${RNGSTREAM_SRC}
-       ${add_src_files}
-       ${xml_files}
-       ${tesh_files}
-       ${txt_files}
-       ${CMAKE_SOURCE_FILES}
-       ${bin_files}
-       ${DOC_SOURCES}
-       ${DOC_FIGS}
-       ${README_files}
-       buildtools/Cmake/simgrid.nsi.in 
+  ${bin_files}
+  tools/MSG_visualization/colorize.pl
+  tools/sg_unit_extractor.pl
+  tools/simgrid_update_xml.pl
+)
+
+set(EXAMPLES_CMAKEFILES_TXT
+examples/smpi/CMakeLists.txt
+examples/amok/saturate/CMakeLists.txt
+examples/amok/bandwidth/CMakeLists.txt
+examples/simdag/dot/CMakeLists.txt
+examples/simdag/goal/CMakeLists.txt
+examples/simdag/properties/CMakeLists.txt
+examples/simdag/scheduling/CMakeLists.txt
+examples/simdag/metaxml/CMakeLists.txt
+examples/simdag/dax/CMakeLists.txt
+examples/simdag/CMakeLists.txt
+examples/msg/gpu/CMakeLists.txt
+examples/msg/pmm/CMakeLists.txt
+examples/msg/migration/CMakeLists.txt
+examples/msg/properties/CMakeLists.txt
+examples/msg/mc/CMakeLists.txt
+examples/msg/masterslave/CMakeLists.txt
+examples/msg/chord/CMakeLists.txt
+examples/msg/suspend/CMakeLists.txt
+examples/msg/actions/CMakeLists.txt
+examples/msg/io/CMakeLists.txt
+examples/msg/sendrecv/CMakeLists.txt
+examples/msg/start_kill_time/CMakeLists.txt
+examples/msg/parallel_task/CMakeLists.txt
+examples/msg/priority/CMakeLists.txt
+examples/msg/cloud/CMakeLists.txt
+examples/msg/gtnets/CMakeLists.txt
+examples/msg/icomms/CMakeLists.txt
+examples/msg/tracing/CMakeLists.txt
+examples/msg/ns3/CMakeLists.txt
+examples/msg/token_ring/CMakeLists.txt
+examples/gras/mutual_exclusion/simple_token/CMakeLists.txt
+examples/gras/ping/CMakeLists.txt
+examples/gras/pmm/CMakeLists.txt
+examples/gras/properties/CMakeLists.txt
+examples/gras/rpc/CMakeLists.txt
+examples/gras/chrono/CMakeLists.txt
+examples/gras/timer/CMakeLists.txt
+examples/gras/mmrpc/CMakeLists.txt
+examples/gras/all2all/CMakeLists.txt
+examples/gras/synchro/CMakeLists.txt
+examples/gras/console/CMakeLists.txt
+examples/gras/spawn/CMakeLists.txt
+examples/lua/CMakeLists.txt
+examples/msg/CMakeLists.txt
+examples/xbt/CMakeLists.txt
+)
+
+set(TESHSUITE_CMAKEFILES_TXT
+teshsuite/xbt/CMakeLists.txt
+teshsuite/simdag/network/p2p/CMakeLists.txt
+teshsuite/simdag/network/mxn/CMakeLists.txt
+teshsuite/simdag/network/CMakeLists.txt
+teshsuite/simdag/platforms/CMakeLists.txt
+teshsuite/simdag/partask/CMakeLists.txt
+teshsuite/simdag/CMakeLists.txt
+teshsuite/msg/trace/CMakeLists.txt
+teshsuite/msg/CMakeLists.txt
+teshsuite/gras/small_sleep/CMakeLists.txt
+teshsuite/gras/empty_main/CMakeLists.txt
+teshsuite/gras/msg_handle/CMakeLists.txt
+teshsuite/gras/datadesc/CMakeLists.txt
+teshsuite/CMakeLists.txt
+teshsuite/gras/CMakeLists.txt
+)
+
+set(CMAKE_SOURCE_FILES
+buildtools/Cmake/CTestConfig.cmake
+buildtools/Cmake/UnitTesting.cmake
+buildtools/Cmake/AddTests.cmake
+buildtools/Cmake/Option.cmake
+buildtools/Cmake/memcheck_tests.cmake
+buildtools/Cmake/MakeLibWin.cmake
+buildtools/Cmake/Flags.cmake
+buildtools/Cmake/DefinePackages.cmake
+buildtools/Cmake/CompleteInFiles.cmake
+buildtools/Cmake/Scripts/SimGrid.packproj
+buildtools/Cmake/Scripts/update_tesh.pl
+buildtools/Cmake/Scripts/test_java.sh
+buildtools/Cmake/Scripts/my_valgrind.pl
+buildtools/Cmake/Scripts/tesh.pl
+buildtools/Cmake/Scripts/Makefile.default
+buildtools/Cmake/Scripts/preinstall.sh
+buildtools/Cmake/Scripts/Diff.pm
+buildtools/Cmake/Scripts/generate_new_tests.pl
+buildtools/Cmake/Scripts/postinstall.sh
+buildtools/Cmake/Scripts/generate_memcheck_tests.pl
+buildtools/Cmake/MaintainerMode.cmake
+buildtools/Cmake/Supernovae.cmake
+buildtools/Cmake/Pipol.cmake
+buildtools/Cmake/GenerateDoc.cmake
+buildtools/Cmake/test_prog/prog_getline.c
+buildtools/Cmake/test_prog/prog_mutex_timedlock.c
+buildtools/Cmake/test_prog/prog_gtnets.cpp
+buildtools/Cmake/test_prog/prog_GRAS_ARCH.c
+buildtools/Cmake/test_prog/prog_printf_null.c
+buildtools/Cmake/test_prog/prog_sem_timedwait.c
+buildtools/Cmake/test_prog/prog_va_copy.c
+buildtools/Cmake/test_prog/prog_thread_storage.c
+buildtools/Cmake/test_prog/prog_AC_CHECK_MCSC.c
+buildtools/Cmake/test_prog/prog_stacksetup.c
+buildtools/Cmake/test_prog/prog_snprintf.c
+buildtools/Cmake/test_prog/prog_GRAS_CHECK_STRUCT_COMPACTION.c
+buildtools/Cmake/test_prog/prog_sem_init.c
+buildtools/Cmake/test_prog/prog_sem_open.c
+buildtools/Cmake/test_prog/prog_stackgrowth.c
+buildtools/Cmake/test_prog/prog_max_size.c
+buildtools/Cmake/test_prog/prog_vsnprintf.c
+buildtools/Cmake/Modules/FindRubySimgrid.cmake
+buildtools/Cmake/Modules/FindF2c.cmake
+buildtools/Cmake/Modules/FindPCRE.cmake
+buildtools/Cmake/Modules/FindPcreWin.cmake
+buildtools/Cmake/Modules/FindGTnets.cmake
+buildtools/Cmake/Modules/FindNS3.cmake
+buildtools/Cmake/Modules/FindSimGrid.cmake
+buildtools/Cmake/Modules/FindLua51Simgrid.cmake
+buildtools/Cmake/Modules/FindGraphviz.cmake
+buildtools/Cmake/Modules/FindValgrind.cmake
+buildtools/Cmake/Modules/FindRngStream.cmake
+buildtools/Cmake/GenerateDocWin.cmake
+buildtools/Cmake/MakeExe.cmake
+buildtools/Cmake/PrintArgs.cmake
+buildtools/Cmake/MakeLib.cmake
+buildtools/Cmake/Distrib.cmake
+buildtools/Cmake/src/gras_config.h.in
+buildtools/Cmake/src/simgrid.nsi.in
+CMakeLists.txt
 )
index 8dc65ed..b5889af 100644 (file)
@@ -95,12 +95,12 @@ foreach(file ${HEADERS})
 endforeach(file ${HEADERS})
 
 # example files
-foreach(file ${examples_to_install_in_doc})
+foreach(file ${examples_to_install})
   string(REPLACE "${CMAKE_CURRENT_SOURCE_DIR}/examples/" "" file ${file})
   get_filename_component(location ${file} PATH)
   install(FILES "examples/${file}"
           DESTINATION $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/doc/simgrid/examples/${location})
-endforeach(file ${examples_to_install_in_doc})
+endforeach(file ${examples_to_install})
 
 # bindings cruft
 
@@ -174,6 +174,44 @@ endif(HAVE_LUA)
 ##   (instead of any cruft laying on my disk as CPack does)  ###
 ################################################################
 
+# This is the complete list of what will be added to the source archive
+set(source_to_pack  
+  ${headers_to_install}
+  ${source_of_generated_headers}
+  ${XBT_RL_SRC}
+  ${EXTRA_DIST}
+  ${SMPI_SRC}
+  ${GRAS_RL_SRC}
+  ${XBT_SRC}
+  ${GTNETS_SRC}
+  ${NS3_SRC}
+  ${SURF_SRC}
+  ${SIMIX_SRC}
+  ${TRACING_SRC}
+  ${MSG_SRC}
+  ${SIMDAG_SRC}
+  ${GRAS_COMMON_SRC}
+  ${GRAS_SG_SRC}
+  ${AMOK_SRC}
+  ${LUA_SRC}
+  ${MC_SRC}
+  ${JEDULE_SRC}
+  ${RNGSTREAM_SRC}
+  ${add_src_files}
+  ${CMAKE_SOURCE_FILES}
+  ${EXAMPLES_CMAKEFILES_TXT}
+  ${TESHSUITE_CMAKEFILES_TXT}
+  ${DOC_SOURCES}
+  ${DOC_FIGS}
+  ${README_files}
+  ${xml_files}
+  ${tesh_files}
+  ${txt_files}
+  ${bin_files}
+  ${examples_src}
+  ${teshsuite_src}
+)
+
 ##########################################
 ### Fill in the "make dist-dir" target ###
 ##########################################
@@ -214,7 +252,7 @@ foreach(file ${source_to_pack})
    
    add_custom_command(
      TARGET dist-dir
-     COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/Makefile.default ${PROJECT_NAME}-${release_version}/Makefile
+     COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/Scripts/Makefile.default ${PROJECT_NAME}-${release_version}/Makefile
    )
 endforeach(file ${source_to_pack})
 
index b3f1413..75b58b6 100644 (file)
@@ -1,13 +1,22 @@
 ###################################################################\r
 ### Load all files declaring binaries (tools, examples and tests) #\r
 ###################################################################\r
+##################################################################\r
+# Those CMakelists or just here to define extra files in dist    #\r
+add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/lua)\r
+add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/msg)\r
+add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/xbt)\r
+add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite)\r
+add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/gras)\r
+##################################################################\r
+\r
 add_subdirectory(${CMAKE_HOME_DIRECTORY}/tools/gras)\r
 \r
 if(WIN32)\r
        add_custom_target(tesh ALL\r
-       DEPENDS ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl\r
-       COMMENT "Install ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl"\r
-       COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl ${CMAKE_BINARY_DIR}/bin/tesh\r
+       DEPENDS ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/Scripts/tesh.pl\r
+       COMMENT "Install ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/Scripts/tesh.pl"\r
+       COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/Scripts/tesh.pl ${CMAKE_BINARY_DIR}/bin/tesh\r
        )\r
 else(WIN32)\r
        add_subdirectory(${CMAKE_HOME_DIRECTORY}/tools/tesh)\r
index 33f022b..9d764f8 100644 (file)
@@ -11,8 +11,8 @@ find_program(VALGRIND_EXE
 
 if(VALGRIND_EXE)
 message(STATUS "Found valgrind: ${VALGRIND_EXE}")
-SET(VALGRIND_COMMAND "${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/my_valgrind.pl")
-SET(MEMORYCHECK_COMMAND "${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/my_valgrind.pl")
+SET(VALGRIND_COMMAND "${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/Scripts/my_valgrind.pl")
+SET(MEMORYCHECK_COMMAND "${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/Scripts/my_valgrind.pl")
 endif(VALGRIND_EXE)
 
 if(VALGRIND_EXE)
@@ -20,7 +20,7 @@ if(VALGRIND_EXE)
        string(REGEX MATCH "[0-9].[0-9].[0-9]" NEW_VALGRIND_VERSION "${VALGRIND_VERSION}")
        if(NEW_VALGRIND_VERSION)
                message(STATUS "Valgrind version: ${NEW_VALGRIND_VERSION}")
-               exec_program("${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/generate_memcheck_tests.pl ${CMAKE_HOME_DIRECTORY} ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/AddTests.cmake > ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/memcheck_tests.cmake" OUTPUT_VARIABLE SHUTT)
+               exec_program("${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/Scripts/generate_memcheck_tests.pl ${CMAKE_HOME_DIRECTORY} ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/AddTests.cmake > ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/memcheck_tests.cmake" OUTPUT_VARIABLE SHUTT)
                set(MEMORYCHECK_COMMAND_OPTIONS "--trace-children=yes --leak-check=full --show-reachable=yes --track-origins=yes --read-var-info=no")
                message(STATUS "Valgrind options: ${MEMORYCHECK_COMMAND_OPTIONS}")
        else(NEW_VALGRIND_VERSION)
index 29b59f2..1b7ea2d 100644 (file)
@@ -1,35 +1,56 @@
 cmake_minimum_required(VERSION 2.6)
 
-set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/_bandwidth_simulator.c
-                                                       ${CMAKE_CURRENT_BINARY_DIR}/_bandwidth_maestro.c
-                                                       ${CMAKE_CURRENT_BINARY_DIR}/_bandwidth_sensor.c
-                                                       PROPERTIES GENERATED true)
+set_source_files_properties(
+  ${CMAKE_CURRENT_BINARY_DIR}/_bandwidth_simulator.c
+  ${CMAKE_CURRENT_BINARY_DIR}/_bandwidth_maestro.c
+  ${CMAKE_CURRENT_BINARY_DIR}/_bandwidth_sensor.c
+  PROPERTIES GENERATED true
+)
 
 set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}")
-
-add_executable(bandwidth_simulator     ${CMAKE_CURRENT_BINARY_DIR}/_bandwidth_simulator.c
-                                                                       ${CMAKE_CURRENT_SOURCE_DIR}/bandwidth.c)
-add_executable(bandwidth_maestro       ${CMAKE_CURRENT_BINARY_DIR}/_bandwidth_maestro.c
-                                                                       ${CMAKE_CURRENT_SOURCE_DIR}/bandwidth.c)
-add_executable(bandwidth_sensor ${CMAKE_CURRENT_BINARY_DIR}/_bandwidth_sensor.c
-                                                               ${CMAKE_CURRENT_SOURCE_DIR}/bandwidth.c)
+add_executable(bandwidth_simulator ${CMAKE_CURRENT_BINARY_DIR}/_bandwidth_simulator.c ${CMAKE_CURRENT_SOURCE_DIR}/bandwidth.c)
+add_executable(bandwidth_maestro   ${CMAKE_CURRENT_BINARY_DIR}/_bandwidth_maestro.c ${CMAKE_CURRENT_SOURCE_DIR}/bandwidth.c)
+add_executable(bandwidth_sensor    ${CMAKE_CURRENT_BINARY_DIR}/_bandwidth_sensor.c ${CMAKE_CURRENT_SOURCE_DIR}/bandwidth.c)
 
 add_custom_command(
-                                       OUTPUT  ${CMAKE_CURRENT_BINARY_DIR}/_bandwidth_simulator.c
-                                                       ${CMAKE_CURRENT_BINARY_DIR}/_bandwidth_maestro.c
-                                                       ${CMAKE_CURRENT_BINARY_DIR}/_bandwidth_sensor.c
-                                       DEPENDS gras_stub_generator ${CMAKE_CURRENT_SOURCE_DIR}/bandwidth.xml
-                                       COMMAND ${CMAKE_BINARY_DIR}/bin/gras_stub_generator bandwidth ${CMAKE_CURRENT_SOURCE_DIR}/bandwidth.xml
-                                       WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-                                       )
+  OUTPUT       ${CMAKE_CURRENT_BINARY_DIR}/_bandwidth_simulator.c
+  ${CMAKE_CURRENT_BINARY_DIR}/_bandwidth_maestro.c
+  ${CMAKE_CURRENT_BINARY_DIR}/_bandwidth_sensor.c
+  DEPENDS gras_stub_generator ${CMAKE_CURRENT_SOURCE_DIR}/bandwidth.xml
+  COMMAND ${CMAKE_BINARY_DIR}/bin/gras_stub_generator bandwidth ${CMAKE_CURRENT_SOURCE_DIR}/bandwidth.xml
+  WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+)
                                        
 ### Add definitions for compile
 if(NOT WIN32)
-target_link_libraries(bandwidth_simulator simgrid pthread m )
-target_link_libraries(bandwidth_maestro gras pthread m )
-target_link_libraries(bandwidth_sensor gras pthread m )
+  target_link_libraries(bandwidth_simulator simgrid pthread m)
+  target_link_libraries(bandwidth_maestro gras pthread m)
+  target_link_libraries(bandwidth_sensor gras pthread m)
 else(NOT WIN32)
-target_link_libraries(bandwidth_simulator simgrid)
-target_link_libraries(bandwidth_maestro gras)
-target_link_libraries(bandwidth_sensor gras)
-endif(NOT WIN32)
\ No newline at end of file
+  target_link_libraries(bandwidth_simulator simgrid)
+  target_link_libraries(bandwidth_maestro gras)
+  target_link_libraries(bandwidth_sensor gras)
+endif(NOT WIN32)
+
+set(tesh_files
+  ${tesh_files}
+  ${CMAKE_CURRENT_SOURCE_DIR}/bandwidth_rl.tesh
+  ${CMAKE_CURRENT_SOURCE_DIR}/bandwidth_sg_32.tesh
+  ${CMAKE_CURRENT_SOURCE_DIR}/bandwidth_sg_64.tesh
+  PARENT_SCOPE
+)
+set(xml_files
+  ${xml_files}
+  ${CMAKE_CURRENT_SOURCE_DIR}/bandwidth.xml
+  PARENT_SCOPE
+)
+set(examples_src
+  ${examples_src}
+  ${CMAKE_CURRENT_SOURCE_DIR}/bandwidth.c
+  PARENT_SCOPE
+)
+set(bin_files
+  ${bin_files}
+  PARENT_SCOPE
+)
+
index 651c0de..c7fa60d 100644 (file)
@@ -1,35 +1,56 @@
 cmake_minimum_required(VERSION 2.6)
 
-set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/_saturate_simulator.c
-                                                       ${CMAKE_CURRENT_BINARY_DIR}/_saturate_maestro.c
-                                                       ${CMAKE_CURRENT_BINARY_DIR}/_saturate_sensor.c
-                                                       PROPERTIES GENERATED true)
-                                                       
-set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}")
+set_source_files_properties(
+  ${CMAKE_CURRENT_BINARY_DIR}/_saturate_simulator.c
+  ${CMAKE_CURRENT_BINARY_DIR}/_saturate_maestro.c
+  ${CMAKE_CURRENT_BINARY_DIR}/_saturate_sensor.c
+  PROPERTIES GENERATED true
+)
 
-add_executable(saturate_simulator      ${CMAKE_CURRENT_BINARY_DIR}/_saturate_simulator.c
-                                                                       ${CMAKE_CURRENT_SOURCE_DIR}/saturate.c)
-add_executable(saturate_maestro ${CMAKE_CURRENT_BINARY_DIR}/_saturate_maestro.c
-                                                               ${CMAKE_CURRENT_SOURCE_DIR}/saturate.c)
-add_executable(saturate_sensor         ${CMAKE_CURRENT_BINARY_DIR}/_saturate_sensor.c
-                                                               ${CMAKE_CURRENT_SOURCE_DIR}/saturate.c)
+set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}")
+add_executable(saturate_simulator ${CMAKE_CURRENT_BINARY_DIR}/_saturate_simulator.c ${CMAKE_CURRENT_SOURCE_DIR}/saturate.c)
+add_executable(saturate_maestro   ${CMAKE_CURRENT_BINARY_DIR}/_saturate_maestro.c ${CMAKE_CURRENT_SOURCE_DIR}/saturate.c)
+add_executable(saturate_sensor    ${CMAKE_CURRENT_BINARY_DIR}/_saturate_sensor.c ${CMAKE_CURRENT_SOURCE_DIR}/saturate.c)
 
 add_custom_command(
-                                       OUTPUT  ${CMAKE_CURRENT_BINARY_DIR}/_saturate_simulator.c
-                                                       ${CMAKE_CURRENT_BINARY_DIR}/_saturate_maestro.c
-                                                       ${CMAKE_CURRENT_BINARY_DIR}/_saturate_sensor.c
-                                       DEPENDS gras_stub_generator ${CMAKE_CURRENT_SOURCE_DIR}/saturate.xml
-                                       COMMAND ${CMAKE_BINARY_DIR}/bin/gras_stub_generator saturate ${CMAKE_CURRENT_SOURCE_DIR}/saturate.xml
-                                       WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-                                       )
-                                       
+  OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/_saturate_simulator.c
+         ${CMAKE_CURRENT_BINARY_DIR}/_saturate_maestro.c
+         ${CMAKE_CURRENT_BINARY_DIR}/_saturate_sensor.c
+  DEPENDS gras_stub_generator ${CMAKE_CURRENT_SOURCE_DIR}/saturate.xml
+  COMMAND ${CMAKE_BINARY_DIR}/bin/gras_stub_generator saturate ${CMAKE_CURRENT_SOURCE_DIR}/saturate.xml
+  WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+)
+
 ### Add definitions for compile
 if(NOT WIN32)
-target_link_libraries(saturate_simulator simgrid pthread m )
-target_link_libraries(saturate_maestro gras pthread m )
-target_link_libraries(saturate_sensor gras pthread m )
+  target_link_libraries(saturate_simulator simgrid pthread m)
+  target_link_libraries(saturate_maestro gras pthread m)
+  target_link_libraries(saturate_sensor gras pthread m)
 else(NOT WIN32)
-target_link_libraries(saturate_simulator simgrid)
-target_link_libraries(saturate_maestro gras)
-target_link_libraries(saturate_sensor gras)
-endif(NOT WIN32)
\ No newline at end of file
+  target_link_libraries(saturate_simulator simgrid)
+  target_link_libraries(saturate_maestro gras)
+  target_link_libraries(saturate_sensor gras)
+endif(NOT WIN32)
+
+set(tesh_files
+  ${tesh_files}
+  ${CMAKE_CURRENT_SOURCE_DIR}/saturate_rl.tesh
+  ${CMAKE_CURRENT_SOURCE_DIR}/saturate_sg_32.tesh
+  ${CMAKE_CURRENT_SOURCE_DIR}/saturate_sg_64.tesh
+  PARENT_SCOPE
+)
+set(xml_files
+  ${xml_files}
+  ${CMAKE_CURRENT_SOURCE_DIR}/saturate.xml
+  PARENT_SCOPE
+)
+set(examples_src
+  ${examples_src}
+  ${CMAKE_CURRENT_SOURCE_DIR}/env.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/saturate.c
+  PARENT_SCOPE
+)
+set(bin_files
+  ${bin_files}
+  PARENT_SCOPE
+)
index d3ae7ed..cacaa3e 100644 (file)
@@ -1,36 +1,57 @@
 cmake_minimum_required(VERSION 2.6)
 
-set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/_all2all_simulator.c
-                                                       ${CMAKE_CURRENT_BINARY_DIR}/_all2all_sender.c
-                                                       ${CMAKE_CURRENT_BINARY_DIR}/_all2all_receiver.c
-                                                       PROPERTIES GENERATED true)
+set_source_files_properties(
+  ${CMAKE_CURRENT_BINARY_DIR}/_all2all_simulator.c
+  ${CMAKE_CURRENT_BINARY_DIR}/_all2all_sender.c
+  ${CMAKE_CURRENT_BINARY_DIR}/_all2all_receiver.c
+  PROPERTIES GENERATED true
+  )
 
 set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}")
+add_executable(all2all_simulator ${CMAKE_CURRENT_BINARY_DIR}/_all2all_simulator.c ${CMAKE_CURRENT_SOURCE_DIR}/all2all.c)
+add_executable(all2all_sender    ${CMAKE_CURRENT_BINARY_DIR}/_all2all_sender.c ${CMAKE_CURRENT_SOURCE_DIR}/all2all.c)
+add_executable(all2all_receiver  ${CMAKE_CURRENT_BINARY_DIR}/_all2all_receiver.c ${CMAKE_CURRENT_SOURCE_DIR}/all2all.c)
 
-add_executable(all2all_simulator       ${CMAKE_CURRENT_BINARY_DIR}/_all2all_simulator.c
-                                                                       ${CMAKE_CURRENT_SOURCE_DIR}/all2all.c)
-add_executable(all2all_sender  ${CMAKE_CURRENT_BINARY_DIR}/_all2all_sender.c
-                                                               ${CMAKE_CURRENT_SOURCE_DIR}/all2all.c)
-add_executable(all2all_receiver ${CMAKE_CURRENT_BINARY_DIR}/_all2all_receiver.c
-                                                               ${CMAKE_CURRENT_SOURCE_DIR}/all2all.c)
-                                                               
 add_custom_command(
-                                       OUTPUT  ${CMAKE_CURRENT_BINARY_DIR}/_all2all_simulator.c
-                                                       ${CMAKE_CURRENT_BINARY_DIR}/_all2all_sender.c
-                                                       ${CMAKE_CURRENT_BINARY_DIR}/_all2all_receiver.c
-                                       DEPENDS gras_stub_generator ${CMAKE_CURRENT_SOURCE_DIR}/all2all.xml
-                                       COMMAND ${CMAKE_BINARY_DIR}/bin/gras_stub_generator all2all ${CMAKE_CURRENT_SOURCE_DIR}/all2all.xml
-                                       WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-                                       )
+  OUTPUT       ${CMAKE_CURRENT_BINARY_DIR}/_all2all_simulator.c
+  ${CMAKE_CURRENT_BINARY_DIR}/_all2all_sender.c
+  ${CMAKE_CURRENT_BINARY_DIR}/_all2all_receiver.c
+  DEPENDS gras_stub_generator ${CMAKE_CURRENT_SOURCE_DIR}/all2all.xml
+  COMMAND ${CMAKE_BINARY_DIR}/bin/gras_stub_generator all2all ${CMAKE_CURRENT_SOURCE_DIR}/all2all.xml
+  WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+)
 
 ### Add definitions for compile
 if(NOT WIN32)
-target_link_libraries(all2all_simulator simgrid pthread m )
-target_link_libraries(all2all_sender gras pthread m )
-target_link_libraries(all2all_receiver gras pthread m )
+  target_link_libraries(all2all_simulator simgrid pthread m)
+  target_link_libraries(all2all_sender gras pthread m)
+  target_link_libraries(all2all_receiver gras pthread m)
 else(NOT WIN32)
-target_link_libraries(all2all_simulator simgrid)
-target_link_libraries(all2all_sender gras)
-target_link_libraries(all2all_receiver gras)
+  target_link_libraries(all2all_simulator simgrid)
+  target_link_libraries(all2all_sender gras)
+  target_link_libraries(all2all_receiver gras)
 endif(NOT WIN32)
 
+set(tesh_files
+  ${tesh_files}
+  ${CMAKE_CURRENT_SOURCE_DIR}/test_rl.tesh
+  ${CMAKE_CURRENT_SOURCE_DIR}/test_sg_32.tesh
+  ${CMAKE_CURRENT_SOURCE_DIR}/test_sg_64.tesh
+  PARENT_SCOPE
+)
+set(xml_files
+  ${xml_files}
+  ${CMAKE_CURRENT_SOURCE_DIR}/all2all.xml
+  PARENT_SCOPE
+)
+set(examples_src
+  ${examples_src}
+  ${CMAKE_CURRENT_SOURCE_DIR}/all2all.c
+  PARENT_SCOPE
+)
+set(bin_files
+  ${bin_files}
+  ${CMAKE_CURRENT_SOURCE_DIR}/make_deployment.pl
+  ${CMAKE_CURRENT_SOURCE_DIR}/run.sh
+  PARENT_SCOPE
+)
\ No newline at end of file
index 62d8d4a..c61554e 100644 (file)
@@ -1,19 +1,17 @@
 cmake_minimum_required(VERSION 2.6)
 
-set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/_chrono_simulator.c
-                                                       ${CMAKE_CURRENT_BINARY_DIR}/_chrono_multiplier.c
-                                                       PROPERTIES GENERATED true)
+set_source_files_properties(
+  ${CMAKE_CURRENT_BINARY_DIR}/_chrono_simulator.c
+  ${CMAKE_CURRENT_BINARY_DIR}/_chrono_multiplier.c
+  PROPERTIES GENERATED true)
 
 set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}")
+add_executable(chrono_simulator  ${CMAKE_CURRENT_BINARY_DIR}/_chrono_simulator.c ${CMAKE_CURRENT_SOURCE_DIR}/chrono.c)
+add_executable(chrono_multiplier ${CMAKE_CURRENT_BINARY_DIR}/_chrono_multiplier.c ${CMAKE_CURRENT_SOURCE_DIR}/chrono.c)
 
-add_executable(chrono_simulator ${CMAKE_CURRENT_BINARY_DIR}/_chrono_simulator.c
-                                                               ${CMAKE_CURRENT_SOURCE_DIR}/chrono.c)
-add_executable(chrono_multiplier       ${CMAKE_CURRENT_BINARY_DIR}/_chrono_multiplier.c
-                                                                       ${CMAKE_CURRENT_SOURCE_DIR}/chrono.c)
-                                                                       
 add_custom_command(
   OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/_chrono_simulator.c
-         ${CMAKE_CURRENT_BINARY_DIR}/_chrono_multiplier.c
+  ${CMAKE_CURRENT_BINARY_DIR}/_chrono_multiplier.c
   DEPENDS gras_stub_generator ${CMAKE_CURRENT_SOURCE_DIR}/chrono.xml
   COMMAND ${CMAKE_BINARY_DIR}/bin/gras_stub_generator chrono ${CMAKE_CURRENT_SOURCE_DIR}/chrono.xml
   WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
@@ -21,9 +19,32 @@ add_custom_command(
 
 ### Add definitions for compile
 if(NOT WIN32)
-target_link_libraries(chrono_simulator simgrid pthread m )
-target_link_libraries(chrono_multiplier gras pthread m )
+  target_link_libraries(chrono_simulator simgrid pthread m )
+  target_link_libraries(chrono_multiplier gras pthread m )
 else(NOT WIN32)
-target_link_libraries(chrono_simulator simgrid)
-target_link_libraries(chrono_multiplier gras)
+  target_link_libraries(chrono_simulator simgrid)
+  target_link_libraries(chrono_multiplier gras)
 endif(NOT WIN32)
+
+set(tesh_files
+  ${tesh_files}
+  ${CMAKE_CURRENT_SOURCE_DIR}/test_rl.tesh
+  ${CMAKE_CURRENT_SOURCE_DIR}/test_sg_32.tesh
+  ${CMAKE_CURRENT_SOURCE_DIR}/test_sg_64.tesh
+  PARENT_SCOPE
+)
+set(xml_files
+  ${xml_files}
+  ${CMAKE_CURRENT_SOURCE_DIR}/chrono.xml
+  PARENT_SCOPE
+)
+set(examples_src
+  ${examples_src}
+  ${CMAKE_CURRENT_SOURCE_DIR}/chrono.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/chrono2.c
+  PARENT_SCOPE
+)
+set(bin_files
+  ${bin_files}
+  PARENT_SCOPE
+)
index 29309c0..952d48e 100644 (file)
@@ -1,38 +1,65 @@
 if(HAVE_LUA)
 cmake_minimum_required(VERSION 2.6)
 
-set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/_ping_simulator.c
-                                                       ${CMAKE_CURRENT_BINARY_DIR}/_ping_client.c 
-                                                       ${CMAKE_CURRENT_BINARY_DIR}/_ping_server.c
-                            PROPERTIES GENERATED true)
+set_source_files_properties(
+  ${CMAKE_CURRENT_BINARY_DIR}/_ping_simulator.c
+  ${CMAKE_CURRENT_BINARY_DIR}/_ping_client.c 
+  ${CMAKE_CURRENT_BINARY_DIR}/_ping_server.c
+  PROPERTIES GENERATED true)
 
 set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}")
+add_executable(ping_simulator_console
+  ${CMAKE_CURRENT_BINARY_DIR}/_ping_simulator.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/ping_server.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/ping_client.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/ping_common.c)
 
-add_executable(ping_simulator_console  ${CMAKE_CURRENT_BINARY_DIR}/_ping_simulator.c
-                                                                               ${CMAKE_CURRENT_SOURCE_DIR}/ping_server.c
-                                                                               ${CMAKE_CURRENT_SOURCE_DIR}/ping_client.c
-                                                                               ${CMAKE_CURRENT_SOURCE_DIR}/ping_common.c)
-                                                               
-add_executable(ping_client_console     ${CMAKE_CURRENT_BINARY_DIR}/_ping_client.c
-                                                                               ${CMAKE_CURRENT_SOURCE_DIR}/ping_client.c
-                                                                               ${CMAKE_CURRENT_SOURCE_DIR}/ping_common.c)
-                                                               
-add_executable(ping_server_console     ${CMAKE_CURRENT_BINARY_DIR}/_ping_server.c
-                                                                               ${CMAKE_CURRENT_SOURCE_DIR}/ping_server.c
-                                                                               ${CMAKE_CURRENT_SOURCE_DIR}/ping_common.c)
+add_executable(ping_client_console
+  ${CMAKE_CURRENT_BINARY_DIR}/_ping_client.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/ping_client.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/ping_common.c)
+
+add_executable(ping_server_console
+  ${CMAKE_CURRENT_BINARY_DIR}/_ping_server.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/ping_server.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/ping_common.c)
   
 add_custom_command(
-                                       OUTPUT  ${CMAKE_CURRENT_BINARY_DIR}/_ping_simulator.c 
-                                               ${CMAKE_CURRENT_BINARY_DIR}/_ping_client.c 
-                                                       ${CMAKE_CURRENT_BINARY_DIR}/_ping_server.c
-                                                       ${CMAKE_CURRENT_BINARY_DIR}/simgrid.${LIB_EXE}
-                                       COMMAND ${CMAKE_COMMAND} -E create_symlink ${CMAKE_BINARY_DIR}/lib/libsimgrid.${LIB_EXE} ${CMAKE_CURRENT_BINARY_DIR}/simgrid.${LIB_EXE}
-                                       COMMAND lua ${CMAKE_CURRENT_SOURCE_DIR}/ping_generator.lua
-                                       WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} #needed to find simgrid.so. By default CMAKE_CURRENT_BINARY_DIR
-                                       )
+  OUTPUT
+    ${CMAKE_CURRENT_BINARY_DIR}/_ping_simulator.c 
+    ${CMAKE_CURRENT_BINARY_DIR}/_ping_client.c 
+    ${CMAKE_CURRENT_BINARY_DIR}/_ping_server.c
+    ${CMAKE_CURRENT_BINARY_DIR}/simgrid.${LIB_EXE}
+  COMMAND ${CMAKE_COMMAND} -E create_symlink ${CMAKE_BINARY_DIR}/lib/libsimgrid.${LIB_EXE} ${CMAKE_CURRENT_BINARY_DIR}/simgrid.${LIB_EXE}
+  COMMAND lua ${CMAKE_CURRENT_SOURCE_DIR}/ping_generator.lua
+  WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} #needed to find simgrid.so. By default CMAKE_CURRENT_BINARY_DIR
+)
 
 ### Add definitions for compile
-target_link_libraries(ping_simulator_console simgrid pthread m )
-target_link_libraries(ping_client_console gras simgrid pthread m )
-target_link_libraries(ping_server_console gras simgrid pthread m )
+target_link_libraries(ping_simulator_console simgrid pthread m)
+target_link_libraries(ping_client_console gras simgrid pthread m)
+target_link_libraries(ping_server_console gras simgrid pthread m)
 endif(HAVE_LUA)
+
+set(tesh_files
+  ${tesh_files}
+  PARENT_SCOPE
+)
+set(xml_files
+  ${xml_files}
+  PARENT_SCOPE
+)
+set(examples_src
+  ${examples_src}
+  ${CMAKE_CURRENT_SOURCE_DIR}/ping_client.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/ping_common.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/ping_server.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/ping.h
+  PARENT_SCOPE
+)
+set(bin_files
+  ${bin_files}
+  ${CMAKE_CURRENT_SOURCE_DIR}/gras_platform_script.lua
+  ${CMAKE_CURRENT_SOURCE_DIR}/ping_generator.lua
+  PARENT_SCOPE
+)
index 4f5d118..3dfd4b1 100644 (file)
@@ -1,40 +1,70 @@
 cmake_minimum_required(VERSION 2.6)
 
-set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/_mmrpc_simulator.c 
-                                                       ${CMAKE_CURRENT_BINARY_DIR}/_mmrpc_client.c 
-                                                       ${CMAKE_CURRENT_BINARY_DIR}/_mmrpc_server.c
-                                                       PROPERTIES GENERATED true)
+set_source_files_properties(
+  ${CMAKE_CURRENT_BINARY_DIR}/_mmrpc_simulator.c 
+  ${CMAKE_CURRENT_BINARY_DIR}/_mmrpc_client.c 
+  ${CMAKE_CURRENT_BINARY_DIR}/_mmrpc_server.c
+  PROPERTIES GENERATED true)
 
 set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}")
-
-add_executable(mmrpc_simulator         ${CMAKE_CURRENT_BINARY_DIR}/_mmrpc_simulator.c 
-                                                               ${CMAKE_CURRENT_SOURCE_DIR}/mmrpc_common.c
-                                                               ${CMAKE_CURRENT_SOURCE_DIR}/mmrpc_client.c
-                                                               ${CMAKE_CURRENT_SOURCE_DIR}/mmrpc_server.c)
-add_executable(mmrpc_client ${CMAKE_CURRENT_BINARY_DIR}/_mmrpc_client.c
-                                                       ${CMAKE_CURRENT_SOURCE_DIR}/mmrpc_common.c
-                                                       ${CMAKE_CURRENT_SOURCE_DIR}/mmrpc_client.c)
-add_executable(mmrpc_server ${CMAKE_CURRENT_BINARY_DIR}/_mmrpc_server.c
-                                                       ${CMAKE_CURRENT_SOURCE_DIR}/mmrpc_common.c
-                                                       ${CMAKE_CURRENT_SOURCE_DIR}/mmrpc_server.c)
+add_executable(mmrpc_simulator
+  ${CMAKE_CURRENT_BINARY_DIR}/_mmrpc_simulator.c 
+  ${CMAKE_CURRENT_SOURCE_DIR}/mmrpc_common.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/mmrpc_client.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/mmrpc_server.c)
+add_executable(mmrpc_client
+  ${CMAKE_CURRENT_BINARY_DIR}/_mmrpc_client.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/mmrpc_common.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/mmrpc_client.c)
+add_executable(mmrpc_server
+  ${CMAKE_CURRENT_BINARY_DIR}/_mmrpc_server.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/mmrpc_common.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/mmrpc_server.c)
 
 add_custom_command(
-                                       OUTPUT  ${CMAKE_CURRENT_BINARY_DIR}/_mmrpc_simulator.c 
-                                                       ${CMAKE_CURRENT_BINARY_DIR}/_mmrpc_client.c 
-                                                       ${CMAKE_CURRENT_BINARY_DIR}/_mmrpc_server.c
-                                       DEPENDS gras_stub_generator ${CMAKE_CURRENT_SOURCE_DIR}/mmrpc.xml
-                                       COMMAND ${CMAKE_BINARY_DIR}/bin/gras_stub_generator mmrpc ${CMAKE_CURRENT_SOURCE_DIR}/mmrpc.xml
-                    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-                                       )
-                                       
+  OUTPUT
+    ${CMAKE_CURRENT_BINARY_DIR}/_mmrpc_simulator.c 
+    ${CMAKE_CURRENT_BINARY_DIR}/_mmrpc_client.c 
+    ${CMAKE_CURRENT_BINARY_DIR}/_mmrpc_server.c
+  DEPENDS gras_stub_generator ${CMAKE_CURRENT_SOURCE_DIR}/mmrpc.xml
+  COMMAND ${CMAKE_BINARY_DIR}/bin/gras_stub_generator mmrpc ${CMAKE_CURRENT_SOURCE_DIR}/mmrpc.xml
+  WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+)
+
 ### Add definitions for compile
 if(NOT WIN32)
-target_link_libraries(mmrpc_simulator simgrid pthread m )
-target_link_libraries(mmrpc_client gras pthread m )
-target_link_libraries(mmrpc_server gras pthread m )
+  target_link_libraries(mmrpc_simulator simgrid pthread m )
+  target_link_libraries(mmrpc_client gras pthread m )
+  target_link_libraries(mmrpc_server gras pthread m )
 else(NOT WIN32)
-target_link_libraries(mmrpc_simulator simgrid)
-target_link_libraries(mmrpc_client gras)
-target_link_libraries(mmrpc_server gras)
+  target_link_libraries(mmrpc_simulator simgrid)
+  target_link_libraries(mmrpc_client gras)
+  target_link_libraries(mmrpc_server gras)
 endif(NOT WIN32)
 
+set(tesh_files
+  ${tesh_files}
+  ${CMAKE_CURRENT_SOURCE_DIR}/test_rl.tesh
+  ${CMAKE_CURRENT_SOURCE_DIR}/test_sg_32.tesh
+  ${CMAKE_CURRENT_SOURCE_DIR}/test_sg_64.tesh
+  PARENT_SCOPE
+)
+set(xml_files
+  ${xml_files}
+  ${CMAKE_CURRENT_SOURCE_DIR}/mmrpc.xml
+  PARENT_SCOPE
+)
+set(examples_src
+  ${examples_src}
+  ${CMAKE_CURRENT_SOURCE_DIR}/mmrpc_client.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/mmrpc_common.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/mmrpc_server.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/mmrpc.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/mmrpc.h
+  PARENT_SCOPE
+)
+set(bin_files
+  ${bin_files}
+  PARENT_SCOPE
+)
+
index 0305c43..6288c73 100644 (file)
@@ -1,31 +1,52 @@
 cmake_minimum_required(VERSION 2.6)
 
-set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/_simple_token_simulator.c
-                                                       ${CMAKE_CURRENT_BINARY_DIR}/_simple_token_node.c
-                                                       PROPERTIES GENERATED true)
+set_source_files_properties(
+  ${CMAKE_CURRENT_BINARY_DIR}/_simple_token_simulator.c
+  ${CMAKE_CURRENT_BINARY_DIR}/_simple_token_node.c
+  PROPERTIES GENERATED true)
 
 set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}")
+add_executable(simple_token_simulator ${CMAKE_CURRENT_BINARY_DIR}/_simple_token_simulator.c ${CMAKE_CURRENT_SOURCE_DIR}/simple_token.c)
+add_executable(simple_token_node      ${CMAKE_CURRENT_BINARY_DIR}/_simple_token_node.c ${CMAKE_CURRENT_SOURCE_DIR}/simple_token.c)
 
-add_executable(simple_token_simulator  ${CMAKE_CURRENT_BINARY_DIR}/_simple_token_simulator.c
-                                                                               ${CMAKE_CURRENT_SOURCE_DIR}/simple_token.c)
-add_executable(simple_token_node       ${CMAKE_CURRENT_BINARY_DIR}/_simple_token_node.c
-                                                                       ${CMAKE_CURRENT_SOURCE_DIR}/simple_token.c)
-                                                                       
 add_custom_command(
-                                       OUTPUT  ${CMAKE_CURRENT_BINARY_DIR}/_simple_token_simulator.c 
-                                               ${CMAKE_CURRENT_BINARY_DIR}/_simple_token_node.c 
-                                       DEPENDS gras_stub_generator ${CMAKE_CURRENT_SOURCE_DIR}/simple_token.xml
-                                       COMMAND ${CMAKE_BINARY_DIR}/bin/gras_stub_generator simple_token ${CMAKE_CURRENT_SOURCE_DIR}/simple_token.xml
-                    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-                                       )
+  OUTPUT
+    ${CMAKE_CURRENT_BINARY_DIR}/_simple_token_simulator.c 
+    ${CMAKE_CURRENT_BINARY_DIR}/_simple_token_node.c 
+  DEPENDS gras_stub_generator ${CMAKE_CURRENT_SOURCE_DIR}/simple_token.xml
+  COMMAND ${CMAKE_BINARY_DIR}/bin/gras_stub_generator simple_token ${CMAKE_CURRENT_SOURCE_DIR}/simple_token.xml
+  WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+)
 
 ### Add definitions for compile
 if(NOT WIN32)
-target_link_libraries(simple_token_simulator simgrid pthread m )
-target_link_libraries(simple_token_node gras pthread m )
+  target_link_libraries(simple_token_simulator simgrid pthread m )
+  target_link_libraries(simple_token_node gras pthread m )
 else(NOT WIN32)
-target_link_libraries(simple_token_simulator simgrid)
-target_link_libraries(simple_token_node gras)
+  target_link_libraries(simple_token_simulator simgrid)
+  target_link_libraries(simple_token_node gras)
 endif(NOT WIN32)
 
-
+set(tesh_files
+  ${tesh_files}
+  ${CMAKE_CURRENT_SOURCE_DIR}/test_rl.tesh
+  ${CMAKE_CURRENT_SOURCE_DIR}/test_sg_32.tesh
+  ${CMAKE_CURRENT_SOURCE_DIR}/test_sg_64.tesh
+  PARENT_SCOPE
+)
+set(xml_files
+  ${xml_files}
+  ${CMAKE_CURRENT_SOURCE_DIR}/simple_token.xml
+  PARENT_SCOPE
+)
+set(examples_src
+  ${examples_src}
+  ${CMAKE_CURRENT_SOURCE_DIR}/simple_token.c
+  PARENT_SCOPE
+)
+set(bin_files
+  ${bin_files}
+  ${CMAKE_CURRENT_SOURCE_DIR}/run.sh
+  ${CMAKE_CURRENT_SOURCE_DIR}/make_deployment.pl
+  PARENT_SCOPE
+)
index 6a2400a..aa9c674 100644 (file)
@@ -1,38 +1,68 @@
 cmake_minimum_required(VERSION 2.6)
 
-set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/_ping_simulator.c
-                                                       ${CMAKE_CURRENT_BINARY_DIR}/_ping_client.c 
-                                                       ${CMAKE_CURRENT_BINARY_DIR}/_ping_server.c
-                            PROPERTIES GENERATED true)
+set_source_files_properties(
+  ${CMAKE_CURRENT_BINARY_DIR}/_ping_simulator.c
+  ${CMAKE_CURRENT_BINARY_DIR}/_ping_client.c 
+  ${CMAKE_CURRENT_BINARY_DIR}/_ping_server.c
+  PROPERTIES GENERATED true)
 
 set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}")
+add_executable(ping_simulator
+  ${CMAKE_CURRENT_BINARY_DIR}/_ping_simulator.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/ping_server.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/ping_client.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/ping_common.c)
+add_executable(ping_client
+  ${CMAKE_CURRENT_BINARY_DIR}/_ping_client.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/ping_client.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/ping_common.c)
+add_executable(ping_server
+  ${CMAKE_CURRENT_BINARY_DIR}/_ping_server.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/ping_server.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/ping_common.c)
 
-add_executable(ping_simulator  ${CMAKE_CURRENT_BINARY_DIR}/_ping_simulator.c
-                                                               ${CMAKE_CURRENT_SOURCE_DIR}/ping_server.c
-                                                               ${CMAKE_CURRENT_SOURCE_DIR}/ping_client.c
-                                                               ${CMAKE_CURRENT_SOURCE_DIR}/ping_common.c)
-add_executable(ping_client     ${CMAKE_CURRENT_BINARY_DIR}/_ping_client.c
-                                                               ${CMAKE_CURRENT_SOURCE_DIR}/ping_client.c
-                                                               ${CMAKE_CURRENT_SOURCE_DIR}/ping_common.c)
-add_executable(ping_server     ${CMAKE_CURRENT_BINARY_DIR}/_ping_server.c
-                                                               ${CMAKE_CURRENT_SOURCE_DIR}/ping_server.c
-                                                               ${CMAKE_CURRENT_SOURCE_DIR}/ping_common.c)
 add_custom_command(
-                                       OUTPUT  ${CMAKE_CURRENT_BINARY_DIR}/_ping_simulator.c 
-                                               ${CMAKE_CURRENT_BINARY_DIR}/_ping_client.c 
-                                                       ${CMAKE_CURRENT_BINARY_DIR}/_ping_server.c
-                                       DEPENDS gras_stub_generator ${CMAKE_CURRENT_SOURCE_DIR}/ping.xml
-                                       COMMAND ${CMAKE_BINARY_DIR}/bin/gras_stub_generator ping ${CMAKE_CURRENT_SOURCE_DIR}/ping.xml
-                    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-                                       )
+  OUTPUT
+    ${CMAKE_CURRENT_BINARY_DIR}/_ping_simulator.c 
+    ${CMAKE_CURRENT_BINARY_DIR}/_ping_client.c 
+    ${CMAKE_CURRENT_BINARY_DIR}/_ping_server.c
+  DEPENDS gras_stub_generator ${CMAKE_CURRENT_SOURCE_DIR}/ping.xml
+  COMMAND ${CMAKE_BINARY_DIR}/bin/gras_stub_generator ping ${CMAKE_CURRENT_SOURCE_DIR}/ping.xml
+  WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+)
 
 ### Add definitions for compile
 if(NOT WIN32)
-target_link_libraries(ping_simulator simgrid pthread m )
-target_link_libraries(ping_client gras pthread m )
-target_link_libraries(ping_server gras pthread m )
+  target_link_libraries(ping_simulator simgrid pthread m )
+  target_link_libraries(ping_client gras pthread m )
+  target_link_libraries(ping_server gras pthread m )
 else(NOT WIN32)
-target_link_libraries(ping_simulator simgrid)
-target_link_libraries(ping_client gras)
-target_link_libraries(ping_server gras)
-endif(NOT WIN32)
\ No newline at end of file
+  target_link_libraries(ping_simulator simgrid)
+  target_link_libraries(ping_client gras)
+  target_link_libraries(ping_server gras)
+endif(NOT WIN32)
+
+set(tesh_files
+  ${tesh_files}
+  ${CMAKE_CURRENT_SOURCE_DIR}/test_rl.tesh
+  ${CMAKE_CURRENT_SOURCE_DIR}/test_sg_32.tesh
+  ${CMAKE_CURRENT_SOURCE_DIR}/test_sg_64.tesh
+  PARENT_SCOPE
+)
+set(xml_files
+  ${xml_files}
+  ${CMAKE_CURRENT_SOURCE_DIR}/ping.xml
+  PARENT_SCOPE
+)
+set(examples_src
+  ${examples_src}
+  ${CMAKE_CURRENT_SOURCE_DIR}/ping_client.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/ping_common.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/ping_server.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/ping.h
+  PARENT_SCOPE
+)
+set(bin_files
+  ${bin_files}
+  PARENT_SCOPE
+)
\ No newline at end of file
index dfc431e..278c05f 100644 (file)
@@ -1,36 +1,56 @@
 cmake_minimum_required(VERSION 2.6)
 
-set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/_pmm_simulator.c 
-                                                       ${CMAKE_CURRENT_BINARY_DIR}/_pmm_slave.c 
-                                                       ${CMAKE_CURRENT_BINARY_DIR}/_pmm_master.c
-                                                       PROPERTIES GENERATED true)
+set_source_files_properties(
+  ${CMAKE_CURRENT_BINARY_DIR}/_pmm_simulator.c 
+  ${CMAKE_CURRENT_BINARY_DIR}/_pmm_slave.c 
+  ${CMAKE_CURRENT_BINARY_DIR}/_pmm_master.c
+  PROPERTIES GENERATED true)
 
 set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}")
-
-add_executable(pmm_simulator   ${CMAKE_CURRENT_BINARY_DIR}/_pmm_simulator.c 
-                                                               ${CMAKE_CURRENT_SOURCE_DIR}/pmm.c)
-add_executable(pmm_slave       ${CMAKE_CURRENT_BINARY_DIR}/_pmm_slave.c 
-                                                       ${CMAKE_CURRENT_SOURCE_DIR}/pmm.c)
-add_executable(pmm_master      ${CMAKE_CURRENT_BINARY_DIR}/_pmm_master.c 
-                                                       ${CMAKE_CURRENT_SOURCE_DIR}/pmm.c)
+add_executable(pmm_simulator ${CMAKE_CURRENT_BINARY_DIR}/_pmm_simulator.c ${CMAKE_CURRENT_SOURCE_DIR}/pmm.c)
+add_executable(pmm_slave     ${CMAKE_CURRENT_BINARY_DIR}/_pmm_slave.c ${CMAKE_CURRENT_SOURCE_DIR}/pmm.c)
+add_executable(pmm_master    ${CMAKE_CURRENT_BINARY_DIR}/_pmm_master.c ${CMAKE_CURRENT_SOURCE_DIR}/pmm.c)
 
 add_custom_command(
-                                       OUTPUT  ${CMAKE_CURRENT_BINARY_DIR}/_pmm_simulator.c 
-                                                       ${CMAKE_CURRENT_BINARY_DIR}/_pmm_slave.c 
-                                                       ${CMAKE_CURRENT_BINARY_DIR}/_pmm_master.c
-                                       DEPENDS gras_stub_generator ${CMAKE_CURRENT_SOURCE_DIR}/pmm.xml
-                                       COMMAND ${CMAKE_BINARY_DIR}/bin/gras_stub_generator pmm ${CMAKE_CURRENT_SOURCE_DIR}/pmm.xml
-                                       WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-                                       )
+  OUTPUT
+    ${CMAKE_CURRENT_BINARY_DIR}/_pmm_simulator.c 
+    ${CMAKE_CURRENT_BINARY_DIR}/_pmm_slave.c 
+    ${CMAKE_CURRENT_BINARY_DIR}/_pmm_master.c
+  DEPENDS gras_stub_generator ${CMAKE_CURRENT_SOURCE_DIR}/pmm.xml
+  COMMAND ${CMAKE_BINARY_DIR}/bin/gras_stub_generator pmm ${CMAKE_CURRENT_SOURCE_DIR}/pmm.xml
+  WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+)
 
 ### Add definitions for compile
 if(NOT WIN32)
-target_link_libraries(pmm_simulator simgrid pthread m )
-target_link_libraries(pmm_slave gras pthread m )
-target_link_libraries(pmm_master gras pthread m )
+  target_link_libraries(pmm_simulator simgrid pthread m )
+  target_link_libraries(pmm_slave gras pthread m )
+  target_link_libraries(pmm_master gras pthread m )
 else(NOT WIN32)
-target_link_libraries(pmm_simulator simgrid)
-target_link_libraries(pmm_slave gras)
-target_link_libraries(pmm_master gras)
+  target_link_libraries(pmm_simulator simgrid)
+  target_link_libraries(pmm_slave gras)
+  target_link_libraries(pmm_master gras)
 endif(NOT WIN32)
 
+set(tesh_files
+  ${tesh_files}
+  ${CMAKE_CURRENT_SOURCE_DIR}/test_rl.tesh
+  ${CMAKE_CURRENT_SOURCE_DIR}/test_sg_32.tesh
+  ${CMAKE_CURRENT_SOURCE_DIR}/test_sg_64.tesh
+  PARENT_SCOPE
+)
+set(xml_files
+  ${xml_files}
+  ${CMAKE_CURRENT_SOURCE_DIR}/pmm.xml
+  PARENT_SCOPE
+)
+set(examples_src
+  ${examples_src}
+  ${CMAKE_CURRENT_SOURCE_DIR}/pmm.c
+  PARENT_SCOPE
+)
+set(bin_files
+  ${bin_files}
+  ${CMAKE_CURRENT_SOURCE_DIR}/make_deployment.pl
+  PARENT_SCOPE
+)
index cd83b22..e49ff2e 100644 (file)
@@ -1,35 +1,56 @@
 cmake_minimum_required(VERSION 2.6)
 
-set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/_properties_simulator.c
-                                                       ${CMAKE_CURRENT_BINARY_DIR}/_properties_alice.c
-                                                       ${CMAKE_CURRENT_BINARY_DIR}/_properties_bob.c
-                                                       PROPERTIES GENERATED true)
+set_source_files_properties(
+  ${CMAKE_CURRENT_BINARY_DIR}/_properties_simulator.c
+  ${CMAKE_CURRENT_BINARY_DIR}/_properties_alice.c
+  ${CMAKE_CURRENT_BINARY_DIR}/_properties_bob.c
+  PROPERTIES GENERATED true)
 
 set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}")
 
-add_executable(properties_simulator ${CMAKE_CURRENT_BINARY_DIR}/_properties_simulator.c
-                                                                       ${CMAKE_CURRENT_SOURCE_DIR}/properties.c)
-add_executable(properties_alice ${CMAKE_CURRENT_BINARY_DIR}/_properties_alice.c
-                                                               ${CMAKE_CURRENT_SOURCE_DIR}/properties.c)
-add_executable(properties_bob  ${CMAKE_CURRENT_BINARY_DIR}/_properties_bob.c
-                                                               ${CMAKE_CURRENT_SOURCE_DIR}/properties.c)
+add_executable(properties_simulator ${CMAKE_CURRENT_BINARY_DIR}/_properties_simulator.c ${CMAKE_CURRENT_SOURCE_DIR}/properties.c)
+add_executable(properties_alice     ${CMAKE_CURRENT_BINARY_DIR}/_properties_alice.c ${CMAKE_CURRENT_SOURCE_DIR}/properties.c)
+add_executable(properties_bob       ${CMAKE_CURRENT_BINARY_DIR}/_properties_bob.c ${CMAKE_CURRENT_SOURCE_DIR}/properties.c)
 add_custom_command(
-                                       OUTPUT  ${CMAKE_CURRENT_BINARY_DIR}/_properties_simulator.c
-                                                       ${CMAKE_CURRENT_BINARY_DIR}/_properties_alice.c
-                                                       ${CMAKE_CURRENT_BINARY_DIR}/_properties_bob.c
-                                       DEPENDS gras_stub_generator ${CMAKE_CURRENT_SOURCE_DIR}/properties.xml
-                                       COMMAND ${CMAKE_BINARY_DIR}/bin/gras_stub_generator properties ${CMAKE_CURRENT_SOURCE_DIR}/properties.xml
-                                       WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-                                       )
-                                       
+  OUTPUT
+    ${CMAKE_CURRENT_BINARY_DIR}/_properties_simulator.c
+    ${CMAKE_CURRENT_BINARY_DIR}/_properties_alice.c
+    ${CMAKE_CURRENT_BINARY_DIR}/_properties_bob.c
+  DEPENDS gras_stub_generator ${CMAKE_CURRENT_SOURCE_DIR}/properties.xml
+  COMMAND ${CMAKE_BINARY_DIR}/bin/gras_stub_generator properties ${CMAKE_CURRENT_SOURCE_DIR}/properties.xml
+  WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+  )
+
 ### Add definitions for compile
 if(NOT WIN32)
-target_link_libraries(properties_simulator simgrid pthread m )
-target_link_libraries(properties_alice gras pthread m )
-target_link_libraries(properties_bob gras pthread m )
+  target_link_libraries(properties_simulator simgrid pthread m )
+  target_link_libraries(properties_alice gras pthread m )
+  target_link_libraries(properties_bob gras pthread m )
 else(NOT WIN32)
-target_link_libraries(properties_simulator simgrid)
-target_link_libraries(properties_alice gras)
-target_link_libraries(properties_bob gras)
+  target_link_libraries(properties_simulator simgrid)
+  target_link_libraries(properties_alice gras)
+  target_link_libraries(properties_bob gras)
 endif(NOT WIN32)
 
+set(tesh_files
+  ${tesh_files}
+  ${CMAKE_CURRENT_SOURCE_DIR}/test_rl.tesh
+  ${CMAKE_CURRENT_SOURCE_DIR}/test_sg.tesh
+  PARENT_SCOPE
+)
+set(xml_files
+  ${xml_files}
+  ${CMAKE_CURRENT_SOURCE_DIR}/properties.xml
+  PARENT_SCOPE
+)
+set(examples_src
+  ${examples_src}
+  ${CMAKE_CURRENT_SOURCE_DIR}/properties.c
+  PARENT_SCOPE
+)
+set(bin_files
+  ${bin_files}
+  PARENT_SCOPE
+)
+
+
index b790002..b70c99f 100644 (file)
@@ -1,23 +1,24 @@
 cmake_minimum_required(VERSION 2.6)
 
-set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/_rpc_simulator.c 
-                            ${CMAKE_CURRENT_BINARY_DIR}/_rpc_client.c 
-                                               ${CMAKE_CURRENT_BINARY_DIR}/_rpc_forwarder.c 
-                                               ${CMAKE_CURRENT_BINARY_DIR}/_rpc_server.c
-                                               PROPERTIES GENERATED true)
+set_source_files_properties(
+  ${CMAKE_CURRENT_BINARY_DIR}/_rpc_simulator.c 
+  ${CMAKE_CURRENT_BINARY_DIR}/_rpc_client.c 
+  ${CMAKE_CURRENT_BINARY_DIR}/_rpc_forwarder.c 
+  ${CMAKE_CURRENT_BINARY_DIR}/_rpc_server.c
+  PROPERTIES GENERATED true)
 
 set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}")
-
 add_executable(rpc_simulator ${CMAKE_CURRENT_BINARY_DIR}/_rpc_simulator.c rpc.c)
 add_executable(rpc_client    ${CMAKE_CURRENT_BINARY_DIR}/_rpc_client.c    rpc.c)
 add_executable(rpc_forwarder ${CMAKE_CURRENT_BINARY_DIR}/_rpc_forwarder.c rpc.c)
 add_executable(rpc_server    ${CMAKE_CURRENT_BINARY_DIR}/_rpc_server.c    rpc.c)
 
 add_custom_command(
-  OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/_rpc_simulator.c
-         ${CMAKE_CURRENT_BINARY_DIR}/_rpc_client.c
-         ${CMAKE_CURRENT_BINARY_DIR}/_rpc_server.c
-         ${CMAKE_CURRENT_BINARY_DIR}/_rpc_forwarder.c
+  OUTPUT 
+    ${CMAKE_CURRENT_BINARY_DIR}/_rpc_simulator.c
+    ${CMAKE_CURRENT_BINARY_DIR}/_rpc_client.c
+    ${CMAKE_CURRENT_BINARY_DIR}/_rpc_server.c
+    ${CMAKE_CURRENT_BINARY_DIR}/_rpc_forwarder.c
   DEPENDS gras_stub_generator ${CMAKE_CURRENT_SOURCE_DIR}/rpc.xml
   COMMAND ${CMAKE_BINARY_DIR}/bin/gras_stub_generator rpc ${CMAKE_CURRENT_SOURCE_DIR}/rpc.xml
   WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
@@ -25,14 +26,35 @@ add_custom_command(
 
 ### Add definitions for compile
 if(NOT WIN32)
-target_link_libraries(rpc_simulator simgrid pthread m )
-target_link_libraries(rpc_client gras pthread m )
-target_link_libraries(rpc_forwarder gras pthread m )
-target_link_libraries(rpc_server gras pthread m )
+  target_link_libraries(rpc_simulator simgrid pthread m )
+  target_link_libraries(rpc_client gras pthread m )
+  target_link_libraries(rpc_forwarder gras pthread m )
+  target_link_libraries(rpc_server gras pthread m )
 else(NOT WIN32)
-target_link_libraries(rpc_simulator simgrid)
-target_link_libraries(rpc_client gras)
-target_link_libraries(rpc_forwarder gras)
-target_link_libraries(rpc_server gras)
+  target_link_libraries(rpc_simulator simgrid)
+  target_link_libraries(rpc_client gras)
+  target_link_libraries(rpc_forwarder gras)
+  target_link_libraries(rpc_server gras)
 endif(NOT WIN32)
 
+set(tesh_files
+  ${tesh_files}
+  ${CMAKE_CURRENT_SOURCE_DIR}/test_rl.tesh
+  ${CMAKE_CURRENT_SOURCE_DIR}/test_sg_32.tesh
+  ${CMAKE_CURRENT_SOURCE_DIR}/test_sg_64.tesh
+  PARENT_SCOPE
+)
+set(xml_files
+  ${xml_files}
+  ${CMAKE_CURRENT_SOURCE_DIR}/rpc.xml
+  PARENT_SCOPE
+)
+set(examples_src
+  ${examples_src}
+  ${CMAKE_CURRENT_SOURCE_DIR}/rpc.c
+  PARENT_SCOPE
+)
+set(bin_files
+  ${bin_files}
+  PARENT_SCOPE
+)
index 0a7e4c0..b634986 100644 (file)
@@ -1,28 +1,51 @@
 cmake_minimum_required(VERSION 2.6)
 
-set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/_spawn_simulator.c
-                                       ${CMAKE_CURRENT_BINARY_DIR}/_spawn_server.c
-                                       PROPERTIES GENERATED true)
+set_source_files_properties(
+  ${CMAKE_CURRENT_BINARY_DIR}/_spawn_simulator.c
+  ${CMAKE_CURRENT_BINARY_DIR}/_spawn_server.c
+  PROPERTIES GENERATED true)
 
 set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}")
+add_executable(spawn_simulator ${CMAKE_CURRENT_BINARY_DIR}/_spawn_simulator.c ${CMAKE_CURRENT_SOURCE_DIR}/spawn.c)
+add_executable(spawn_server    ${CMAKE_CURRENT_BINARY_DIR}/_spawn_server.c ${CMAKE_CURRENT_SOURCE_DIR}/spawn.c)
 
-add_executable(spawn_simulator         ${CMAKE_CURRENT_BINARY_DIR}/_spawn_simulator.c 
-                               ${CMAKE_CURRENT_SOURCE_DIR}/spawn.c)
-add_executable(spawn_server    ${CMAKE_CURRENT_BINARY_DIR}/_spawn_server.c 
-                               ${CMAKE_CURRENT_SOURCE_DIR}/spawn.c)
+add_custom_command(
+  OUTPUT
+    ${CMAKE_CURRENT_BINARY_DIR}/_spawn_server.c
+    ${CMAKE_CURRENT_BINARY_DIR}/_spawn_simulator.c
+  DEPENDS gras_stub_generator ${CMAKE_CURRENT_SOURCE_DIR}/spawn.xml
+  COMMAND ${CMAKE_BINARY_DIR}/bin/gras_stub_generator spawn ${CMAKE_CURRENT_SOURCE_DIR}/spawn.xml
+  WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+)
 
-add_custom_command(OUTPUT   ${CMAKE_CURRENT_BINARY_DIR}/_spawn_server.c
-                            ${CMAKE_CURRENT_BINARY_DIR}/_spawn_simulator.c
-                   DEPENDS gras_stub_generator ${CMAKE_CURRENT_SOURCE_DIR}/spawn.xml
-                   COMMAND ${CMAKE_BINARY_DIR}/bin/gras_stub_generator spawn ${CMAKE_CURRENT_SOURCE_DIR}/spawn.xml
-                   WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-                   )
-          
 ### Add definitions for compile
 if(NOT WIN32)
-target_link_libraries(spawn_simulator simgrid pthread m )
-target_link_libraries(spawn_server gras pthread m )
+  target_link_libraries(spawn_simulator simgrid pthread m )
+  target_link_libraries(spawn_server gras pthread m )
 else(NOT WIN32)
-target_link_libraries(spawn_simulator simgrid)
-target_link_libraries(spawn_server gras)
+  target_link_libraries(spawn_simulator simgrid)
+  target_link_libraries(spawn_server gras)
 endif(NOT WIN32)
+
+set(tesh_files
+  ${tesh_files}
+  ${CMAKE_CURRENT_SOURCE_DIR}/test_rl.tesh
+  ${CMAKE_CURRENT_SOURCE_DIR}/test_sg_32.tesh
+  ${CMAKE_CURRENT_SOURCE_DIR}/test_sg_64.tesh
+  PARENT_SCOPE
+)
+set(xml_files
+  ${xml_files}
+  ${CMAKE_CURRENT_SOURCE_DIR}/spawn.xml
+  PARENT_SCOPE
+)
+set(examples_src
+  ${examples_src}
+  ${CMAKE_CURRENT_SOURCE_DIR}/spawn.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/spawn.h
+  PARENT_SCOPE
+)
+set(bin_files
+  ${bin_files}
+  PARENT_SCOPE
+)
index 24c555d..416783e 100644 (file)
@@ -1,30 +1,50 @@
 cmake_minimum_required(VERSION 2.6)
 
-set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/_synchro_simulator.c
-                                                       ${CMAKE_CURRENT_BINARY_DIR}/_synchro_philosopher.c
-                                                       PROPERTIES GENERATED true)
+set_source_files_properties(
+  ${CMAKE_CURRENT_BINARY_DIR}/_synchro_simulator.c
+  ${CMAKE_CURRENT_BINARY_DIR}/_synchro_philosopher.c
+  PROPERTIES GENERATED true)
 
 set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}")
-
-add_executable(synchro_simulator       ${CMAKE_CURRENT_BINARY_DIR}/_synchro_simulator.c
-                                                                       ${CMAKE_CURRENT_SOURCE_DIR}/philosopher.c)
-add_executable(synchro_philosopher     ${CMAKE_CURRENT_BINARY_DIR}/_synchro_philosopher.c 
-                                                                       ${CMAKE_CURRENT_SOURCE_DIR}/philosopher.c)
+add_executable(synchro_simulator   ${CMAKE_CURRENT_BINARY_DIR}/_synchro_simulator.c ${CMAKE_CURRENT_SOURCE_DIR}/philosopher.c)
+add_executable(synchro_philosopher ${CMAKE_CURRENT_BINARY_DIR}/_synchro_philosopher.c ${CMAKE_CURRENT_SOURCE_DIR}/philosopher.c)
 
 add_custom_command(
-                                       OUTPUT  ${CMAKE_CURRENT_BINARY_DIR}/_synchro_simulator.c
-                                                       ${CMAKE_CURRENT_BINARY_DIR}/_synchro_philosopher.c
-                                       DEPENDS gras_stub_generator ${CMAKE_CURRENT_SOURCE_DIR}/synchro.xml
-                                       COMMAND ${CMAKE_BINARY_DIR}/bin/gras_stub_generator synchro ${CMAKE_CURRENT_SOURCE_DIR}/synchro.xml
-                    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-                                       )
+  OUTPUT
+    ${CMAKE_CURRENT_BINARY_DIR}/_synchro_simulator.c
+    ${CMAKE_CURRENT_BINARY_DIR}/_synchro_philosopher.c
+  DEPENDS gras_stub_generator ${CMAKE_CURRENT_SOURCE_DIR}/synchro.xml
+  COMMAND ${CMAKE_BINARY_DIR}/bin/gras_stub_generator synchro ${CMAKE_CURRENT_SOURCE_DIR}/synchro.xml
+  WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+)
 
 ### Add definitions for compile
 if(NOT WIN32)
-target_link_libraries(synchro_simulator simgrid pthread m )
-target_link_libraries(synchro_philosopher gras pthread m )
+  target_link_libraries(synchro_simulator simgrid pthread m )
+  target_link_libraries(synchro_philosopher gras pthread m )
 else(NOT WIN32)
-target_link_libraries(synchro_simulator simgrid)
-target_link_libraries(synchro_philosopher gras)
+  target_link_libraries(synchro_simulator simgrid)
+  target_link_libraries(synchro_philosopher gras)
 endif(NOT WIN32)
 
+set(tesh_files
+  ${tesh_files}
+  ${CMAKE_CURRENT_SOURCE_DIR}/test_rl.tesh
+  ${CMAKE_CURRENT_SOURCE_DIR}/test_sg_32.tesh
+  ${CMAKE_CURRENT_SOURCE_DIR}/test_sg_64.tesh
+  PARENT_SCOPE
+)
+set(xml_files
+  ${xml_files}
+  ${CMAKE_CURRENT_SOURCE_DIR}/synchro.xml
+  PARENT_SCOPE
+)
+set(examples_src
+  ${examples_src}
+  ${CMAKE_CURRENT_SOURCE_DIR}/philosopher.c
+  PARENT_SCOPE
+)
+set(bin_files
+  ${bin_files}
+  PARENT_SCOPE
+)
\ No newline at end of file
index 758fa29..2140741 100644 (file)
@@ -1,19 +1,18 @@
 cmake_minimum_required(VERSION 2.6)
 
-set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/_timer_simulator.c
-                                                       ${CMAKE_CURRENT_BINARY_DIR}/_timer_client.c
-                                                       PROPERTIES GENERATED true)
+set_source_files_properties(
+  ${CMAKE_CURRENT_BINARY_DIR}/_timer_simulator.c
+  ${CMAKE_CURRENT_BINARY_DIR}/_timer_client.c
+  PROPERTIES GENERATED true)
 
 set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}")
-
-add_executable(timer_simulator         ${CMAKE_CURRENT_BINARY_DIR}/_timer_simulator.c 
-                                                               ${CMAKE_CURRENT_SOURCE_DIR}/timer.c)
-add_executable(timer_client    ${CMAKE_CURRENT_BINARY_DIR}/_timer_client.c
-                                                               ${CMAKE_CURRENT_SOURCE_DIR}/timer.c)
+add_executable(timer_simulator ${CMAKE_CURRENT_BINARY_DIR}/_timer_simulator.c ${CMAKE_CURRENT_SOURCE_DIR}/timer.c)
+add_executable(timer_client    ${CMAKE_CURRENT_BINARY_DIR}/_timer_client.c ${CMAKE_CURRENT_SOURCE_DIR}/timer.c)
 
 add_custom_command(
-  OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/_timer_simulator.c
-         ${CMAKE_CURRENT_BINARY_DIR}/_timer_client.c
+  OUTPUT
+    ${CMAKE_CURRENT_BINARY_DIR}/_timer_simulator.c
+    ${CMAKE_CURRENT_BINARY_DIR}/_timer_client.c
   DEPENDS gras_stub_generator ${CMAKE_CURRENT_SOURCE_DIR}/timer.xml
   COMMAND ${CMAKE_BINARY_DIR}/bin/gras_stub_generator timer ${CMAKE_CURRENT_SOURCE_DIR}/timer.xml
   WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
@@ -21,10 +20,31 @@ add_custom_command(
 
 ### Add definitions for compile
 if(NOT WIN32)
-target_link_libraries(timer_simulator simgrid pthread m )
-target_link_libraries(timer_client gras pthread m )
+  target_link_libraries(timer_simulator simgrid pthread m )
+  target_link_libraries(timer_client gras pthread m )
 else(NOT WIN32)
-target_link_libraries(timer_simulator simgrid)
-target_link_libraries(timer_client gras)
+  target_link_libraries(timer_simulator simgrid)
+  target_link_libraries(timer_client gras)
 endif(NOT WIN32)
 
+set(tesh_files
+  ${tesh_files}
+  ${CMAKE_CURRENT_SOURCE_DIR}/test_rl.tesh
+  ${CMAKE_CURRENT_SOURCE_DIR}/test_sg_32.tesh
+  ${CMAKE_CURRENT_SOURCE_DIR}/test_sg_64.tesh
+  PARENT_SCOPE
+)
+set(xml_files
+  ${xml_files}
+  ${CMAKE_CURRENT_SOURCE_DIR}/timer.xml
+  PARENT_SCOPE
+)
+set(examples_src
+  ${examples_src}
+  ${CMAKE_CURRENT_SOURCE_DIR}/timer.c
+  PARENT_SCOPE
+)
+set(bin_files
+  ${bin_files}
+  PARENT_SCOPE
+)
diff --git a/examples/lua/CMakeLists.txt b/examples/lua/CMakeLists.txt
new file mode 100644 (file)
index 0000000..ac06ad7
--- /dev/null
@@ -0,0 +1,61 @@
+cmake_minimum_required(VERSION 2.6)
+
+set(tesh_files
+  ${tesh_files}
+  ${CMAKE_CURRENT_SOURCE_DIR}/multi_matrix/mult_matrix.tesh
+  ${CMAKE_CURRENT_SOURCE_DIR}/masterslave/master_slave.tesh
+  ${CMAKE_CURRENT_SOURCE_DIR}/chord/chord.tesh
+  ${CMAKE_CURRENT_SOURCE_DIR}/state_cloner/duplicated_globals.tesh
+  ${CMAKE_CURRENT_SOURCE_DIR}/console/master_slave_bypass.tesh
+  PARENT_SCOPE
+)
+set(xml_files
+  ${xml_files}
+  ${CMAKE_CURRENT_SOURCE_DIR}/multi_matrix/quicksort_deployment.xml
+  ${CMAKE_CURRENT_SOURCE_DIR}/multi_matrix/quicksort_platform.xml
+  ${CMAKE_CURRENT_SOURCE_DIR}/deploy.xml
+  ${CMAKE_CURRENT_SOURCE_DIR}/state_cloner/deployment_duplicated_globals.xml
+  PARENT_SCOPE
+)
+set(examples_src
+  ${examples_src}
+  ${CMAKE_CURRENT_SOURCE_DIR}/multi_matrix/sender.lua
+  ${CMAKE_CURRENT_SOURCE_DIR}/multi_matrix/receiver.lua
+  ${CMAKE_CURRENT_SOURCE_DIR}/multi_matrix/mult_matrix.lua
+  ${CMAKE_CURRENT_SOURCE_DIR}/masterslave/master.lua
+  ${CMAKE_CURRENT_SOURCE_DIR}/masterslave/master_slave.lua
+  ${CMAKE_CURRENT_SOURCE_DIR}/masterslave/platform.lua
+  ${CMAKE_CURRENT_SOURCE_DIR}/masterslave/slave.lua
+  ${CMAKE_CURRENT_SOURCE_DIR}/chord/chord.lua
+  ${CMAKE_CURRENT_SOURCE_DIR}/splaySim/master.lua
+  ${CMAKE_CURRENT_SOURCE_DIR}/splaySim/splay_deploy_masterslave.lua
+  ${CMAKE_CURRENT_SOURCE_DIR}/splaySim/splay_ctrl.lua
+  ${CMAKE_CURRENT_SOURCE_DIR}/splaySim/splay_platform.lua
+  ${CMAKE_CURRENT_SOURCE_DIR}/splaySim/slave.lua
+  ${CMAKE_CURRENT_SOURCE_DIR}/SimSplay/splay_school.lua
+  ${CMAKE_CURRENT_SOURCE_DIR}/SimSplay/chord.lua
+  ${CMAKE_CURRENT_SOURCE_DIR}/SimSplay/sim_splay.lua
+  ${CMAKE_CURRENT_SOURCE_DIR}/SimSplay/platform_script.lua
+  ${CMAKE_CURRENT_SOURCE_DIR}/tracing/master.lua
+  ${CMAKE_CURRENT_SOURCE_DIR}/tracing/master_slave_trace.lua
+  ${CMAKE_CURRENT_SOURCE_DIR}/tracing/slave.lua
+  ${CMAKE_CURRENT_SOURCE_DIR}/state_cloner/duplicated_globals.lua
+  ${CMAKE_CURRENT_SOURCE_DIR}/console/master.lua
+  ${CMAKE_CURRENT_SOURCE_DIR}/console/platform.lua
+  ${CMAKE_CURRENT_SOURCE_DIR}/console/slave.lua
+  ${CMAKE_CURRENT_SOURCE_DIR}/console/master_slave_bypass.lua
+  ${CMAKE_CURRENT_SOURCE_DIR}/console/deploy.lua
+  PARENT_SCOPE
+)
+set(bin_files
+  ${bin_files}
+  PARENT_SCOPE
+)
+set(txt_files
+  ${txt_files}
+  ${CMAKE_CURRENT_SOURCE_DIR}/SimSplay/TODO
+  ${CMAKE_CURRENT_SOURCE_DIR}/README
+  ${CMAKE_CURRENT_SOURCE_DIR}/tracing/file.trace
+  ${CMAKE_CURRENT_SOURCE_DIR}/tracing/simgrid.trace
+  PARENT_SCOPE
+)
\ No newline at end of file
diff --git a/examples/msg/CMakeLists.txt b/examples/msg/CMakeLists.txt
new file mode 100644 (file)
index 0000000..c35c89d
--- /dev/null
@@ -0,0 +1,34 @@
+cmake_minimum_required(VERSION 2.6)
+
+set(tesh_files
+  ${tesh_files}
+  PARENT_SCOPE
+)
+set(xml_files
+  ${xml_files}
+  ${CMAKE_CURRENT_SOURCE_DIR}/msg_platform.xml
+  ${CMAKE_CURRENT_SOURCE_DIR}/small_platform_with_failures.xml
+  ${CMAKE_CURRENT_SOURCE_DIR}/small_platform_with_routers.xml
+  ${CMAKE_CURRENT_SOURCE_DIR}/small_platform.xml
+  PARENT_SCOPE
+)
+set(examples_src
+  ${examples_src}
+  PARENT_SCOPE
+)
+set(bin_files
+  ${bin_files}
+  PARENT_SCOPE
+)
+set(txt_files
+  ${txt_files}
+  ${CMAKE_CURRENT_SOURCE_DIR}/bourassa_state.trace
+  ${CMAKE_CURRENT_SOURCE_DIR}/fafard_state.trace
+  ${CMAKE_CURRENT_SOURCE_DIR}/ginette_state.trace
+  ${CMAKE_CURRENT_SOURCE_DIR}/jupiter_state.trace
+  ${CMAKE_CURRENT_SOURCE_DIR}/link3_state.trace
+  ${CMAKE_CURRENT_SOURCE_DIR}/link4_state.trace
+  ${CMAKE_CURRENT_SOURCE_DIR}/link5_state.trace
+  ${CMAKE_CURRENT_SOURCE_DIR}/README
+  PARENT_SCOPE
+)
\ No newline at end of file
index 85b4e39..63526ee 100644 (file)
@@ -1,20 +1,43 @@
 cmake_minimum_required(VERSION 2.6)
 
 set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}")
-
 add_executable(actions actions.c)
 
 ### Add definitions for compile
-target_link_libraries(actions simgrid m )
+target_link_libraries(actions simgrid m)
+
+set(tesh_files
+  ${tesh_files}
+  ${CMAKE_CURRENT_SOURCE_DIR}/actions.tesh
+  PARENT_SCOPE
+)
+set(xml_files
+  ${xml_files}
+  ${CMAKE_CURRENT_SOURCE_DIR}/deployment_split.xml
+  ${CMAKE_CURRENT_SOURCE_DIR}/deployment.xml
+  ${CMAKE_CURRENT_SOURCE_DIR}/homogeneous_3_hosts.xml
+  PARENT_SCOPE
+)
+set(examples_src
+  ${examples_src}
+  ${CMAKE_CURRENT_SOURCE_DIR}/actions.c
+  PARENT_SCOPE
+)
+set(bin_files
+  ${bin_files}
+  PARENT_SCOPE
+)
+set(txt_files
+  ${txt_files}
+  ${CMAKE_CURRENT_SOURCE_DIR}/actions_allReduce.txt
+  ${CMAKE_CURRENT_SOURCE_DIR}/actions_barrier.txt
+  ${CMAKE_CURRENT_SOURCE_DIR}/actions_bcast.txt
+  ${CMAKE_CURRENT_SOURCE_DIR}/actions_reduce.txt
+  ${CMAKE_CURRENT_SOURCE_DIR}/actions_split_p0.txt
+  ${CMAKE_CURRENT_SOURCE_DIR}/actions_split_p1.txt
+  ${CMAKE_CURRENT_SOURCE_DIR}/actions.txt
+  ${CMAKE_CURRENT_SOURCE_DIR}/actions_with_isend.txt
 
-### Get our action files in the archive
-set(EXTRA_DIST ${EXTRA_DIST} 
-       examples/msg/actions/actions_allReduce.txt
-       examples/msg/actions/actions_barrier.txt
-       examples/msg/actions/actions_bcast.txt
-       examples/msg/actions/actions_reduce.txt
-       examples/msg/actions/actions_split_p0.txt
-       examples/msg/actions/actions_split_p1.txt
-       examples/msg/actions/actions.txt
-       examples/msg/actions/actions_with_isend.txt
-       )
\ No newline at end of file
+  PARENT_SCOPE
+)
+       
\ No newline at end of file
index cc0096d..5cb3464 100644 (file)
@@ -2,7 +2,37 @@ cmake_minimum_required(VERSION 2.6)
 
 set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}")
 
-add_executable(chord "chord.c")
+add_executable(chord chord.c)
 
 ### Add definitions for compile
 target_link_libraries(chord simgrid )
+
+set(tesh_files
+  ${tesh_files}
+  ${CMAKE_CURRENT_SOURCE_DIR}/chord.tesh
+  ${CMAKE_CURRENT_SOURCE_DIR}/chord_crosstraffic.tesh
+  PARENT_SCOPE
+)
+set(xml_files
+  ${xml_files}
+  ${CMAKE_CURRENT_SOURCE_DIR}/chord.xml
+  ${CMAKE_CURRENT_SOURCE_DIR}/chord10.xml
+  ${CMAKE_CURRENT_SOURCE_DIR}/chord100.xml
+  ${CMAKE_CURRENT_SOURCE_DIR}/chord90.xml
+  PARENT_SCOPE
+)
+set(examples_src
+  ${examples_src}
+  ${CMAKE_CURRENT_SOURCE_DIR}/chord.c
+  PARENT_SCOPE
+)
+set(bin_files
+  ${bin_files}
+  ${CMAKE_CURRENT_SOURCE_DIR}/generate.py
+  ${CMAKE_CURRENT_SOURCE_DIR}/run_chord
+  PARENT_SCOPE
+)
+set(txt_files
+  ${txt_files}
+  PARENT_SCOPE
+)
\ No newline at end of file
index 3103f3e..a445de0 100644 (file)
@@ -8,5 +8,28 @@ add_executable(masterslave_virtual_machines "masterslave_virtual_machines.c")
 if(WIN32)
   target_link_libraries(masterslave_virtual_machines simgrid )
 else(WIN32)
-  target_link_libraries(masterslave_virtual_machines simgrid m )
+  target_link_libraries(masterslave_virtual_machines simgrid m)
 endif(WIN32)
+
+set(tesh_files
+  ${tesh_files}
+  PARENT_SCOPE
+)
+set(xml_files
+  ${xml_files}
+  ${CMAKE_CURRENT_SOURCE_DIR}/masterslave_virtual_machines.xml
+  PARENT_SCOPE
+)
+set(examples_src
+  ${examples_src}
+  ${CMAKE_CURRENT_SOURCE_DIR}/masterslave_virtual_machines.c
+  PARENT_SCOPE
+)
+set(bin_files
+  ${bin_files}
+  PARENT_SCOPE
+)
+set(txt_files
+  ${txt_files}
+  PARENT_SCOPE
+)
\ No newline at end of file
index c09c794..0056679 100644 (file)
@@ -7,3 +7,24 @@ add_executable(test_MSG_gpu_task_create "test_MSG_gpu_task_create.c")
 ### Add definitions for compile
 target_link_libraries(test_MSG_gpu_task_create simgrid m )
 
+set(tesh_files
+  ${tesh_files}
+  PARENT_SCOPE
+)
+set(xml_files
+  ${xml_files}
+  PARENT_SCOPE
+)
+set(examples_src
+  ${examples_src}
+  ${CMAKE_CURRENT_SOURCE_DIR}/test_MSG_gpu_task_create.c
+  PARENT_SCOPE
+)
+set(bin_files
+  ${bin_files}
+  PARENT_SCOPE
+)
+set(txt_files
+  ${txt_files}
+  PARENT_SCOPE
+)
\ No newline at end of file
index 709d3cd..f46e8c4 100644 (file)
@@ -2,8 +2,48 @@ cmake_minimum_required(VERSION 2.6)
 
 set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}")
 
-add_executable(gtnets "gtnets.c")
+add_executable(gtnets gtnets.c)
 
 ### Add definitions for compile
-target_link_libraries(gtnets simgrid m )
+target_link_libraries(gtnets simgrid m)
 
+set(tesh_files
+  ${tesh_files}
+  ${CMAKE_CURRENT_SOURCE_DIR}/gtnets-crosstraffic.tesh
+  ${CMAKE_CURRENT_SOURCE_DIR}/gtnets-onelink-gtnets.tesh
+  ${CMAKE_CURRENT_SOURCE_DIR}/tracing-gtnets-dogbone-gtnets.tesh
+  ${CMAKE_CURRENT_SOURCE_DIR}/tracing-gtnets-onelink-lv08.tesh
+  ${CMAKE_CURRENT_SOURCE_DIR}/gtnets-dogbone-gtnets.tesh
+  ${CMAKE_CURRENT_SOURCE_DIR}/gtnets-onelink-lv08.tesh
+  ${CMAKE_CURRENT_SOURCE_DIR}/tracing-gtnets-dogbone-lv08.tesh
+  ${CMAKE_CURRENT_SOURCE_DIR}/tracing-gtnets-waxman.tesh
+  ${CMAKE_CURRENT_SOURCE_DIR}/gtnets-dogbone-lv08.tesh
+  ${CMAKE_CURRENT_SOURCE_DIR}/gtnets-waxman.tesh
+  ${CMAKE_CURRENT_SOURCE_DIR}/tracing-gtnets-onelink-gtnets.tesh
+  PARENT_SCOPE
+)
+set(xml_files
+  ${xml_files}
+  ${CMAKE_CURRENT_SOURCE_DIR}/crosstraffic-d.xml
+  ${CMAKE_CURRENT_SOURCE_DIR}/crosstraffic-p.xml  
+  ${CMAKE_CURRENT_SOURCE_DIR}/dogbone-d.xml  
+  ${CMAKE_CURRENT_SOURCE_DIR}/dogbone-p.xml  
+  ${CMAKE_CURRENT_SOURCE_DIR}/onelink-d.xml  
+  ${CMAKE_CURRENT_SOURCE_DIR}/onelink-p.xml  
+  ${CMAKE_CURRENT_SOURCE_DIR}/waxman-d.xml  
+  ${CMAKE_CURRENT_SOURCE_DIR}/waxman-p.xml
+  PARENT_SCOPE
+)
+set(examples_src
+  ${examples_src}
+  ${CMAKE_CURRENT_SOURCE_DIR}/gtnets.c
+  PARENT_SCOPE
+)
+set(bin_files
+  ${bin_files}
+  PARENT_SCOPE
+)
+set(txt_files
+  ${txt_files}
+  PARENT_SCOPE
+)
\ No newline at end of file
index 7a628bd..8708bac 100644 (file)
@@ -9,4 +9,36 @@ add_executable(peer2 peer2.c)
 target_link_libraries(peer2 simgrid)
 
 add_executable(peer3 peer3.c)
-target_link_libraries(peer3 simgrid)
\ No newline at end of file
+target_link_libraries(peer3 simgrid)
+
+set(tesh_files
+  ${tesh_files}
+  ${CMAKE_CURRENT_SOURCE_DIR}/peer.tesh
+  PARENT_SCOPE
+)
+set(xml_files
+  ${xml_files}
+  ${CMAKE_CURRENT_SOURCE_DIR}/deployment_peer.xml
+  ${CMAKE_CURRENT_SOURCE_DIR}/deployment_peer01.xml
+  ${CMAKE_CURRENT_SOURCE_DIR}/deployment_peer02.xml
+  ${CMAKE_CURRENT_SOURCE_DIR}/deployment_peer03.xml
+  ${CMAKE_CURRENT_SOURCE_DIR}/deployment_peer04.xml
+  ${CMAKE_CURRENT_SOURCE_DIR}/deployment_peer05.xml
+  ${CMAKE_CURRENT_SOURCE_DIR}/small_platform.xml
+  PARENT_SCOPE
+)
+set(examples_src
+  ${examples_src}
+  ${CMAKE_CURRENT_SOURCE_DIR}/peer.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/peer2.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/peer3.c
+  PARENT_SCOPE
+)
+set(bin_files
+  ${bin_files}
+  PARENT_SCOPE
+)
+set(txt_files
+  ${txt_files}
+  PARENT_SCOPE
+)
index 9a9d754..9ee39ae 100644 (file)
@@ -6,8 +6,30 @@ add_executable(file file.c)
 
 ### Add definitions for compile
 if(NOT WIN32)
-target_link_libraries(file simgrid m pthread )
+  target_link_libraries(file simgrid m pthread)
 else(NOT WIN32)
-target_link_libraries(file simgrid)
+  target_link_libraries(file simgrid)
 endif(NOT WIN32)
 
+set(tesh_files
+  ${tesh_files}
+  ${CMAKE_CURRENT_SOURCE_DIR}/io.tesh
+  PARENT_SCOPE
+)
+set(xml_files
+  ${xml_files}
+  PARENT_SCOPE
+)
+set(examples_src
+  ${examples_src}
+  ${CMAKE_CURRENT_SOURCE_DIR}/file.c
+  PARENT_SCOPE
+)
+set(bin_files
+  ${bin_files}
+  PARENT_SCOPE
+)
+set(txt_files
+  ${txt_files}
+  PARENT_SCOPE
+)
index b6b352f..55a78e8 100644 (file)
@@ -13,20 +13,74 @@ add_executable(masterslave_arg "masterslave_arg.c")
 
 ### Add definitions for compile
 if(WIN32)
-target_link_libraries(masterslave_forwarder simgrid )
-target_link_libraries(masterslave_failure simgrid )
-target_link_libraries(masterslave_mailbox simgrid )
-target_link_libraries(masterslave_bypass simgrid )
-target_link_libraries(masterslave_console simgrid )
-target_link_libraries(masterslave_kill simgrid )
-target_link_libraries(masterslave_arg simgrid )
+  target_link_libraries(masterslave_forwarder simgrid )
+  target_link_libraries(masterslave_failure simgrid )
+  target_link_libraries(masterslave_mailbox simgrid )
+  target_link_libraries(masterslave_bypass simgrid )
+  target_link_libraries(masterslave_console simgrid )
+  target_link_libraries(masterslave_kill simgrid )
+  target_link_libraries(masterslave_arg simgrid )
 else(WIN32)
-target_link_libraries(masterslave_forwarder simgrid m )
-target_link_libraries(masterslave_failure simgrid m )
-target_link_libraries(masterslave_mailbox simgrid m )
-target_link_libraries(masterslave_bypass simgrid m )
-target_link_libraries(masterslave_console simgrid m )
-target_link_libraries(masterslave_kill simgrid m )
-target_link_libraries(masterslave_arg simgrid m )
+  target_link_libraries(masterslave_forwarder simgrid m )
+  target_link_libraries(masterslave_failure simgrid m )
+  target_link_libraries(masterslave_mailbox simgrid m )
+  target_link_libraries(masterslave_bypass simgrid m )
+  target_link_libraries(masterslave_console simgrid m )
+  target_link_libraries(masterslave_kill simgrid m )
+  target_link_libraries(masterslave_arg simgrid m )
 endif(WIN32)
-target_link_libraries(masterslave_cluster simgrid)
\ No newline at end of file
+target_link_libraries(masterslave_cluster simgrid)
+
+set(tesh_files
+  ${tesh_files}
+  ${CMAKE_CURRENT_SOURCE_DIR}/masterslave_bypass.tesh
+  ${CMAKE_CURRENT_SOURCE_DIR}/masterslave_cpu_ti.tesh
+  ${CMAKE_CURRENT_SOURCE_DIR}/masterslave_forwarder_crosstraffic.tesh
+  ${CMAKE_CURRENT_SOURCE_DIR}/masterslave_mailbox.tesh
+  ${CMAKE_CURRENT_SOURCE_DIR}/masterslave_cas01_im.tesh
+  ${CMAKE_CURRENT_SOURCE_DIR}/masterslave_crosstraffic.tesh
+  ${CMAKE_CURRENT_SOURCE_DIR}/masterslave_forwarder.tesh
+  ${CMAKE_CURRENT_SOURCE_DIR}/masterslave_multicore.tesh
+  ${CMAKE_CURRENT_SOURCE_DIR}/masterslave_console.tesh
+  ${CMAKE_CURRENT_SOURCE_DIR}/masterslave_failure_crosstraffic.tesh
+  ${CMAKE_CURRENT_SOURCE_DIR}/masterslave_kill.tesh
+  ${CMAKE_CURRENT_SOURCE_DIR}/masterslave.tesh
+  ${CMAKE_CURRENT_SOURCE_DIR}/masterslave_cpu_ti_crosstraffic.tesh
+  ${CMAKE_CURRENT_SOURCE_DIR}/masterslave_failure.tesh
+  ${CMAKE_CURRENT_SOURCE_DIR}/masterslave_mailbox_crosstraffic.tesh
+  ${CMAKE_CURRENT_SOURCE_DIR}/masterslave_vivaldi.tesh
+  PARENT_SCOPE
+)
+set(xml_files
+  ${xml_files}
+  ${CMAKE_CURRENT_SOURCE_DIR}/deployment_masterslave_forwarder.xml
+  ${CMAKE_CURRENT_SOURCE_DIR}/deployment_masterslave_mailbox_multicore.xml
+  ${CMAKE_CURRENT_SOURCE_DIR}/deployment_masterslave_vivaldi.xml
+  ${CMAKE_CURRENT_SOURCE_DIR}/platform_clusters.xml
+  ${CMAKE_CURRENT_SOURCE_DIR}/deployment_masterslave_kill.xml
+  ${CMAKE_CURRENT_SOURCE_DIR}/deployment_masterslave_mailbox.xml
+  ${CMAKE_CURRENT_SOURCE_DIR}/deployment_masterslave.xml
+  ${CMAKE_CURRENT_SOURCE_DIR}/platform_kill.xml
+  PARENT_SCOPE
+)
+set(examples_src
+  ${examples_src}
+  ${CMAKE_CURRENT_SOURCE_DIR}/masterslave_arg.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/masterslave_bypass.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/masterslave_cluster.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/masterslave_console.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/masterslave_failure.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/masterslave_forwarder.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/masterslave_kill.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/masterslave_mailbox.c
+  PARENT_SCOPE
+)
+set(bin_files
+  ${bin_files}
+  ${CMAKE_CURRENT_SOURCE_DIR}/platform_script.lua
+  PARENT_SCOPE
+)
+set(txt_files
+  ${txt_files}
+  PARENT_SCOPE
+)
index aa9cbad..b093ccf 100644 (file)
@@ -29,3 +29,71 @@ target_link_libraries(bugged2_liveness     simgrid m )
 target_link_libraries(centralized_liveness     simgrid m )
 target_link_libraries(centralized_liveness_deadlock     simgrid m )
 target_link_libraries(test_snapshot     simgrid m )
+
+set(tesh_files
+  ${tesh_files}
+  ${CMAKE_CURRENT_SOURCE_DIR}/bugged1.tesh
+  ${CMAKE_CURRENT_SOURCE_DIR}/bugged2.tesh
+  ${CMAKE_CURRENT_SOURCE_DIR}/centralized.tesh
+  PARENT_SCOPE
+)
+set(xml_files
+  ${xml_files}
+  ${CMAKE_CURRENT_SOURCE_DIR}/deploy_bugged1_liveness.xml
+  ${CMAKE_CURRENT_SOURCE_DIR}/deploy_bugged1.xml
+  ${CMAKE_CURRENT_SOURCE_DIR}/deploy_bugged2_liveness.xml
+  ${CMAKE_CURRENT_SOURCE_DIR}/deploy_bugged2.xml
+  ${CMAKE_CURRENT_SOURCE_DIR}/deploy_bugged3.xml
+  ${CMAKE_CURRENT_SOURCE_DIR}/deploy_cennralized_liveness.xml
+  ${CMAKE_CURRENT_SOURCE_DIR}/deploy_mutex.xml
+  ${CMAKE_CURRENT_SOURCE_DIR}/deploy_random_test.xml
+  ${CMAKE_CURRENT_SOURCE_DIR}/platform.xml
+  PARENT_SCOPE
+)
+set(examples_src
+  ${examples_src}
+  ${CMAKE_CURRENT_SOURCE_DIR}/automanon.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/automatonparse_promela.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/bugged1.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/bugged1_for_liveness.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/bugged1_stateful.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/bugged1_while_liveness.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/bugged2.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/bugged2_liveness.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/bugged2_stateful.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/bugged3.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/centralized_liveness.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/centralized_liveness_deadlock.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/centralized_munex.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/lex.yy.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/random_test.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/test_snapshot.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/y.tab.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/automaton.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/automatonparse_promela.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/bugged1_liveness.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/bugged2_liveness.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/centralized_liveness.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/test_snapshot.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/y.tab.h
+  PARENT_SCOPE
+)
+set(bin_files
+  ${bin_files}
+  ${CMAKE_CURRENT_SOURCE_DIR}/dwarf
+  ${CMAKE_CURRENT_SOURCE_DIR}/parse_dwarf
+  ${CMAKE_CURRENT_SOURCE_DIR}/parserPromela.lex
+  ${CMAKE_CURRENT_SOURCE_DIR}/parserPromela.yacc
+  ${CMAKE_CURRENT_SOURCE_DIR}/promela1_bugged1_liveness
+  ${CMAKE_CURRENT_SOURCE_DIR}/promela2_bugged1_liveness
+  ${CMAKE_CURRENT_SOURCE_DIR}/promela2_bugged2_liveness
+  ${CMAKE_CURRENT_SOURCE_DIR}/promela2_centralized_liveness
+  ${CMAKE_CURRENT_SOURCE_DIR}/promela_bugged2_liveness
+  ${CMAKE_CURRENT_SOURCE_DIR}/promela_centralized_liveness
+  
+  PARENT_SCOPE
+)
+set(txt_files
+  ${txt_files}
+  PARENT_SCOPE
+)
index 3c825c6..0c8e3c0 100644 (file)
@@ -6,3 +6,27 @@ add_executable(migration migration.c)
 
 ### Add definitions for compile
 target_link_libraries(migration simgrid m )
+
+set(tesh_files
+  ${tesh_files}
+  ${CMAKE_CURRENT_SOURCE_DIR}/migration.tesh
+  PARENT_SCOPE
+)
+set(xml_files
+  ${xml_files}
+  PARENT_SCOPE
+)
+set(examples_src
+  ${examples_src}
+  ${CMAKE_CURRENT_SOURCE_DIR}/migration.c
+  PARENT_SCOPE
+)
+set(bin_files
+  ${bin_files}
+    ${CMAKE_CURRENT_SOURCE_DIR}/migration.deploy
+  PARENT_SCOPE
+)
+set(txt_files
+  ${txt_files}
+  PARENT_SCOPE
+)
\ No newline at end of file
index 1111655..41df0b4 100644 (file)
@@ -7,3 +7,34 @@ add_executable(ns3 "ns3.c")
 ### Add definitions for compile
 target_link_libraries(ns3 simgrid m )
 
+set(tesh_files
+  ${tesh_files}
+  ${CMAKE_CURRENT_SOURCE_DIR}/ns3.tesh
+  PARENT_SCOPE
+)
+set(xml_files
+  ${xml_files}
+  ${CMAKE_CURRENT_SOURCE_DIR}/3hosns_2links_d.xml
+  ${CMAKE_CURRENT_SOURCE_DIR}/3hosns_2links_p.xml
+  ${CMAKE_CURRENT_SOURCE_DIR}/3links-d-nimer.xml
+  ${CMAKE_CURRENT_SOURCE_DIR}/3links-d.xml
+  ${CMAKE_CURRENT_SOURCE_DIR}/3links-p.xml
+  ${CMAKE_CURRENT_SOURCE_DIR}/dogbone-d.xml
+  ${CMAKE_CURRENT_SOURCE_DIR}/dogbone-p.xml
+  ${CMAKE_CURRENT_SOURCE_DIR}/One_clusner-d.xml
+  ${CMAKE_CURRENT_SOURCE_DIR}/Two_clusners-d.xml
+  PARENT_SCOPE
+)
+set(examples_src
+  ${examples_src}
+  ${CMAKE_CURRENT_SOURCE_DIR}/ns3.c
+  PARENT_SCOPE
+)
+set(bin_files
+  ${bin_files}
+  PARENT_SCOPE
+)
+set(txt_files
+  ${txt_files}
+  PARENT_SCOPE
+)
index 760b58c..9373d6f 100644 (file)
@@ -8,3 +8,29 @@ add_executable(test_ptask test_ptask.c)
 ### Add definitions for compile
 target_link_libraries(parallel_task simgrid m )
 target_link_libraries(test_ptask simgrid m )
+
+set(tesh_files
+  ${tesh_files}
+  ${CMAKE_CURRENT_SOURCE_DIR}/parallel_task.tesh
+  PARENT_SCOPE
+)
+set(xml_files
+  ${xml_files}
+  ${CMAKE_CURRENT_SOURCE_DIR}/test_ptask_deployment.xml
+  ${CMAKE_CURRENT_SOURCE_DIR}/test_ptask_platform.xml
+  PARENT_SCOPE
+)
+set(examples_src
+  ${examples_src}
+  ${CMAKE_CURRENT_SOURCE_DIR}/parallel_task.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/test_ptask.c
+  PARENT_SCOPE
+)
+set(bin_files
+  ${bin_files}
+  PARENT_SCOPE
+)
+set(txt_files
+  ${txt_files}
+  PARENT_SCOPE
+)
index 6d627cd..746c55a 100644 (file)
@@ -5,3 +5,26 @@ set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}")
 add_executable(msg_pmm     msg_pmm.c)
 
 target_link_libraries(msg_pmm simgrid m )
+
+set(tesh_files
+  ${tesh_files}
+  PARENT_SCOPE
+)
+set(xml_files
+  ${xml_files}
+  ${CMAKE_CURRENT_SOURCE_DIR}/pmm_9_deploy.xml
+  PARENT_SCOPE
+)
+set(examples_src
+  ${examples_src}
+  ${CMAKE_CURRENT_SOURCE_DIR}/msg_pmm.c
+  PARENT_SCOPE
+)
+set(bin_files
+  ${bin_files}
+  PARENT_SCOPE
+)
+set(txt_files
+  ${txt_files}
+  PARENT_SCOPE
+)
index 0f9757f..bc18665 100644 (file)
@@ -5,4 +5,28 @@ set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}")
 add_executable(priority priority.c)
 
 ### Add definitions for compile
-target_link_libraries(priority simgrid m )
+target_link_libraries(priority simgrid m)
+
+set(tesh_files
+  ${tesh_files}
+  ${CMAKE_CURRENT_SOURCE_DIR}/priority.tesh
+  PARENT_SCOPE
+)
+set(xml_files
+  ${xml_files}
+  ${CMAKE_CURRENT_SOURCE_DIR}/deployment_priority.xml
+  PARENT_SCOPE
+)
+set(examples_src
+  ${examples_src}
+  ${CMAKE_CURRENT_SOURCE_DIR}/priority.c
+  PARENT_SCOPE
+)
+set(bin_files
+  ${bin_files}
+  PARENT_SCOPE
+)
+set(txt_files
+  ${txt_files}
+  PARENT_SCOPE
+)
\ No newline at end of file
index 36aad93..1c80f15 100644 (file)
@@ -6,3 +6,27 @@ add_executable(msg_prop msg_prop.c)
 
 ### Add definitions for compile
 target_link_libraries(msg_prop simgrid m )
+
+set(tesh_files
+  ${tesh_files}
+  ${CMAKE_CURRENT_SOURCE_DIR}/msg_prop.tesh
+  PARENT_SCOPE
+)
+set(xml_files
+  ${xml_files}
+  ${CMAKE_CURRENT_SOURCE_DIR}/deployment_properties.xml
+  PARENT_SCOPE
+)
+set(examples_src
+  ${examples_src}
+  ${CMAKE_CURRENT_SOURCE_DIR}/msg_prop.c
+  PARENT_SCOPE
+)
+set(bin_files
+  ${bin_files}
+  PARENT_SCOPE
+)
+set(txt_files
+  ${txt_files}
+  PARENT_SCOPE
+)
\ No newline at end of file
index 73ac887..160c623 100644 (file)
@@ -6,3 +6,32 @@ add_executable(sendrecv sendrecv.c)
 
 ### Add definitions for compile
 target_link_libraries(sendrecv simgrid m )
+
+set(tesh_files
+  ${tesh_files}
+  ${CMAKE_CURRENT_SOURCE_DIR}/sendrecv_CLM03.tesh
+  ${CMAKE_CURRENT_SOURCE_DIR}/sendrecv_KCCFLN05.tesh
+  ${CMAKE_CURRENT_SOURCE_DIR}/sendrecv_Reno.tesh
+  ${CMAKE_CURRENT_SOURCE_DIR}/sendrecv_Vegas.tesh
+  PARENT_SCOPE
+)
+set(xml_files
+  ${xml_files}
+  ${CMAKE_CURRENT_SOURCE_DIR}/deployment_sendrecv.xml
+  ${CMAKE_CURRENT_SOURCE_DIR}/platform_sendrecv.xml
+  PARENT_SCOPE
+)
+set(examples_src
+  ${examples_src}
+  ${CMAKE_CURRENT_SOURCE_DIR}/sendrecv.c
+  PARENT_SCOPE
+)
+set(bin_files
+  ${bin_files}
+  PARENT_SCOPE
+)
+set(txt_files
+  ${txt_files}
+  ${CMAKE_CURRENT_SOURCE_DIR}/README
+  PARENT_SCOPE
+)
\ No newline at end of file
index 85b478c..1e6fcd1 100644 (file)
@@ -6,7 +6,34 @@ add_executable(sk_time "sk_time.c")
 
 ### Add definitions for compile
 if(WIN32)
-target_link_libraries(sk_time simgrid )
+  target_link_libraries(sk_time simgrid )
 else(WIN32)
-target_link_libraries(sk_time simgrid m )
-endif(WIN32)
\ No newline at end of file
+  target_link_libraries(sk_time simgrid m )
+endif(WIN32)
+
+set(tesh_files
+  ${tesh_files}
+  ${CMAKE_CURRENT_SOURCE_DIR}/start_kill_time.tesh
+  PARENT_SCOPE
+)
+set(xml_files
+  ${xml_files}
+  ${CMAKE_CURRENT_SOURCE_DIR}/deployment_kill.xml
+  ${CMAKE_CURRENT_SOURCE_DIR}/deployment_start_kill.xml
+  ${CMAKE_CURRENT_SOURCE_DIR}/deployment_start.xml
+  ${CMAKE_CURRENT_SOURCE_DIR}/deployment.xml
+  PARENT_SCOPE
+)
+set(examples_src
+  ${examples_src}
+  ${CMAKE_CURRENT_SOURCE_DIR}/sk_time.c
+  PARENT_SCOPE
+)
+set(bin_files
+  ${bin_files}
+  PARENT_SCOPE
+)
+set(txt_files
+  ${txt_files}
+  PARENT_SCOPE
+)
\ No newline at end of file
index 7d4a9e1..33df39c 100644 (file)
@@ -6,3 +6,27 @@ add_executable(suspend suspend.c)
 
 ### Add definitions for compile
 target_link_libraries(suspend simgrid m )
+
+set(tesh_files
+  ${tesh_files}
+  ${CMAKE_CURRENT_SOURCE_DIR}/suspend.tesh
+  PARENT_SCOPE
+)
+set(xml_files
+  ${xml_files}
+  ${CMAKE_CURRENT_SOURCE_DIR}/deployment_suspend.xml
+  PARENT_SCOPE
+)
+set(examples_src
+  ${examples_src}
+  ${CMAKE_CURRENT_SOURCE_DIR}/suspend.c
+  PARENT_SCOPE
+)
+set(bin_files
+  ${bin_files}
+  PARENT_SCOPE
+)
+set(txt_files
+  ${txt_files}
+  PARENT_SCOPE
+)
index dbd974f..98da46a 100644 (file)
@@ -6,8 +6,32 @@ add_executable(token_ring ring_call.c)
 
 ### Add definitions for compile
 if(NOT WIN32)
-target_link_libraries(token_ring simgrid m pthread )
+  target_link_libraries(token_ring simgrid m pthread )
 else(NOT WIN32)
-target_link_libraries(token_ring simgrid)
+  target_link_libraries(token_ring simgrid)
 endif(NOT WIN32)
 
+set(tesh_files
+  ${tesh_files}
+  ${CMAKE_CURRENT_SOURCE_DIR}/token_ring.tesh
+  PARENT_SCOPE
+)
+set(xml_files
+  ${xml_files}
+  ${CMAKE_CURRENT_SOURCE_DIR}/two_clusters.xml
+  ${CMAKE_CURRENT_SOURCE_DIR}/two_peers.xml
+  PARENT_SCOPE
+)
+set(examples_src
+  ${examples_src}
+  ${CMAKE_CURRENT_SOURCE_DIR}/ring_call.c
+  PARENT_SCOPE
+)
+set(bin_files
+  ${bin_files}
+  PARENT_SCOPE
+)
+set(txt_files
+  ${txt_files}
+  PARENT_SCOPE
+)
index f79eaa1..679a97a 100644 (file)
@@ -25,5 +25,41 @@ target_link_libraries(link_srcdst_user_variables simgrid m )
 ## Clean generated files
 get_directory_property(extra_clean_files ADDITIONAL_MAKE_CLEAN_FILES)
 set_directory_properties(
-       PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES
-        "${extra_clean_files};${CMAKE_CURRENT_BINARY_DIR}/ms.cat.plist;${CMAKE_CURRENT_BINARY_DIR}/ms.trace;${CMAKE_CURRENT_BINARY_DIR}/ms.uncat.plist;")
+  PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES
+    "${extra_clean_files};${CMAKE_CURRENT_BINARY_DIR}/ms.cat.plist;${CMAKE_CURRENT_BINARY_DIR}/ms.trace;${CMAKE_CURRENT_BINARY_DIR}/ms.uncat.plist;"
+ )
+
+ set(tesh_files
+  ${tesh_files}
+  ${CMAKE_CURRENT_BINARY_DIR}/categories.tesh
+  ${CMAKE_CURRENT_BINARY_DIR}/link_srcdst_user_variables.tesh
+  ${CMAKE_CURRENT_BINARY_DIR}/link_user_variables.tesh
+  ${CMAKE_CURRENT_BINARY_DIR}/ms.tesh
+  ${CMAKE_CURRENT_BINARY_DIR}/procmig.tesh
+  ${CMAKE_CURRENT_BINARY_DIR}/trace_platform.tesh
+  ${CMAKE_CURRENT_BINARY_DIR}/user_variables.tesh
+)
+set(xml_files
+  ${xml_files}
+  ${CMAKE_CURRENT_BINARY_DIR}/deployment.xml
+  ${CMAKE_CURRENT_BINARY_DIR}/platform.xml
+  ${CMAKE_CURRENT_BINARY_DIR}/procmig-deploy.xml
+)
+set(examples_src
+  ${examples_src}
+  ${CMAKE_CURRENT_BINARY_DIR}/categories.c
+  ${CMAKE_CURRENT_BINARY_DIR}/link_srcdst_user_variables.c
+  ${CMAKE_CURRENT_BINARY_DIR}/link_user_variables.c
+  ${CMAKE_CURRENT_BINARY_DIR}/ms.c
+  ${CMAKE_CURRENT_BINARY_DIR}/procmig.c
+  ${CMAKE_CURRENT_BINARY_DIR}/simple.c
+  ${CMAKE_CURRENT_BINARY_DIR}/trace_platform.c
+  ${CMAKE_CURRENT_BINARY_DIR}/user_variables.c
+)
+set(bin_files
+  ${bin_files}
+)
+set(txt_files
+  ${txt_files}
+)
\ No newline at end of file
index e891144..8d99b16 100644 (file)
@@ -11,39 +11,71 @@ add_executable(simdag_tracing simdag_trace.c)
 
 ### Add definitions for compile
 if(NOT WIN32)
-       target_link_libraries(ex_sd_test simgrid pthread m )
-       target_link_libraries(sd_test2 simgrid pthread m )
-       target_link_libraries(sd_typed_tasks_test simgrid pthread m )
-       target_link_libraries(sd_seq_access simgrid pthread m )
-       target_link_libraries(sd_test_console simgrid pthread m )
-       target_link_libraries(simdag_tracing simgrid pthread m )
-       
-       add_custom_command(TARGET ex_sd_test
-               POST_BUILD
-               COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_BINARY_DIR}/ex_sd_test ${CMAKE_CURRENT_BINARY_DIR}/sd_test
-               WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
-       )
-       get_directory_property(extra_clean_files ADDITIONAL_MAKE_CLEAN_FILES)
-       set_directory_properties(
-        PROPERTIES
-        ADDITIONAL_MAKE_CLEAN_FILES "${extra_clean_files};${CMAKE_CURRENT_BINARY_DIR}/sd_test")
+  target_link_libraries(ex_sd_test simgrid pthread m )
+  target_link_libraries(sd_test2 simgrid pthread m )
+  target_link_libraries(sd_typed_tasks_test simgrid pthread m )
+  target_link_libraries(sd_seq_access simgrid pthread m )
+  target_link_libraries(sd_test_console simgrid pthread m )
+  target_link_libraries(simdag_tracing simgrid pthread m )
+
+  add_custom_command(TARGET ex_sd_test
+    POST_BUILD
+    COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_BINARY_DIR}/ex_sd_test ${CMAKE_CURRENT_BINARY_DIR}/sd_test
+    WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
+  )
+  get_directory_property(extra_clean_files ADDITIONAL_MAKE_CLEAN_FILES)
+  set_directory_properties(
+    PROPERTIES
+    ADDITIONAL_MAKE_CLEAN_FILES "${extra_clean_files};${CMAKE_CURRENT_BINARY_DIR}/sd_test")
+
 else(NOT WIN32)
-       target_link_libraries(ex_sd_test simgrid)
-       target_link_libraries(sd_test2 simgrid)
-       target_link_libraries(sd_typed_tasks_test simgrid)
-       target_link_libraries(sd_seq_access simgrid)
-       target_link_libraries(sd_test_console simgrid)
-       target_link_libraries(simdag_tracing simgrid)
-       
-       add_custom_command(TARGET ex_sd_test
-               POST_BUILD
-               COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_BINARY_DIR}/ex_sd_test.exe ${CMAKE_CURRENT_BINARY_DIR}/sd_test.exe
-               WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
-       )
-       get_directory_property(extra_clean_files ADDITIONAL_MAKE_CLEAN_FILES)
-       set_directory_properties(
-        PROPERTIES
-        ADDITIONAL_MAKE_CLEAN_FILES "${extra_clean_files};${CMAKE_CURRENT_BINARY_DIR}/sd_test.exe")
+  target_link_libraries(ex_sd_test simgrid)
+  target_link_libraries(sd_test2 simgrid)
+  target_link_libraries(sd_typed_tasks_test simgrid)
+  target_link_libraries(sd_seq_access simgrid)
+  target_link_libraries(sd_test_console simgrid)
+  target_link_libraries(simdag_tracing simgrid)
+
+  add_custom_command(TARGET ex_sd_test
+    POST_BUILD
+    COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_BINARY_DIR}/ex_sd_test.exe ${CMAKE_CURRENT_BINARY_DIR}/sd_test.exe
+    WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
+  )
+  get_directory_property(extra_clean_files ADDITIONAL_MAKE_CLEAN_FILES)
+  set_directory_properties(
+    PROPERTIES
+    ADDITIONAL_MAKE_CLEAN_FILES "${extra_clean_files};${CMAKE_CURRENT_BINARY_DIR}/sd_test.exe")
 endif(NOT WIN32)
 
+set(tesh_files
+  ${tesh_files}
+  ${CMAKE_CURRENT_SOURCE_DIR}/test_simdag2.tesh
+  ${CMAKE_CURRENT_SOURCE_DIR}/test_simdag_seq_access.tesh
+  ${CMAKE_CURRENT_SOURCE_DIR}/test_simdag.tesh
+  PARENT_SCOPE
+)
+set(xml_files
+  ${xml_files}
+  ${CMAKE_CURRENT_SOURCE_DIR}/2clusters.xml
+  PARENT_SCOPE
+)
+set(examples_src
+  ${examples_src}
+  ${CMAKE_CURRENT_SOURCE_DIR}/sd_seq_access.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/sd_test2.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/sd_test.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/sd_test_console.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/sd_typed_tasks_test.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/simdag_trace.c
+  PARENT_SCOPE
+)
+set(bin_files
+  ${bin_files}
+  ${CMAKE_CURRENT_SOURCE_DIR}/platform_script.lua
+  ${CMAKE_CURRENT_SOURCE_DIR}/test_simdag.in
+  PARENT_SCOPE
+)
+set(txt_files
+  ${txt_files}
+  PARENT_SCOPE
+)
index cc71e08..bf6c6c9 100644 (file)
@@ -6,7 +6,33 @@ add_executable(dax_test dax_test.c)
 
 ### Add definitions for compile
 if(NOT WIN32)
-target_link_libraries(dax_test simgrid pthread m )
+  target_link_libraries(dax_test simgrid pthread m )
 else(NOT WIN32)
-target_link_libraries(dax_test simgrid)
+  target_link_libraries(dax_test simgrid)
 endif(NOT WIN32)
+
+set(tesh_files
+  ${tesh_files}
+  PARENT_SCOPE
+)
+set(xml_files
+  ${xml_files}
+  ${CMAKE_CURRENT_SOURCE_DIR}/Montage_50.xml
+  PARENT_SCOPE
+)
+set(examples_src
+  ${examples_src}
+  ${CMAKE_CURRENT_SOURCE_DIR}/dax_test.c
+  PARENT_SCOPE
+)
+set(bin_files
+  ${bin_files}
+  ${CMAKE_CURRENT_SOURCE_DIR}/generate_forkjoin.pl
+  ${CMAKE_CURRENT_SOURCE_DIR}/generate_strassen.pl
+  PARENT_SCOPE
+)
+set(txt_files
+  ${txt_files}
+  PARENT_SCOPE
+)
+
index 6cfac8f..97408b0 100644 (file)
@@ -12,24 +12,45 @@ if(NOT WIN32)
   target_link_libraries(simulate_dot simgrid pthread m)        #target_link_libraries(<name_of_targe> <dependencies>)
   target_link_libraries(dot_test2 simgrid pthread m)   #target_link_libraries(<name_of_targe> <dependencies>)
 
-       get_directory_property(extra_clean_files ADDITIONAL_MAKE_CLEAN_FILES)
-       set_directory_properties(
-        PROPERTIES
-        ADDITIONAL_MAKE_CLEAN_FILES "${extra_clean_files};${CMAKE_CURRENT_BINARY_DIR}/dot_test; ${CMAKE_CURRENT_BINARY_DIR}/simulate_dot;")
-  
+  get_directory_property(extra_clean_files ADDITIONAL_MAKE_CLEAN_FILES)
+  set_directory_properties(
+    PROPERTIES
+    ADDITIONAL_MAKE_CLEAN_FILES "${extra_clean_files};${CMAKE_CURRENT_BINARY_DIR}/dot_test; ${CMAKE_CURRENT_BINARY_DIR}/simulate_dot;")
+
 else(NOT WIN32)
   target_link_libraries(dot_test simgrid)      #target_link_libraries(<name_of_targe> <dependencies>)
   target_link_libraries(simulate_dot simgrid)  #target_link_libraries(<name_of_targe> <dependencies>)
   target_link_libraries(dot_test2 simgrid)     #target_link_libraries(<name_of_targe> <dependencies>)
-       set_directory_properties(
-        PROPERTIES
-        ADDITIONAL_MAKE_CLEAN_FILES "${extra_clean_files};${CMAKE_CURRENT_BINARY_DIR}/dot_test; ${CMAKE_CURRENT_BINARY_DIR}/simulate_dot;")
+  set_directory_properties(
+    PROPERTIES
+    ADDITIONAL_MAKE_CLEAN_FILES "${extra_clean_files};${CMAKE_CURRENT_BINARY_DIR}/dot_test; ${CMAKE_CURRENT_BINARY_DIR}/simulate_dot;")
 endif(NOT WIN32)
 
-set(EXTRA_DIST
-       ${EXTRA_DIST}
-       ${CMAKE_CURRENT_BINARY_DIR}/dag_with_bad_schedule.dot
-       ${CMAKE_CURRENT_BINARY_DIR}/dag_with_cycle.dot
-       ${CMAKE_CURRENT_BINARY_DIR}/dag_with_good_schedule.dot
-       ${CMAKE_CURRENT_BINARY_DIR}/simulate_dot.c
-)
\ No newline at end of file
+set(tesh_files
+  ${tesh_files}
+  PARENT_SCOPE
+)
+set(xml_files
+  ${xml_files}
+  PARENT_SCOPE
+)
+set(examples_src
+  ${examples_src}
+  ${CMAKE_CURRENT_SOURCE_DIR}/dot_test.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/dot_test2.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/simulate_dot.c
+  PARENT_SCOPE
+)
+set(bin_files
+  ${bin_files}
+  PARENT_SCOPE
+)
+set(txt_files
+  ${txt_files}
+  ${CMAKE_CURRENT_SOURCE_DIR}/dag_with_bad_schedule.dot
+  ${CMAKE_CURRENT_SOURCE_DIR}/dag_with_cycle.dot
+  ${CMAKE_CURRENT_SOURCE_DIR}/dag_with_good_schedule.dot
+  ${CMAKE_CURRENT_SOURCE_DIR}/simulate_dot.c
+  PARENT_SCOPE
+)
+  
\ No newline at end of file
index 941fc7d..9e7e37b 100644 (file)
@@ -6,7 +6,29 @@ add_executable(goal_test goal_test.c)
 
 ### Add definitions for compile
 if(NOT WIN32)
-target_link_libraries(goal_test simgrid pthread m )
+  target_link_libraries(goal_test simgrid pthread m )
 else(NOT WIN32)
-target_link_libraries(goal_test simgrid)
+  target_link_libraries(goal_test simgrid)
 endif(NOT WIN32)
+
+set(tesh_files
+  ${tesh_files}
+  PARENT_SCOPE
+)
+set(xml_files
+  ${xml_files}
+  PARENT_SCOPE
+)
+set(examples_src
+  ${examples_src}
+  ${CMAKE_CURRENT_SOURCE_DIR}/goal_test.c
+  PARENT_SCOPE
+)
+set(bin_files
+  ${bin_files}
+  PARENT_SCOPE
+)
+set(txt_files
+  ${txt_files}
+  PARENT_SCOPE
+)
\ No newline at end of file
index ab744c8..bf06eec 100644 (file)
@@ -6,7 +6,31 @@ add_executable(sd_meta sd_meta.c)
 
 ### Add definitions for compile
 if(NOT WIN32)
-target_link_libraries(sd_meta simgrid pthread m )
+  target_link_libraries(sd_meta simgrid pthread m )
 else(NOT WIN32)
-target_link_libraries(sd_meta simgrid)
-endif(NOT WIN32)
\ No newline at end of file
+  target_link_libraries(sd_meta simgrid)
+endif(NOT WIN32)
+
+set(tesh_files
+  ${tesh_files}
+  ${CMAKE_CURRENT_SOURCE_DIR}/metaxml_test.tesh
+  ${CMAKE_CURRENT_SOURCE_DIR}/metaxml_test2.tesh
+  PARENT_SCOPE
+)
+set(xml_files
+  ${xml_files}
+  PARENT_SCOPE
+)
+set(examples_src
+  ${examples_src}
+  ${CMAKE_CURRENT_SOURCE_DIR}/sd_meta.c
+  PARENT_SCOPE
+)
+set(bin_files
+  ${bin_files}
+  PARENT_SCOPE
+)
+set(txt_files
+  ${txt_files}
+  PARENT_SCOPE
+)
\ No newline at end of file
index 57f4105..4a1dd4a 100644 (file)
@@ -6,7 +6,30 @@ add_executable(sd_prop sd_prop.c)
 
 ### Add definitions for compile
 if(NOT WIN32)
-target_link_libraries(sd_prop simgrid pthread m )
+  target_link_libraries(sd_prop simgrid pthread m )
 else(NOT WIN32)
-target_link_libraries(sd_prop simgrid)
+  target_link_libraries(sd_prop simgrid)
 endif(NOT WIN32)
+
+set(tesh_files
+  ${tesh_files}
+  ${CMAKE_CURRENT_SOURCE_DIR}/test_prop.tesh
+  PARENT_SCOPE
+)
+set(xml_files
+  ${xml_files}
+  PARENT_SCOPE
+)
+set(examples_src
+  ${examples_src}
+  ${CMAKE_CURRENT_SOURCE_DIR}/sd_prop.c
+  PARENT_SCOPE
+)
+set(bin_files
+  ${bin_files}
+  PARENT_SCOPE
+)
+set(txt_files
+  ${txt_files}
+  PARENT_SCOPE
+)
\ No newline at end of file
index e112e4a..a30e343 100644 (file)
@@ -6,7 +6,32 @@ add_executable(minmin_test minmin_test.c)
 
 ### Add definitions for compile
 if(NOT WIN32)
-target_link_libraries(minmin_test simgrid pthread m)
+  target_link_libraries(minmin_test simgrid pthread m)
 else(NOT WIN32)
-target_link_libraries(minmin_test simgrid)
+  target_link_libraries(minmin_test simgrid)
 endif(NOT WIN32)
+
+set(tesh_files
+  ${tesh_files}
+  ${CMAKE_CURRENT_SOURCE_DIR}/test_minmin.tesh
+  PARENT_SCOPE
+)
+set(xml_files
+  ${xml_files}
+  ${CMAKE_CURRENT_SOURCE_DIR}/Montage_25.xml
+  ${CMAKE_CURRENT_SOURCE_DIR}/simulacrum_7_hosts.xml
+  PARENT_SCOPE
+)
+set(examples_src
+  ${examples_src}
+  ${CMAKE_CURRENT_SOURCE_DIR}/minmin_test.c
+  PARENT_SCOPE
+)
+set(bin_files
+  ${bin_files}
+  PARENT_SCOPE
+)
+set(txt_files
+  ${txt_files}
+  PARENT_SCOPE
+)
\ No newline at end of file
index 19e4c29..c086d0c 100644 (file)
@@ -53,3 +53,52 @@ target_link_libraries(mc_bugged1 m simgrid smpi )
 target_link_libraries(mc_bugged2 m simgrid smpi )
 
 set_target_properties(smpi_sendrecv PROPERTIES RENAME sendrecv)
+
+set(tesh_files
+  ${tesh_files}
+  ${CMAKE_CURRENT_SOURCE_DIR}/bcast.tesh
+  ${CMAKE_CURRENT_SOURCE_DIR}/reduce.tesh
+  ${CMAKE_CURRENT_SOURCE_DIR}/tracing/smpi_traced.tesh
+  PARENT_SCOPE
+)
+set(xml_files
+  ${xml_files}
+  PARENT_SCOPE
+)
+set(examples_src
+  ${examples_src}
+  ${CMAKE_CURRENT_SOURCE_DIR}/alltoallv.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/mc_bugged2.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/get_processor_name.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/pingpong.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/bcast.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/allreduce.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/alltoall_basic.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/sendrecv.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/mc_bugged1.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/reduce.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/mvmul.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/compute2.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/split.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/dsend.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/ttest01.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/compute.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/compute3.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/alltoall2.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/scatter.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/sendtest.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/barrier.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/bcbench.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/tracing/smpi_traced.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/tracing/smpi_traced_simple.c
+  PARENT_SCOPE
+)
+set(bin_files
+  ${bin_files}
+  ${CMAKE_CURRENT_SOURCE_DIR}/hostfile
+  PARENT_SCOPE
+)
+set(txt_files
+  ${txt_files}
+  PARENT_SCOPE
+)
diff --git a/examples/xbt/CMakeLists.txt b/examples/xbt/CMakeLists.txt
new file mode 100644 (file)
index 0000000..ddfd414
--- /dev/null
@@ -0,0 +1,24 @@
+cmake_minimum_required(VERSION 2.6)
+
+set(tesh_files
+  ${tesh_files}
+  PARENT_SCOPE
+)
+set(xml_files
+  ${xml_files}
+  PARENT_SCOPE
+)
+set(examples_src
+  ${examples_src}
+  ${CMAKE_CURRENT_SOURCE_DIR}/sem_basic.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/sem_sched.c
+  PARENT_SCOPE
+)
+set(bin_files
+  ${bin_files}
+  PARENT_SCOPE
+)
+set(txt_files
+  ${txt_files}
+  PARENT_SCOPE
+)
\ No newline at end of file
index ca1af63..6efd752 100644 (file)
@@ -125,6 +125,8 @@ XBT_PUBLIC(void) SD_task_set_data(SD_task_t task, void *data);
 XBT_PUBLIC(e_SD_task_state_t) SD_task_get_state(SD_task_t task);
 XBT_PUBLIC(const char *) SD_task_get_name(SD_task_t task);
 XBT_PUBLIC(void) SD_task_set_name(SD_task_t task, const char *name);
+XBT_PUBLIC(void) SD_task_set_rate(SD_task_t task, double rate);
+
 XBT_PUBLIC(void) SD_task_watch(SD_task_t task, e_SD_task_state_t state);
 XBT_PUBLIC(void) SD_task_unwatch(SD_task_t task, e_SD_task_state_t state);
 XBT_PUBLIC(double) SD_task_get_amount(SD_task_t task);
index cff2e0a..d8014a4 100644 (file)
@@ -532,9 +532,9 @@ static void generate_cat_configuration (const char *output, const char *name, in
           "configuration (categorized).", output, name);
     }
 
-    fprintf (file, "{\n");
+    if (brackets) fprintf (file, "{\n");
     cat_configuration (file);
-    fprintf (file, "}\n");
+    if (brackets) fprintf (file, "}\n");
     fclose (file);
   }
 }
index b8e800f..bda366c 100644 (file)
@@ -149,10 +149,10 @@ void MSG_vm_resume(msg_vm_t vm) {
  * No extra delay occurs. If you want to simulate this too, you want to
  * use a #MSG_process_sleep() or something. I'm not quite sure.
  */
-void MSG_vm_shutdown(msg_vm_t vm) {
-  unsigned int cpt;
+void MSG_vm_shutdown(msg_vm_t vm)
+{
   m_process_t process;
-  XBT_DEBUG("%d processes in the VM",xbt_dynar_length(vm->processes));
+  XBT_DEBUG("%lu processes in the VM", xbt_dynar_length(vm->processes));
   while (xbt_dynar_length(vm->processes) > 0) {
        process = xbt_dynar_get_as(vm->processes,0,m_process_t);
        MSG_process_kill(process);
index e7bd309..e62ad0f 100644 (file)
@@ -249,6 +249,20 @@ void SD_task_set_data(SD_task_t task, void *data)
   task->data = data;
 }
 
+/**
+ * \brief Sets the rate of a task
+ *
+ * This will change the percentage of the available power or network bandwidth
+ * a task can use.
+ *
+ * \param task a task
+ * \param rate the new rate you want to associate with this task
+ */
+void SD_task_set_rate(SD_task_t task, double rate)
+{
+  task->rate = rate;
+}
+
 /**
  * \brief Returns the state of a task
  *
index 4eb0569..3f333ce 100644 (file)
@@ -211,24 +211,33 @@ const char *xbt_ex_catname(xbt_errcat_t cat)
 {
   switch (cat) {
   case unknown_error:
-    return "unknown_err";
+    return "unknown error";
   case arg_error:
-    return "invalid_arg";
+    return "invalid argument";
+  case bound_error:
+    return "out of bounds";
   case mismatch_error:
     return "mismatch";
   case not_found_error:
     return "not found";
   case system_error:
-    return "system_err";
+    return "system error";
   case network_error:
-    return "network_err";
+    return "network error";
   case timeout_error:
     return "timeout";
+  case cancel_error:
+    return "action canceled";
   case thread_error:
-    return "thread_err";
-  default:
-    return "INVALID_ERR";
+    return "thread error";
+  case host_error:
+    return "host failed";
+  case tracing_error:
+    return "tracing error";
+  case io_error:
+    return "io error";
   }
+  return "INVALID ERROR";
 }
 
 
diff --git a/teshsuite/CMakeLists.txt b/teshsuite/CMakeLists.txt
new file mode 100644 (file)
index 0000000..2b848d9
--- /dev/null
@@ -0,0 +1,23 @@
+cmake_minimum_required(VERSION 2.6)
+
+set(tesh_files
+  ${tesh_files}
+  ${CMAKE_CURRENT_SOURCE_DIR}/SimGrid.tesh
+  PARENT_SCOPE
+)
+set(xml_files
+  ${xml_files}
+  PARENT_SCOPE
+)
+set(teshsuite_src
+  ${teshsuite_src}
+  PARENT_SCOPE
+)
+set(bin_files
+  ${bin_files}
+  PARENT_SCOPE
+)
+set(txt_files
+  ${txt_files}
+  PARENT_SCOPE
+)
\ No newline at end of file
diff --git a/teshsuite/gras/CMakeLists.txt b/teshsuite/gras/CMakeLists.txt
new file mode 100644 (file)
index 0000000..3d9d7f3
--- /dev/null
@@ -0,0 +1,24 @@
+cmake_minimum_required(VERSION 2.6)
+
+set(tesh_files
+  ${tesh_files}
+  ${CMAKE_CURRENT_SOURCE_DIR}/gras.tesh
+  PARENT_SCOPE
+)
+set(xml_files
+  ${xml_files}
+  PARENT_SCOPE
+)
+set(teshsuite_src
+  ${teshsuite_src}
+  PARENT_SCOPE
+)
+set(bin_files
+  ${bin_files}
+  PARENT_SCOPE
+)
+set(txt_files
+  ${txt_files}
+  ${CMAKE_CURRENT_SOURCE_DIR}/README
+  PARENT_SCOPE
+)
\ No newline at end of file
index d54b570..88d30b1 100644 (file)
@@ -6,7 +6,41 @@ add_executable(datadesc_usage datadesc_usage.c datadesc_structs.c)
 
 ### Add definitions for compile
 if(NOT WIN32)
-target_link_libraries(datadesc_usage gras m pthread)
+  target_link_libraries(datadesc_usage gras m pthread)
 elseif(NOT WIN32)
-target_link_libraries(datadesc_usage gras)
-endif(NOT WIN32)
\ No newline at end of file
+  target_link_libraries(datadesc_usage gras)
+endif(NOT WIN32)
+
+set(tesh_files
+  ${tesh_files}
+  ${CMAKE_CURRENT_SOURCE_DIR}/datadesc_r_little32_4.tesh
+  ${CMAKE_CURRENT_SOURCE_DIR}/datadesc_r_big32_8_4.tesh
+  ${CMAKE_CURRENT_SOURCE_DIR}/datadesc_mem.tesh
+  ${CMAKE_CURRENT_SOURCE_DIR}/datadesc_r_little64.tesh
+  ${CMAKE_CURRENT_SOURCE_DIR}/datadesc.tesh
+  ${CMAKE_CURRENT_SOURCE_DIR}/datadesc_rw.tesh
+  PARENT_SCOPE
+)
+set(xml_files
+  ${xml_files}
+  PARENT_SCOPE
+)
+set(teshsuite_src
+  ${teshsuite_src}
+  ${CMAKE_CURRENT_SOURCE_DIR}/datadesc_usage.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/datadesc_structs.c
+  PARENT_SCOPE
+)
+set(bin_files
+  ${bin_files}
+  ${CMAKE_CURRENT_SOURCE_DIR}/mk_datadesc_structs.pl
+  PARENT_SCOPE
+)
+set(txt_files
+  ${txt_files}
+  ${CMAKE_CURRENT_SOURCE_DIR}/datadesc.big32_8_4
+  ${CMAKE_CURRENT_SOURCE_DIR}/datadesc.big64
+  ${CMAKE_CURRENT_SOURCE_DIR}/datadesc.little32_4
+  ${CMAKE_CURRENT_SOURCE_DIR}/datadesc.little64
+  PARENT_SCOPE
+)
\ No newline at end of file
index c8df2b6..3f3e4a6 100644 (file)
@@ -21,9 +21,34 @@ add_custom_command(
                                        
 ### Add definitions for compile
 if(NOT WIN32)
-target_link_libraries(empty_main_simulator simgrid m pthread)
-target_link_libraries(empty_main_function gras m pthread)
+  target_link_libraries(empty_main_simulator simgrid m pthread)
+  target_link_libraries(empty_main_function gras m pthread)
 else(NOT WIN32)
-target_link_libraries(empty_main_simulator simgrid)
-target_link_libraries(empty_main_function gras)
-endif(NOT WIN32)
\ No newline at end of file
+  target_link_libraries(empty_main_simulator simgrid)
+  target_link_libraries(empty_main_function gras)
+endif(NOT WIN32)
+
+set(tesh_files
+  ${tesh_files}
+  ${CMAKE_CURRENT_SOURCE_DIR}/test_rl.tesh
+  ${CMAKE_CURRENT_SOURCE_DIR}/test_sg.tesh
+  PARENT_SCOPE
+)
+set(xml_files
+  ${xml_files}
+  ${CMAKE_CURRENT_SOURCE_DIR}/empty_main.xml
+  PARENT_SCOPE
+)
+set(teshsuite_src
+  ${teshsuite_src}
+  ${CMAKE_CURRENT_SOURCE_DIR}/empty_main.c
+  PARENT_SCOPE
+)
+set(bin_files
+  ${bin_files}
+  PARENT_SCOPE
+)
+set(txt_files
+  ${txt_files}
+  PARENT_SCOPE
+)
\ No newline at end of file
index 8aab3ad..5fe15a9 100644 (file)
@@ -25,11 +25,37 @@ add_custom_command(
 
 ### Add definitions for compile
 if(NOT WIN32)
-target_link_libraries(msg_handle_simulator simgrid m pthread )
-target_link_libraries(msg_handle_client gras m pthread )
-target_link_libraries(msg_handle_server gras m pthread )
+  target_link_libraries(msg_handle_simulator simgrid m pthread )
+  target_link_libraries(msg_handle_client gras m pthread )
+  target_link_libraries(msg_handle_server gras m pthread )
 else(NOT WIN32)
-target_link_libraries(msg_handle_simulator simgrid)
-target_link_libraries(msg_handle_client gras)
-target_link_libraries(msg_handle_server gras)
+  target_link_libraries(msg_handle_simulator simgrid)
+  target_link_libraries(msg_handle_client gras)
+  target_link_libraries(msg_handle_server gras)
 endif(NOT WIN32)
+
+set(tesh_files
+  ${tesh_files}
+  ${CMAKE_CURRENT_SOURCE_DIR}/test_rl.tesh
+  ${CMAKE_CURRENT_SOURCE_DIR}/test_sg_32.tesh
+  ${CMAKE_CURRENT_SOURCE_DIR}/test_sg_64.tesh
+  PARENT_SCOPE
+)
+set(xml_files
+  ${xml_files}
+  ${CMAKE_CURRENT_SOURCE_DIR}/msg_handle.xml
+  PARENT_SCOPE
+)
+set(teshsuite_src
+  ${teshsuite_src}
+  ${CMAKE_CURRENT_SOURCE_DIR}/msg_handle.c
+  PARENT_SCOPE
+)
+set(bin_files
+  ${bin_files}
+  PARENT_SCOPE
+)
+set(txt_files
+  ${txt_files}
+  PARENT_SCOPE
+)
index 8291f77..7f7e26e 100644 (file)
@@ -21,9 +21,34 @@ add_custom_command(
                                        
 ### Add definitions for compile
 if(NOT WIN32)
-target_link_libraries(small_sleep_simulator simgrid m pthread)
-target_link_libraries(small_sleep_function gras m pthread)
+  target_link_libraries(small_sleep_simulator simgrid m pthread)
+  target_link_libraries(small_sleep_function gras m pthread)
 else(NOT WIN32)
-target_link_libraries(small_sleep_simulator simgrid)
-target_link_libraries(small_sleep_function gras)
-endif(NOT WIN32)
\ No newline at end of file
+  target_link_libraries(small_sleep_simulator simgrid)
+  target_link_libraries(small_sleep_function gras)
+endif(NOT WIN32)
+
+set(tesh_files
+  ${tesh_files}
+  ${CMAKE_CURRENT_SOURCE_DIR}/test_sg_32.tesh
+  ${CMAKE_CURRENT_SOURCE_DIR}/test_sg_64.tesh
+  PARENT_SCOPE
+)
+set(xml_files
+  ${xml_files}
+  ${CMAKE_CURRENT_SOURCE_DIR}/small_sleep.xml
+  PARENT_SCOPE
+)
+set(teshsuite_src
+  ${teshsuite_src}
+  ${CMAKE_CURRENT_SOURCE_DIR}/small_sleep.c
+  PARENT_SCOPE
+)
+set(bin_files
+  ${bin_files}
+  PARENT_SCOPE
+)
+set(txt_files
+  ${txt_files}
+  PARENT_SCOPE
+)
\ No newline at end of file
index 45f1241..0b136ff 100644 (file)
@@ -6,7 +6,33 @@ add_executable(get_sender ${CMAKE_HOME_DIRECTORY}/teshsuite/msg/get_sender.c)
 
 ### Add definitions for compile
 if(NOT WIN32)
-target_link_libraries(get_sender simgrid m pthread )
+  target_link_libraries(get_sender simgrid m pthread )
 else(NOT WIN32)
-target_link_libraries(get_sender simgrid)
+  target_link_libraries(get_sender simgrid)
 endif(NOT WIN32)
+
+set(tesh_files
+  ${tesh_files}
+  ${CMAKE_CURRENT_SOURCE_DIR}/get_sender.tesh
+  PARENT_SCOPE
+)
+set(xml_files
+  ${xml_files}
+  ${CMAKE_CURRENT_SOURCE_DIR}/get_sender.xml
+  ${CMAKE_CURRENT_SOURCE_DIR}/get_sender_d.xml
+  ${CMAKE_CURRENT_SOURCE_DIR}/get_sender_p.xml
+  PARENT_SCOPE
+)
+set(teshsuite_src
+  ${teshsuite_src}
+  ${CMAKE_CURRENT_SOURCE_DIR}/get_sender.c
+  PARENT_SCOPE
+)
+set(bin_files
+  ${bin_files}
+  PARENT_SCOPE
+)
+set(txt_files
+  ${txt_files}
+  PARENT_SCOPE
+)
\ No newline at end of file
index 235b9a0..b9ef71f 100644 (file)
@@ -6,3 +6,39 @@ add_executable(test_trace_integration test_trace_integration.c)
 
 ### Add definitions for compile
 target_link_libraries(test_trace_integration simgrid m )
+
+set(tesh_files
+  ${tesh_files}
+  ${CMAKE_CURRENT_SOURCE_DIR}/trace.tesh
+  PARENT_SCOPE
+)
+set(xml_files
+  ${xml_files}
+  ${CMAKE_CURRENT_SOURCE_DIR}/test10.xml
+  ${CMAKE_CURRENT_SOURCE_DIR}/test11.xml
+  ${CMAKE_CURRENT_SOURCE_DIR}/test1.xml
+  ${CMAKE_CURRENT_SOURCE_DIR}/test2.xml
+  ${CMAKE_CURRENT_SOURCE_DIR}/test3.xml
+  ${CMAKE_CURRENT_SOURCE_DIR}/test4.xml
+  ${CMAKE_CURRENT_SOURCE_DIR}/test5.xml
+  ${CMAKE_CURRENT_SOURCE_DIR}/test6.xml
+  ${CMAKE_CURRENT_SOURCE_DIR}/test7.xml
+  ${CMAKE_CURRENT_SOURCE_DIR}/test8.xml
+  ${CMAKE_CURRENT_SOURCE_DIR}/test9.xml
+  ${CMAKE_CURRENT_SOURCE_DIR}/test_trace_integration.xml
+  PARENT_SCOPE
+)
+set(teshsuite_src
+  ${teshsuite_src}
+  ${CMAKE_CURRENT_SOURCE_DIR}/test_trace_integration.c
+  PARENT_SCOPE
+)
+set(bin_files
+  ${bin_files}
+  PARENT_SCOPE
+)
+set(txt_files
+  ${txt_files}
+  ${CMAKE_CURRENT_SOURCE_DIR}/file.trace
+  PARENT_SCOPE
+)
\ No newline at end of file
index 5b06f23..210543a 100644 (file)
@@ -28,3 +28,40 @@ target_link_libraries(basic4 simgrid)
 target_link_libraries(basic5 simgrid)
 target_link_libraries(basic6 simgrid)
 endif(NOT WIN32)
+
+set(tesh_files
+  ${tesh_files}
+  ${CMAKE_CURRENT_SOURCE_DIR}/basic0.tesh
+  ${CMAKE_CURRENT_SOURCE_DIR}/basic1.tesh
+  ${CMAKE_CURRENT_SOURCE_DIR}/basic2.tesh
+  ${CMAKE_CURRENT_SOURCE_DIR}/basic3.tesh
+  ${CMAKE_CURRENT_SOURCE_DIR}/basic4.tesh
+  ${CMAKE_CURRENT_SOURCE_DIR}/basic5.tesh
+  ${CMAKE_CURRENT_SOURCE_DIR}/basic6.tesh
+  ${CMAKE_CURRENT_SOURCE_DIR}/simdag.tesh
+  PARENT_SCOPE
+)
+set(xml_files
+  ${xml_files}
+  ${CMAKE_CURRENT_SOURCE_DIR}/basic_platform.xml
+  PARENT_SCOPE
+)
+set(teshsuite_src
+  ${teshsuite_src}
+  ${CMAKE_CURRENT_SOURCE_DIR}/basic0.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/basic1.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/basic2.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/basic3.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/basic4.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/basic5.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/basic6.c
+  PARENT_SCOPE
+)
+set(bin_files
+  ${bin_files}
+  PARENT_SCOPE
+)
+set(txt_files
+  ${txt_files}
+  PARENT_SCOPE
+)
\ No newline at end of file
index d921c21..352046c 100644 (file)
@@ -12,3 +12,26 @@ else(NOT WIN32)
 target_link_libraries(test_reinit_costs simgrid)
 endif(NOT WIN32)
 
+set(tesh_files
+  ${tesh_files}
+  ${CMAKE_CURRENT_SOURCE_DIR}/test_reinit_costs.tesh
+  PARENT_SCOPE
+)
+set(xml_files
+  ${xml_files}
+  ${CMAKE_CURRENT_SOURCE_DIR}/platform_2p_1sl.xml
+  PARENT_SCOPE
+)
+set(teshsuite_src
+  ${teshsuite_src}
+  ${CMAKE_CURRENT_SOURCE_DIR}/test_reinit_costs.c
+  PARENT_SCOPE
+)
+set(bin_files
+  ${bin_files}
+  PARENT_SCOPE
+)
+set(txt_files
+  ${txt_files}
+  PARENT_SCOPE
+)
\ No newline at end of file
index b4bc5a5..46ab6c9 100644 (file)
@@ -15,4 +15,33 @@ else(NOT WIN32)
 target_link_libraries(test_intra_all2all simgrid)
 target_link_libraries(test_intra_independent_comm simgrid)
 target_link_libraries(test_intra_scatter simgrid)
-endif(NOT WIN32)
\ No newline at end of file
+endif(NOT WIN32)
+
+set(tesh_files
+  ${tesh_files}
+  ${CMAKE_CURRENT_SOURCE_DIR}/test_intra_all2all.tesh
+  ${CMAKE_CURRENT_SOURCE_DIR}/test_intra_independent_comm.tesh
+  ${CMAKE_CURRENT_SOURCE_DIR}/test_intra_scatter.tesh
+  PARENT_SCOPE
+)
+set(xml_files
+  ${xml_files}
+  ${CMAKE_CURRENT_SOURCE_DIR}/platform_4p_1switch.xml
+  PARENT_SCOPE
+)
+set(teshsuite_src
+  ${teshsuite_src}
+  ${CMAKE_CURRENT_SOURCE_DIR}/test_intra_all2all.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/test_intra_independent_comm.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/test_intra_scatter.c
+  PARENT_SCOPE
+)
+set(bin_files
+  ${bin_files}
+  PARENT_SCOPE
+)
+set(txt_files
+  ${txt_files}
+  PARENT_SCOPE
+)
+
index 34b60fa..7345ea4 100644 (file)
@@ -19,3 +19,36 @@ target_link_libraries(test_latency2 simgrid)
 target_link_libraries(test_latency3 simgrid)
 target_link_libraries(test_latency_bound simgrid)
 endif(NOT WIN32)
+
+set(tesh_files
+  ${tesh_files}
+  ${CMAKE_CURRENT_SOURCE_DIR}/test_latency1.tesh
+  ${CMAKE_CURRENT_SOURCE_DIR}/test_latency2.tesh
+  ${CMAKE_CURRENT_SOURCE_DIR}/test_latency3.tesh
+  ${CMAKE_CURRENT_SOURCE_DIR}/test_latency_bound.tesh
+  PARENT_SCOPE
+)
+set(xml_files
+  ${xml_files}
+  ${CMAKE_CURRENT_SOURCE_DIR}/platform_2p_1bb.xml
+  ${CMAKE_CURRENT_SOURCE_DIR}/platform_2p_1fl.xml
+  ${CMAKE_CURRENT_SOURCE_DIR}/platform_2p_1sl.xml
+  ${CMAKE_CURRENT_SOURCE_DIR}/platform_2p_1switch.xml
+  PARENT_SCOPE
+)
+set(teshsuite_src
+  ${teshsuite_src}
+  ${CMAKE_CURRENT_SOURCE_DIR}/test_latency1.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/test_latency2.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/test_latency3.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/test_latency_bound.c
+  PARENT_SCOPE
+)
+set(bin_files
+  ${bin_files}
+  PARENT_SCOPE
+)
+set(txt_files
+  ${txt_files}
+  PARENT_SCOPE
+)
\ No newline at end of file
index cc357a2..5891f31 100644 (file)
@@ -13,3 +13,30 @@ else(NOT WIN32)
 target_link_libraries(test_comp_only_seq simgrid)
 target_link_libraries(test_comp_only_par simgrid)
 endif(NOT WIN32)
+
+set(tesh_files
+  ${tesh_files}
+  ${CMAKE_CURRENT_SOURCE_DIR}/test_comp_only_par.tesh
+  ${CMAKE_CURRENT_SOURCE_DIR}/test_comp_only_seq.tesh
+  PARENT_SCOPE
+)
+set(xml_files
+  ${xml_files}
+  ${CMAKE_CURRENT_SOURCE_DIR}/platform_2p_1sl_hetero.xml
+  ${CMAKE_CURRENT_SOURCE_DIR}/platform_2p_1sl.xml
+  PARENT_SCOPE
+)
+set(teshsuite_src
+  ${teshsuite_src}
+  ${CMAKE_CURRENT_SOURCE_DIR}/test_comp_only_par.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/test_comp_only_seq.c
+  PARENT_SCOPE
+)
+set(bin_files
+  ${bin_files}
+  PARENT_SCOPE
+)
+set(txt_files
+  ${txt_files}
+  PARENT_SCOPE
+)
index 56cd9bd..af76e2a 100644 (file)
@@ -22,4 +22,92 @@ target_link_libraries(basic_parsing_test simgrid)
 target_link_libraries(is_router_test simgrid)
 target_link_libraries(flatifier simgrid)
 target_link_libraries(basic_tracing simgrid)
-endif(NOT WIN32)
\ No newline at end of file
+endif(NOT WIN32)
+
+set(tesh_files
+  ${tesh_files}
+  ${CMAKE_CURRENT_SOURCE_DIR}/basic_parsing_test_failing.tesh
+  ${CMAKE_CURRENT_SOURCE_DIR}/basic_parsing_test_sym_full.tesh
+  ${CMAKE_CURRENT_SOURCE_DIR}/basic_parsing_test.tesh
+  ${CMAKE_CURRENT_SOURCE_DIR}/basic_parsing_test_bypass.tesh
+  ${CMAKE_CURRENT_SOURCE_DIR}/flatifier.tesh
+  ${CMAKE_CURRENT_SOURCE_DIR}/get_full_link.tesh
+  ${CMAKE_CURRENT_SOURCE_DIR}/two_hosts_asymetric.tesh
+  PARENT_SCOPE
+)
+set(xml_files
+  ${xml_files}
+  ${CMAKE_CURRENT_SOURCE_DIR}/four_hosts_Dijkstra_ns3.xml
+  ${CMAKE_CURRENT_SOURCE_DIR}/four_hosts_floyd_bis.xml
+  ${CMAKE_CURRENT_SOURCE_DIR}/four_hosts_floyd_ns3.xml
+  ${CMAKE_CURRENT_SOURCE_DIR}/four_hosts_floyd.xml
+  ${CMAKE_CURRENT_SOURCE_DIR}/two_hosts_multi_hop.xml
+  ${CMAKE_CURRENT_SOURCE_DIR}/one_cluster_file.xml
+  ${CMAKE_CURRENT_SOURCE_DIR}/one_cluster_foreach.xml
+  ${CMAKE_CURRENT_SOURCE_DIR}/one_cluster_fullduplex.xml
+  ${CMAKE_CURRENT_SOURCE_DIR}/one_cluster_one_host_random.xml
+  ${CMAKE_CURRENT_SOURCE_DIR}/one_cluster_one_host.xml
+  ${CMAKE_CURRENT_SOURCE_DIR}/one_cluster_properties_foreach.xml
+  ${CMAKE_CURRENT_SOURCE_DIR}/one_cluster_properties_override.xml
+  ${CMAKE_CURRENT_SOURCE_DIR}/one_cluster_router_id.xml
+  ${CMAKE_CURRENT_SOURCE_DIR}/one_cluster.xml
+  ${CMAKE_CURRENT_SOURCE_DIR}/one_host_availability.xml
+  ${CMAKE_CURRENT_SOURCE_DIR}/one_host_properties.xml
+  ${CMAKE_CURRENT_SOURCE_DIR}/one_host_state_file.xml
+  ${CMAKE_CURRENT_SOURCE_DIR}/one_host_state_off.xml
+  ${CMAKE_CURRENT_SOURCE_DIR}/one_host_state_on.xml
+  ${CMAKE_CURRENT_SOURCE_DIR}/one_host_trace_file.xml
+  ${CMAKE_CURRENT_SOURCE_DIR}/one_host_trace_inside.xml
+  ${CMAKE_CURRENT_SOURCE_DIR}/one_host.xml
+  ${CMAKE_CURRENT_SOURCE_DIR}/one_link_availability.xml
+  ${CMAKE_CURRENT_SOURCE_DIR}/one_link_fatpipe.xml
+  ${CMAKE_CURRENT_SOURCE_DIR}/one_link_shared.xml
+  ${CMAKE_CURRENT_SOURCE_DIR}/one_link_state_file.xml
+  ${CMAKE_CURRENT_SOURCE_DIR}/platform_include.xml
+  ${CMAKE_CURRENT_SOURCE_DIR}/properties.xml
+  ${CMAKE_CURRENT_SOURCE_DIR}/random.xml
+  ${CMAKE_CURRENT_SOURCE_DIR}/route_override.xml
+  ${CMAKE_CURRENT_SOURCE_DIR}/test_of_is_router.xml
+  ${CMAKE_CURRENT_SOURCE_DIR}/three_hosts_non_symmetric_route.xml
+  ${CMAKE_CURRENT_SOURCE_DIR}/two_clusters_one_name.xml
+  ${CMAKE_CURRENT_SOURCE_DIR}/two_clusters_router_id.xml
+  ${CMAKE_CURRENT_SOURCE_DIR}/Two_clusters_rulebased.xml
+  ${CMAKE_CURRENT_SOURCE_DIR}/two_clusters_symmetric.xml
+  ${CMAKE_CURRENT_SOURCE_DIR}/two_clusters.xml
+  ${CMAKE_CURRENT_SOURCE_DIR}/two_hosts_asymetric_BOGUS2.xml
+  ${CMAKE_CURRENT_SOURCE_DIR}/two_hosts_asymetric_BOGUS.xml
+  ${CMAKE_CURRENT_SOURCE_DIR}/two_hosts_one_link_fullduplex.xml
+  ${CMAKE_CURRENT_SOURCE_DIR}/two_hosts_one_link_symmetrical.xml
+  ${CMAKE_CURRENT_SOURCE_DIR}/two_hosts_one_link.xml
+  ${CMAKE_CURRENT_SOURCE_DIR}/clusterA.xml
+  ${CMAKE_CURRENT_SOURCE_DIR}/clusterB.xml
+  ${CMAKE_CURRENT_SOURCE_DIR}/Dijkstra.xml
+  PARENT_SCOPE
+)
+set(teshsuite_src
+  ${teshsuite_src}
+  ${CMAKE_CURRENT_SOURCE_DIR}/basic_parsing_test.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/basic_tracing.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/Evaluate_get_route_time.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/Evaluate_parse_time.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/flatifier.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/is_router_test.c
+  PARENT_SCOPE
+)
+set(bin_files
+  ${bin_files}
+  PARENT_SCOPE
+)
+set(txt_files
+  ${txt_files}
+  ${CMAKE_CURRENT_SOURCE_DIR}/bob0_availability_file.trace
+  ${CMAKE_CURRENT_SOURCE_DIR}/bob0_state_file.trace
+  ${CMAKE_CURRENT_SOURCE_DIR}/bob2_availability_file.trace
+  ${CMAKE_CURRENT_SOURCE_DIR}/bob2_state_file.trace
+  ${CMAKE_CURRENT_SOURCE_DIR}/bob.fail
+  ${CMAKE_CURRENT_SOURCE_DIR}/bob.trace
+  ${CMAKE_CURRENT_SOURCE_DIR}/link1.bw
+  ${CMAKE_CURRENT_SOURCE_DIR}/link1.fail
+  ${CMAKE_CURRENT_SOURCE_DIR}/link1.lat
+  PARENT_SCOPE
+)
\ No newline at end of file
index 59574a2..b986ed1 100644 (file)
@@ -13,3 +13,29 @@ else(NOT WIN32)
 target_link_libraries(log_large_test gras)
 target_link_libraries(parallel_log_crashtest gras)
 endif(NOT WIN32)
+
+set(tesh_files
+  ${tesh_files}
+  ${CMAKE_CURRENT_SOURCE_DIR}/log_large_test.tesh
+  ${CMAKE_CURRENT_SOURCE_DIR}/parallel_log_crashtest.tesh
+  ${CMAKE_CURRENT_SOURCE_DIR}/xbt.tesh
+  PARENT_SCOPE
+)
+set(xml_files
+  ${xml_files}
+  PARENT_SCOPE
+)
+set(teshsuite_src
+  ${teshsuite_src}
+  ${CMAKE_CURRENT_SOURCE_DIR}/log_large_test.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/parallel_log_crashtest.c
+  PARENT_SCOPE
+)
+set(bin_files
+  ${bin_files}
+  PARENT_SCOPE
+)
+set(txt_files
+  ${txt_files}
+  PARENT_SCOPE
+)
\ No newline at end of file