X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/41979235d361aa38c8ce15449cb719191c9f0fd6..513baa2ee64b3db9b8697c61123715e6892afb4e:/buildtools/Cmake/DefinePackages.cmake

diff --git a/buildtools/Cmake/DefinePackages.cmake b/buildtools/Cmake/DefinePackages.cmake
index 4cc6409ab5..02bff444e6 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
@@ -49,12 +47,14 @@ set(EXTRA_DIST
 	src/surf/gtnets/gtnets_simulator.h
 	src/surf/gtnets/gtnets_topology.h
 	src/surf/cpu_ti_private.h
+	src/surf/surf_routing_private.h
 	src/include/surf/surf_resource.h
 	src/include/surf/datatypes.h
 	src/include/surf/maxmin.h
 	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
@@ -67,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
@@ -89,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 
@@ -140,7 +152,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
@@ -167,6 +178,7 @@ set(XBT_SRC
 	src/xbt/setset.c
 	src/xbt/parmap.c
 	src/xbt/xbt_replay_trace_reader.c
+	src/xbt/lib.c
 )
 
 if(HAVE_MMAP)
@@ -183,10 +195,23 @@ 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
+	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
 	src/surf/surf_routing.c
+	src/surf/surf_routing_full.c
+	src/surf/surf_routing_floyd.c
+	src/surf/surf_routing_rulebased.c
+	src/surf/surf_routing_dijkstra.c
+	src/surf/surf_routing_none.c
 	src/surf/surf_config.c
 	src/surf/maxmin.c
 	src/surf/fair_bottleneck.c
@@ -195,6 +220,7 @@ set(SURF_SRC
 	src/surf/random_mgr.c
 	src/surf/surf.c
 	src/surf/surfxml_parse.c
+	src/surf/surfxml_parseplatf.c
 	src/surf/cpu.c
 	src/surf/network.c
 	src/surf/network_im.c
@@ -297,6 +323,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
@@ -307,8 +335,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
@@ -328,14 +354,6 @@ set(JEDULE_SRC
 	src/instr/jedule/jedule_sd_binding.c
 )
 
-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
-)
-
 set(MC_SRC
 	src/mc/mc_memory.c
 	src/mc/mc_checkpoint.c
@@ -348,10 +366,11 @@ set(MC_SRC
 )
 
 set(RNGSTREAM_SRC
+	src/rngstreams/RngStream.h
 	src/rngstreams/RngStream.c
 )
 
-set(install_HEADERS
+set(headers_to_install
 	include/xbt/misc.h
 	include/xbt/sysdep.h
 	include/xbt/virtu.h
@@ -371,6 +390,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
@@ -391,11 +411,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
@@ -407,40 +428,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
 )
-
-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)
+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
@@ -483,7 +480,6 @@ else(HAVE_GTNETS)
 	)
 endif(HAVE_GTNETS)
 
-
 ### Simgrid Lib sources
 set(simgrid_sources
 	${XBT_SRC}
@@ -507,6 +503,23 @@ 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
+		${simgrid_sources}
+		src/xbt/win32_ucontext.c
+		src/xbt/xbt_os_thread.c
+		src/simix/smx_context_thread.c
+		)
+endif(WIN32)
+
 ### Gras Lib sources
 set(gras_sources
 	${XBT_SRC}
@@ -527,21 +540,6 @@ elseif(${HAVE_LUA})
 	)
 endif(${HAVE_LUA})
 
-
-if(${HAVE_RUBY})
-	set(simgrid_sources
-		${simgrid_sources}
-		${RUBY_SRC}
-		src/bindings/ruby/simgrid_ruby.c
-	)
-else(${HAVE_RUBY})
-	set(EXTRA_DIST
-		${EXTRA_DIST}
-		${RUBY_SRC}
-		src/bindings/ruby/simgrid_ruby.c
-	)
-endif(${HAVE_RUBY})
-
 file(GLOB_RECURSE examples_to_install_in_doc
 "examples/*.c"
 "examples/*.h"
@@ -554,13 +552,20 @@ 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
 	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
@@ -579,8 +584,8 @@ 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-API.doc
 	doc/index.doc
 	doc/module-amok.doc
 	doc/module-gras.doc
@@ -589,8 +594,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
@@ -631,20 +634,20 @@ 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
+	doc/triva-graph_visualization.png
+	doc/simgrid.css
 	
 	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
 )
 
@@ -687,17 +690,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"
@@ -721,13 +713,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"
@@ -744,50 +731,54 @@ set(txt_files
 "teshsuite/gras/datadesc/datadesc.little64"
 "teshsuite/gras/datadesc/datadesc.big32_8_4"
 "teshsuite/gras/datadesc/mk_datadesc_structs.pl"
-"teshsuite/gras/msg_handle/test_rl"
-"teshsuite/gras/msg_handle/test_sg_32"
-"teshsuite/gras/msg_handle/test_sg_64"
-"teshsuite/gras/empty_main/test_rl"
-"teshsuite/gras/empty_main/test_sg"
-"teshsuite/gras/small_sleep/test_sg_32"
-"teshsuite/gras/small_sleep/test_sg_64"
+"teshsuite/gras/msg_handle/test_rl.tesh"
+"teshsuite/gras/msg_handle/test_sg_32.tesh"
+"teshsuite/gras/msg_handle/test_sg_64.tesh"
+"teshsuite/gras/empty_main/test_rl.tesh"
+"teshsuite/gras/empty_main/test_sg.tesh"
+"teshsuite/gras/small_sleep/test_sg_32.tesh"
+"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"
-"examples/gras/ping/test_rl"
-"examples/gras/rpc/test_rl"
-"examples/gras/spawn/test_rl"
-"examples/gras/timer/test_rl"
-"examples/gras/chrono/test_rl"
-"examples/gras/mutual_exclusion/simple_token/test_rl"
-"examples/gras/mmrpc/test_rl"
-"examples/gras/all2all/test_rl"
-"examples/gras/pmm/test_rl"
-"examples/gras/synchro/test_rl"
-"examples/gras/properties/test_rl"
-"examples/gras/ping/test_sg_32"
-"examples/gras/rpc/test_sg_32"
-"examples/gras/spawn/test_sg_32"
-"examples/gras/timer/test_sg_32"
-"examples/gras/chrono/test_sg_32"
-"examples/gras/mutual_exclusion/simple_token/test_sg_32"
-"examples/gras/mmrpc/test_sg_32"
-"examples/gras/all2all/test_sg_32"
-"examples/gras/pmm/test_sg_32"
-"examples/gras/synchro/test_sg_32"
-"examples/gras/ping/test_sg_64"
-"examples/gras/rpc/test_sg_64"
-"examples/gras/spawn/test_sg_64"
-"examples/gras/timer/test_sg_64"
-"examples/gras/chrono/test_sg_64"
-"examples/gras/mutual_exclusion/simple_token/test_sg_64"
-"examples/gras/mmrpc/test_sg_64"
-"examples/gras/all2all/test_sg_64"
-"examples/gras/pmm/test_sg_64"
-"examples/gras/synchro/test_sg_64"
-"examples/gras/properties/test_sg"
+"examples/gras/ping/test_rl.tesh"
+"examples/gras/rpc/test_rl.tesh"
+"examples/gras/spawn/test_rl.tesh"
+"examples/gras/timer/test_rl.tesh"
+"examples/gras/chrono/test_rl.tesh"
+"examples/gras/mutual_exclusion/simple_token/test_rl.tesh"
+"examples/gras/mmrpc/test_rl.tesh"
+"examples/gras/all2all/test_rl.tesh"
+"examples/gras/pmm/test_rl.tesh"
+"examples/gras/synchro/test_rl.tesh"
+"examples/gras/properties/test_rl.tesh"
+"examples/gras/ping/test_sg_32.tesh"
+"examples/gras/rpc/test_sg_32.tesh"
+"examples/gras/spawn/test_sg_32.tesh"
+"examples/gras/timer/test_sg_32.tesh"
+"examples/gras/chrono/test_sg_32.tesh"
+"examples/gras/mutual_exclusion/simple_token/test_sg_32.tesh"
+"examples/gras/mmrpc/test_sg_32.tesh"
+"examples/gras/all2all/test_sg_32.tesh"
+"examples/gras/pmm/test_sg_32.tesh"
+"examples/gras/synchro/test_sg_32.tesh"
+"examples/gras/ping/test_sg_64.tesh"
+"examples/gras/rpc/test_sg_64.tesh"
+"examples/gras/spawn/test_sg_64.tesh"
+"examples/gras/timer/test_sg_64.tesh"
+"examples/gras/chrono/test_sg_64.tesh"
+"examples/gras/mutual_exclusion/simple_token/test_sg_64.tesh"
+"examples/gras/mmrpc/test_sg_64.tesh"
+"examples/gras/all2all/test_sg_64.tesh"
+"examples/gras/pmm/test_sg_64.tesh"
+"examples/gras/synchro/test_sg_64.tesh"
+"examples/gras/properties/test_sg.tesh"
 )
 
 set(txt_files
@@ -809,6 +800,7 @@ file(GLOB_RECURSE README_files
 string(REPLACE "${CMAKE_HOME_DIRECTORY}/" "" README_files "${README_files}")
 
 file(GLOB_RECURSE CMAKE_SOURCE_FILES
+"buildtools/Cmake/Makefile.default"
 "buildtools/Cmake/test_java.sh"
 "buildtools/Cmake/*.cmake"
 "buildtools/Cmake/*.h.in"
@@ -825,14 +817,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}
@@ -842,17 +837,17 @@ set(source_to_pack
 	${GRAS_SG_SRC}
 	${AMOK_SRC}
 	${LUA_SRC}
-	${RUBY_SRC}
 	${MC_SRC}
+	${JEDULE_SRC}
+	${RNGSTREAM_SRC}
 	${add_src_files}
-	${include_files}
 	${xml_files}
 	${tesh_files}
 	${txt_files}
-	${EXTRA_DIST}
 	${CMAKE_SOURCE_FILES}
 	${bin_files}
 	${DOC_SOURCES}
 	${DOC_FIGS}
 	${README_files}
+	buildtools/Cmake/simgrid.nsi.in 
 )