From: Martin Quinson <martin.quinson@loria.fr>
Date: Tue, 29 Sep 2015 17:37:16 +0000 (+0200)
Subject: cleanups in Java: call jar only once to add our content
X-Git-Tag: v3_12~104
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/e2634d0c00e2dd66280f890425038df8ac1bbb98

cleanups in Java: call jar only once to add our content
---

diff --git a/tools/cmake/MakeJava.cmake b/tools/cmake/MakeJava.cmake
index cdebc74d1a..006213d698 100644
--- a/tools/cmake/MakeJava.cmake
+++ b/tools/cmake/MakeJava.cmake
@@ -79,16 +79,14 @@ add_custom_command(
 	  ${CMAKE_HOME_DIRECTORY}/ChangeLog
 	  ${CMAKE_HOME_DIRECTORY}/ChangeLog.SimGrid-java
 	  ${CMAKE_HOME_DIRECTORY}/LICENSE-LGPL-2.1
-	  
-  COMMAND ${JAVA_ARCHIVE} -uvf ${SIMGRID_JAR} -C ${CMAKE_HOME_DIRECTORY} COPYING ChangeLog ChangeLog.SimGrid-java LICENSE-LGPL-2.1
-  
+	    
   COMMAND ${CMAKE_COMMAND} -E copy ${MANIFEST_IN_FILE} ${MANIFEST_FILE}
   COMMAND ${CMAKE_COMMAND} -E echo "Specification-Version: \\\"${SIMGRID_VERSION_MAJOR}.${SIMGRID_VERSION_MINOR}.${SIMGRID_VERSION_PATCH}\\\"" >> ${MANIFEST_FILE}
   COMMAND ${CMAKE_COMMAND} -E echo "Implementation-Version: \\\"${GIT_VERSION}\\\"" >> ${MANIFEST_FILE}
-  COMMAND ${JAVA_ARCHIVE} -uvmf ${MANIFEST_FILE} ${SIMGRID_JAR}
 
   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} -uvf ${SIMGRID_JAR} doc/javadoc  
+  
+  COMMAND ${JAVA_ARCHIVE} -uvmf ${MANIFEST_FILE} ${SIMGRID_JAR} doc/javadoc -C ${CMAKE_HOME_DIRECTORY} COPYING ChangeLog ChangeLog.SimGrid-java LICENSE-LGPL-2.1
   )
 
 ###