[java] strip the windows version now that it works

[simgrid.git] / tools / cmake / Java.cmake

diff --git a/tools/cmake/Java.cmake b/tools/cmake/Java.cmake
index fdf7ad4..689f119 100644 (file)
--- a/tools/cmake/Java.cmake
+++ b/tools/cmake/Java.cmake
@@ -1,5 +1,11 @@
+##
+## The Cmake definitions for the use of Java (and Scala)
+##   This file is loaded only if the Java option is activated
+##
+
 cmake_minimum_required(VERSION 2.8.6)
 
+find_package(Java 1.7 REQUIRED)
 include(UseJava)
 
 # Rules to build libsimgrid-java
@@ -29,21 +35,11 @@ target_link_libraries(simgrid-java simgrid)
 
 
 if(WIN32)
-  exec_program("java -d32 -version"
-                OUTPUT_VARIABLE IS_32_BITS_JVM)
+  exec_program("java -d32 -version" OUTPUT_VARIABLE IS_32_BITS_JVM)
   STRING( FIND ${IS_32_BITS_JVM} "Error" POSITION )
-  if(${POSITION} GREATER -1)
-    message("POTENTIAL ERROR: Java JVM needs to be 32 bits to be able to run with Simgrid on Windows for now")
+  if(NOT ${POSITION} GREATER -1)
+    message(fatal_error "SimGrid can only use Java 64 bits")
   endif()
-
-  set_target_properties(simgrid-java PROPERTIES
-    LINK_FLAGS "-Wl,--subsystem,windows,--kill-at")
-  find_path(PEXPORTS_PATH NAMES pexports.exe PATHS NO_DEFAULT_PATHS)
-  message(STATUS "pexports: ${PEXPORTS_PATH}")
-  if(PEXPORTS_PATH)
-    add_custom_command(TARGET simgrid-java POST_BUILD
-      COMMAND ${PEXPORTS_PATH}/pexports.exe ${CMAKE_BINARY_DIR}/lib/simgrid-java.dll > ${CMAKE_BINARY_DIR}/lib/simgrid-java.def)
-  endif(PEXPORTS_PATH)
 endif()
 
 # Rules to build simgrid.jar
@@ -77,6 +73,7 @@ add_custom_command(
   DEPENDS ${MANIFEST_IN_FILE}
          ${CMAKE_HOME_DIRECTORY}/COPYING
          ${CMAKE_HOME_DIRECTORY}/ChangeLog
+         ${CMAKE_HOME_DIRECTORY}/NEWS
          ${CMAKE_HOME_DIRECTORY}/ChangeLog.SimGrid-java
          ${CMAKE_HOME_DIRECTORY}/LICENSE-LGPL-2.1
            
@@ -86,7 +83,7 @@ add_custom_command(
 
   COMMAND ${Java_JAVADOC_EXECUTABLE} -quiet -d doc/javadoc -sourcepath ${CMAKE_HOME_DIRECTORY}/src/bindings/java/ org.simgrid.msg org.simgrid.surf org.simgrid.trace
   
-  COMMAND ${JAVA_ARCHIVE} -uvmf ${MANIFEST_FILE} ${SIMGRID_JAR} doc/javadoc -C ${CMAKE_HOME_DIRECTORY} COPYING ChangeLog ChangeLog.SimGrid-java LICENSE-LGPL-2.1
+  COMMAND ${JAVA_ARCHIVE} -uvmf ${MANIFEST_FILE} ${SIMGRID_JAR} doc/javadoc -C ${CMAKE_HOME_DIRECTORY} COPYING ChangeLog ChangeLog.SimGrid-java LICENSE-LGPL-2.1 NEWS
   )
 
 ###
@@ -175,11 +172,3 @@ set_target_properties(simgrid-java PROPERTIES SKIP_BUILD_RPATH ON)
 add_dependencies(simgrid-java surf-java)
 add_dependencies(simgrid-java_jar surf-java)
 
-if(WIN32)
-  set_target_properties(surf-java PROPERTIES
-    LINK_FLAGS "-Wl,--subsystem,windows,--kill-at")
-  if(PEXPORTS_PATH)
-    add_custom_command(TARGET surf-java POST_BUILD
-      COMMAND ${PEXPORTS_PATH}/pexports.exe ${CMAKE_BINARY_DIR}/lib/surf-java.dll > ${CMAKE_BINARY_DIR}/lib/surf-java.def)
-  endif(PEXPORTS_PATH)
-endif()