X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/3ef766de9bcfde2fa7534b57ac68253b461f4988..ad51858fe444dfe10cdf18e9d8e25f7d339164f7:/buildtools/Cmake/DefinePackages.cmake

diff --git a/buildtools/Cmake/DefinePackages.cmake b/buildtools/Cmake/DefinePackages.cmake
index 1c2cc46922..fa800c38ee 100644
--- 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
@@ -82,7 +83,6 @@ set(EXTRA_DIST
 	src/amok/amok_modinter.h
 	src/simix/private.h
 	src/simix/smx_context_private.h
-	src/simix/smx_context_java.h
 	src/smpi/private.h
 	src/smpi/smpi_coll_private.h
 	src/smpi/smpi_mpi_dt_private.h
@@ -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_pmpi.c
 	src/smpi/smpi_f77.c
 	src/smpi/smpi_comm.c
 	src/smpi/smpi_group.c
@@ -113,40 +114,6 @@ set(SMPI_SRC
 	src/smpi/smpi_mpi_dt.c
 )
 
-set(JMSG_C_SRC
-	src/simix/smx_context_java.c
-	src/java/jxbt_utilities.c
-	src/java/jxbt_utilities.h
-	src/java/jmsg.c 
-	src/java/jmsg.h
-	src/java/jmsg_host.c
-	src/java/jmsg_host.h
-	src/java/jmsg_process.c
-	src/java/jmsg_process.h
-	src/java/jmsg_task.c
-	src/java/jmsg_task.h
-	src/java/jmsg_application_handler.c
-	src/java/jmsg_application_handler.h
-)
-
-set(JMSG_JAVA_SRC
-	src/java/simgrid/msg/ApplicationHandler.java
-	src/java/simgrid/msg/Host.java
-	src/java/simgrid/msg/HostFailureException.java	
-	src/java/simgrid/msg/HostNotFoundException.java	
-	src/java/simgrid/msg/JniException.java
-	src/java/simgrid/msg/Msg.java
-	src/java/simgrid/msg/MsgException.java
-	src/java/simgrid/msg/MsgNative.java
-	src/java/simgrid/msg/NativeException.java
-	src/java/simgrid/msg/Process.java
-	src/java/simgrid/msg/ProcessNotFoundException.java
-	src/java/simgrid/msg/Sem.java
-	src/java/simgrid/msg/Task.java
-	src/java/simgrid/msg/TaskCancelledException.java
-	src/java/simgrid/msg/TimeoutException.java
-	src/java/simgrid/msg/TransferFailureException.java	
-)
 
 set(GRAS_RL_SRC
 	src/gras/rl_stubs.c
@@ -196,6 +163,7 @@ set(XBT_SRC
 	src/xbt/cunit.c
 	src/xbt/graphxml_parse.c
 	src/xbt/setset.c
+	src/xbt/threadpool.c
 )
 
 if(HAVE_MMAP)
@@ -229,7 +197,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
@@ -241,12 +208,13 @@ 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_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
@@ -273,6 +241,10 @@ 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
@@ -352,11 +324,11 @@ set(RUBY_SRC
 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
 )
 
@@ -508,21 +480,6 @@ elseif(${HAVE_LUA})
 	)
 endif(${HAVE_LUA})
 
-set(EXTRA_DIST
-	${EXTRA_DIST}
-	${JMSG_JAVA_SRC}
-)
-if(${HAVE_JAVA})
-	set(simgrid_sources
-		${simgrid_sources}
-		${JMSG_C_SRC} # add the binding support to the library
-	)
-else(${HAVE_JAVA})
-	set(EXTRA_DIST
-		${EXTRA_DIST}
-		${JMSG_C_SRC}
-	)
-endif(${HAVE_JAVA})
 
 if(${HAVE_RUBY})
 	set(simgrid_sources
@@ -548,6 +505,7 @@ file(GLOB_RECURSE examples_to_install_in_doc
 "examples/*.lua"
 "examples/*.java"
 "examples/*.xml"
+"examples/*.txt"
 )
 
 file(GLOB_RECURSE README_examples_files
@@ -561,7 +519,7 @@ ${README_examples_files}
 
 set(DOC_SOURCES
 	doc/contrib.doc
-        doc/FAQ.doc
+    doc/FAQ.doc
 	doc/gtut-howto-design.doc
 	doc/gtut-howto.doc
 	doc/gtut-introduction.doc
@@ -587,7 +545,6 @@ set(DOC_SOURCES
 	doc/history.doc
 	doc/index-API.doc
 	doc/index.doc
-	doc/logcategories.doc
 	doc/module-amok.doc
 	doc/module-gras.doc
 	doc/module-msg.doc
@@ -597,13 +554,69 @@ set(DOC_SOURCES
 	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
-	${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
+	${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})
@@ -623,6 +636,7 @@ 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"
@@ -631,7 +645,6 @@ file(GLOB_RECURSE add_src_files
 "tools/*CMakeLists.txt"
 "examples/*.c"
 "examples/*.cxx"
-"examples/*.java"
 "examples/*.lua"
 "examples/*.rb"
 "examples/*CMakeLists.txt"
@@ -685,8 +698,16 @@ 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"
 "teshsuite/gras/datadesc/datadesc.little64"
 "teshsuite/gras/datadesc/datadesc.big32_8"
@@ -737,10 +758,6 @@ file(GLOB_RECURSE txt_files
 "examples/gras/pmm/test_sg_64"
 "examples/gras/synchro/test_sg_64"
 "examples/gras/properties/test_sg"
-"examples/java/basic/BasicTest"
-"examples/java/ping_pong/PingPongTest"
-"examples/java/comm_time/CommTimeTest"
-"examples/java/suspend/SuspendTest"
 )
 
 set(txt_files
@@ -780,8 +797,6 @@ set(source_to_pack
 	${XBT_RL_SRC}
 	${EXTRA_DIST}
 	${SMPI_SRC}
-	${JMSG_C_SRC}
-	${JMSG_JAVA_SRC}
 	${GRAS_RL_SRC}
 	${XBT_SRC}
 	${GTNETS_SRC}