X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b6ec60a26d8c59cfb51b74d6bc1b9fb85b0ac0c4..95f6b03528220e3c0063859e19d79906c7c2c881:/buildtools/Cmake/DefinePackages.cmake diff --git a/buildtools/Cmake/DefinePackages.cmake b/buildtools/Cmake/DefinePackages.cmake index 8375a45ac3..b3b8e898d1 100644 --- a/buildtools/Cmake/DefinePackages.cmake +++ b/buildtools/Cmake/DefinePackages.cmake @@ -8,7 +8,6 @@ set(EXTRA_DIST src/xbt/fifo_private.h src/xbt/graph_private.h src/xbt/graphxml_parse.c - src/xbt/graphxml.l src/xbt/graphxml.c src/xbt/graphxml.dtd src/xbt/log_private.h @@ -40,7 +39,6 @@ set(EXTRA_DIST src/surf/trace_mgr_private.h src/surf/surf_private.h src/surf/surfxml_parse.c - src/surf/simgrid_dtd.l src/surf/simgrid_dtd.c src/surf/simgrid.dtd src/surf/network_private.h @@ -56,6 +54,7 @@ set(EXTRA_DIST src/include/surf/trace_mgr.h src/include/surf/surf.h src/include/surf/surfxml_parse_private.h + src/include/surf/surfxml_parse_values.h src/include/surf/random_mgr.h src/include/surf/surf_resource_lmm.h src/include/xbt/wine_dbghelp.h @@ -68,7 +67,6 @@ set(EXTRA_DIST src/msg/mailbox.h src/simdag/private.h src/simdag/dax.dtd - src/simdag/dax_dtd.l src/simdag/dax_dtd.h src/simdag/dax_dtd.c src/gras/DataDesc/ddt_parse.yy.l @@ -90,7 +88,20 @@ set(EXTRA_DIST src/smpi/private.h 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 + src/surf/ns3/my-point-to-point-helper.h + src/surf/ns3/red-queue.h ) set(XBT_RL_SRC @@ -188,8 +199,10 @@ set(NS3_SRC src/surf/network_ns3.c src/surf/ns3/ns3_interface.cc src/surf/ns3/ns3_simulator.cc - ) - + src/surf/ns3/red-queue.cc + src/surf/ns3/my-point-to-point-helper.cc +) + set(SURF_SRC src/surf/surf_model.c src/surf/surf_action.c @@ -309,6 +322,8 @@ set(LUA_SRC src/bindings/lua/simgrid_lua.c src/bindings/lua/lua_stub_generator.c src/bindings/lua/lua_console.c + src/bindings/lua/lua_utils.c + src/bindings/lua/lua_state_cloner.c ) set(TRACING_SRC @@ -319,8 +334,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 @@ -356,7 +369,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 @@ -376,6 +389,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 @@ -398,6 +412,7 @@ set(install_HEADERS include/smpi/smpi.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 @@ -418,10 +433,10 @@ set(install_HEADERS include/simix/datatypes.h include/simix/context.h ) -set(GENERATE_HEADERS - ${CMAKE_CURRENT_BINARY_DIR}/include/smpi/smpif.h - ${CMAKE_CURRENT_BINARY_DIR}/include/simgrid_config.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 @@ -536,9 +551,15 @@ file(GLOB_RECURSE examples_to_install_in_doc "examples/*README" ) + + 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/pls.doc doc/gtut-howto-design.doc doc/gtut-howto.doc doc/gtut-introduction.doc @@ -562,7 +583,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 @@ -572,8 +593,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 @@ -614,10 +633,8 @@ 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/webcruft/fish.gif doc/triva-graph_configuration.png doc/triva-graph_visualization.png doc/simgrid.css @@ -625,13 +642,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 ) @@ -643,10 +658,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" @@ -678,17 +689,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" @@ -818,13 +818,15 @@ buildtools/Cmake/tesh.pl # This is the complete list of what will be added to the source archive set(source_to_pack - ${install_HEADERS} + ${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} @@ -838,7 +840,6 @@ set(source_to_pack ${JEDULE_SRC} ${RNGSTREAM_SRC} ${add_src_files} - ${include_files} ${xml_files} ${tesh_files} ${txt_files} @@ -846,6 +847,6 @@ set(source_to_pack ${bin_files} ${DOC_SOURCES} ${DOC_FIGS} - ${DOC_bib} ${README_files} + buildtools/Cmake/simgrid.nsi.in )