[med-svn] r3621 - in trunk/packages/gdcm/trunk/debian: . patches

[Mathieu Malaterre]

Author: malat-guest
Date: 2009-07-13 08:40:16 +0000 (Mon, 13 Jul 2009)
New Revision: 3621

Modified:
   trunk/packages/gdcm/trunk/debian/changelog
   trunk/packages/gdcm/trunk/debian/patches/vtk_jar.patch
Log:
update for new layout

Modified: trunk/packages/gdcm/trunk/debian/changelog
===================================================================
--- trunk/packages/gdcm/trunk/debian/changelog	2009-07-13 08:03:25 UTC (rev 3620)
+++ trunk/packages/gdcm/trunk/debian/changelog	2009-07-13 08:40:16 UTC (rev 3621)
@@ -1,3 +1,10 @@
+gdcm (2.0.12-6) unstable; urgency=low
+
+  * Bug #533198, moved vtk Java libraries from /usr/lib to /usr/lib/jni. Support
+    both old and new layout.
+
+ -- Mathieu Malaterre <mathieu.malaterre at gmail.com>  Mon, 13 Jul 2009 10:39:12 +0200
+
 gdcm (2.0.12-5) unstable; urgency=low
 
   * Yet-Another-Attempt at fixing armel/alpha. Thanks to George Danchev

Modified: trunk/packages/gdcm/trunk/debian/patches/vtk_jar.patch
===================================================================
--- trunk/packages/gdcm/trunk/debian/patches/vtk_jar.patch	2009-07-13 08:03:25 UTC (rev 3620)
+++ trunk/packages/gdcm/trunk/debian/patches/vtk_jar.patch	2009-07-13 08:40:16 UTC (rev 3621)
@@ -25,14 +25,35 @@
    ENDIF(GDCM_USE_ACTIVIZ)
    SEPARATE_ARGUMENTS(CMAKE_SWIG_FLAGS)
    SWIG_ADD_MODULE(vtkgdcmsharpglue csharp vtkgdcm.i)
-@@ -235,9 +235,13 @@
-     # Create the jar file:
-     # I am pretty sure this *.java thingy will byte me one day, when someone will try
-     # to recompile from an existing build tree with invalid generated *.java file...
+@@ -227,27 +241,47 @@
+     INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
+ 
+     VTK_WRAP_JAVA3(${VTKGDCM_NAME}Java vtkgdcmJAVA_SRCS "${vtkgdcm_SRCS}")
++    # libvtk-java is a pain to handle...
 +    if(EXISTS ${VTK_JAVA_JAR})
 +      # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=533193
 +      set(GDCM_VTK_JAVA_JAR ${VTK_JAVA_JAR})
++    else(EXISTS ${VTK_JAVA_JAR})
++      # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=533198
++      if(EXISTS /usr/lib/jni/libvtkCommonJava.so)
++        message("Implicitely adding debian package layout...")
++        link_directories("/usr/lib/jni")
++      endif()
 +    endif(EXISTS ${VTK_JAVA_JAR})
++    MARK_AS_ADVANCED(GDCM_VTK_JAVA_JAR)
++    if(EXISTS ${GDCM_VTK_JAVA_JAR})
++    else(EXISTS ${GDCM_VTK_JAVA_JAR})
++      message(FATAL_ERROR "Could not find vtk.jar file")
++    endif(EXISTS ${GDCM_VTK_JAVA_JAR})
+     ADD_LIBRARY(${VTKGDCM_NAME}Java SHARED ${vtkgdcmJAVA_SRCS})
+     TARGET_LINK_LIBRARIES(${VTKGDCM_NAME}Java ${VTKGDCM_NAME})
+     FOREACH(c ${vtkgdcm_LIBS})
+       TARGET_LINK_LIBRARIES(${VTKGDCM_NAME}Java ${c}Java)
+     ENDFOREACH(c)
+     # Create the jar file:
+-    # I am pretty sure this *.java thingy will byte me one day, when someone will try
++    # I am pretty sure this *.java thingy will bite me one day, when someone will try
+     # to recompile from an existing build tree with invalid generated *.java file...
      ADD_CUSTOM_COMMAND(
        OUTPUT ${LIBRARY_OUTPUT_PATH}/vtkgdcm.jar
 -      COMMAND ${JAVA_COMPILE} ARGS -cp ${VTK_JAVA_JAR} "vtk/*.java"
@@ -40,15 +61,22 @@
        COMMAND ${JAVA_ARCHIVE} ARGS cvf ${LIBRARY_OUTPUT_PATH}/${PROJECT_NAME}.jar vtk/*.class
        WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/java
        DEPENDS ${VTKGDCM_NAME}Java
-@@ -248,6 +248,7 @@
+-      COMMENT   "*.java -> jar"
++      #${VTK_JAVA_DEPENDENCIES}
++      #vtkgdcmJavaJavaClasses
++      COMMENT   "javac *.java -> jar; jar cvf -> vtkgdcm.jar"
+     )
+     # Target to execute custom command:
+     ADD_CUSTOM_TARGET(VTKGDCMJavaJar ALL
        DEPENDS ${LIBRARY_OUTPUT_PATH}/vtkgdcm.jar
        COMMENT "building vtkgdcm.jar"
      )
 +    ADD_DEPENDENCIES(VTKGDCMJavaJar vtkgdcmJavaJavaClasses)
++
      # Install rules:
      IF(NOT GDCM_INSTALL_NO_LIBRARIES)
        INSTALL(TARGETS ${VTKGDCM_NAME}Java
-@@ -255,6 +259,10 @@
+@@ -255,6 +289,10 @@
          LIBRARY DESTINATION ${GDCM_INSTALL_LIB_DIR} COMPONENT VTKLibraries ${NAMELINK_SKIP}
          ARCHIVE DESTINATION ${GDCM_INSTALL_LIB_DIR} COMPONENT VTKDevelopment
        )