X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/dd26d1201071250f4cd4c99201c503d17c2bc1a4..a9e025e9ec512e6038ca65747abc6d78d5bf913e:/buildtools/Cmake/DefinePackages.cmake diff --git a/buildtools/Cmake/DefinePackages.cmake b/buildtools/Cmake/DefinePackages.cmake index b3b10954cb..0cf83fa8eb 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 @@ -32,10 +35,10 @@ set(EXTRA_DIST src/simix/smx_smurf_private.h src/simix/smx_synchro_private.h src/smpi/README + src/smpi/colls/colls.h 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 +50,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 +58,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,9 +90,7 @@ 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 ) @@ -105,8 +108,21 @@ set(SMPI_SRC src/smpi/smpi_mpi_dt.c src/smpi/smpi_pmpi.c src/smpi/smpi_replay.c + src/smpi/colls/alltoall-2dmesh.c + src/smpi/colls/alltoall-3dmesh.c + # src/smpi/colls/alltoall-bruck.c + src/smpi/colls/alltoall-pair.c + src/smpi/colls/alltoall-pair-light-barrier.c + src/smpi/colls/alltoall-pair-mpi-barrier.c + src/smpi/colls/alltoall-pair-one-barrier.c + src/smpi/colls/alltoall-rdb.c + src/smpi/colls/alltoall-ring.c + src/smpi/colls/alltoall-ring-light-barrier.c + src/smpi/colls/alltoall-ring-mpi-barrier.c + src/smpi/colls/alltoall-ring-one-barrier.c + src/smpi/colls/alltoall-simple.c ) - + if(SMPI_F2C) set(SMPI_SRC ${SMPI_SRC} @@ -240,6 +256,7 @@ 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_deployment.c src/msg/msg_environment.c @@ -284,6 +301,7 @@ set(EXTRA_DIST #* ****************************************************************************************** *# set(SIMDAG_SRC + src/simdag/instr_sd_task.c src/simdag/sd_daxloader.c src/simdag/sd_global.c src/simdag/sd_link.c @@ -308,6 +326,72 @@ 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}) + list(APPEND JMSG_JAVA_SRC ${JTRACE_JAVA_SRC}) +else() + list(APPEND EXTRA_DIST ${JTRACE_C_SRC}) + list(APPEND EXTRA_DIST ${JTRACE_JAVA_SRC}) +endif() + set(LUA_SRC src/bindings/lua/lua_comm.c src/bindings/lua/lua_host.c @@ -353,6 +437,7 @@ set(MC_SRC src/mc/mc_request.c src/mc/mc_state.c src/mc/memory_map.c + src/mc/mc_pair.c ) set(headers_to_install @@ -369,6 +454,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 @@ -467,6 +553,7 @@ set(simgrid_sources ${SURF_SRC} ${TRACING_SRC} ${XBT_SRC} + ${SMPI_SRC} ) if(${HAVE_JEDULE}) @@ -531,52 +618,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 +698,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 @@ -621,7 +734,9 @@ set(txt_files AUTHORS COPYING README + README.java ChangeLog + ChangeLog.SimGrid-java INSTALL LICENSE-LGPL-2.1 NEWS @@ -630,6 +745,24 @@ set(txt_files ) set(EXAMPLES_CMAKEFILES_TXT + examples/java/CMakeLists.txt + examples/java/async/CMakeLists.txt + examples/java/bittorrent/CMakeLists.txt + examples/java/chord/CMakeLists.txt + examples/java/cloud/CMakeLists.txt + examples/java/commTime/CMakeLists.txt + examples/java/io/CMakeLists.txt + examples/java/kademlia/CMakeLists.txt + examples/java/master_slave_bypass/CMakeLists.txt + examples/java/master_slave_kill/CMakeLists.txt + examples/java/masterslave/CMakeLists.txt + examples/java/migration/CMakeLists.txt + examples/java/mutualExclusion/CMakeLists.txt + examples/java/pingPong/CMakeLists.txt + examples/java/priority/CMakeLists.txt + examples/java/startKillTime/CMakeLists.txt + examples/java/suspend/CMakeLists.txt + examples/java/tracing/CMakeLists.txt examples/lua/CMakeLists.txt examples/msg/CMakeLists.txt examples/msg/actions/CMakeLists.txt @@ -677,8 +810,10 @@ set(TESHSUITE_CMAKEFILES_TXT teshsuite/simdag/network/p2p/CMakeLists.txt teshsuite/simdag/partask/CMakeLists.txt teshsuite/simdag/platforms/CMakeLists.txt + teshsuite/simdag/availability/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 @@ -710,11 +845,13 @@ set(CMAKE_SOURCE_FILES buildtools/Cmake/GenerateDocWin.cmake buildtools/Cmake/MaintainerMode.cmake buildtools/Cmake/MakeExe.cmake + buildtools/Cmake/MakeJava.cmake buildtools/Cmake/MakeLib.cmake buildtools/Cmake/MakeLibWin.cmake 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 +860,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 @@ -736,14 +872,14 @@ set(CMAKE_SOURCE_FILES buildtools/Cmake/Scripts/postinstall.sh buildtools/Cmake/Scripts/preinstall.sh buildtools/Cmake/Scripts/tesh.pl - buildtools/Cmake/Scripts/test_java.sh buildtools/Cmake/Scripts/update_tesh.pl buildtools/Cmake/Supernovae.cmake buildtools/Cmake/UnitTesting.cmake buildtools/Cmake/src/internal_config.h.in 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 +889,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 +915,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 +927,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