[vtk6] 02/04: Compile java module with -target 1.5. Thanks to Gianfranco Costamagna <costamagnagianfranco at yahoo.it>. (Closes: #747108)

Anton Gladky gladk at moszumanska.debian.org
Sat May 10 10:49:35 UTC 2014


This is an automated email from the git hooks/post-receive script.

gladk pushed a commit to branch master
in repository vtk6.

commit a0f25149f4517ad4a055364ae2b565a801f792e7
Author: Anton Gladky <gladk at debian.org>
Date:   Fri May 9 20:23:47 2014 +0200

    Compile java module with -target 1.5. Thanks to Gianfranco Costamagna <costamagnagianfranco at yahoo.it>. (Closes: #747108)
---
 debian/patches/10_Java_Target.patch | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/debian/patches/10_Java_Target.patch b/debian/patches/10_Java_Target.patch
new file mode 100644
index 0000000..b70d373
--- /dev/null
+++ b/debian/patches/10_Java_Target.patch
@@ -0,0 +1,25 @@
+Description: Compile java module with -target 1.5
+Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>, Anton Gladky <gladk at debian.org>
+Bug-Debian: http://bugs.debian.org/747108
+Last-Update: 2014-05-09
+
+--- vtk6-6.0.0.orig/Wrapping/Java/CMakeLists.txt
++++ vtk6-6.0.0/Wrapping/Java/CMakeLists.txt
+@@ -237,7 +237,7 @@ add_custom_command(
+   OUTPUT ${VTK_BINARY_DIR}/java/javac_stamp.txt
+   DEPENDS ${VTK_JAVA_SOURCE_FILES}
+   COMMAND ${JAVA_COMPILE} ${JAVAC_OPTIONS}
+-    -source 1.5 -classpath ${VTK_JAVA_HOME}/..${SEPARATOR}${ECLIPSE_SWT_LIBRARIES} -sourcepath ${VTK_SOURCE_DIR}/Wrapping/Java/ -d ${VTK_BINARY_DIR}/java
++    -source 1.5 -target 1.5 -classpath ${VTK_JAVA_HOME}/..${SEPARATOR}${ECLIPSE_SWT_LIBRARIES} -sourcepath ${VTK_SOURCE_DIR}/Wrapping/Java/ -d ${VTK_BINARY_DIR}/java
+     ${VTK_BINARY_DIR}/java/vtk/*.java ${VTK_BINARY_DIR}/java/vtk/rendering/*.java ${VTK_BINARY_DIR}/java/vtk/rendering/awt/*.java ${SWT_FILES}
+   COMMAND ${CMAKE_COMMAND} -E touch ${VTK_BINARY_DIR}/java/javac_stamp.txt
+   COMMENT "Compiling Java Classes"
+@@ -269,7 +269,7 @@ if(BUILD_TESTING)
+   add_custom_command(
+     OUTPUT ${VTK_BINARY_DIR}/java/javac_tests_stamp.txt
+     COMMAND ${JAVA_COMPILE} ${JAVAC_OPTIONS} -classpath ${VTK_JAR_PATH}/vtk.jar${SEPARATOR}${VTK_BINARY_DIR}/Wrapping/Java
+-    -source 1.5 -sourcepath ${VTK_SOURCE_DIR}/Wrapping/Java
++    -source 1.5 -target 1.5 -sourcepath ${VTK_SOURCE_DIR}/Wrapping/Java
+     -d ${VTK_BINARY_DIR}/Wrapping/Java
+     ${VTK_JAVA_TESTS}
+     COMMAND ${CMAKE_COMMAND} -E touch ${VTK_BINARY_DIR}/java/javac_tests_stamp.txt

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/vtk6.git



More information about the debian-science-commits mailing list