X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e4976006576357505914f995f0220214dda25598..4787d30c2fcd7987135ecc4ff9d11eb530d851bd:/tools/cmake/Java.cmake

diff --git a/tools/cmake/Java.cmake b/tools/cmake/Java.cmake
index fdf7ad46ad..b7637055a1 100644
--- 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
@@ -38,12 +44,6 @@ if(WIN32)
 
   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 +77,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 +87,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
   )
 
 ###
@@ -98,6 +99,9 @@ if(enable_lib_in_jar)
   if(NOT STRIP_COMMAND)
     set(STRIP_COMMAND "cmake -E echo (strip not found)")
   endif()
+  if(WIN32)
+    set(STRIP_COMMAND "cmake -E echo (dont strip on windows)")
+  endif()
 
   set(JAVA_NATIVE_PATH NATIVE/${CMAKE_SYSTEM_NAME}/${CMAKE_SYSTEM_PROCESSOR})
   if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "^i[3-6]86$")
@@ -178,8 +182,4 @@ 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()