X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/212ba1c7e2879dd2e1073ad93f98e590c228352b..dd3b2144ace8296855c0b65efd79e325a57672f8:/tools/cmake/DefinePackages.cmake diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake index 32051f7388..7d2d45f2a5 100644 --- a/tools/cmake/DefinePackages.cmake +++ b/tools/cmake/DefinePackages.cmake @@ -1,14 +1,13 @@ ### define source packages set(EXTRA_DIST - src/bindings/java/MANIFEST.MF.in + src/bindings/java/MANIFEST.in src/include/instr/instr_interface.h src/include/mc/datatypes.h src/include/mc/mc.h src/mc/mc_mmu.h src/mc/PageStore.hpp src/mc/mc_record.h - src/include/simgrid/platf_interface.h src/include/simgrid/sg_config.h src/include/smpi/smpi_interface.h src/include/surf/datatypes.h @@ -60,10 +59,11 @@ set(EXTRA_DIST src/surf/ns3/ns3_interface.h src/surf/ns3/ns3_simulator.h src/surf/ns3/red-queue.h - src/surf/platform.hpp src/surf/plugins/energy.hpp - src/surf/simgrid.dtd - src/surf/simgrid_dtd.c + src/surf/xml/simgrid.dtd + src/surf/xml/simgrid_dtd.h + src/surf/xml/simgrid_dtd.c + src/surf/xml/surfxml_sax_cb.cpp src/surf/storage_interface.hpp src/surf/storage_n11.hpp src/surf/surf_interface.hpp @@ -75,11 +75,10 @@ set(EXTRA_DIST src/surf/surf_routing_dijkstra.hpp src/surf/surf_routing_floyd.hpp src/surf/surf_routing_full.hpp - src/surf/surf_routing_generic.hpp + src/surf/surf_routing_RoutedGraph.hpp src/surf/surf_routing_none.hpp src/surf/surf_routing_private.hpp src/surf/surf_routing_vivaldi.hpp - src/surf/surfxml_parse.cpp src/surf/vm_hl13.hpp src/surf/PropertyHolder.hpp src/surf/virtual_machine.hpp @@ -114,7 +113,6 @@ set(EXTRA_DIST src/xbt/mmalloc/mmalloc.texi src/xbt/mmalloc/mmorecore.c src/xbt/mmalloc/mmprivate.h - src/xbt/mmalloc/mmtrace.awk src/xbt/mmalloc/mrealloc.c src/xbt/probes.h src/xbt/win32_ucontext.c @@ -334,11 +332,13 @@ set(SURF_SRC src/surf/surf_routing_dijkstra.cpp src/surf/surf_routing_floyd.cpp src/surf/surf_routing_full.cpp - src/surf/surf_routing_generic.cpp + src/surf/surf_routing_RoutedGraph.cpp src/surf/surf_routing_none.cpp src/surf/surf_routing_vivaldi.cpp - src/surf/surfxml_parse.cpp - src/surf/surfxml_parseplatf.cpp + src/surf/xml/platf.hpp + src/surf/xml/platf_private.hpp + src/surf/xml/surfxml_sax_cb.cpp + src/surf/xml/surfxml_parseplatf.cpp src/surf/trace_mgr.hpp src/surf/trace_mgr.cpp src/surf/vm_hl13.cpp @@ -521,7 +521,6 @@ list(APPEND JMSG_C_SRC ${JTRACE_C_SRC}) list(APPEND JMSG_JAVA_SRC ${JTRACE_JAVA_SRC}) set(LUA_SRC - src/bindings/lua/factories/host.lua src/bindings/lua/lua_host.cpp src/bindings/lua/lua_platf.cpp src/bindings/lua/lua_debug.cpp @@ -655,7 +654,6 @@ set(headers_to_install include/simgrid/datatypes.h include/simgrid/modelchecker.h include/simgrid/forward.h - include/simgrid/platf.h include/simgrid/simix.h include/simgrid/simix.hpp include/simgrid/host.h @@ -674,9 +672,7 @@ set(headers_to_install include/smpi/mpi.h include/smpi/smpi.h include/smpi/smpi_main.h - include/surf/simgrid_dtd.h include/surf/surf_routing.h - include/surf/surfxml_parse.h include/xbt.h include/xbt/RngStream.h include/xbt/asserts.h @@ -765,12 +761,14 @@ endif() ### Simgrid Lib sources set(simgrid_sources ${BINDINGS_SRC} - ${S4U_SRC} + ${MC_SRC_BASE} ${MSG_SRC} + ${S4U_SRC} ${SIMDAG_SRC} ${SIMGRID_SRC} ${SIMIX_SRC} ${SURF_SRC} + ${TRACING_SRC} ${XBT_SRC} ) @@ -793,16 +791,6 @@ if(enable_smpi) ) endif() -set(simgrid_sources - ${simgrid_sources} - ${TRACING_SRC} - ) - -set(simgrid_sources - ${simgrid_sources} - ${MC_SRC_BASE} - ) - if(HAVE_MC) set(simgrid_sources ${simgrid_sources} @@ -857,10 +845,6 @@ set(DOC_SOURCES doc/triva-time_interval.png doc/triva-time_interval.svg - doc/HelloWorld/CMakeLists.txt - doc/HelloWorld/HelloWorld.c - doc/HelloWorld/README - doc/doxygen/FAQ.doc doc/doxygen/advanced.doc doc/doxygen/bindings.doc @@ -929,7 +913,6 @@ set(DOC_TOOLS # these files get copied automatically to the html documentation set(DOC_IMG - ${CMAKE_HOME_DIRECTORY}/doc/simgrid.css ${CMAKE_HOME_DIRECTORY}/doc/sc3-description.png ${CMAKE_HOME_DIRECTORY}/doc/webcruft/AS_hierarchy.png ${CMAKE_HOME_DIRECTORY}/doc/webcruft/Paje_MSG_screenshot.jpg @@ -975,7 +958,6 @@ set(txt_files LICENSE-LGPL-2.1 NEWS TODO - configure ) set(EXAMPLES_CMAKEFILES_TXT @@ -1034,10 +1016,6 @@ set(EXAMPLES_CMAKEFILES_TXT examples/s4u/CMakeLists.txt examples/s4u/basic/CMakeLists.txt examples/s4u/io/CMakeLists.txt - examples/scala/CMakeLists.txt - examples/scala/master_slave_bypass/CMakeLists.txt - examples/scala/master_slave_kill/CMakeLists.txt - examples/scala/masterslave/CMakeLists.txt examples/simdag/CMakeLists.txt examples/simdag/dax/CMakeLists.txt examples/simdag/dot/CMakeLists.txt @@ -1057,7 +1035,6 @@ set(EXAMPLES_CMAKEFILES_TXT set(TESHSUITE_CMAKEFILES_TXT teshsuite/bug-17132/CMakeLists.txt - teshsuite/java/CMakeLists.txt teshsuite/java/semaphore/CMakeLists.txt teshsuite/java/sleep_host_off/CMakeLists.txt teshsuite/lua/lua_platforms.tesh @@ -1065,7 +1042,6 @@ set(TESHSUITE_CMAKEFILES_TXT teshsuite/mc/dwarf/CMakeLists.txt teshsuite/mc/dwarf_expression/CMakeLists.txt teshsuite/mc/replay/CMakeLists.txt - teshsuite/msg/CMakeLists.txt teshsuite/msg/get_sender/CMakeLists.txt teshsuite/msg/host_on_off/CMakeLists.txt teshsuite/msg/host_on_off_processes/CMakeLists.txt @@ -1133,7 +1109,6 @@ set(TESHSUITE_CMAKEFILES_TXT teshsuite/smpi/mpich3-test/topo/CMakeLists.txt teshsuite/smpi/mpich3-test/rma/CMakeLists.txt teshsuite/smpi/mpich3-test/perf/CMakeLists.txt - teshsuite/surf/CMakeLists.txt teshsuite/surf/lmm_usage/CMakeLists.txt teshsuite/surf/maxmin_bench/CMakeLists.txt teshsuite/surf/surf_usage/CMakeLists.txt @@ -1178,7 +1153,6 @@ set(CMAKE_SOURCE_FILES tools/cmake/Modules/FindNS3.cmake tools/cmake/Modules/FindRngStream.cmake tools/cmake/Modules/FindRubySimgrid.cmake - tools/cmake/Modules/FindScala.cmake tools/cmake/Modules/FindSimGrid.cmake tools/cmake/Modules/FindValgrind.cmake tools/cmake/Option.cmake @@ -1191,12 +1165,8 @@ set(CMAKE_SOURCE_FILES tools/cmake/scripts/IPC/Run/Win32IO.pm tools/cmake/scripts/IPC/Run/Win32Pump.pm tools/cmake/scripts/Diff.pm - tools/cmake/scripts/Makefile.default - tools/cmake/scripts/SimGrid.packproj tools/cmake/scripts/generate_memcheck_tests.pl tools/cmake/scripts/my_valgrind.pl - tools/cmake/scripts/postinstall.sh - tools/cmake/scripts/preinstall.sh tools/cmake/scripts/update_tesh.pl tools/cmake/UnitTesting.cmake tools/cmake/src/internal_config.h.in @@ -1244,8 +1214,6 @@ set(PLATFORMS_EXAMPLES examples/platforms/energy_platform.xml examples/platforms/fat_tree_cluster.xml examples/platforms/g5k.xml - examples/platforms/generation_scripts/create_hierarchical_clusters.pl - examples/platforms/generation_scripts/enhancedDTDwithHierarchicalCluster.pl examples/platforms/griffon.xml examples/platforms/meta_cluster.xml examples/platforms/multicore_machine.xml