X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f667b231f734dfd699f012056c33aa88711b0ba5..1fcc8dd3e67dc3f7c1e789459028a361a1c86b5f:/buildtools/Cmake/DefinePackages.cmake diff --git a/buildtools/Cmake/DefinePackages.cmake b/buildtools/Cmake/DefinePackages.cmake index 89b8c96352..814e0f242b 100644 --- a/buildtools/Cmake/DefinePackages.cmake +++ b/buildtools/Cmake/DefinePackages.cmake @@ -91,6 +91,18 @@ set(EXTRA_DIST src/smpi/smpi_mpi_dt_private.h src/smpi/README src/mk_supernovae.pl + + examples/gras/ping/ping.h + examples/gras/console/ping.h + examples/gras/mmrpc/mmrpc.h + + tools/gras/gras_stub_generator.h + tools/tesh/run_context.h + tools/tesh/tesh.h + + src/surf/network_ns3_private.h + src/surf/ns3/ns3_interface.h + src/surf/ns3/ns3_simulator.h ) set(XBT_RL_SRC @@ -184,6 +196,12 @@ set(GTNETS_SRC src/surf/network_gtnets.c ) +set(NS3_SRC + src/surf/network_ns3.c + src/surf/ns3/ns3_interface.cc + src/surf/ns3/ns3_simulator.cc + ) + set(SURF_SRC src/surf/surf_model.c src/surf/surf_action.c @@ -313,8 +331,6 @@ set(TRACING_SRC 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 @@ -350,7 +366,7 @@ set(RNGSTREAM_SRC src/rngstreams/RngStream.c ) -set(install_HEADERS +set(headers_to_install include/xbt/misc.h include/xbt/sysdep.h include/xbt/virtu.h @@ -370,6 +386,7 @@ set(install_HEADERS include/xbt/graph.h include/xbt/fifo.h include/xbt/swag.h + include/xbt/lib.h include/xbt/matrix.h include/xbt/peer.h include/xbt/config.h @@ -390,11 +407,12 @@ set(install_HEADERS include/simdag/simdag.h include/simdag/datatypes.h include/smpi/smpi.h - ${CMAKE_CURRENT_BINARY_DIR}/include/smpi/smpif.h include/smpi/mpi.h include/smpi/mpif.h + include/smpi/smpi_cocci.h include/surf/surfxml_parse.h include/surf/simgrid_dtd.h + include/surf/surf_routing.h include/gras/datadesc.h include/gras/transport.h include/gras/virtu.h @@ -406,13 +424,16 @@ set(install_HEADERS 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 include/simix/simix.h include/simix/datatypes.h include/simix/context.h ) +set(source_of_generated_headers + include/simgrid_config.h.in + include/smpi/smpif.h.in + src/context_sysv_config.h.in) ### depend of some variables setted upper # -->CONTEXT_THREADS CONTEXT_UCONTEXT @@ -478,6 +499,13 @@ if(HAVE_MC) ) endif(HAVE_MC) +if(HAVE_NS3) + set(simgrid_sources + ${simgrid_sources} + ${NS3_SRC} + ) +endif(HAVE_NS3) + # WINDOWS if(WIN32) set(simgrid_sources @@ -520,13 +548,37 @@ file(GLOB_RECURSE examples_to_install_in_doc "examples/*README" ) +set(WEBSITE_SOURCES + website/contrib.doc + website/FAQ.doc + website/history.doc + website/people.doc + website/publis.doc + website/all.bib + website/Doxyfile_website.in + website/footer.html + website/index.php.in + website/download.php.in + website/documentation.php.in + + tools/doxygen/bibtex2html_table_count.pl + doc/webcruft/fish.gif + doc/webcruft/robots.txt + ) + set(DOC_SOURCES - doc/contrib.doc - doc/FAQ.doc + doc/installSimgrid.doc + doc/bindings.doc + doc/options.doc + doc/use.doc + doc/tracing.doc + doc/gtnets.doc + doc/ns3.doc doc/gtut-howto-design.doc doc/gtut-howto.doc doc/gtut-introduction.doc doc/gtut-main.doc + doc/gtut-tour-00-install.doc doc/gtut-tour-01-bones.doc doc/gtut-tour-02-simple.doc doc/gtut-tour-03-args.doc @@ -545,7 +597,7 @@ set(DOC_SOURCES 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 @@ -555,8 +607,6 @@ set(DOC_SOURCES doc/modules.doc doc/module-surf.doc doc/module-xbt.doc - doc/people.doc - doc/publis.doc doc/gtut-files/01-bones.c doc/gtut-files/01-bones.output @@ -597,7 +647,6 @@ set(DOC_SOURCES 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/triva-graph_configuration.png @@ -607,13 +656,11 @@ set(DOC_SOURCES 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 ) @@ -625,10 +672,6 @@ set(DOC_FIGS ${CMAKE_HOME_DIRECTORY}/doc/fig/gras_comm.fig ) -set(DOC_bib - ${CMAKE_HOME_DIRECTORY}/doc/all.bib -) - file(GLOB_RECURSE add_src_files "teshsuite/*.c" "teshsuite/*.cxx" @@ -660,17 +703,6 @@ set(add_src_files src/simix/smx_context_sysv_private.h ) -file(GLOB_RECURSE include_files -"include/*.h" -"teshsuite/*.h" -"testsuite/*.h" -"tools/*.h" -"examples/*.h" -"examples/*.hpp" -"src/*.h.in" -"include/*.h.in" -) - file(GLOB_RECURSE xml_files "examples/*.xml" "include/*.xml" @@ -694,13 +726,8 @@ set(txt_files "testsuite/surf/trace_A.txt" "testsuite/surf/trace_B.txt" "examples/smpi/hostfile" -"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" @@ -726,6 +753,10 @@ set(txt_files "teshsuite/gras/small_sleep/test_sg_64.tesh" "teshsuite/simdag/platforms/bob.fail" "teshsuite/simdag/platforms/bob.trace" +"teshsuite/simdag/platforms/bob0_availability_file.trace" +"teshsuite/simdag/platforms/bob0_state_file.trace" +"teshsuite/simdag/platforms/bob2_availability_file.trace" +"teshsuite/simdag/platforms/bob2_state_file.trace" "teshsuite/simdag/platforms/link1.bw" "teshsuite/simdag/platforms/link1.fail" "teshsuite/simdag/platforms/link1.lat" @@ -799,14 +830,17 @@ tools/simgrid_update_xml.pl buildtools/Cmake/tesh.pl ) -# This is the complete lise of what will be added to the source archive +# This is the complete list of what will be added to the source archive set(source_to_pack + ${headers_to_install} + ${source_of_generated_headers} ${XBT_RL_SRC} ${EXTRA_DIST} ${SMPI_SRC} ${GRAS_RL_SRC} ${XBT_SRC} ${GTNETS_SRC} + ${NS3_SRC} ${SURF_SRC} ${SIMIX_SRC} ${TRACING_SRC} @@ -820,14 +854,14 @@ set(source_to_pack ${JEDULE_SRC} ${RNGSTREAM_SRC} ${add_src_files} - ${include_files} ${xml_files} ${tesh_files} ${txt_files} ${CMAKE_SOURCE_FILES} ${bin_files} ${DOC_SOURCES} + ${WEBSITE_SOURCES} ${DOC_FIGS} - ${DOC_bib} ${README_files} + buildtools/Cmake/simgrid.nsi.in )