X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/22ff6a49b0593f2164d8c4c6244bff1a8bb16d86..d96c801afcc9beac00274914682f4ce28f54ed7f:/buildtools/Cmake/DefinePackages.cmake

diff --git a/buildtools/Cmake/DefinePackages.cmake b/buildtools/Cmake/DefinePackages.cmake
index 32264f5509..283893ca40 100644
--- a/buildtools/Cmake/DefinePackages.cmake
+++ b/buildtools/Cmake/DefinePackages.cmake
@@ -1,11 +1,14 @@
 ### define source packages
 
 set(EXTRA_DIST
+  include/xbt/win32_ucontext.h
+  src/bindings/java/MANIFEST.MF
   src/include/instr/instr_interface.h
   src/include/mc/datatypes.h
   src/include/mc/mc.h
   src/include/simgrid/platf_interface.h
   src/include/simgrid/sg_config.h
+  src/include/smpi/smpi_interface.h
   src/include/surf/datatypes.h
   src/include/surf/maxmin.h
   src/include/surf/random_mgr.h
@@ -35,7 +38,6 @@ set(EXTRA_DIST
   src/smpi/private.h
   src/smpi/smpi_mpi_dt_private.h
   src/surf/cpu_ti_private.h
-  src/surf/platf_generator_private.h
   src/surf/gtnets/gtnets_interface.h
   src/surf/gtnets/gtnets_simulator.h
   src/surf/gtnets/gtnets_topology.h
@@ -47,6 +49,7 @@ set(EXTRA_DIST
   src/surf/ns3/ns3_interface.h
   src/surf/ns3/ns3_simulator.h
   src/surf/ns3/red-queue.h
+  src/surf/platf_generator_private.h
   src/surf/simgrid.dtd
   src/surf/simgrid_dtd.c
   src/surf/storage_private.h
@@ -54,6 +57,7 @@ set(EXTRA_DIST
   src/surf/surf_routing_private.h
   src/surf/surfxml_parse.c
   src/surf/trace_mgr_private.h
+  src/win32/config.h
   src/xbt/automaton/automaton_lexer.yy.c
   src/xbt/automaton/parserPromela.lex
   src/xbt/automaton/parserPromela.tab.cacc
@@ -85,14 +89,13 @@ set(EXTRA_DIST
   src/xbt/mmalloc/mmtrace.awk
   src/xbt/mmalloc/mrealloc.c
   src/xbt/setset_private.h
-  src/win32/config.h
   src/xbt/win32_ucontext.c
-  include/xbt/win32_ucontext.h
   tools/tesh/run_context.h
   tools/tesh/tesh.h
   )
 
 set(SMPI_SRC
+  src/smpi/instr_smpi.c
   src/smpi/smpi_base.c
   src/smpi/smpi_bench.c
   src/smpi/smpi_c99.c
@@ -105,7 +108,7 @@ set(SMPI_SRC
   src/smpi/smpi_pmpi.c
   src/smpi/smpi_replay.c
   )
-  
+
 if(SMPI_F2C)
   set(SMPI_SRC
     ${SMPI_SRC}
@@ -186,6 +189,8 @@ set(SURF_SRC
   src/surf/cpu_cas01.c
   src/surf/cpu_ti.c
   src/surf/fair_bottleneck.c
+  src/surf/instr_routing.c
+  src/surf/instr_surf.c
   src/surf/lagrange.c
   src/surf/maxmin.c
   src/surf/network.c
@@ -235,8 +240,10 @@ set(SIMGRID_SRC
   )
 
 set(MSG_SRC
+  src/msg/instr_msg_process.c
+  src/msg/instr_msg_task.c
+  src/msg/instr_msg_vm.c
   src/msg/msg_actions.c
-  src/msg/msg_config.c
   src/msg/msg_deployment.c
   src/msg/msg_environment.c
   src/msg/msg_global.c
@@ -304,6 +311,70 @@ set(BINDINGS_SRC
   src/bindings/lua/simgrid_lua.h
   )
 
+set(JMSG_C_SRC
+  src/bindings/java/jmsg.c
+  src/bindings/java/jmsg.h
+  src/bindings/java/jmsg_comm.c
+  src/bindings/java/jmsg_comm.h
+  src/bindings/java/jmsg_file.c
+  src/bindings/java/jmsg_file.h
+  src/bindings/java/jmsg_host.c
+  src/bindings/java/jmsg_host.h
+  src/bindings/java/jmsg_process.c
+  src/bindings/java/jmsg_process.h
+  src/bindings/java/jmsg_rngstream.c
+  src/bindings/java/jmsg_rngstream.h
+  src/bindings/java/jmsg_synchro.c
+  src/bindings/java/jmsg_synchro.h
+  src/bindings/java/jmsg_task.c
+  src/bindings/java/jmsg_task.h
+  src/bindings/java/jmsg_vm.c
+  src/bindings/java/jmsg_vm.h
+  src/bindings/java/jxbt_utilities.c
+  src/bindings/java/jxbt_utilities.h
+  src/bindings/java/smx_context_cojava.c
+  src/bindings/java/smx_context_cojava.h
+  src/bindings/java/smx_context_java.c
+  src/bindings/java/smx_context_java.h
+)
+
+set(JMSG_JAVA_SRC
+  src/bindings/java/org/simgrid/msg/Comm.java
+  src/bindings/java/org/simgrid/msg/File.java
+  src/bindings/java/org/simgrid/msg/Host.java
+  src/bindings/java/org/simgrid/msg/HostFailureException.java
+  src/bindings/java/org/simgrid/msg/HostNotFoundException.java
+  src/bindings/java/org/simgrid/msg/JniException.java
+  src/bindings/java/org/simgrid/msg/Msg.java
+  src/bindings/java/org/simgrid/msg/MsgException.java
+  src/bindings/java/org/simgrid/msg/Mutex.java
+  src/bindings/java/org/simgrid/msg/NativeException.java
+  src/bindings/java/org/simgrid/msg/Process.java
+  src/bindings/java/org/simgrid/msg/ProcessKilledError.java
+  src/bindings/java/org/simgrid/msg/ProcessNotFoundException.java
+  src/bindings/java/org/simgrid/msg/RngStream.java
+  src/bindings/java/org/simgrid/msg/Task.java
+  src/bindings/java/org/simgrid/msg/TaskCancelledException.java
+  src/bindings/java/org/simgrid/msg/TimeoutException.java
+  src/bindings/java/org/simgrid/msg/TransferFailureException.java
+  src/bindings/java/org/simgrid/msg/VM.java
+)
+
+set(JTRACE_C_SRC
+  src/bindings/java/jtrace.c
+  src/bindings/java/jtrace.h
+)
+
+set(JTRACE_JAVA_SRC
+  src/bindings/java/org/simgrid/trace/Trace.java
+)
+
+if(HAVE_TRACING)
+  list(APPEND JMSG_C_SRC ${JTRACE_C_SRC})
+else()
+  list(APPEND EXTRA_DIST ${JTRACE_C_SRC})
+endif()
+
 set(LUA_SRC
   src/bindings/lua/lua_comm.c
   src/bindings/lua/lua_host.c
@@ -318,8 +389,6 @@ set(LUA_SRC
 set(TRACING_SRC
   src/instr/instr_config.c
   src/instr/instr_interface.c
-  src/instr/instr_msg_process.c
-  src/instr/instr_msg_task.c
   src/instr/instr_paje_containers.c
   src/instr/instr_paje_trace.c
   src/instr/instr_paje_header.c
@@ -327,9 +396,6 @@ set(TRACING_SRC
   src/instr/instr_paje_values.c
   src/instr/instr_private.h
   src/instr/instr_resource_utilization.c
-  src/instr/instr_routing.c
-  src/instr/instr_smpi.c
-  src/instr/instr_surf.c
   )
 
 set(JEDULE_SRC
@@ -370,6 +436,7 @@ set(headers_to_install
   include/smpi/mpif.h
   include/smpi/smpi.h
   include/smpi/smpi_cocci.h
+  include/smpi/smpi_main.h
   include/surf/simgrid_dtd.h
   include/surf/surf_routing.h
   include/surf/surfxml_parse.h
@@ -466,6 +533,7 @@ set(simgrid_sources
   ${SIMGRID_SRC}
   ${SIMIX_SRC}
   ${SURF_SRC}
+  ${TRACING_SRC}
   ${XBT_SRC}
   )
 
@@ -531,52 +599,77 @@ endif()
 
 set(DOC_SOURCES
   doc/AS_hierarchy.png
+  doc/Doxyfile.in
+  doc/Layout.xml
   doc/sg_thread_model.fig
   doc/simix.fig
   doc/surf_nutshell.fig
-  doc/Doxyfile.in
-  doc/Layout.xml
   doc/triva-graph_configuration.png
+  doc/triva-graph_configuration.svg
   doc/triva-graph_visualization.png
+  doc/triva-graph_visualization.svg
   doc/triva-time_interval.png
-  
-    doc/doxygen/footer.html
-  doc/doxygen/header.html
-  doc/doxygen/stylesheet.css
-  
-  doc/doxygen/index.doc
-  doc/doxygen/getting_started.doc  
-  doc/doxygen/introduction.doc
-  doc/doxygen/use.doc
+  doc/triva-time_interval.svg
+
+  doc/HelloWorld/CMakeLists.txt
+  doc/HelloWorld/HelloWorld.c
+  doc/HelloWorld/FindPcreWin.cmake
+  doc/HelloWorld/README
+
+  doc/doxygen/FAQ.doc
+  doc/doxygen/advanced.doc
   doc/doxygen/bindings.doc
+  doc/doxygen/contributing.doc
   doc/doxygen/deployment.doc
+  doc/doxygen/footer.html
+  doc/doxygen/getting_started.doc
+  doc/doxygen/header.html
+  doc/doxygen/help.doc
+  doc/doxygen/index.doc
+  doc/doxygen/inside_autotests.doc
+  doc/doxygen/inside_cmake.doc
+  doc/doxygen/inside_doxygen.doc
+  doc/doxygen/inside_extending.doc
+  doc/doxygen/inside_release.doc
   doc/doxygen/install.doc
+  doc/doxygen/internals.doc
+  doc/doxygen/introduction.doc
+  doc/doxygen/module-msg.doc
+  doc/doxygen/module-sd.doc
+  doc/doxygen/module-simix.doc
+  doc/doxygen/module-surf.doc
+  doc/doxygen/module-trace.doc
+  doc/doxygen/module-xbt.doc
+  doc/doxygen/modules.doc
   doc/doxygen/options.doc
   doc/doxygen/platform.doc
   doc/doxygen/pls.doc
+  doc/doxygen/stylesheet.css
   doc/doxygen/tracing.doc
-  doc/doxygen/FAQ.doc
-  doc/doxygen/advanced.doc
-    doc/doxygen/inside_autotests.doc  
-    doc/doxygen/inside_cmake.doc
-    doc/doxygen/inside_extending.doc 
-    doc/doxygen/inside_release.doc
-    doc/doxygen/contributing.doc
-  doc/doxygen/modules.doc
-    doc/doxygen/module-msg.doc
-    doc/doxygen/module-sd.doc
-    doc/doxygen/module-simix.doc
-    doc/doxygen/module-surf.doc
-    doc/doxygen/module-trace.doc
-    doc/doxygen/module-xbt.doc
+  doc/doxygen/use.doc
 
+  doc/msg-tuto-src/deployment0.xml
+  doc/msg-tuto-src/deployment1.xml
+  doc/msg-tuto-src/deployment2.xml
+  doc/msg-tuto-src/deployment3.xml
+  doc/msg-tuto-src/deployment_general.xml
+  doc/msg-tuto-src/masterworker0.c
+  doc/msg-tuto-src/masterworker1.c
+  doc/msg-tuto-src/masterworker2.c
+  doc/msg-tuto-src/masterworker3.c
+  doc/msg-tuto-src/masterworker4.c
+  doc/msg-tuto-src/platforms/cloud.xml
+  doc/msg-tuto-src/platforms/g5k.xml
+  doc/msg-tuto-src/platforms/griffon.xml
+  doc/msg-tuto-src/platforms/peers.xml
+  doc/msg-tuto-src/platforms/platform.xml
   )
 
 set(DOC_FIGS
   ${CMAKE_HOME_DIRECTORY}/doc/shared/fig/simgrid_modules.fig
   ${CMAKE_HOME_DIRECTORY}/doc/shared/fig/simgrid_modules2.fig
   )
-  
+
 set(DOC_TOOLS
   tools/doxygen/fig2dev_postprocessor.pl
   tools/doxygen/index_create.pl
@@ -586,6 +679,7 @@ set(DOC_TOOLS
 # these files get copied automatically to the html documentation
 set(DOC_IMG
   ${CMAKE_HOME_DIRECTORY}/doc/simgrid.css
+  ${CMAKE_HOME_DIRECTORY}/doc/sc3-description.png
   ${CMAKE_HOME_DIRECTORY}/doc/webcruft/Paje_MSG_screenshot.jpg
   ${CMAKE_HOME_DIRECTORY}/doc/webcruft/Paje_MSG_screenshot_thn.jpg
   ${CMAKE_HOME_DIRECTORY}/doc/webcruft/SGicon.gif
@@ -630,6 +724,7 @@ set(txt_files
   )
 
 set(EXAMPLES_CMAKEFILES_TXT
+  examples/java/bittorrent/CMakeLists.txt
   examples/lua/CMakeLists.txt
   examples/msg/CMakeLists.txt
   examples/msg/actions/CMakeLists.txt
@@ -679,6 +774,7 @@ set(TESHSUITE_CMAKEFILES_TXT
   teshsuite/simdag/platforms/CMakeLists.txt
   teshsuite/xbt/CMakeLists.txt
   teshsuite/smpi/CMakeLists.txt
+  teshsuite/smpi/mpich-test/CMakeLists.txt
   teshsuite/smpi/mpich-test/env/CMakeLists.txt
   teshsuite/smpi/mpich-test/coll/CMakeLists.txt
   teshsuite/smpi/mpich-test/context/CMakeLists.txt
@@ -715,6 +811,7 @@ set(CMAKE_SOURCE_FILES
   buildtools/Cmake/Modules/FindF2c.cmake
   buildtools/Cmake/Modules/FindGTnets.cmake
   buildtools/Cmake/Modules/FindGraphviz.cmake
+  buildtools/Cmake/Modules/FindLibunwind.cmake
   buildtools/Cmake/Modules/FindLua51Simgrid.cmake
   buildtools/Cmake/Modules/FindNS3.cmake
   buildtools/Cmake/Modules/FindPCRE.cmake
@@ -723,7 +820,6 @@ set(CMAKE_SOURCE_FILES
   buildtools/Cmake/Modules/FindRubySimgrid.cmake
   buildtools/Cmake/Modules/FindSimGrid.cmake
   buildtools/Cmake/Modules/FindValgrind.cmake
-  buildtools/Cmake/Modules/FindLibunwind.cmake
   buildtools/Cmake/Option.cmake
   buildtools/Cmake/Pipol.cmake
   buildtools/Cmake/PrintArgs.cmake
@@ -744,6 +840,8 @@ set(CMAKE_SOURCE_FILES
   buildtools/Cmake/src/simgrid.nsi.in
   buildtools/Cmake/test_prog/prog_AC_CHECK_MCSC.c
   buildtools/Cmake/test_prog/prog_getline.c
+  buildtools/Cmake/test_prog/prog_gnu_dynlinker.c
+  buildtools/Cmake/test_prog/prog_gtnets.cpp
   buildtools/Cmake/test_prog/prog_mutex_timedlock.c
   buildtools/Cmake/test_prog/prog_printf_null.c
   buildtools/Cmake/test_prog/prog_sem_init.c
@@ -753,9 +851,7 @@ set(CMAKE_SOURCE_FILES
   buildtools/Cmake/test_prog/prog_stackgrowth.c
   buildtools/Cmake/test_prog/prog_stacksetup.c
   buildtools/Cmake/test_prog/prog_thread_storage.c
-  buildtools/Cmake/test_prog/prog_va_copy.c
   buildtools/Cmake/test_prog/prog_vsnprintf.c
-  buildtools/Cmake/test_prog/prog_gnu_dynlinker.c
   )
 
 set(PLATFORMS_EXAMPLES
@@ -781,8 +877,10 @@ set(PLATFORMS_EXAMPLES
   examples/platforms/generation_scripts/generate_g5k_platform.pl
   examples/platforms/generation_scripts/generate_g5k_platform_cabinets.pl
   examples/platforms/griffon.xml
+  examples/platforms/meta_cluster.xml
   examples/platforms/multicore_machine.xml
   examples/platforms/prop.xml
+  examples/platforms/routing_cluster.xml
   examples/platforms/storage.xml
   examples/platforms/syscoord/generate_peer_platform.pl
   examples/platforms/syscoord/median_harvard.syscoord
@@ -791,10 +889,8 @@ set(PLATFORMS_EXAMPLES
   examples/platforms/syscoord/median_meridian.xml
   examples/platforms/syscoord/median_p2psim.syscoord
   examples/platforms/syscoord/median_p2psim.xml
-  examples/platforms/vivaldi.xml
-  examples/platforms/routing_cluster.xml
-  examples/platforms/meta_cluster.xml
   examples/platforms/two_peers.xml
+  examples/platforms/vivaldi.xml
   )
 
 set(generated_src_files