Build simgrid.jar.

diff --git a/buildtools/Cmake/CompleteInFiles.cmake b/buildtools/Cmake/CompleteInFiles.cmake
index b1a391a..00cf1ec 100644 (file)
--- a/buildtools/Cmake/CompleteInFiles.cmake
+++ b/buildtools/Cmake/CompleteInFiles.cmake
@@ -85,6 +85,7 @@ endif()
 if(enable_java)
   find_package(Java REQUIRED COMPONENTS Runtime Development)
   find_package(JNI REQUIRED)
+  include(UseJava)
   set(HAVE_Java 1)
 endif()
 if(enable_lua)

diff --git a/buildtools/Cmake/DefinePackages.cmake b/buildtools/Cmake/DefinePackages.cmake
index aec5a8c..8489356 100644 (file)
--- a/buildtools/Cmake/DefinePackages.cmake
+++ b/buildtools/Cmake/DefinePackages.cmake
@@ -2,6 +2,7 @@
 
 set(EXTRA_DIST
   include/xbt/win32_ucontext.h
+  src/bindings/java/MANIFEST.MF
   src/include/instr/instr_interface.h
   src/include/mc/datatypes.h
   src/include/mc/mc.h

diff --git a/buildtools/Cmake/MakeLib.cmake b/buildtools/Cmake/MakeLib.cmake
index 09cd281..5a477cc 100644 (file)
--- a/buildtools/Cmake/MakeLib.cmake
+++ b/buildtools/Cmake/MakeLib.cmake
@@ -45,6 +45,13 @@ if(enable_java)
   else()
     target_link_libraries(SG_java simgrid)
   endif()
+
+  set(CMAKE_JAVA_TARGET_OUTPUT_NAME simgrid)
+  set(MANIFEST_FILE ${CMAKE_HOME_DIRECTORY}/src/bindings/java/MANIFEST.MF)
+  add_jar(SG_java_jar ${JMSG_JAVA_SRC})
+  add_custom_command(TARGET SG_java_jar POST_BUILD
+    DEPENDS ${MANIFEST_FILE}
+    COMMAND ${JAVA_ARCHIVE} -uvmf ${MANIFEST_FILE} ${CMAKE_BINARY_DIR}/${CMAKE_JAVA_TARGET_OUTPUT_NAME}.jar)
 endif()
 
 add_dependencies(simgrid maintainer_files)

diff --git a/simgrid-java/MANIFEST.MF b/src/bindings/java/MANIFEST.MF
similarity index 100%
rename from simgrid-java/MANIFEST.MF
rename to src/bindings/java/MANIFEST.MF