[mapguide-commits] r9303 - in sandbox/jng/cmake_v2/Web/src: JavaApi JavaApiEx

[svn_mapguide at osgeo.org]

Author: jng
Date: 2018-01-09 08:14:47 -0800 (Tue, 09 Jan 2018)
New Revision: 9303

Modified:
   sandbox/jng/cmake_v2/Web/src/JavaApi/CMakeLists.txt
   sandbox/jng/cmake_v2/Web/src/JavaApiEx/CMakeLists.txt
Log:
Fix jar packaging. Must use relative paths. If using absolute path, it will package from the topmost directory

Modified: sandbox/jng/cmake_v2/Web/src/JavaApi/CMakeLists.txt
===================================================================
--- sandbox/jng/cmake_v2/Web/src/JavaApi/CMakeLists.txt	2018-01-09 15:53:01 UTC (rev 9302)
+++ sandbox/jng/cmake_v2/Web/src/JavaApi/CMakeLists.txt	2018-01-09 16:14:47 UTC (rev 9303)
@@ -52,10 +52,10 @@
     COMMAND ${Java_JAVAC_EXECUTABLE} -classpath ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}/org/osgeo/mapguide/*.java
     COMMAND ${Java_JAR_EXECUTABLE} -cf 
             ${CMAKE_CURRENT_BINARY_DIR}/../WEB-INF/lib/MapGuideApi.jar
-            ${CMAKE_CURRENT_BINARY_DIR}/org/osgeo/mapguide/*.class
+            org/osgeo/mapguide/*.class
     COMMAND ${Java_JAR_EXECUTABLE} -cf 
             ${CMAKE_CURRENT_BINARY_DIR}/../WEB-INF/lib/MapGuideApi-sources.jar
-            ${CMAKE_CURRENT_BINARY_DIR}/org/osgeo/mapguide/*.java
+            org/osgeo/mapguide/*.java
 )
 
 add_library(MapGuideJavaApi${MG_VERSION_SUFFIX} SHARED ${MapGuideJavaApi_SRCS})

Modified: sandbox/jng/cmake_v2/Web/src/JavaApiEx/CMakeLists.txt
===================================================================
--- sandbox/jng/cmake_v2/Web/src/JavaApiEx/CMakeLists.txt	2018-01-09 15:53:01 UTC (rev 9302)
+++ sandbox/jng/cmake_v2/Web/src/JavaApiEx/CMakeLists.txt	2018-01-09 16:14:47 UTC (rev 9303)
@@ -53,10 +53,10 @@
     COMMAND ${Java_JAVAC_EXECUTABLE} -classpath ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}/org/osgeo/mapguide/*.java
     COMMAND ${Java_JAR_EXECUTABLE} -cf 
             ${CMAKE_CURRENT_BINARY_DIR}/../WEB-INF/lib/MapGuideApiEx.jar
-            ${CMAKE_CURRENT_BINARY_DIR}/org/osgeo/mapguide/*.class
+            org/osgeo/mapguide/*.class
     COMMAND ${Java_JAR_EXECUTABLE} -cf 
             ${CMAKE_CURRENT_BINARY_DIR}/../WEB-INF/lib/MapGuideApiEx-sources.jar
-            ${CMAKE_CURRENT_BINARY_DIR}/org/osgeo/mapguide/*.java
+            org/osgeo/mapguide/*.java
 )
 
 add_library(MapGuideJavaApiEx${MG_VERSION_SUFFIX} SHARED ${MapGuideJavaApiEx_SRCS})