X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/8d5eb75ca43a7d072ab9d0ef84a0b409139321ba..50ab57b5725333f64387b16d45db219d1b9fcf44:/tools/cmake/DefinePackages.cmake

diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake
index a28a827bf2..af8542cded 100644
--- a/tools/cmake/DefinePackages.cmake
+++ b/tools/cmake/DefinePackages.cmake
@@ -26,7 +26,7 @@ set(EXTRA_DIST
   src/simdag/dax.dtd
   src/simdag/dax_dtd.c
   src/simdag/dax_dtd.h
-  src/simdag/private.h
+  src/simdag/simdag_private.h
   src/simix/simcalls.in
   src/simix/simcalls.py
   src/simix/popping_private.h
@@ -63,6 +63,7 @@ set(EXTRA_DIST
   src/surf/ns3/ns3_simulator.h
   src/surf/ns3/red-queue.h
   src/surf/platf_generator_private.h
+  src/surf/platform.hpp
   src/surf/plugins/energy.hpp
   src/surf/simgrid.dtd
   src/surf/simgrid_dtd.c
@@ -84,6 +85,7 @@ set(EXTRA_DIST
   src/surf/surfxml_parse.c
   src/surf/trace_mgr_private.h
   src/surf/vm_hl13.hpp
+  src/surf/PropertyHolder.hpp
   src/surf/virtual_machine.hpp
   src/surf/host_clm03.hpp
   src/surf/host_interface.hpp
@@ -272,6 +274,7 @@ set(XBT_SRC
   src/xbt/parmap.cpp
   src/xbt/set.c
   src/xbt/snprintf.c
+  src/xbt/string.cpp
   src/xbt/swag.c
   src/xbt/xbt_log_appender_file.c
   src/xbt/xbt_log_layout_format.c
@@ -325,6 +328,7 @@ set(SURF_SRC
   src/surf/network_ib.cpp
   src/surf/platf_generator.c
   src/surf/plugins/energy.cpp
+  src/surf/PropertyHolder.cpp
   src/surf/random_mgr.c
   src/surf/sg_platf.cpp
   src/surf/storage_interface.cpp
@@ -415,120 +419,76 @@ set(SIMGRID_SRC
   )
 
 set(MSG_SRC
-  src/msg/instr_msg_process.c
-  src/msg/instr_msg_task.c
-  src/msg/instr_msg_vm.c
-  src/msg/msg_actions.c
-  src/msg/msg_deployment.c
-  src/msg/msg_environment.c
-  src/msg/msg_global.c
-  src/msg/msg_gos.c
-  src/msg/msg_host.c
-  src/msg/msg_io.c
-  src/msg/msg_mailbox.c
-  src/msg/msg_process.c
-  src/msg/msg_synchro.c
-  src/msg/msg_task.c
-  src/msg/msg_vm.c
+  src/msg/instr_msg_process.cpp
+  src/msg/instr_msg_task.cpp
+  src/msg/instr_msg_vm.cpp
+  src/msg/msg_actions.cpp
+  src/msg/msg_deployment.cpp
+  src/msg/msg_environment.cpp
+  src/msg/msg_global.cpp
+  src/msg/msg_gos.cpp
+  src/msg/msg_host.cpp
+  src/msg/msg_io.cpp
+  src/msg/msg_mailbox.cpp
+  src/msg/msg_process.cpp
+  src/msg/msg_synchro.cpp
+  src/msg/msg_task.cpp
+  src/msg/msg_vm.cpp
   )
 
 set(SIMDAG_SRC
-  src/simdag/instr_sd_task.c
-  src/simdag/sd_daxloader.c
-  src/simdag/sd_global.c
-  src/simdag/sd_link.c
-  src/simdag/sd_task.c
-  src/simdag/sd_workstation.c
+  src/simdag/instr_sd_task.cpp
+  src/simdag/sd_daxloader.cpp
+  src/simdag/sd_global.cpp
+  src/simdag/sd_task.cpp
+  src/simdag/sd_workstation.cpp
   )
 if(HAVE_GRAPHVIZ)
   set(SIMDAG_SRC
-    ${SIMDAG_SRC} src/simdag/sd_dotloader.c
+    ${SIMDAG_SRC} src/simdag/sd_dotloader.cpp
     )
 else()
   set(EXTRA_DIST
-    ${EXTRA_DIST} src/simdag/sd_dotloader.c
+    ${EXTRA_DIST} src/simdag/sd_dotloader.cpp
     )
 endif()
 
 set(BINDINGS_SRC
   src/bindings/bindings_global.c
   src/bindings/lua/lua_private.h
-  src/bindings/lua/lua_state_cloner.h
   src/bindings/lua/lua_utils.h
   src/bindings/lua/simgrid_lua.h
   )
 
-set(JSURF_SWIG_SRC
-  src/bindings/java/surf.i
-)
-
-set(JSURF_SWIG_SRC_EXTRA
-  src/bindings/java/surfdoc.i
-)
-
-set(JSURF_JAVA_C_SRC
-  src/bindings/java/surf_swig.cpp
-  src/bindings/java/surf_swig.hpp
-)
-
-set(JSURF_JAVA_GENERATED_SRC
-  src/bindings/java/org/simgrid/surf/Action.java
-  src/bindings/java/org/simgrid/surf/ActionList.java
-  src/bindings/java/org/simgrid/surf/ActionState.java
-  src/bindings/java/org/simgrid/surf/Cpu.java
-  src/bindings/java/org/simgrid/surf/CpuAction.java
-  src/bindings/java/org/simgrid/surf/CpuModel.java
-  src/bindings/java/org/simgrid/surf/LmmConstraint.java
-  src/bindings/java/org/simgrid/surf/LmmVariable.java
-  src/bindings/java/org/simgrid/surf/Model.java
-  src/bindings/java/org/simgrid/surf/NetworkAction.java
-  src/bindings/java/org/simgrid/surf/Link.java
-  src/bindings/java/org/simgrid/surf/Plugin.java
-  src/bindings/java/org/simgrid/surf/Resource.java
-  src/bindings/java/org/simgrid/surf/ResourceState.java
-  src/bindings/java/org/simgrid/surf/RoutingEdge.java
-  src/bindings/java/org/simgrid/surf/Surf.java
-  src/bindings/java/org/simgrid/surf/SurfJNI.java
-  src/bindings/java/org/simgrid/surf/TmgrTrace.java
-  src/bindings/java/org/simgrid/surf/TmgrTraceEvent.java
-  src/bindings/java/org/simgrid/surf/XbtDict.java
-)
-
 set(JMSG_C_SRC
-  src/bindings/java/jmsg.c
+  src/bindings/java/jmsg.cpp
   src/bindings/java/jmsg.h
-  src/bindings/java/jmsg_as.c
+  src/bindings/java/jmsg_as.cpp
   src/bindings/java/jmsg_as.h
-  src/bindings/java/jmsg_comm.c
+  src/bindings/java/jmsg_comm.cpp
   src/bindings/java/jmsg_comm.h
-  src/bindings/java/jmsg_file.c
+  src/bindings/java/jmsg_file.cpp
   src/bindings/java/jmsg_file.h
-  src/bindings/java/jmsg_host.c
+  src/bindings/java/jmsg_host.cpp
   src/bindings/java/jmsg_host.h
-  src/bindings/java/jmsg_process.c
+  src/bindings/java/jmsg_process.cpp
   src/bindings/java/jmsg_process.h
-  src/bindings/java/jmsg_rngstream.c
+  src/bindings/java/jmsg_rngstream.cpp
   src/bindings/java/jmsg_rngstream.h
-  src/bindings/java/jmsg_synchro.c
+  src/bindings/java/jmsg_synchro.cpp
   src/bindings/java/jmsg_synchro.h
-  src/bindings/java/jmsg_task.c
+  src/bindings/java/jmsg_task.cpp
   src/bindings/java/jmsg_task.h
-  src/bindings/java/jmsg_vm.c
+  src/bindings/java/jmsg_vm.cpp
   src/bindings/java/jmsg_vm.h
-  src/bindings/java/jxbt_utilities.c
+  src/bindings/java/jxbt_utilities.cpp
   src/bindings/java/jxbt_utilities.h
-  src/bindings/java/smx_context_java.c
-  src/bindings/java/smx_context_java.h
-  src/bindings/java/jmsg_storage.c
+  src/bindings/java/JavaContext.cpp
+  src/bindings/java/JavaContext.hpp
+  src/bindings/java/jmsg_storage.cpp
   src/bindings/java/jmsg_storage.h
 )
 
-set(JSURF_C_SRC
-  src/bindings/java/org/simgrid/surf/surfJAVA_wrap.cxx
-  src/bindings/java/org/simgrid/surf/surfJAVA_wrap.h
-  ${JSURF_JAVA_C_SRC}
-)
-
 set(JMSG_JAVA_SRC
   src/bindings/java/org/simgrid/NativeLib.java
   src/bindings/java/org/simgrid/msg/As.java
@@ -554,11 +514,10 @@ set(JMSG_JAVA_SRC
   src/bindings/java/org/simgrid/msg/TimeoutException.java
   src/bindings/java/org/simgrid/msg/TransferFailureException.java
   src/bindings/java/org/simgrid/msg/VM.java
-  ${JSURF_JAVA_GENERATED_SRC}
 )
 
 set(JTRACE_C_SRC
-  src/bindings/java/jtrace.c
+  src/bindings/java/jtrace.cpp
   src/bindings/java/jtrace.h
 )
 
@@ -571,28 +530,24 @@ list(APPEND JMSG_JAVA_SRC ${JTRACE_JAVA_SRC})
 
 set(LUA_SRC
   src/bindings/lua/factories/host.lua
-  src/bindings/lua/lua_comm.c
   src/bindings/lua/lua_host.c
   src/bindings/lua/lua_platf.c
-  src/bindings/lua/lua_process.c
-  src/bindings/lua/lua_state_cloner.c
-  src/bindings/lua/lua_task.c
-  src/bindings/lua/lua_utils.c
+  src/bindings/lua/lua_debug.c
   src/bindings/lua/simgrid_lua.c
   )
 
 set(TRACING_SRC
-  src/instr/instr_TI_trace.c
-  src/instr/instr_config.c
-  src/instr/instr_interface.c
-  src/instr/instr_paje_containers.c
-  src/instr/instr_paje_header.c
-  src/instr/instr_paje_trace.c
-  src/instr/instr_paje_types.c
-  src/instr/instr_paje_values.c
+  src/instr/instr_TI_trace.cpp
+  src/instr/instr_config.cpp
+  src/instr/instr_interface.cpp
+  src/instr/instr_paje_containers.cpp
+  src/instr/instr_paje_header.cpp
+  src/instr/instr_paje_trace.cpp
+  src/instr/instr_paje_types.cpp
+  src/instr/instr_paje_values.cpp
   src/instr/instr_private.h
-  src/instr/instr_resource_utilization.c
-  src/instr/instr_trace.c
+  src/instr/instr_resource_utilization.cpp
+  src/instr/instr_trace.cpp
   )
 
 set(JEDULE_SRC
@@ -700,19 +655,21 @@ set(headers_to_install
   include/simdag/simdag.h
   include/simdag/datatypes.h
   
+  include/simgrid/plugins/energy.h
   include/simgrid/instr.h
   include/simgrid/msg.h
   include/simgrid/simdag.h
   include/simgrid.h
   include/simgrid/datatypes.h
   include/simgrid/modelchecker.h
+  include/simgrid/forward.h
   include/simgrid/platf.h
   include/simgrid/platf_generator.h
-  include/simgrid/plugins.h
   include/simgrid/simix.h
   include/simgrid/simix.hpp
   include/simgrid/host.h
   include/simgrid/link.h
+  include/simgrid/s4u/forward.hpp
   include/simgrid/s4u/actor.hpp
   include/simgrid/s4u/async.hpp
   include/simgrid/s4u/comm.hpp
@@ -722,6 +679,7 @@ set(headers_to_install
   include/simgrid/s4u/mailbox.hpp  
   include/simgrid/s4u/storage.hpp  
   include/simgrid/s4u.h
+  include/simgrid/plugins/energy.h
   include/smpi/mpi.h
   include/smpi/smpi.h
   include/smpi/smpi_cocci.h
@@ -738,6 +696,8 @@ set(headers_to_install
   include/xbt/config.h
   include/xbt/cunit.h
   include/xbt/dict.h
+  include/xbt/string.hpp
+  include/xbt/signal.hpp
   include/xbt/dynar.h
   include/xbt/ex.h
   include/xbt/fifo.h
@@ -749,6 +709,7 @@ set(headers_to_install
   include/xbt/hash.h
   include/xbt/heap.h
   include/xbt/lib.h
+  include/xbt/Extendable.hpp
   include/xbt/log.h
   include/xbt/mallocator.h
   include/xbt/matrix.h
@@ -873,8 +834,8 @@ endif()
 if(WIN32)
   set(simgrid_sources
     ${simgrid_sources}
-    src/simix/src/simix/ThreadContext.cpp
-    src/simix/src/simix/ThreadContext.hpp
+    src/simix/ThreadContext.cpp
+    src/simix/ThreadContext.hpp
     src/xbt/win32_ucontext.c
     src/xbt/xbt_os_thread.c
     )
@@ -1026,6 +987,7 @@ set(bin_files
 
 set(txt_files
   ${txt_files}
+  .appveyor-download.cmd
   AUTHORS
   COPYING
   README
@@ -1046,8 +1008,10 @@ set(EXAMPLES_CMAKEFILES_TXT
   examples/java/bittorrent/CMakeLists.txt
   examples/java/chord/CMakeLists.txt
   examples/java/cloud/CMakeLists.txt
+  examples/java/cloud/energy/CMakeLists.txt
   examples/java/cloud/migration/CMakeLists.txt
   examples/java/commTime/CMakeLists.txt
+  examples/java/energy/CMakeLists.txt
   examples/java/io/CMakeLists.txt
   examples/java/kademlia/CMakeLists.txt
   examples/java/master_slave_bypass/CMakeLists.txt
@@ -1057,13 +1021,9 @@ set(EXAMPLES_CMAKEFILES_TXT
   examples/java/mutualExclusion/CMakeLists.txt
   examples/java/pingPong/CMakeLists.txt
   examples/java/priority/CMakeLists.txt
-  examples/java/reservationSurfPlugin/CMakeLists.txt
   examples/java/startKillTime/CMakeLists.txt
-  examples/java/surfCpuModel/CMakeLists.txt
-  examples/java/surfPlugin/CMakeLists.txt
   examples/java/suspend/CMakeLists.txt
   examples/java/tracing/CMakeLists.txt
-  examples/lua/CMakeLists.txt
   examples/msg/CMakeLists.txt
   examples/msg/actions/CMakeLists.txt
   examples/msg/bittorrent/CMakeLists.txt