X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/43037dfd252cbfffd2afe9867b2ff0a8c84b3463..de0b4695379832237daa6785278ff42df1db08e1:/tools/cmake/DefinePackages.cmake

diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake
index 6ab51fd392..3041c00cbf 100644
--- a/tools/cmake/DefinePackages.cmake
+++ b/tools/cmake/DefinePackages.cmake
@@ -2,12 +2,15 @@
 
 set(EXTRA_DIST
   src/bindings/java/MANIFEST.in
+  src/bindings/python/simgrid_python.cpp
   src/include/mc/datatypes.h
   src/include/mc/mc.h
   src/include/simgrid/sg_config.hpp
   src/include/surf/surf.hpp
+  src/include/xbt/coverage.h
   src/include/xbt/parmap.hpp
   src/include/xbt/mmalloc.h
+  src/include/catch.hpp
   src/mc/mc_mmu.hpp
   src/mc/mc_record.hpp
   src/msg/msg_private.hpp
@@ -32,6 +35,8 @@ set(EXTRA_DIST
   src/smpi/colls/smpi_mvapich2_selector_stampede.hpp
   src/smpi/include/private.hpp
   src/smpi/include/smpi_utils.hpp
+  src/smpi/smpi_main.c
+  src/smpi/smpi_replay_main.cpp
   src/surf/cpu_cas01.hpp
   src/surf/cpu_interface.hpp
   src/surf/cpu_ti.hpp
@@ -42,9 +47,6 @@ set(EXTRA_DIST
   src/surf/network_smpi.hpp
   src/surf/network_ib.hpp
   src/surf/ns3/ns3_simulator.hpp
-  src/surf/trace_mgr_test.cpp
-  src/mc/sosp/mc_snapshot_test.cpp
-  src/mc/sosp/PageStore_test.cpp
   src/surf/xml/simgrid.dtd
   src/surf/xml/simgrid_dtd.h
   src/surf/xml/simgrid_dtd.c
@@ -63,10 +65,8 @@ set(EXTRA_DIST
   src/xbt/automaton/parserPromela.tab.cacc
   src/xbt/automaton/parserPromela.tab.hacc
   src/xbt/automaton/parserPromela.yacc
-  src/xbt/backtrace_dummy.cpp
-  src/xbt/backtrace_linux.cpp
   src/xbt/dict_private.h
-  src/xbt/log_private.h
+  src/xbt/log_private.hpp
   src/xbt/mallocator_private.h
 
   src/xbt/mmalloc/mfree.c
@@ -87,12 +87,11 @@ set(EXTRA_DIST
   examples/smpi/mc/only_send_deterministic.tesh
   examples/smpi/mc/non_deterministic.tesh
 
-  examples/java/.classpath
-  examples/java/.project
+  examples/deprecated/java/.classpath
+  examples/deprecated/java/.project
   )
 
 set(SMPI_SRC
-  src/smpi/smpi_main.c
   src/smpi/bindings/smpi_mpi.cpp
   src/smpi/bindings/smpi_pmpi.cpp
   src/smpi/bindings/smpi_pmpi_coll.cpp
@@ -278,16 +277,17 @@ set(XBT_SRC
   src/xbt/dynar.cpp
   src/xbt/exception.cpp
   src/xbt/graph.c
-  src/xbt/log.c
+  src/xbt/log.cpp
   src/xbt/mallocator.c
   src/xbt/memory_map.cpp
   src/xbt/memory_map.hpp
+  src/xbt/OsSemaphore.hpp
   src/xbt/parmap.cpp
   src/xbt/snprintf.c
   src/xbt/string.cpp
-  src/xbt/xbt_log_appender_file.c
-  src/xbt/xbt_log_layout_format.c
-  src/xbt/xbt_log_layout_simple.c
+  src/xbt/xbt_log_appender_file.cpp
+  src/xbt/xbt_log_layout_format.cpp
+  src/xbt/xbt_log_layout_simple.cpp
   src/xbt/xbt_main.cpp
   src/xbt/xbt_os_file.cpp
   src/xbt/xbt_os_synchro.cpp
@@ -381,6 +381,10 @@ set(SIMIX_SRC
   src/kernel/context/Context.hpp
   src/kernel/context/ContextRaw.cpp
   src/kernel/context/ContextRaw.hpp
+  src/kernel/context/ContextSwapped.cpp
+  src/kernel/context/ContextSwapped.hpp
+  src/kernel/context/ContextThread.cpp
+  src/kernel/context/ContextThread.hpp
   src/simix/smx_deployment.cpp
   src/simix/smx_environment.cpp
   src/simix/smx_global.cpp
@@ -455,7 +459,6 @@ set(MSG_SRC
   src/msg/msg_gos.cpp
   src/msg/msg_legacy.cpp
   src/msg/msg_process.cpp
-  src/msg/msg_synchro.cpp
   src/msg/msg_task.cpp
   )
 
@@ -692,6 +695,7 @@ set(headers_to_install
   include/simgrid/kernel/future.hpp
   include/simgrid/host.h
   include/simgrid/link.h
+  include/simgrid/semaphore.h
   include/simgrid/storage.h
   include/simgrid/vm.h
   include/simgrid/zone.h
@@ -743,7 +747,6 @@ set(headers_to_install
   include/xbt/asserts.h
   include/xbt/automaton.h
   include/xbt/automaton.hpp
-  include/xbt/backtrace.h
   include/xbt/backtrace.hpp
   include/xbt/base.h
   include/xbt/config.h
@@ -775,32 +778,17 @@ set(headers_to_install
   include/xbt/system_error.hpp
   include/xbt/utility.hpp
   include/xbt/virtu.h
-  include/xbt/xbt_os_thread.h
   include/xbt/xbt_os_time.h
   )
 set(source_of_generated_headers
   include/simgrid/config.h.in
+  src/internal_config.h.in
+  src/simgrid/version.h.in
   include/smpi/mpif.h.in)
 
 ### depend of some variables setted upper
-# -->HAVE_THREAD_CONTEXTS HAVE_UCONTEXT_CONTEXTS
-if(${HAVE_THREAD_CONTEXTS}) #pthread
-  set(SURF_SRC   ${SURF_SRC}   src/kernel/context/ContextThread.cpp
-                               src/kernel/context/ContextThread.hpp )
-else() # NOT pthread
-  set(EXTRA_DIST ${EXTRA_DIST} src/kernel/context/ContextThread.cpp
-                               src/kernel/context/ContextThread.hpp )
-endif()
-
-if(${HAVE_THREAD_CONTEXTS}) #pthread
-  set(SURF_SRC    ${SURF_SRC}   src/xbt/xbt_os_thread.c)
-else() # NOT pthread
-  set(EXTRA_DIST  ${EXTRA_DIST} src/xbt/xbt_os_thread.c
-    )
-endif()
-
 if(${HAVE_UCONTEXT_CONTEXTS}) #ucontext
-  set(SURF_SRC    ${SURF_SRC}   src/kernel/context/ContextUnix.hpp
+  set(SIMIX_SRC    ${SIMIX_SRC} src/kernel/context/ContextUnix.hpp
                                 src/kernel/context/ContextUnix.cpp)
 else() # NOT ucontext
   set(EXTRA_DIST  ${EXTRA_DIST} src/kernel/context/ContextUnix.hpp
@@ -840,16 +828,6 @@ if(SIMGRID_HAVE_NS3)
   set(simgrid_sources  ${simgrid_sources}  ${NS3_SRC})
 endif()
 
-# WINDOWS
-if(WIN32)
-  set(simgrid_sources
-    ${simgrid_sources}
-    src/kernel/context/ContextThread.cpp
-    src/kernel/context/ContextThread.hpp
-    src/xbt/xbt_os_thread.c
-    )
-endif()
-
 if(SIMGRID_HAVE_LUA)
   set(simgrid_sources  ${simgrid_sources}  ${LUA_SRC})
 else()
@@ -865,7 +843,6 @@ set(DOC_SOURCES
   doc/doxygen/deployment.doc
   doc/doxygen/footer.html
   doc/doxygen/header.html
-  doc/doxygen/howtos.doc
   doc/doxygen/index.doc
   doc/doxygen/inside.doc
   doc/doxygen/inside_tests.doc
@@ -907,6 +884,8 @@ set(DOC_SOURCES
   docs/source/img/extlink.png
   docs/source/img/extlink.svg
   docs/source/img/graphical-toc.svg
+  docs/source/img/lang_cpp.png
+  docs/source/img/lang_python.png
   docs/source/img/smpi_simgrid_alltoall_pair_16.png
   docs/source/img/smpi_simgrid_alltoall_ring_16.png
   docs/source/img/zone_hierarchy.png
@@ -920,14 +899,17 @@ set(DOC_SOURCES
   docs/source/index.rst
   docs/source/intro_concepts.rst
   docs/source/introduction.rst
-  docs/source/intro_install.rst
-  docs/source/intro_yours.rst
+  docs/source/Installing_SimGrid.rst
+  docs/source/Start_Your_Own_Project.rst
   docs/source/models.rst
   docs/source/platform.rst
-  docs/source/scenar_config.rst
+  docs/source/platform_examples.rst
+  docs/source/platform_howtos.rst
+  docs/source/platform_reference.rst
+  docs/source/Configuring_SimGrid.rst
   docs/source/scenario.rst
 
-  docs/source/tuto_s4u.rst
+  docs/source/Tutorial_Algorithms.rst
   docs/source/tuto_s4u/deployment1.xml
   docs/source/tuto_s4u/deployment2.xml
   docs/source/tuto_s4u/deployment3.xml
@@ -943,12 +925,12 @@ set(DOC_SOURCES
   docs/source/tuto_s4u/master-workers-lab3.cpp
   docs/source/tuto_s4u/master-workers-lab4.cpp
 
+  docs/source/Tutorial_MPI_Applications.rst
   docs/source/tuto_smpi/3hosts.png
   docs/source/tuto_smpi/3hosts.xml
   docs/source/tuto_smpi/img/big-picture.svg
   docs/source/tuto_smpi/img/lu.S.4.png
   docs/source/tuto_smpi/roundtrip.c
-  docs/source/tuto_smpi.rst
 
   CITATION.bib
   )
@@ -1004,19 +986,19 @@ set(txt_files
 # The list of cmake build directories is constructed from the following list.
 # Add your CMakeLists file here to see your subdir built.
 set(CMAKEFILES_TXT
-  examples/java/CMakeLists.txt
-  examples/msg/CMakeLists.txt
-    examples/msg/mc/CMakeLists.txt
   examples/s4u/CMakeLists.txt
-  examples/simdag/CMakeLists.txt
   examples/smpi/CMakeLists.txt
     examples/smpi/NAS/CMakeLists.txt
     examples/smpi/smpi_msg_masterslave/CMakeLists.txt
     examples/smpi/replay_multiple/CMakeLists.txt
     examples/smpi/replay_multiple_manual_deploy/CMakeLists.txt
-    examples/smpi/load_balancer_replay/CMakeLists.txt
     examples/smpi/energy/f77/CMakeLists.txt
     examples/smpi/energy/f90/CMakeLists.txt
+  examples/python/CMakeLists.txt
+  examples/deprecated/java/CMakeLists.txt
+  examples/deprecated/msg/CMakeLists.txt
+    examples/deprecated/msg/mc/CMakeLists.txt
+  examples/deprecated/simdag/CMakeLists.txt
 
   teshsuite/java/CMakeLists.txt
   teshsuite/mc/CMakeLists.txt
@@ -1073,7 +1055,7 @@ set(CMAKE_SOURCE_FILES
   tools/cmake/CTestCustom.cmake
   tools/cmake/DefinePackages.cmake
   tools/cmake/Distrib.cmake
-  tools/cmake/GCCFlags.cmake
+  tools/cmake/Flags.cmake
   tools/cmake/Documentation.cmake
   tools/cmake/MaintainerMode.cmake
   tools/cmake/Java.cmake
@@ -1090,21 +1072,14 @@ set(CMAKE_SOURCE_FILES
   tools/cmake/Modules/FindRngStream.cmake
   tools/cmake/Modules/FindValgrind.cmake
   tools/cmake/Option.cmake
+  tools/cmake/scripts/fixup_simgrid_dtd_l.pl
   tools/cmake/scripts/my_valgrind.pl
   tools/cmake/scripts/update_tesh.pl
   tools/cmake/UnitTesting.cmake
-  tools/cmake/src/internal_config.h.in
   tools/cmake/test_prog/prog_asan.cpp
-  tools/cmake/test_prog/prog_gnu_dynlinker.c
   tools/cmake/test_prog/prog_makecontext.c
-  tools/cmake/test_prog/prog_mutex_timedlock.c
-  tools/cmake/test_prog/prog_sem_init.c
-  tools/cmake/test_prog/prog_sem_open.c
-  tools/cmake/test_prog/prog_sem_timedwait.c
-  tools/cmake/test_prog/prog_snprintf.c
   tools/cmake/test_prog/prog_stackgrowth.c
   tools/cmake/test_prog/prog_stacksetup.c
-  tools/cmake/test_prog/prog_vsnprintf.c
   tools/cmake/cross-mingw.cmake
   tools/smpi/generate_smpi_defines.pl
   tools/stack-cleaner/as