X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ae855a0d996d06d373fbc233e78b0fbe7f1f2df6..0bb15d22417c0691dafb9e369eea3564e0cfae7b:/buildtools/Cmake/DefinePackages.cmake diff --git a/buildtools/Cmake/DefinePackages.cmake b/buildtools/Cmake/DefinePackages.cmake index 132869db1f..b8331bcaad 100644 --- a/buildtools/Cmake/DefinePackages.cmake +++ b/buildtools/Cmake/DefinePackages.cmake @@ -17,7 +17,7 @@ set(EXTRA_DIST src/xbt/backtrace_windows.c src/xbt/backtrace_dummy.c src/xbt/setset_private.h - src/xbt/threadpool_private.h + src/xbt/parmap_private.h src/xbt/mmalloc/attach.c src/xbt/mmalloc/detach.c src/xbt/mmalloc/keys.c @@ -87,7 +87,6 @@ set(EXTRA_DIST 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 @@ -109,10 +108,10 @@ set(SMPI_SRC 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 ) @@ -141,7 +140,6 @@ set(XBT_SRC src/gras_modinter.h src/xbt/xbt_virtu.c src/xbt/xbt_os_time.c - src/xbt/asserts.c src/xbt/log.c src/xbt/xbt_log_appender_file.c src/xbt/xbt_log_layout_simple.c @@ -166,7 +164,8 @@ set(XBT_SRC src/xbt/cunit.c src/xbt/graphxml_parse.c src/xbt/setset.c - src/xbt/threadpool.c + src/xbt/parmap.c + src/xbt/xbt_replay_trace_reader.c ) if(HAVE_MMAP) @@ -197,6 +196,7 @@ set(SURF_SRC src/surf/surfxml_parse.c src/surf/cpu.c src/surf/network.c + src/surf/network_im.c src/surf/network_constant.c src/surf/workstation.c src/surf/workstation_ptask_L07.c @@ -217,6 +217,7 @@ set(SIMIX_SRC 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 @@ -298,10 +299,11 @@ set(LUA_SRC ) set(TRACING_SRC + src/instr/instr_routing.c src/instr/instr_config.c - src/instr/instr_categories.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 @@ -309,11 +311,22 @@ set(TRACING_SRC src/instr/instr_surf.c src/instr/instr_smpi.c src/instr/instr_simdag.c - src/instr/instr_variables.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 @@ -333,6 +346,10 @@ set(MC_SRC src/mc/private.h ) +set(RNGSTREAM_SRC + src/rngstreams/RngStream.c +) + set(install_HEADERS include/xbt/misc.h include/xbt/sysdep.h @@ -365,13 +382,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 @@ -396,38 +415,32 @@ set(install_HEADERS ) ### 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) @@ -455,6 +468,8 @@ set(simgrid_sources ${GRAS_COMMON_SRC} ${GRAS_SG_SRC} ${AMOK_SRC} + ${JEDULE_SRC} + ${RNGSTREAM_SRC} ) if(HAVE_MC) @@ -504,22 +519,13 @@ file(GLOB_RECURSE examples_to_install_in_doc "examples/*.h" "examples/*.cxx" "examples/*.hpp" -"examples/*.c" "examples/*.rb" "examples/*.lua" "examples/*.java" "examples/*.xml" -) - -file(GLOB_RECURSE README_examples_files "examples/*README" ) -set(examples_to_install_in_doc -${examples_to_install_in_doc} -${README_examples_files} -) - set(DOC_SOURCES doc/contrib.doc doc/FAQ.doc @@ -622,20 +628,6 @@ set(DOC_FIGS ${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" @@ -778,6 +770,8 @@ set(txt_files LICENSE-LGPL-2.1 NEWS TODO + configure + INSTALL ) file(GLOB_RECURSE README_files @@ -800,6 +794,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