Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
Add sources for rngstreams
[simgrid.git] / buildtools / Cmake / DefinePackages.cmake
old mode 100755 (executable)
new mode 100644 (file)
index 3e6b61e..4cc6409
@@ -17,6 +17,7 @@ set(EXTRA_DIST
        src/xbt/backtrace_windows.c
        src/xbt/backtrace_dummy.c
        src/xbt/setset_private.h
+       src/xbt/parmap_private.h
        src/xbt/mmalloc/attach.c
        src/xbt/mmalloc/detach.c        
        src/xbt/mmalloc/keys.c
@@ -61,8 +62,6 @@ set(EXTRA_DIST
        src/include/xbt/xbt_os_thread.h
        src/include/mc/datatypes.h
        src/include/mc/mc.h
-       src/include/simix/simix.h
-       src/include/simix/datatypes.h
        src/include/simix/context.h
        src/msg/private.h
        src/msg/mailbox.h
@@ -81,13 +80,16 @@ set(EXTRA_DIST
        src/amok/Bandwidth/bandwidth_private.h
        src/amok/amok_modinter.h
        src/simix/private.h
-       src/simix/smx_context_private.h
-       src/simix/smx_context_java.h
+       src/simix/process_private.h
+       src/simix/host_private.h
+       src/simix/network_private.h
+       src/simix/smurf_private.h
+       src/simix/synchro_private.h
+       
        src/smpi/private.h
-       src/smpi/smpi_coll_private.h
        src/smpi/smpi_mpi_dt_private.h
        src/smpi/README
-       src/mk_supernovae.sh
+       src/mk_supernovae.pl
 )
 
 set(XBT_RL_SRC 
@@ -105,47 +107,15 @@ set(SMPI_SRC
        src/smpi/smpi_bench.c
        src/smpi/smpi_global.c
        src/smpi/smpi_mpi.c
+       src/smpi/smpi_pmpi.c
+       src/smpi/smpi_c99.c
+       src/smpi/smpi_f77.c
        src/smpi/smpi_comm.c
        src/smpi/smpi_group.c
-       src/smpi/smpi_util.c
        src/smpi/smpi_coll.c
        src/smpi/smpi_mpi_dt.c
 )
 
-set(JMSG_C_SRC
-       src/simix/smx_context_java.c
-       src/java/jxbt_utilities.c
-       src/java/jxbt_utilities.h
-       src/java/jmsg.c 
-       src/java/jmsg.h
-       src/java/jmsg_host.c
-       src/java/jmsg_host.h
-       src/java/jmsg_process.c
-       src/java/jmsg_process.h
-       src/java/jmsg_task.c
-       src/java/jmsg_task.h
-       src/java/jmsg_application_handler.c
-       src/java/jmsg_application_handler.h
-)
-
-set(JMSG_JAVA_SRC
-       src/java/simgrid/msg/ApplicationHandler.java
-       src/java/simgrid/msg/Host.java
-       src/java/simgrid/msg/HostFailureException.java  
-       src/java/simgrid/msg/HostNotFoundException.java 
-       src/java/simgrid/msg/JniException.java
-       src/java/simgrid/msg/Msg.java
-       src/java/simgrid/msg/MsgException.java
-       src/java/simgrid/msg/MsgNative.java
-       src/java/simgrid/msg/NativeException.java
-       src/java/simgrid/msg/Process.java
-       src/java/simgrid/msg/ProcessNotFoundException.java
-       src/java/simgrid/msg/Sem.java
-       src/java/simgrid/msg/Task.java
-       src/java/simgrid/msg/TaskCancelledException.java
-       src/java/simgrid/msg/TimeoutException.java
-       src/java/simgrid/msg/TransferFailureException.java      
-)
 
 set(GRAS_RL_SRC
        src/gras/rl_stubs.c
@@ -195,9 +165,17 @@ set(XBT_SRC
        src/xbt/cunit.c
        src/xbt/graphxml_parse.c
        src/xbt/setset.c
-       src/xbt/mmalloc/mm.c
+       src/xbt/parmap.c
+       src/xbt/xbt_replay_trace_reader.c
 )
 
+if(HAVE_MMAP)
+       set(XBT_SRC
+       ${XBT_SRC}
+       src/xbt/mmalloc/mm.c    
+       )
+endif(HAVE_MMAP)
+
 set(GTNETS_SRC 
        src/surf/gtnets/gtnets_simulator.cc
        src/surf/gtnets/gtnets_topology.cc
@@ -219,10 +197,9 @@ set(SURF_SRC
        src/surf/surfxml_parse.c
        src/surf/cpu.c
        src/surf/network.c
-       src/surf/network_vivaldi.c
+       src/surf/network_im.c
        src/surf/network_constant.c
        src/surf/workstation.c
-       src/surf/surf_model_timer.c
        src/surf/workstation_ptask_L07.c
        src/surf/cpu_ti.c
        src/surf/cpu_im.c
@@ -236,10 +213,12 @@ set(SIMIX_SRC
        src/simix/smx_host.c
        src/simix/smx_process.c
        src/simix/smx_context.c
-       src/simix/smx_action.c
        src/simix/smx_synchro.c
        src/simix/smx_network.c
        src/simix/smx_context_base.c
+       src/simix/smx_user.c
+       src/simix/smx_smurf.c
+       src/simix/smx_context_raw.c
 )
 
 set(MSG_SRC
@@ -262,6 +241,15 @@ set(SIMDAG_SRC
        src/simdag/sd_workstation.c
        src/simdag/sd_daxloader.c
 )
+if(HAVE_GRAPHVIZ)
+       set(SIMDAG_SRC 
+           ${SIMDAG_SRC} src/simdag/sd_dotloader.c
+       )
+else(HAVE_GRAPHVIZ)
+       set(EXTRA_DIST
+           ${EXTRA_DIST} src/simdag/sd_dotloader.c
+       )
+endif(HAVE_GRAPHVIZ)
 
 set(GRAS_COMMON_SRC
        src/gras/gras.c
@@ -306,176 +294,181 @@ set(AMOK_SRC
 )
 
 set(LUA_SRC
-       src/simix/smx_context_lua.c
        src/bindings/lua/simgrid_lua.c
+       src/bindings/lua/lua_stub_generator.c
+       src/bindings/lua/lua_console.c
 )
 
 set(TRACING_SRC
-       src/instr/interface.c
-       src/instr/general.c
-       src/instr/paje.c
-       src/instr/msg_task_instr.c
-       src/instr/msg_process_instr.c
-       src/instr/msg_volume.c
-       src/instr/smx_instr.c
-       src/instr/surf_instr.c
-       src/instr/variables_instr.c
-       src/instr/private.h
+       src/instr/instr_routing.c
+       src/instr/instr_config.c
+       src/instr/instr_interface.c
+       src/instr/instr_paje.c
+       src/instr/instr_paje_trace.c
+       src/instr/instr_msg_task.c
+       src/instr/instr_msg_process.c
+       src/instr/instr_msg_volume.c
+       src/instr/instr_smx.c
+       src/instr/instr_surf.c
+       src/instr/instr_smpi.c
+       src/instr/instr_simdag.c
+       src/instr/instr_resource_utilization.c
+       src/instr/instr_private.h
+)
+
+
+set(JEDULE_SRC
+       include/instr/jedule/jedule_events.h
+       include/instr/jedule/jedule_output.h
+       include/instr/jedule/jedule_platform.h
+       include/instr/jedule/jedule_sd_binding.h
+       src/instr/jedule/jedule_events.c
+       src/instr/jedule/jedule_output.c
+       src/instr/jedule/jedule_platform.c
+       src/instr/jedule/jedule_sd_binding.c
 )
 
 set(RUBY_SRC
-src/simix/smx_context_ruby.c
-src/bindings/ruby/rb_msg_process.c
-src/bindings/ruby/rb_msg_host.c
-src/bindings/ruby/rb_msg_task.c
-src/bindings/ruby/rb_application_handler.c
+       src/simix/smx_context_ruby.c
+       src/bindings/ruby/rb_msg_process.c
+       src/bindings/ruby/rb_msg_host.c
+       src/bindings/ruby/rb_msg_task.c
+       src/bindings/ruby/rb_application_handler.c
 )
 
 set(MC_SRC
        src/mc/mc_memory.c
        src/mc/mc_checkpoint.c
+       src/mc/mc_state.c
        src/mc/memory_map.c
        src/mc/mc_global.c
-       src/mc/mc_dfs.c
        src/mc/mc_dpor.c
-       src/mc/mc_transition.c
+       src/mc/mc_request.c
        src/mc/private.h
 )
 
+set(RNGSTREAM_SRC
+       src/rngstreams/RngStream.c
+)
 
 set(install_HEADERS
-include/gras.h 
-include/xbt.h
-include/simgrid_config.h
-include/xbt/misc.h
-include/xbt/sysdep.h
-include/xbt/virtu.h
-include/xbt/str.h
-include/xbt/strbuff.h
-include/xbt/hash.h
-include/xbt/function_types.h
-include/xbt/asserts.h 
-include/xbt/ex.h
-include/xbt/log.h
-include/xbt/module.h
-include/xbt/mallocator.h
-include/xbt/dynar.h
-include/xbt/dict.h
-include/xbt/set.h
-include/xbt/heap.h
-include/xbt/graph.h
-include/xbt/fifo.h
-include/xbt/swag.h
-include/xbt/matrix.h
-include/xbt/peer.h
-include/xbt/config.h
-include/xbt/cunit.h
-include/xbt/graphxml_parse.h
-include/xbt/graphxml.h
-include/xbt/time.h
-include/xbt/synchro.h
-include/xbt/synchro_core.h
-include/xbt/queue.h
-include/xbt/setset.h
-include/xbt/mmalloc.h
-include/mc/modelchecker.h
-include/msg/msg.h
-include/msg/datatypes.h
-include/simdag/simdag.h
-include/simdag/datatypes.h
-include/smpi/smpi.h
-include/smpi/mpi.h
-include/surf/surfxml_parse.h
-include/surf/simgrid_dtd.h
-include/gras/datadesc.h
-include/gras/transport.h
-include/gras/virtu.h
-include/gras/emul.h
-include/gras/process.h
-include/gras/module.h
-include/gras/messages.h
-include/gras/timer.h
-include/amok/peermanagement.h
-include/amok/bandwidth.h
-include/instr/instr.h
-include/instr/tracing_config.h
-)
-
-set(TEST_UNITS
-cunit_unit.c
-ex_unit.c
-dynar_unit.c
-dict_unit.c
-set_unit.c
-swag_unit.c
-xbt_str_unit.c
-xbt_strbuff_unit.c
-xbt_sha_unit.c
-config_unit.c
-xbt_synchro_unit.c
-)
-
-set(TEST_CFILES
-src/xbt/cunit.c
-src/xbt/ex.c
-src/xbt/dynar.c
-src/xbt/dict.c
-src/xbt/set.c
-src/xbt/swag.c
-src/xbt/xbt_str.c
-src/xbt/xbt_strbuff.c
-src/xbt/xbt_sha.c
-src/xbt/config.c
-src/xbt/xbt_synchro.c
-)
-
-#Here must have all files which permit to generate source files
-set(SRC_TO_LOOK
-src/surf/simgrid.dtd
-src/xbt/graphxml.dtd
-src/simdag/dax.dtd
-examples/gras/ping/ping.xml
-examples/gras/rpc/rpc.xml
-examples/gras/spawn/spawn.xml
-examples/gras/timer/timer.xml
-examples/gras/chrono/chrono.xml
-examples/gras/mutual_exclusion/simple_token/simple_token.xml
-examples/gras/mmrpc/mmrpc.xml
-examples/gras/all2all/all2all.xml
-examples/gras/pmm/pmm.xml
-examples/gras/synchro/synchro.xml
-examples/gras/properties/properties.xml
-teshsuite/gras/msg_handle/msg_handle.xml
-teshsuite/gras/empty_main/empty_main.xml
-teshsuite/gras/small_sleep/small_sleep.xml
-examples/amok/bandwidth/bandwidth.xml
-examples/amok/saturate/saturate.xml
-${TEST_CFILES}
-)
+       include/xbt/misc.h
+       include/xbt/sysdep.h
+       include/xbt/virtu.h
+       include/xbt/str.h
+       include/xbt/strbuff.h
+       include/xbt/hash.h
+       include/xbt/function_types.h
+       include/xbt/asserts.h 
+       include/xbt/ex.h
+       include/xbt/log.h
+       include/xbt/module.h
+       include/xbt/mallocator.h
+       include/xbt/dynar.h
+       include/xbt/dict.h
+       include/xbt/set.h
+       include/xbt/heap.h
+       include/xbt/graph.h
+       include/xbt/fifo.h
+       include/xbt/swag.h
+       include/xbt/matrix.h
+       include/xbt/peer.h
+       include/xbt/config.h
+       include/xbt/cunit.h
+       include/xbt/graphxml_parse.h
+       include/xbt/graphxml.h
+       include/xbt/time.h
+       include/xbt/synchro.h
+       include/xbt/synchro_core.h
+       include/xbt/queue.h
+       include/xbt/setset.h
+       include/xbt/mmalloc.h
+       include/xbt/replay_trace_reader.h
+       include/xbt/parmap.h
+       include/mc/modelchecker.h
+       include/msg/msg.h
+       include/msg/datatypes.h
+       include/simdag/simdag.h
+       include/simdag/datatypes.h
+       include/smpi/smpi.h
+       ${CMAKE_CURRENT_BINARY_DIR}/include/smpi/smpif.h
+       include/smpi/mpi.h
+       include/smpi/mpif.h
+       include/surf/surfxml_parse.h
+       include/surf/simgrid_dtd.h
+       include/gras/datadesc.h
+       include/gras/transport.h
+       include/gras/virtu.h
+       include/gras/emul.h
+       include/gras/process.h
+       include/gras/module.h
+       include/gras/messages.h
+       include/gras/timer.h
+       include/amok/peermanagement.h
+       include/amok/bandwidth.h
+       include/instr/instr.h
+       ${CMAKE_CURRENT_BINARY_DIR}/include/simgrid_config.h
+       include/gras.h 
+       include/xbt.h
+       include/simix/simix.h
+       include/simix/datatypes.h
+       include/simix/context.h
+)
+
+if(enable_java)
+set(install_HEADERS
+       ${install_HEADERS}
+       #Those src files are necessary for binding java 
+       src/portable.h
+       src/msg/private.h
+       src/simix/private.h
+       src/msg/mailbox.h
+       src/include/surf/surf.h
+       src/instr/instr_private.h
+       src/include/surf/datatypes.h
+       src/include/surf/surf_resource_lmm.h
+       src/include/surf/surf_resource.h
+       src/simdag/private.h
+       src/xbt/ex_interface.h
+       src/simix/process_private.h
+       src/simix/host_private.h
+       src/simix/network_private.h
+       src/simix/smurf_private.h
+       src/simix/synchro_private.h
+       src/include/surf/trace_mgr.h
+       src/include/xbt/xbt_os_thread.h
+       src/include/surf/maxmin.h
+       include/xbt/swag.h
+       ${CMAKE_CURRENT_BINARY_DIR}/src/gras_config.h)
+endif(enable_java)
 
 ### depend of some variables setted upper
-# -->CONTEXT_THREADS
-if(${CONTEXT_THREADS})
+# -->CONTEXT_THREADS CONTEXT_UCONTEXT
+if(${CONTEXT_THREADS}) #pthread
        set(SURF_SRC
                ${SURF_SRC}
                src/xbt/xbt_os_thread.c
                src/simix/smx_context_thread.c
-       )
+               )
+else(${CONTEXT_THREADS}) # NOT pthread
        set(EXTRA_DIST
                ${EXTRA_DIST}
-               src/simix/smx_context_sysv.c
-       )
-else(${CONTEXT_THREADS})
+               src/xbt/xbt_os_thread.c
+               src/simix/smx_context_thread.c
+               )
+endif(${CONTEXT_THREADS})
+
+if(${CONTEXT_UCONTEXT}) #ucontext
        set(SURF_SRC
                ${SURF_SRC}
                src/simix/smx_context_sysv.c
        )
+else(${CONTEXT_UCONTEXT}) # NOT ucontext
        set(EXTRA_DIST
                ${EXTRA_DIST}
-               src/xbt/xbt_os_thread.c
-               src/simix/smx_context_thread.c
+               src/simix/smx_context_sysv.c
        )
-endif(${CONTEXT_THREADS})
+endif(${CONTEXT_UCONTEXT})
 
 # -->HAVE_GTNETS
 if(HAVE_GTNETS)
@@ -490,10 +483,6 @@ else(HAVE_GTNETS)
        )
 endif(HAVE_GTNETS)
 
-set(EXTRA_DIST
-       ${EXTRA_DIST}
-       ${JMSG_JAVA_SRC}
-)
 
 ### Simgrid Lib sources
 set(simgrid_sources
@@ -507,9 +496,17 @@ set(simgrid_sources
        ${GRAS_COMMON_SRC}
        ${GRAS_SG_SRC}
        ${AMOK_SRC}
-       ${MC_SRC}
+       ${JEDULE_SRC}
+       ${RNGSTREAM_SRC}
 )
 
+if(HAVE_MC)
+       set(simgrid_sources
+               ${simgrid_sources}
+               ${MC_SRC}
+               )
+endif(HAVE_MC)
+
 ### Gras Lib sources
 set(gras_sources
        ${XBT_SRC}
@@ -530,18 +527,6 @@ elseif(${HAVE_LUA})
        )
 endif(${HAVE_LUA})
 
-if(${HAVE_JAVA})
-       set(simgrid_sources
-               ${simgrid_sources}
-               ${JMSG_C_SRC} # add the binding support to the library
-       )
-else(${HAVE_JAVA})
-       set(EXTRA_DIST
-               ${EXTRA_DIST}
-               ${JMSG_C_SRC}
-               ${MSG_SRC}
-       )
-endif(${HAVE_JAVA})
 
 if(${HAVE_RUBY})
        set(simgrid_sources
@@ -557,49 +542,150 @@ else(${HAVE_RUBY})
        )
 endif(${HAVE_RUBY})
 
-file(GLOB_RECURSE add_src_files
-"examples/*.c"
-"teshsuite/*.c"
-"testsuite/*.c"
-"tools/*.c"
-"examples/*.cxx"
-"teshsuite/*.cxx"
-"testsuite/*.cxx"
-"tools/*.cxx"
-"examples/*CMakeLists.txt"
-"teshsuite/*CMakeLists.txt"
-"testsuite/*CMakeLists.txt"
-"tools/*CMakeLists.txt"
-"src/*CMakeLists.txt"
-"examples/*.java"
-)
-
 file(GLOB_RECURSE examples_to_install_in_doc
 "examples/*.c"
 "examples/*.h"
 "examples/*.cxx"
 "examples/*.hpp"
-"examples/*.c"
 "examples/*.rb"
 "examples/*.lua"
 "examples/*.java"
 "examples/*.xml"
+"examples/*README"
+)
+
+set(DOC_SOURCES
+       doc/contrib.doc
+    doc/FAQ.doc
+       doc/gtut-howto-design.doc
+       doc/gtut-howto.doc
+       doc/gtut-introduction.doc
+       doc/gtut-main.doc
+       doc/gtut-tour-01-bones.doc
+       doc/gtut-tour-02-simple.doc
+       doc/gtut-tour-03-args.doc
+       doc/gtut-tour-04-callback.doc
+       doc/gtut-tour-05-globals.doc
+       doc/gtut-tour-06-logs.doc
+       doc/gtut-tour-07-timers.doc
+       doc/gtut-tour-08-exceptions.doc
+       doc/gtut-tour-09-simpledata.doc
+       doc/gtut-tour-10-rpc.doc
+       doc/gtut-tour-11-explicitwait.doc
+       doc/gtut-tour-12-staticstruct.doc
+       doc/gtut-tour-13-pointers.doc
+       doc/gtut-tour-14-dynar.doc
+       doc/gtut-tour-15-manualdatadef.doc
+       doc/gtut-tour-16-exchangecb.doc
+       doc/gtut-tour.doc
+       doc/gtut-tour-recap-messages.doc
+       doc/history.doc
+       doc/index-API.doc
+       doc/index.doc
+       doc/module-amok.doc
+       doc/module-gras.doc
+       doc/module-msg.doc
+       doc/module-sd.doc
+       doc/modules.doc
+       doc/module-surf.doc
+       doc/module-xbt.doc
+       doc/people.doc  
+       doc/publis.doc
+       
+       doc/gtut-files/01-bones.c
+       doc/gtut-files/01-bones.output
+       doc/gtut-files/02-simple.c
+       doc/gtut-files/02-simple.output
+       doc/gtut-files/03-args.c
+       doc/gtut-files/03-args.output
+       doc/gtut-files/03-args.xml
+       doc/gtut-files/04-callback.c
+       doc/gtut-files/04-callback.output
+       doc/gtut-files/05-globals.c
+       doc/gtut-files/05-globals.output
+       doc/gtut-files/06-logs.c
+       doc/gtut-files/06-logs.output
+       doc/gtut-files/06-logs.output.error
+       doc/gtut-files/06-logs.output.fmt
+       doc/gtut-files/06-logs.output.fmt-bt
+       doc/gtut-files/06-logs.output.verbose
+       doc/gtut-files/07-timers.c
+       doc/gtut-files/07-timers.output
+       doc/gtut-files/08-exceptions.c
+       doc/gtut-files/08-exceptions.output
+       doc/gtut-files/09-datatype-dump.c
+       doc/gtut-files/09-simpledata.c
+       doc/gtut-files/09-simpledata.output
+       doc/gtut-files/10-rpc.c
+       doc/gtut-files/10-rpc.output
+       doc/gtut-files/11-explicitwait.c
+       doc/gtut-files/11-explicitwait.output
+       doc/gtut-files/11-explicitwait.xml
+       doc/gtut-files/gtut-platform-3nodes.xml
+       doc/gtut-files/gtut-platform.xml
+       doc/gtut-files/Makefile
+       doc/gtut-files/README
+       doc/gtut-files/test.xml
+       
+       doc/webcruft/awstats_logo3.png
+       doc/webcruft/Paje_MSG_screenshot.jpg
+       doc/webcruft/Paje_MSG_screenshot_thn.jpg
+       doc/webcruft/poster_thumbnail.png
+       doc/webcruft/robots.txt
+       doc/webcruft/simgrid_logo.png
+       doc/webcruft/simgrid_logo_small.png
+       
+       doc/Doxyfile.in
+       doc/footer.html.in
+       
+       tools/doxygen/bibtex2html_table_count.pl
+       tools/doxygen/doxygen_postprocesser.pl
+       tools/doxygen/index_create.pl
+       tools/doxygen/toc_create.pl
+       tools/doxygen/bibtex2html_wrapper.pl
+       tools/doxygen/fig2dev_postprocessor.pl
+       tools/doxygen/index_php.pl
+       tools/doxygen/xbt_log_extract_hierarchy.pl
 )
 
-foreach(file ${examples_to_install_in_doc})
-       string(REGEX REPLACE "/[^/]*$" "" file "${file}")
-       set(new_examples_to_install_in_doc "${new_examples_to_install_in_doc}${file};")
-endforeach(file ${examples_to_install_in_doc})
-
-set(directory_to_create "")
-
-foreach(file ${new_examples_to_install_in_doc})
-       string(REGEX MATCH "${file};" OPERATION "${directory_to_create}")
-       if(NOT OPERATION)
-               set(directory_to_create "${directory_to_create}${file};")
-       endif(NOT OPERATION)
-endforeach(file ${new_examples_to_install_in_doc})
+set(DOC_FIGS
+       ${CMAKE_HOME_DIRECTORY}/doc/fig/simgrid_modules.fig
+       ${CMAKE_HOME_DIRECTORY}/doc/fig/simgrid_modules2.fig
+       ${CMAKE_HOME_DIRECTORY}/doc/fig/amok_bw_test.fig
+       ${CMAKE_HOME_DIRECTORY}/doc/fig/amok_bw_sat.fig
+       ${CMAKE_HOME_DIRECTORY}/doc/fig/gras_comm.fig
+)
 
+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"
+"src/bindings/*.h"
+"src/bindings/*CMakeLists.txt"
+)
+set(add_src_files
+       ${add_src_files}
+        CMakeLists.txt
+       src/smpi/smpicc.in
+       src/smpi/smpif2c.in
+       src/smpi/smpiff.in
+       src/smpi/smpirun.in
+       src/simix/smx_context_sysv_private.h
+)
 
 file(GLOB_RECURSE include_files
 "include/*.h"
@@ -611,7 +697,6 @@ file(GLOB_RECURSE include_files
 "src/*.h.in"
 "include/*.h.in"
 )
-#message("\n\ninclude:\n${include_files}")
 
 file(GLOB_RECURSE xml_files
 "examples/*.xml"
@@ -621,7 +706,6 @@ file(GLOB_RECURSE xml_files
 "testsuite/*.xml"
 "tools/*.xml"
 )
-#message("\n\nxml:\n${xml_files}")
 
 file(GLOB_RECURSE tesh_files
 "examples/*.tesh"
@@ -631,20 +715,34 @@ file(GLOB_RECURSE tesh_files
 "testsuite/*.tesh"
 "tools/*.tesh"
 )
-#message("\n\ntesh:\n${tesh_files}")
 
-file(GLOB_RECURSE txt_files
-"testsuite/surf/trace*.txt"
-"testsuite/simdag/availability_tremblay.txt"
+set(txt_files
+"testsuite/surf/trace_A_failure.txt"
+"testsuite/surf/trace_A.txt"
+"testsuite/surf/trace_B.txt"
 "examples/smpi/hostfile"
-"examples/msg/*.trace"
+"examples/msg/procmig.trace"
+"examples/msg/volume.trace"
+"examples/msg/ms.trace"
+"examples/msg/trace/file.trace"
+"examples/msg/link5_state.trace"
+"examples/msg/categories.trace"
+"examples/msg/tasks.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"
-"examples/java/runtest"
 "teshsuite/gras/datadesc/datadesc.little32_4"
 "teshsuite/gras/datadesc/datadesc.little64"
-"teshsuite/gras/datadesc/datadesc.big32_8"
 "teshsuite/gras/datadesc/datadesc.big32_8_4"
-"teshsuite/gras/datadesc/datadesc.big32_2"
 "teshsuite/gras/datadesc/mk_datadesc_structs.pl"
 "teshsuite/gras/msg_handle/test_rl"
 "teshsuite/gras/msg_handle/test_sg_32"
@@ -690,21 +788,48 @@ file(GLOB_RECURSE txt_files
 "examples/gras/pmm/test_sg_64"
 "examples/gras/synchro/test_sg_64"
 "examples/gras/properties/test_sg"
-"examples/java/basic/BasicTest"
-"examples/java/ping_pong/PingPongTest"
-"examples/java/comm_time/CommTimeTest"
-"examples/java/suspend/SuspendTest"
 )
 
+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/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"
+)
+
+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 lise of what will be added to the source archive
 set(source_to_pack     
        ${XBT_RL_SRC}
        ${EXTRA_DIST}
        ${SMPI_SRC}
-       ${JMSG_C_SRC}
-       ${JMSG_JAVA_SRC}
        ${GRAS_RL_SRC}
        ${XBT_SRC}
        ${GTNETS_SRC}
@@ -724,107 +849,10 @@ set(source_to_pack
        ${xml_files}
        ${tesh_files}
        ${txt_files}
-       ${TEST_CFILES}
        ${EXTRA_DIST}
-       
-       CMakeLists.txt
-       buildtools/Cmake/src/CTestConfig.cmake
-       buildtools/Cmake/src/CTestTestfile.cmake
-       # FIXME: these should be renamed to .cmake, I guess
-       buildtools/Cmake/src/CMakeCompleteInFiles.txt
-       buildtools/Cmake/src/CMakeDefinePackages.txt
-       buildtools/Cmake/src/CMakeDistrib.txt
-       buildtools/Cmake/src/CMakeDocs.txt
-       buildtools/Cmake/src/CMakeFlags.txt
-       buildtools/Cmake/src/CMakeJarAndClass.txt
-       buildtools/Cmake/src/CMakeMaintainerMode.txt
-       buildtools/Cmake/src/CMakeMakeExeLib.txt
-       buildtools/Cmake/src/CMakeOption.txt
-       buildtools/Cmake/src/CMakePrintArgs.txt
-       buildtools/Cmake/src/CMakeSupernovae.txt
-       buildtools/Cmake/src/CMakeTest.txt
-       buildtools/Cmake/src/memcheck_tests.txt
-       # FIXME: these should live in src/ and the content of src in root of Cmake/ maybe
-       buildtools/Cmake/prog_test/prog_AC_CHECK_MCSC.c
-       buildtools/Cmake/prog_test/prog_getline.c
-       buildtools/Cmake/prog_test/prog_GRAS_ARCH.c
-       buildtools/Cmake/prog_test/prog_GRAS_CHECK_STRUCT_COMPACTION.c
-       buildtools/Cmake/prog_test/prog_gtnets.cpp
-       buildtools/Cmake/prog_test/prog_max_size.c
-       buildtools/Cmake/prog_test/prog_mutex_timedlock.c
-       buildtools/Cmake/prog_test/prog_printf_null.c
-       buildtools/Cmake/prog_test/prog_sem_init.c
-       buildtools/Cmake/prog_test/prog_sem_timedwait.c
-       buildtools/Cmake/prog_test/prog_snprintf.c
-       buildtools/Cmake/prog_test/prog_stackgrowth.c
-       buildtools/Cmake/prog_test/prog_stacksetup.c
-       buildtools/Cmake/prog_test/prog_va_copy.c
-       buildtools/Cmake/prog_test/prog_vsnprintf.c
-       # FIXME: these are badly named and placed
-       buildtools/Cmake/src/c_gras_config.h.in
-       buildtools/Cmake/src/tracing_config.h.in
-       
-       AUTHORS
-       ChangeLog
-       COPYING
-       missing
-       NEWS
-       README
-       README.IEEE
-       TODO
-       src/smpi/smpicc.in
-       src/smpi/smpirun.in
-       src/bindings/ruby/simgrid_ruby.c
-       src/bindings/ruby_bindings.h
-       src/simix/smx_context_sysv_private.h
-       src/simgrid_units_main.c
-       src/cunit_unit.c
-       src/ex_unit.c
-       src/dynar_unit.c
-       src/dict_unit.c
-       src/set_unit.c
-       src/swag_unit.c
-       src/xbt_str_unit.c
-       src/xbt_strbuff_unit.c
-       src/xbt_sha_unit.c
-       src/config_unit.c
-       src/xbt_synchro_unit.c
-       src/bindings/lua/master_slave.lua
-       src/bindings/lua/mult_matrix.lua
-       examples/lua/master_slave.lua
-       examples/lua/mult_matrix.lua
-       examples/lua/README
-       src/bindings/ruby/MasterSlave.rb
-       src/bindings/ruby/MasterSlaveData.rb
-       src/bindings/ruby/PingPong.rb
-       src/bindings/ruby/Quicksort.rb
-       src/bindings/ruby/simgrid.rb
-       examples/ruby/README
-       examples/ruby/MasterSlave.rb
-       examples/ruby/PingPong.rb
-       examples/ruby/Quicksort.rb
-       src/bindings/rubyDag/example.rb
-       src/bindings/rubyDag/extconfig.rb
-       src/bindings/rubyDag/rb_SD_task.c
-       src/bindings/rubyDag/rb_SD_task.h
-       src/bindings/rubyDag/rb_SD_workstation.c
-       src/bindings/rubyDag/rb_SD_workstation.h
-       src/bindings/rubyDag/rb_simdag.c
-       src/bindings/rubyDag/simdag.rb
-)
-#set(script_to_install
-#      src/smpi/smpicc
-#      src/smpi/smpirun
-#      tools/MSG_visualization/colorize.pl
-#)
-#      tools/sg_unit_extractor.pl
-#      tools/doxygen/index_create.pl
-#      tools/doxygen/toc_create.pl
-#      tools/doxygen/index_php.pl
-#      tools/doxygen/doxygen_postprocesser.pl
-#      tools/doxygen/bibtex2html_table_count.pl
-#      tools/doxygen/bibtex2html_postprocessor.pl
-#      tools/doxygen/xbt_log_extract_hierarchy.pl
-#      tools/MSG_visualization/trace2fig.pl
-
-#message("\n\ntesh:\n${txt_files}")
+       ${CMAKE_SOURCE_FILES}
+       ${bin_files}
+       ${DOC_SOURCES}
+       ${DOC_FIGS}
+       ${README_files}
+)