X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/5a2381818ef1eec814d276bbe5d9452e3e092661..6683debe0efeb6371e0cbafb4f0d461325dd59a5:/buildtools/Cmake/DefinePackages.cmake

diff --git a/buildtools/Cmake/DefinePackages.cmake b/buildtools/Cmake/DefinePackages.cmake
index b4b6295c9b..2b7de553aa 100644
--- a/buildtools/Cmake/DefinePackages.cmake
+++ b/buildtools/Cmake/DefinePackages.cmake
@@ -2,7 +2,7 @@
 
 set(EXTRA_DIST
   include/xbt/win32_ucontext.h
-  src/bindings/java/MANIFEST.MF
+  src/bindings/java/MANIFEST.MF.in
   src/include/instr/instr_interface.h
   src/include/mc/datatypes.h
   src/include/mc/mc.h
@@ -19,7 +19,6 @@ set(EXTRA_DIST
   src/include/surf/trace_mgr.h
   src/include/xbt/wine_dbghelp.h
   src/include/xbt/xbt_os_time.h
-  src/mk_supernovae.pl
   src/msg/msg_mailbox.h
   src/msg/msg_private.h
   src/portable.h
@@ -58,7 +57,7 @@ set(EXTRA_DIST
   src/surf/maxmin_private.hpp
   src/surf/network_interface.hpp
   src/surf/network_gtnets.hpp
-  src/surf/network_ns3_private.h
+  src/surf/network_ns3.hpp
   src/surf/network_cm02.hpp
   src/surf/network_smpi.hpp
   src/surf/network_constant.hpp
@@ -301,7 +300,7 @@ set(GTNETS_SRC
   )
 
 set(NS3_SRC
-  src/surf/network_ns3.c
+  src/surf/network_ns3.cpp
   src/surf/ns3/my-point-to-point-helper.cc
   src/surf/ns3/ns3_interface.cc
   src/surf/ns3/ns3_simulator.cc
@@ -461,6 +460,9 @@ set(JMSG_C_SRC
 )
 
 set(JMSG_JAVA_SRC
+  src/bindings/java/org/simgrid/NativeLib.java
+  #src/bindings/java/org/simgrid/NativeException.java
+
   src/bindings/java/org/simgrid/msg/As.java	
   src/bindings/java/org/simgrid/msg/Comm.java
   src/bindings/java/org/simgrid/msg/File.java
@@ -471,17 +473,31 @@ set(JMSG_JAVA_SRC
   src/bindings/java/org/simgrid/msg/Msg.java
   src/bindings/java/org/simgrid/msg/MsgException.java
   src/bindings/java/org/simgrid/msg/Mutex.java
-  src/bindings/java/org/simgrid/msg/Semaphore.java
-  src/bindings/java/org/simgrid/msg/NativeException.java
+  src/bindings/java/org/simgrid/msg/NativeException.java    
   src/bindings/java/org/simgrid/msg/Process.java
   src/bindings/java/org/simgrid/msg/ProcessKilledError.java
   src/bindings/java/org/simgrid/msg/ProcessNotFoundException.java
   src/bindings/java/org/simgrid/msg/RngStream.java
+  src/bindings/java/org/simgrid/msg/Semaphore.java
   src/bindings/java/org/simgrid/msg/Task.java
   src/bindings/java/org/simgrid/msg/TaskCancelledException.java
   src/bindings/java/org/simgrid/msg/TimeoutException.java
   src/bindings/java/org/simgrid/msg/TransferFailureException.java
   src/bindings/java/org/simgrid/msg/VM.java
+
+  src/bindings/java/org/simgrid/surf/Surf.java
+  src/bindings/java/org/simgrid/surf/SurfJNI.java
+  src/bindings/java/org/simgrid/surf/Plugin.java
+  src/bindings/java/org/simgrid/surf/Model.java
+  src/bindings/java/org/simgrid/surf/Resource.java
+  src/bindings/java/org/simgrid/surf/Action.java  
+  src/bindings/java/org/simgrid/surf/Cpu.java
+  src/bindings/java/org/simgrid/surf/CpuAction.java  
+  src/bindings/java/org/simgrid/surf/NetworkLink.java  
+  src/bindings/java/org/simgrid/surf/NetworkAction.java  
+
+  src/bindings/java/org/simgrid/surf/LmmConstraint.java  
+  src/bindings/java/org/simgrid/surf/XbtDict.java    
 )
 
 set(JTRACE_C_SRC
@@ -875,6 +891,7 @@ set(EXAMPLES_CMAKEFILES_TXT
   examples/java/cloud/CMakeLists.txt
   examples/java/cloud/migration/CMakeLists.txt
   examples/java/commTime/CMakeLists.txt
+  examples/java/surfPlugin/CMakeLists.txt
   examples/java/io/CMakeLists.txt
   examples/java/kademlia/CMakeLists.txt
   examples/java/master_slave_bypass/CMakeLists.txt
@@ -956,6 +973,7 @@ set(TESHSUITE_CMAKEFILES_TXT
   teshsuite/smpi/mpich3-test/coll/CMakeLists.txt
   teshsuite/smpi/mpich3-test/datatype/CMakeLists.txt
   teshsuite/smpi/mpich3-test/group/CMakeLists.txt
+  teshsuite/smpi/mpich3-test/topo/CMakeLists.txt
   teshsuite/smpi/mpich3-test/init/CMakeLists.txt
   teshsuite/smpi/mpich3-test/pt2pt/CMakeLists.txt
   teshsuite/smpi/mpich3-test/f77/util/CMakeLists.txt
@@ -1022,12 +1040,12 @@ set(CMAKE_SOURCE_FILES
   buildtools/Cmake/Scripts/SimGrid.packproj
   buildtools/Cmake/Scripts/generate_memcheck_tests.pl
   buildtools/Cmake/Scripts/generate_new_tests.pl
+  buildtools/Cmake/Scripts/java_bundle.sh
   buildtools/Cmake/Scripts/my_valgrind.pl
   buildtools/Cmake/Scripts/postinstall.sh
   buildtools/Cmake/Scripts/preinstall.sh
   buildtools/Cmake/Scripts/tesh.pl
   buildtools/Cmake/Scripts/update_tesh.pl
-  buildtools/Cmake/Supernovae.cmake
   buildtools/Cmake/UnitTesting.cmake
   buildtools/Cmake/src/internal_config.h.in
   buildtools/Cmake/src/simgrid.nsi.in