X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b91d8031bb392545546a25d9792f1ac68de5ecce..6f54f95c01d108028c7c75dbf64c8fd507c723a0:/buildtools/Cmake/DefinePackages.cmake

diff --git a/buildtools/Cmake/DefinePackages.cmake b/buildtools/Cmake/DefinePackages.cmake
old mode 100755
new mode 100644
index 4d3eb88a2b..e61b383588
--- a/buildtools/Cmake/DefinePackages.cmake
+++ b/buildtools/Cmake/DefinePackages.cmake
@@ -17,6 +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/mmalloc/attach.c
 	src/xbt/mmalloc/detach.c	
 	src/xbt/mmalloc/keys.c
@@ -87,7 +88,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 +106,8 @@ set(SMPI_SRC
 	src/smpi/smpi_bench.c
 	src/smpi/smpi_global.c
 	src/smpi/smpi_mpi.c
+	src/smpi/smpi_pmpi.c
+	src/smpi/smpi_f77.c
 	src/smpi/smpi_comm.c
 	src/smpi/smpi_group.c
 	src/smpi/smpi_util.c
@@ -195,6 +198,7 @@ set(XBT_SRC
 	src/xbt/cunit.c
 	src/xbt/graphxml_parse.c
 	src/xbt/setset.c
+	src/xbt/threadpool.c
 )
 
 if(HAVE_MMAP)
@@ -228,7 +232,6 @@ set(SURF_SRC
 	src/surf/network_vivaldi.c
 	src/surf/network_constant.c
 	src/surf/workstation.c
-	src/surf/surf_model_timer.c
 	src/surf/workstation_ptask_L07.c
 	src/surf/cpu_ti.c
 	src/surf/cpu_im.c
@@ -242,10 +245,11 @@ set(SIMIX_SRC
 	src/simix/smx_host.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
+	src/simix/smx_user.c
+	src/simix/smx_smurf.c
 )
 
 set(MSG_SRC
@@ -268,13 +272,15 @@ set(SIMDAG_SRC
 	src/simdag/sd_workstation.c
 	src/simdag/sd_daxloader.c
 )
-if(HAVE_CGRAPH_H)
-	set(SIMDAG_SRC
-		${SIMDAG_SRC}
-		src/simdag/sd_dotloader.c
+if(HAVE_GRAPHVIZ)
+	set(SIMDAG_SRC 
+	    ${SIMDAG_SRC} src/simdag/sd_dotloader.c
 	)
-
-endif(HAVE_CGRAPH_H)
+else(HAVE_GRAPHVIZ)
+	set(EXTRA_DIST
+	    ${EXTRA_DIST} src/simdag/sd_dotloader.c
+	)
+endif(HAVE_GRAPHVIZ)
 
 set(GRAS_COMMON_SRC
 	src/gras/gras.c
@@ -319,12 +325,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
@@ -334,117 +342,93 @@ set(TRACING_SRC
 	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
 	src/mc/mc_memory.c
 	src/mc/mc_checkpoint.c
+	src/mc/mc_state.c
 	src/mc/memory_map.c
 	src/mc/mc_global.c
-	src/mc/mc_dfs.c
 	src/mc/mc_dpor.c
-	src/mc/mc_transition.c
+	src/mc/mc_request.c
 	src/mc/private.h
 )
 
 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/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
@@ -454,17 +438,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)
@@ -479,10 +473,6 @@ else(HAVE_GTNETS)
 	)
 endif(HAVE_GTNETS)
 
-set(EXTRA_DIST
-	${EXTRA_DIST}
-	${JMSG_JAVA_SRC}
-)
 
 ### Simgrid Lib sources
 set(simgrid_sources
@@ -525,6 +515,10 @@ elseif(${HAVE_LUA})
 	)
 endif(${HAVE_LUA})
 
+set(EXTRA_DIST
+	${EXTRA_DIST}
+	${JMSG_JAVA_SRC}
+)
 if(${HAVE_JAVA})
 	set(simgrid_sources
 		${simgrid_sources}
@@ -534,7 +528,6 @@ else(${HAVE_JAVA})
 	set(EXTRA_DIST
 		${EXTRA_DIST}
 		${JMSG_C_SRC}
-		${MSG_SRC}
 	)
 endif(${HAVE_JAVA})
 
@@ -562,6 +555,118 @@ 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/gtut-files/01-bones.c
+	doc/gtut-files/01-bones.output
+	doc/gtut-files/02-simple.c
+	doc/gtut-files/02-simple.output
+	doc/gtut-files/03-args.c
+	doc/gtut-files/03-args.output
+	doc/gtut-files/03-args.xml
+	doc/gtut-files/04-callback.c
+	doc/gtut-files/04-callback.output
+	doc/gtut-files/05-globals.c
+	doc/gtut-files/05-globals.output
+	doc/gtut-files/06-logs.c
+	doc/gtut-files/06-logs.output
+	doc/gtut-files/06-logs.output.error
+	doc/gtut-files/06-logs.output.fmt
+	doc/gtut-files/06-logs.output.fmt-bt
+	doc/gtut-files/06-logs.output.verbose
+	doc/gtut-files/07-timers.c
+	doc/gtut-files/07-timers.output
+	doc/gtut-files/08-exceptions.c
+	doc/gtut-files/08-exceptions.output
+	doc/gtut-files/09-datatype-dump.c
+	doc/gtut-files/09-simpledata.c
+	doc/gtut-files/09-simpledata.output
+	doc/gtut-files/10-rpc.c
+	doc/gtut-files/10-rpc.output
+	doc/gtut-files/11-explicitwait.c
+	doc/gtut-files/11-explicitwait.output
+	doc/gtut-files/11-explicitwait.xml
+	doc/gtut-files/gtut-platform-3nodes.xml
+	doc/gtut-files/gtut-platform.xml
+	doc/gtut-files/Makefile
+	doc/gtut-files/README
+	doc/gtut-files/test.xml
+	
+	doc/webcruft/awstats_logo3.png
+	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/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
+)
+
+set(DOC_FIGS
+	${CMAKE_HOME_DIRECTORY}/doc/fig/simgrid_modules.fig
+	${CMAKE_HOME_DIRECTORY}/doc/fig/simgrid_modules2.fig
+	${CMAKE_HOME_DIRECTORY}/doc/fig/amok_bw_test.fig
+	${CMAKE_HOME_DIRECTORY}/doc/fig/amok_bw_sat.fig
+	${CMAKE_HOME_DIRECTORY}/doc/fig/gras_comm.fig
 )
 
 foreach(file ${examples_to_install_in_doc})
@@ -581,38 +686,33 @@ 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"
-"*CMakeLists.txt"
+"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
-	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
 )
 
 file(GLOB_RECURSE include_files
@@ -649,6 +749,15 @@ file(GLOB_RECURSE txt_files
 "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"
@@ -706,20 +815,23 @@ file(GLOB_RECURSE txt_files
 "examples/java/comm_time/CommTimeTest"
 "examples/java/suspend/SuspendTest"
 )
+
 set(txt_files
 	${txt_files}
 	AUTHORS
 	ChangeLog
 	COPYING
-	missing
+	LICENSE-LGPL-2.1
 	NEWS
-	README
-	README.IEEE
 	TODO
-	examples/lua/README
-	examples/ruby/README
 )
 
+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"
@@ -732,10 +844,8 @@ file(GLOB_RECURSE CMAKE_SOURCE_FILES
 
 set(bin_files
 tools/MSG_visualization/colorize.pl
-)
-
-file(GLOB_RECURSE doc_files
-"doc/html/*"
+tools/sg_unit_extractor.pl
+tools/simgrid_update_xml.pl
 )
 
 # This is the complete lise of what will be added to the source archive
@@ -764,9 +874,10 @@ set(source_to_pack
 	${xml_files}
 	${tesh_files}
 	${txt_files}
-	${TEST_CFILES}
 	${EXTRA_DIST}
 	${CMAKE_SOURCE_FILES}
 	${bin_files}
-	${doc_files}
+	${DOC_SOURCES}
+	${DOC_FIGS}
+	${README_files}
 )