X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/5fbc4068e8a02ebb8b1acc6437ef8f7dc7f66ec2..0de7df8a3bc351fdff4c4a3e106608b15c842143:/buildtools/Cmake/DefinePackages.cmake diff --git a/buildtools/Cmake/DefinePackages.cmake b/buildtools/Cmake/DefinePackages.cmake index 137ada1771..a32ed9d356 100644 --- a/buildtools/Cmake/DefinePackages.cmake +++ b/buildtools/Cmake/DefinePackages.cmake @@ -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,10 +80,13 @@ 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.pl @@ -105,48 +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 @@ -196,6 +165,8 @@ set(XBT_SRC src/xbt/cunit.c src/xbt/graphxml_parse.c src/xbt/setset.c + src/xbt/parmap.c + src/xbt/xbt_replay_trace_reader.c ) if(HAVE_MMAP) @@ -226,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 @@ -241,12 +211,14 @@ set(SIMIX_SRC src/simix/smx_deployment.c src/simix/smx_environment.c src/simix/smx_host.c - src/simix/smx_action.c src/simix/smx_process.c src/simix/smx_context.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 @@ -273,6 +245,10 @@ 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 @@ -324,21 +300,32 @@ set(LUA_SRC ) set(TRACING_SRC + src/instr/instr_routing.c src/instr/instr_config.c - src/instr/categories.c - 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/smpi_instr.c - src/instr/sd_instr.c - src/instr/variables_instr.c - src/instr/resource_utilization.c - src/instr/private.h + 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 @@ -352,11 +339,11 @@ set(RUBY_SRC 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 ) @@ -392,13 +379,15 @@ set(install_HEADERS 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 - include/smpi/smpif.h + ${CMAKE_CURRENT_BINARY_DIR}/include/smpi/smpif.h include/smpi/mpi.h include/smpi/mpif.h include/surf/surfxml_parse.h @@ -417,41 +406,65 @@ set(install_HEADERS ${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 +# -->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}) #ucontext + 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 ) - - if(WIN32) - set(SURF_SRC - ${SURF_SRC} - src/xbt/xbt_os_thread.c - src/simix/smx_context_thread.c) - else(WIN32) - set(EXTRA_DIST - ${EXTRA_DIST} - src/xbt/xbt_os_thread.c - src/simix/smx_context_thread.c) - endif(WIN32) -endif(${CONTEXT_THREADS}) - - - +else(${CONTEXT_UCONTEXT}) # NOT ucontext + set(EXTRA_DIST + ${EXTRA_DIST} + src/simix/smx_context_sysv.c + ) +endif(${CONTEXT_UCONTEXT}) # -->HAVE_GTNETS if(HAVE_GTNETS) @@ -479,6 +492,7 @@ set(simgrid_sources ${GRAS_COMMON_SRC} ${GRAS_SG_SRC} ${AMOK_SRC} + ${JEDULE_SRC} ) if(HAVE_MC) @@ -508,21 +522,6 @@ elseif(${HAVE_LUA}) ) endif(${HAVE_LUA}) -set(EXTRA_DIST - ${EXTRA_DIST} - ${JMSG_JAVA_SRC} -) -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} - ) -endif(${HAVE_JAVA}) if(${HAVE_RUBY}) set(simgrid_sources @@ -543,16 +542,16 @@ file(GLOB_RECURSE examples_to_install_in_doc "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/FAQ.doc doc/gtut-howto-design.doc doc/gtut-howto.doc doc/gtut-introduction.doc @@ -578,7 +577,6 @@ set(DOC_SOURCES doc/history.doc doc/index-API.doc doc/index.doc - doc/logcategories.doc doc/module-amok.doc doc/module-gras.doc doc/module-msg.doc @@ -588,32 +586,75 @@ set(DOC_SOURCES 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 ) + set(DOC_FIGS - ${PROJECT_DIRECTORY}/doc/fig/simgrid_modules.fig - ${PROJECT_DIRECTORY}/doc/fig/simgrid_modules2.fig - ${PROJECT_DIRECTORY}/doc/fig/amok_bw_test.fig - ${PROJECT_DIRECTORY}/doc/fig/amok_bw_sat.fig - ${PROJECT_DIRECTORY}/doc/fig/gras_comm.fig + ${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 ) -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}) - file(GLOB_RECURSE add_src_files "teshsuite/*.c" "teshsuite/*.cxx" +"teshsuite/*CMakeLists.txt" "testsuite/*.c" "testsuite/*.cxx" "testsuite/*CMakeLists.txt" @@ -622,7 +663,6 @@ file(GLOB_RECURSE add_src_files "tools/*CMakeLists.txt" "examples/*.c" "examples/*.cxx" -"examples/*.java" "examples/*.lua" "examples/*.rb" "examples/*CMakeLists.txt" @@ -671,18 +711,33 @@ file(GLOB_RECURSE tesh_files "tools/*.tesh" ) -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" @@ -728,10 +783,6 @@ 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 @@ -740,14 +791,17 @@ set(txt_files ChangeLog COPYING LICENSE-LGPL-2.1 - missing NEWS - README - README.IEEE TODO - examples/lua/README - examples/ruby/README + 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" @@ -763,6 +817,7 @@ 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 @@ -770,8 +825,6 @@ set(source_to_pack ${XBT_RL_SRC} ${EXTRA_DIST} ${SMPI_SRC} - ${JMSG_C_SRC} - ${JMSG_JAVA_SRC} ${GRAS_RL_SRC} ${XBT_SRC} ${GTNETS_SRC} @@ -796,4 +849,5 @@ set(source_to_pack ${bin_files} ${DOC_SOURCES} ${DOC_FIGS} + ${README_files} )