X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/05eb4d3f2c9a2a8b25072c6d48708bd18c7a39f6..0d9a026354c9cba60941557eeb0a7ad3bfc9d47f:/buildtools/Cmake/DefinePackages.cmake diff --git a/buildtools/Cmake/DefinePackages.cmake b/buildtools/Cmake/DefinePackages.cmake old mode 100755 new mode 100644 index 6756c21f97..99fe4c81bc --- a/buildtools/Cmake/DefinePackages.cmake +++ b/buildtools/Cmake/DefinePackages.cmake @@ -87,7 +87,7 @@ set(EXTRA_DIST 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,6 +105,7 @@ set(SMPI_SRC src/smpi/smpi_bench.c src/smpi/smpi_global.c src/smpi/smpi_mpi.c + src/smpi/smpi_f77.c src/smpi/smpi_comm.c src/smpi/smpi_group.c src/smpi/smpi_util.c @@ -240,9 +241,9 @@ 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_action.c src/simix/smx_synchro.c src/simix/smx_network.c src/simix/smx_context_base.c @@ -267,7 +268,17 @@ set(SIMDAG_SRC src/simdag/sd_task.c src/simdag/sd_workstation.c src/simdag/sd_daxloader.c + src/simdag/sd_dotloader.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 @@ -312,11 +323,14 @@ 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/instr_config.c + src/instr/categories.c src/instr/interface.c src/instr/general.c src/instr/paje.c @@ -325,16 +339,19 @@ set(TRACING_SRC 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 ) 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 @@ -349,94 +366,67 @@ set(MC_SRC ) set(install_HEADERS -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 -include/simgrid_config.h -include/gras.h -include/xbt.h -) - -set(TEST_UNITS -${PROJECT_DIRECTORY}/src/cunit_unit.c -${PROJECT_DIRECTORY}/src/ex_unit.c -${PROJECT_DIRECTORY}/src/dynar_unit.c -${PROJECT_DIRECTORY}/src/dict_unit.c -${PROJECT_DIRECTORY}/src/set_unit.c -${PROJECT_DIRECTORY}/src/swag_unit.c -${PROJECT_DIRECTORY}/src/xbt_str_unit.c -${PROJECT_DIRECTORY}/src/xbt_strbuff_unit.c -${PROJECT_DIRECTORY}/src/xbt_sha_unit.c -${PROJECT_DIRECTORY}/src/config_unit.c -${PROJECT_DIRECTORY}/src/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 + 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/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 ) ### depend of some variables setted upper # -->CONTEXT_THREADS -if(${CONTEXT_THREADS} OR WIN32) +if(${CONTEXT_THREADS}) #pthread set(SURF_SRC ${SURF_SRC} src/xbt/xbt_os_thread.c @@ -446,17 +436,27 @@ if(${CONTEXT_THREADS} OR WIN32) ${EXTRA_DIST} src/simix/smx_context_sysv.c ) -else(${CONTEXT_THREADS} OR WIN32) +else(${CONTEXT_THREADS}) #ucontext set(SURF_SRC ${SURF_SRC} src/simix/smx_context_sysv.c ) - set(EXTRA_DIST - ${EXTRA_DIST} - src/xbt/xbt_os_thread.c - src/simix/smx_context_thread.c - ) -endif(${CONTEXT_THREADS} OR WIN32) + + 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}) + + + # -->HAVE_GTNETS if(HAVE_GTNETS) @@ -471,10 +471,6 @@ else(HAVE_GTNETS) ) endif(HAVE_GTNETS) -set(EXTRA_DIST - ${EXTRA_DIST} - ${JMSG_JAVA_SRC} -) ### Simgrid Lib sources set(simgrid_sources @@ -517,6 +513,10 @@ elseif(${HAVE_LUA}) ) endif(${HAVE_LUA}) +set(EXTRA_DIST + ${EXTRA_DIST} + ${JMSG_JAVA_SRC} +) if(${HAVE_JAVA}) set(simgrid_sources ${simgrid_sources} @@ -526,7 +526,6 @@ else(${HAVE_JAVA}) set(EXTRA_DIST ${EXTRA_DIST} ${JMSG_C_SRC} - ${MSG_SRC} ) endif(${HAVE_JAVA}) @@ -544,23 +543,6 @@ 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" @@ -571,6 +553,71 @@ file(GLOB_RECURSE examples_to_install_in_doc "examples/*.lua" "examples/*.java" "examples/*.xml" +"examples/*.txt" +) + +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 + 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/Doxyfile.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 ) foreach(file ${examples_to_install_in_doc}) @@ -587,6 +634,37 @@ foreach(file ${new_examples_to_install_in_doc}) 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" +"tools/*.c" +"tools/*.cxx" +"tools/*CMakeLists.txt" +"examples/*.c" +"examples/*.cxx" +"examples/*.java" +"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" @@ -598,7 +676,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" @@ -608,7 +685,6 @@ file(GLOB_RECURSE xml_files "testsuite/*.xml" "tools/*.xml" ) -#message("\n\nxml:\n${xml_files}") file(GLOB_RECURSE tesh_files "examples/*.tesh" @@ -618,13 +694,21 @@ 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" "examples/smpi/hostfile" "examples/msg/*.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" @@ -683,7 +767,37 @@ file(GLOB_RECURSE txt_files "examples/java/suspend/SuspendTest" ) +set(txt_files + ${txt_files} + AUTHORS + ChangeLog + COPYING + LICENSE-LGPL-2.1 + NEWS + TODO +) +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 +) # This is the complete lise of what will be added to the source archive set(source_to_pack @@ -711,85 +825,10 @@ set(source_to_pack ${xml_files} ${tesh_files} ${txt_files} - ${TEST_CFILES} ${EXTRA_DIST} - CMakeLists.txt - buildtools/Cmake/CTestConfig.cmake - buildtools/Cmake/CompleteInFiles.cmake - buildtools/Cmake/DefinePackages.cmake - buildtools/Cmake/Distrib.cmake - buildtools/Cmake/GenerateDoc.cmake - buildtools/Cmake/Flags.cmake - buildtools/Cmake/MakeJava.cmake - buildtools/Cmake/MaintainerMode.cmake - buildtools/Cmake/MakeExeLib.cmake - buildtools/Cmake/Option.cmake - buildtools/Cmake/PrintArgs.cmake - buildtools/Cmake/Supernovae.cmake - buildtools/Cmake/AddTests.cmake - buildtools/Cmake/memcheck_tests.cmake - buildtools/Cmake/test_prog/prog_AC_CHECK_MCSC.c - buildtools/Cmake/test_prog/prog_getline.c - buildtools/Cmake/test_prog/prog_GRAS_ARCH.c - buildtools/Cmake/test_prog/prog_GRAS_CHECK_STRUCT_COMPACTION.c - buildtools/Cmake/test_prog/prog_gtnets.cpp - buildtools/Cmake/test_prog/prog_max_size.c - buildtools/Cmake/test_prog/prog_mutex_timedlock.c - buildtools/Cmake/test_prog/prog_printf_null.c - buildtools/Cmake/test_prog/prog_sem_init.c - buildtools/Cmake/test_prog/prog_sem_timedwait.c - buildtools/Cmake/test_prog/prog_snprintf.c - buildtools/Cmake/test_prog/prog_stackgrowth.c - buildtools/Cmake/test_prog/prog_stacksetup.c - buildtools/Cmake/test_prog/prog_va_copy.c - buildtools/Cmake/test_prog/prog_vsnprintf.c - buildtools/Cmake/gras_config.h.in - buildtools/Cmake/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 -) \ No newline at end of file + ${CMAKE_SOURCE_FILES} + ${bin_files} + ${DOC_SOURCES} + ${DOC_FIGS} + ${README_files} +)