[med-svn] r8881 - in trunk/packages/dicomscope/tags: . 3.6.0-8/debian 3.6.0-8/debian/patches
Mathieu Malaterre
malat-guest at alioth.debian.org
Fri Dec 9 13:34:44 UTC 2011
Author: malat-guest
Date: 2011-12-09 13:34:43 +0000 (Fri, 09 Dec 2011)
New Revision: 8881
Added:
trunk/packages/dicomscope/tags/3.6.0-8/
trunk/packages/dicomscope/tags/3.6.0-8/debian/changelog
trunk/packages/dicomscope/tags/3.6.0-8/debian/patches/cmakelists.txt.patch
Removed:
trunk/packages/dicomscope/tags/3.6.0-8/debian/README.source
trunk/packages/dicomscope/tags/3.6.0-8/debian/changelog
trunk/packages/dicomscope/tags/3.6.0-8/debian/patches/cmakelists.txt.patch
Log:
[svn-buildpackage] Tagging dicomscope 3.6.0-8
Deleted: trunk/packages/dicomscope/tags/3.6.0-8/debian/README.source
===================================================================
--- trunk/packages/dicomscope/trunk/debian/README.source 2011-12-09 13:07:56 UTC (rev 8877)
+++ trunk/packages/dicomscope/tags/3.6.0-8/debian/README.source 2011-12-09 13:34:43 UTC (rev 8881)
@@ -1,4 +0,0 @@
-This packages uses the quilt patch system. Please read
-/usr/share/doc/quilt/README.source for more information.
-
- -- Mathieu Malaterre (malat) <mathieu.malaterre at gmail.com> Tue, 08 Sep 2009 09:23:36 +0200
Deleted: trunk/packages/dicomscope/tags/3.6.0-8/debian/changelog
===================================================================
--- trunk/packages/dicomscope/trunk/debian/changelog 2011-12-09 13:07:56 UTC (rev 8877)
+++ trunk/packages/dicomscope/tags/3.6.0-8/debian/changelog 2011-12-09 13:34:43 UTC (rev 8881)
@@ -1,59 +0,0 @@
-dicomscope (3.6.0-7) unstable; urgency=low
-
- [ Andreas Tille ]
- * debian/source/format: 3.0 (quilt)
-
- [ Mathieu Malaterre ]
- * Standards-Version: 3.9.2. No changes needed.
- * Fix VCS URLs
- * Redo the d/rules file for simplification
-
- -- Mathieu Malaterre <mathieu.malaterre at gmail.com> Wed, 23 Nov 2011 12:55:20 +0100
-
-dicomscope (3.6.0-6.1) unstable; urgency=low
-
- * Non-maintainer upload.
- * Fix shlibdeps. Closes: #632460.
- * Replace java depends with default-jre.
-
- -- Mark Hymers <mhy at debian.org> Sat, 02 Jul 2011 13:28:34 +0000
-
-dicomscope (3.6.0-6) unstable; urgency=low
-
- * Remove dep to tk8.3, tk8.4 and replace with wish
- * Fix javac compilation. Closes: #627223
-
- -- Mathieu Malaterre <mathieu.malaterre at gmail.com> Tue, 26 Apr 2011 20:36:47 +0200
-
-dicomscope (3.6.0-5) unstable; urgency=low
-
- * Fix compilation with gcj/java
-
- -- Mathieu Malaterre <mathieu.malaterre at gmail.com> Tue, 26 Apr 2011 16:43:13 +0200
-
-dicomscope (3.6.0-4) unstable; urgency=low
-
- * Upload to unstable. Closes: #623143
-
- -- Mathieu Malaterre <mathieu.malaterre at gmail.com> Wed, 20 Apr 2011 18:30:32 +0200
-
-dicomscope (3.6.0-3) experimental; urgency=low
-
- * Fix compilation of dicomscope against dcmtk 3.6.0 release and new API
- * Convert iso german to utf-8 to prevent warning during java compilation
- * Update debian Standard Version to 3.9.1 no change needed
- * Switch to dpkg-source 3.0 (quilt) format
-
- -- Mathieu Malaterre <mathieu.malaterre at gmail.com> Wed, 09 Feb 2011 11:04:47 +0100
-
-dicomscope (3.6.0-2) unstable; urgency=low
-
- * Remove tofrodos and unzip from Build-Deps. Fixes hurd-386 compilation.
-
- -- Mathieu Malaterre <mathieu.malaterre at gmail.com> Mon, 21 Dec 2009 15:46:02 +0100
-
-dicomscope (3.6.0-1) unstable; urgency=low
-
- * Initial release (Closes: #508990)
-
- -- Mathieu Malaterre <mathieu.malaterre at gmail.com> Mon, 16 Nov 2009 17:58:43 +0100
Copied: trunk/packages/dicomscope/tags/3.6.0-8/debian/changelog (from rev 8879, trunk/packages/dicomscope/trunk/debian/changelog)
===================================================================
--- trunk/packages/dicomscope/tags/3.6.0-8/debian/changelog (rev 0)
+++ trunk/packages/dicomscope/tags/3.6.0-8/debian/changelog 2011-12-09 13:34:43 UTC (rev 8881)
@@ -0,0 +1,65 @@
+dicomscope (3.6.0-8) unstable; urgency=low
+
+ * Fix FTBFS with OpenJDK7. Closes: #651404
+
+ -- Mathieu Malaterre <mathieu.malaterre at gmail.com> Fri, 09 Dec 2011 14:29:15 +0100
+
+dicomscope (3.6.0-7) unstable; urgency=low
+
+ [ Andreas Tille ]
+ * debian/source/format: 3.0 (quilt)
+
+ [ Mathieu Malaterre ]
+ * Standards-Version: 3.9.2. No changes needed.
+ * Fix VCS URLs
+ * Redo the d/rules file for simplification
+
+ -- Mathieu Malaterre <mathieu.malaterre at gmail.com> Wed, 23 Nov 2011 12:55:20 +0100
+
+dicomscope (3.6.0-6.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Fix shlibdeps. Closes: #632460.
+ * Replace java depends with default-jre.
+
+ -- Mark Hymers <mhy at debian.org> Sat, 02 Jul 2011 13:28:34 +0000
+
+dicomscope (3.6.0-6) unstable; urgency=low
+
+ * Remove dep to tk8.3, tk8.4 and replace with wish
+ * Fix javac compilation. Closes: #627223
+
+ -- Mathieu Malaterre <mathieu.malaterre at gmail.com> Tue, 26 Apr 2011 20:36:47 +0200
+
+dicomscope (3.6.0-5) unstable; urgency=low
+
+ * Fix compilation with gcj/java
+
+ -- Mathieu Malaterre <mathieu.malaterre at gmail.com> Tue, 26 Apr 2011 16:43:13 +0200
+
+dicomscope (3.6.0-4) unstable; urgency=low
+
+ * Upload to unstable. Closes: #623143
+
+ -- Mathieu Malaterre <mathieu.malaterre at gmail.com> Wed, 20 Apr 2011 18:30:32 +0200
+
+dicomscope (3.6.0-3) experimental; urgency=low
+
+ * Fix compilation of dicomscope against dcmtk 3.6.0 release and new API
+ * Convert iso german to utf-8 to prevent warning during java compilation
+ * Update debian Standard Version to 3.9.1 no change needed
+ * Switch to dpkg-source 3.0 (quilt) format
+
+ -- Mathieu Malaterre <mathieu.malaterre at gmail.com> Wed, 09 Feb 2011 11:04:47 +0100
+
+dicomscope (3.6.0-2) unstable; urgency=low
+
+ * Remove tofrodos and unzip from Build-Deps. Fixes hurd-386 compilation.
+
+ -- Mathieu Malaterre <mathieu.malaterre at gmail.com> Mon, 21 Dec 2009 15:46:02 +0100
+
+dicomscope (3.6.0-1) unstable; urgency=low
+
+ * Initial release (Closes: #508990)
+
+ -- Mathieu Malaterre <mathieu.malaterre at gmail.com> Mon, 16 Nov 2009 17:58:43 +0100
Deleted: trunk/packages/dicomscope/tags/3.6.0-8/debian/patches/cmakelists.txt.patch
===================================================================
--- trunk/packages/dicomscope/trunk/debian/patches/cmakelists.txt.patch 2011-12-09 13:07:56 UTC (rev 8877)
+++ trunk/packages/dicomscope/tags/3.6.0-8/debian/patches/cmakelists.txt.patch 2011-12-09 13:34:43 UTC (rev 8881)
@@ -1,145 +0,0 @@
-Instead of using the in-src dcmtk build system, provide a replacement one
-that allow building dicomscope outside of dcmtk
-
-Index: dicomscope-3.6.0/CMakeLists.txt
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ dicomscope-3.6.0/CMakeLists.txt 2011-06-15 01:17:08.000000000 +0200
-@@ -0,0 +1,24 @@
-+PROJECT(DICOMSCOPE)
-+
-+cmake_minimum_required(VERSION 2.6)
-+
-+#-----------------------------------------------------------------------------
-+SET (EXECUTABLE_OUTPUT_PATH ${DICOMSCOPE_BINARY_DIR}/bin CACHE PATH "Single output directory for building all executables.")
-+SET (LIBRARY_OUTPUT_PATH ${DICOMSCOPE_BINARY_DIR}/bin CACHE PATH "Single output directory for building all libraries.")
-+MARK_AS_ADVANCED(LIBRARY_OUTPUT_PATH EXECUTABLE_OUTPUT_PATH)
-+
-+IF(NOT DICOMSCOPE_INSTALL_BIN_DIR)
-+ SET(DICOMSCOPE_INSTALL_BIN_DIR "bin")
-+ENDIF(NOT DICOMSCOPE_INSTALL_BIN_DIR)
-+
-+IF(NOT DICOMSCOPE_INSTALL_LIB_DIR)
-+ SET(DICOMSCOPE_INSTALL_LIB_DIR "lib")
-+ENDIF(NOT DICOMSCOPE_INSTALL_LIB_DIR)
-+IF(NOT DICOMSCOPE_INSTALL_JAVA_DIR)
-+ SET(DICOMSCOPE_INSTALL_JAVA_DIR "share/dicomscope")
-+ENDIF(NOT DICOMSCOPE_INSTALL_JAVA_DIR)
-+
-+INCLUDE_DIRECTORIES(interface/include)
-+
-+SUBDIRS(interface/libsrc)
-+SUBDIRS(tkgui)
-Index: dicomscope-3.6.0/interface/libsrc/CMakeLists.txt
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ dicomscope-3.6.0/interface/libsrc/CMakeLists.txt 2011-06-15 01:17:08.000000000 +0200
-@@ -0,0 +1,60 @@
-+SET(dsgui_SRCS
-+DSRCodeValue.cpp
-+DSRCompositeValue.cpp
-+DSRDocument.cpp
-+DSRDocumentTree.cpp
-+DSRImageValue.cpp
-+DSRNumericValue.cpp
-+DSRSCoordValue.cpp
-+DSRTCoordValue.cpp
-+DSRWaveformValue.cpp
-+DVInterface.cpp
-+DVPresentationState.cpp
-+DVPSCurve.cpp
-+DVPSGraphicObject.cpp
-+DVPSStoredPrint.cpp
-+DVPSTextObject.cpp
-+)
-+FIND_PACKAGE(JNI REQUIRED)
-+INCLUDE_DIRECTORIES(
-+ #${JNI_INCLUDE_PATH} # cmake bug #
-+ ${JAVA_INCLUDE_PATH}
-+ ${JAVA_INCLUDE_PATH2}
-+ ${JAVA_AWT_INCLUDE_PATH}
-+ )
-+
-+FIND_PACKAGE(DCMTK REQUIRED)
-+# /usr/include/dcmtk/dcmpstat/dviface.h
-+FIND_PATH( DCMTK_dcmpstat_INCLUDE_DIR dviface.h
-+ ${DCMTK_DIR}/dcmpstat/include
-+ ${DCMTK_DIR}/include/dcmpstat
-+)
-+# /usr/include/dcmtk/dcmjpeg/djdecode.h
-+FIND_PATH( DCMTK_dcmjpeg_INCLUDE_DIR djdecode.h
-+ ${DCMTK_DIR}/dcmjpeg/include
-+ ${DCMTK_DIR}/include/dcmjpeg
-+)
-+# /usr/include/dcmtk/dcmsr/dsrdoc.h
-+FIND_PATH( DCMTK_dcmsr_INCLUDE_DIR dsrdoc.h
-+ ${DCMTK_DIR}/dcmsr/include
-+ ${DCMTK_DIR}/include/dcmsr
-+)
-+
-+# MESSAGE(${DCMTK_INCLUDE_DIR})
-+INCLUDE_DIRECTORIES(
-+ ${DCMTK_INCLUDE_DIR}
-+ ${DCMTK_dcmpstat_INCLUDE_DIR}
-+ ${DCMTK_dcmsr_INCLUDE_DIR} ${DCMTK_dcmjpeg_INCLUDE_DIR}
-+)
-+
-+ADD_DEFINITIONS(-DHAVE_CONFIG_H -DNDEBUG -DHAVE_STRSTREAM_H)
-+
-+#INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
-+ADD_LIBRARY(jInterface SHARED ${dsgui_SRCS})
-+TARGET_LINK_LIBRARIES(jInterface ${DCMTK_LIBRARIES} dcmpstat dcmsr dcmjpeg ijg16 ijg12 ijg8 xml2 dcmdsig dcmqrdb crypto oflog)
-+ INSTALL(TARGETS jInterface
-+ RUNTIME DESTINATION ${DICOMSCOPE_INSTALL_BIN_DIR} COMPONENT Runtime
-+ LIBRARY DESTINATION ${DICOMSCOPE_INSTALL_LIB_DIR} COMPONENT Runtime ${NAMELINK_SKIP}
-+ ARCHIVE DESTINATION ${DICOMSCOPE_INSTALL_LIB_DIR} COMPONENT Development
-+ )
-+
-Index: dicomscope-3.6.0/tkgui/CMakeLists.txt
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ dicomscope-3.6.0/tkgui/CMakeLists.txt 2011-06-15 01:17:08.000000000 +0200
-@@ -0,0 +1,43 @@
-+# Java
-+FIND_PACKAGE(Java REQUIRED) # javac, jar
-+
-+file(GLOB_RECURSE javafiles ${CMAKE_CURRENT_SOURCE_DIR} "*.java")
-+file(GLOB lutfiles "${DICOMSCOPE_SOURCE_DIR}/DICOMscope/lut/*.lut")
-+file(GLOB reportfiles "${DICOMSCOPE_SOURCE_DIR}/DICOMscope/reports/*.dcm")
-+#message(${lutfiles})
-+
-+#FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/DICOMscope)
-+
-+ADD_CUSTOM_COMMAND(
-+ OUTPUT ${DICOMSCOPE_SOURCE_DIR}/DICOMscope/DICOMscope.class
-+ COMMAND ${JAVA_COMPILE} ARGS -d ../DICOMscope -classpath . dicomscope/DICOMscope.java
-+ WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-+ DEPENDS ${javafiles}
-+ COMMENT "javac *.java"
-+)
-+
-+ADD_CUSTOM_COMMAND(
-+ OUTPUT ${LIBRARY_OUTPUT_PATH}/DICOMscope.jar
-+ COMMAND ${JAVA_ARCHIVE} ARGS cfm ${LIBRARY_OUTPUT_PATH}/DICOMscope.jar ${DICOMSCOPE_SOURCE_DIR}/MANIFEST.MF -C ${DICOMSCOPE_SOURCE_DIR}/DICOMscope .
-+ # manifest thingy
-+ #COMMAND ${JAVA_ARCHIVE} ARGS i ${LIBRARY_OUTPUT_PATH}/DICOMscope.jar
-+ WORKING_DIRECTORY ${DICOMSCOPE_SOURCE_DIR}/DICOMscope
-+ DEPENDS ${DICOMSCOPE_SOURCE_DIR}/DICOMscope/DICOMscope.class
-+ COMMENT "jar cvf -> DICOMscope.jar"
-+)
-+
-+ADD_CUSTOM_TARGET(dummy ALL
-+ DEPENDS ${LIBRARY_OUTPUT_PATH}/DICOMscope.jar
-+ COMMENT "building DICOMscope.jar"
-+)
-+
-+ INSTALL(FILES ${reportfiles} DESTINATION ${DICOMSCOPE_INSTALL_JAVA_DIR}/reports COMPONENT Runtime)
-+ INSTALL(FILES ${lutfiles} DESTINATION ${DICOMSCOPE_INSTALL_JAVA_DIR}/lut COMPONENT Runtime)
-+ INSTALL(FILES ${DICOMSCOPE_SOURCE_DIR}/dicomscope DESTINATION ${DICOMSCOPE_INSTALL_BIN_DIR} COMPONENT Runtime)
-+ INSTALL(FILES ${DICOMSCOPE_SOURCE_DIR}/DICOMscope/dcmpschk.tcl ${DICOMSCOPE_SOURCE_DIR}/DICOMscope/dcmpsdmp.tcl DESTINATION ${DICOMSCOPE_INSTALL_JAVA_DIR}/tcl COMPONENT Runtime)
-+ INSTALL(FILES ${DICOMSCOPE_SOURCE_DIR}/DICOMscope/DICOMscope.cfg DESTINATION /etc/dcmtk COMPONENT Runtime)
-+ INSTALL(FILES ${DICOMSCOPE_SOURCE_DIR}/DICOMscope/codes.dic DESTINATION /usr/share/dcmtk COMPONENT Runtime)
-+ INSTALL(FILES ${LIBRARY_OUTPUT_PATH}/DICOMscope.jar ${DICOMSCOPE_SOURCE_DIR}/DICOMscope/codes.dic
-+ DESTINATION ${DICOMSCOPE_INSTALL_JAVA_DIR} COMPONENT Runtime
-+ )
-+
Copied: trunk/packages/dicomscope/tags/3.6.0-8/debian/patches/cmakelists.txt.patch (from rev 8879, trunk/packages/dicomscope/trunk/debian/patches/cmakelists.txt.patch)
===================================================================
--- trunk/packages/dicomscope/tags/3.6.0-8/debian/patches/cmakelists.txt.patch (rev 0)
+++ trunk/packages/dicomscope/tags/3.6.0-8/debian/patches/cmakelists.txt.patch 2011-12-09 13:34:43 UTC (rev 8881)
@@ -0,0 +1,145 @@
+Instead of using the in-src dcmtk build system, provide a replacement one
+that allow building dicomscope outside of dcmtk
+
+Index: dicomscope-3.6.0/CMakeLists.txt
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ dicomscope-3.6.0/CMakeLists.txt 2011-06-15 01:17:08.000000000 +0200
+@@ -0,0 +1,24 @@
++PROJECT(DICOMSCOPE)
++
++cmake_minimum_required(VERSION 2.6)
++
++#-----------------------------------------------------------------------------
++SET (EXECUTABLE_OUTPUT_PATH ${DICOMSCOPE_BINARY_DIR}/bin CACHE PATH "Single output directory for building all executables.")
++SET (LIBRARY_OUTPUT_PATH ${DICOMSCOPE_BINARY_DIR}/bin CACHE PATH "Single output directory for building all libraries.")
++MARK_AS_ADVANCED(LIBRARY_OUTPUT_PATH EXECUTABLE_OUTPUT_PATH)
++
++IF(NOT DICOMSCOPE_INSTALL_BIN_DIR)
++ SET(DICOMSCOPE_INSTALL_BIN_DIR "bin")
++ENDIF(NOT DICOMSCOPE_INSTALL_BIN_DIR)
++
++IF(NOT DICOMSCOPE_INSTALL_LIB_DIR)
++ SET(DICOMSCOPE_INSTALL_LIB_DIR "lib")
++ENDIF(NOT DICOMSCOPE_INSTALL_LIB_DIR)
++IF(NOT DICOMSCOPE_INSTALL_JAVA_DIR)
++ SET(DICOMSCOPE_INSTALL_JAVA_DIR "share/dicomscope")
++ENDIF(NOT DICOMSCOPE_INSTALL_JAVA_DIR)
++
++INCLUDE_DIRECTORIES(interface/include)
++
++SUBDIRS(interface/libsrc)
++SUBDIRS(tkgui)
+Index: dicomscope-3.6.0/interface/libsrc/CMakeLists.txt
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ dicomscope-3.6.0/interface/libsrc/CMakeLists.txt 2011-06-15 01:17:08.000000000 +0200
+@@ -0,0 +1,60 @@
++SET(dsgui_SRCS
++DSRCodeValue.cpp
++DSRCompositeValue.cpp
++DSRDocument.cpp
++DSRDocumentTree.cpp
++DSRImageValue.cpp
++DSRNumericValue.cpp
++DSRSCoordValue.cpp
++DSRTCoordValue.cpp
++DSRWaveformValue.cpp
++DVInterface.cpp
++DVPresentationState.cpp
++DVPSCurve.cpp
++DVPSGraphicObject.cpp
++DVPSStoredPrint.cpp
++DVPSTextObject.cpp
++)
++FIND_PACKAGE(JNI REQUIRED)
++INCLUDE_DIRECTORIES(
++ #${JNI_INCLUDE_PATH} # cmake bug #
++ ${JAVA_INCLUDE_PATH}
++ ${JAVA_INCLUDE_PATH2}
++ ${JAVA_AWT_INCLUDE_PATH}
++ )
++
++FIND_PACKAGE(DCMTK REQUIRED)
++# /usr/include/dcmtk/dcmpstat/dviface.h
++FIND_PATH( DCMTK_dcmpstat_INCLUDE_DIR dviface.h
++ ${DCMTK_DIR}/dcmpstat/include
++ ${DCMTK_DIR}/include/dcmpstat
++)
++# /usr/include/dcmtk/dcmjpeg/djdecode.h
++FIND_PATH( DCMTK_dcmjpeg_INCLUDE_DIR djdecode.h
++ ${DCMTK_DIR}/dcmjpeg/include
++ ${DCMTK_DIR}/include/dcmjpeg
++)
++# /usr/include/dcmtk/dcmsr/dsrdoc.h
++FIND_PATH( DCMTK_dcmsr_INCLUDE_DIR dsrdoc.h
++ ${DCMTK_DIR}/dcmsr/include
++ ${DCMTK_DIR}/include/dcmsr
++)
++
++# MESSAGE(${DCMTK_INCLUDE_DIR})
++INCLUDE_DIRECTORIES(
++ ${DCMTK_INCLUDE_DIR}
++ ${DCMTK_dcmpstat_INCLUDE_DIR}
++ ${DCMTK_dcmsr_INCLUDE_DIR} ${DCMTK_dcmjpeg_INCLUDE_DIR}
++)
++
++ADD_DEFINITIONS(-DHAVE_CONFIG_H -DNDEBUG -DHAVE_STRSTREAM_H)
++
++#INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
++ADD_LIBRARY(jInterface SHARED ${dsgui_SRCS})
++TARGET_LINK_LIBRARIES(jInterface ${DCMTK_LIBRARIES} dcmpstat dcmsr dcmjpeg ijg16 ijg12 ijg8 xml2 dcmdsig dcmqrdb crypto oflog)
++ INSTALL(TARGETS jInterface
++ RUNTIME DESTINATION ${DICOMSCOPE_INSTALL_BIN_DIR} COMPONENT Runtime
++ LIBRARY DESTINATION ${DICOMSCOPE_INSTALL_LIB_DIR} COMPONENT Runtime ${NAMELINK_SKIP}
++ ARCHIVE DESTINATION ${DICOMSCOPE_INSTALL_LIB_DIR} COMPONENT Development
++ )
++
+Index: dicomscope-3.6.0/tkgui/CMakeLists.txt
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ dicomscope-3.6.0/tkgui/CMakeLists.txt 2011-06-15 01:17:08.000000000 +0200
+@@ -0,0 +1,43 @@
++# Java
++FIND_PACKAGE(Java REQUIRED) # javac, jar
++
++file(GLOB_RECURSE javafiles ${CMAKE_CURRENT_SOURCE_DIR} "*.java")
++file(GLOB lutfiles "${DICOMSCOPE_SOURCE_DIR}/DICOMscope/lut/*.lut")
++file(GLOB reportfiles "${DICOMSCOPE_SOURCE_DIR}/DICOMscope/reports/*.dcm")
++#message(${lutfiles})
++
++#FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/DICOMscope)
++
++ADD_CUSTOM_COMMAND(
++ OUTPUT ${DICOMSCOPE_SOURCE_DIR}/DICOMscope/DICOMscope.class
++ COMMAND ${JAVA_COMPILE} ARGS -d ../DICOMscope -classpath . -source 1.5 -target 1.5 dicomscope/DICOMscope.java
++ WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
++ DEPENDS ${javafiles}
++ COMMENT "javac *.java"
++)
++
++ADD_CUSTOM_COMMAND(
++ OUTPUT ${LIBRARY_OUTPUT_PATH}/DICOMscope.jar
++ COMMAND ${JAVA_ARCHIVE} ARGS cfm ${LIBRARY_OUTPUT_PATH}/DICOMscope.jar ${DICOMSCOPE_SOURCE_DIR}/MANIFEST.MF -C ${DICOMSCOPE_SOURCE_DIR}/DICOMscope .
++ # manifest thingy
++ #COMMAND ${JAVA_ARCHIVE} ARGS i ${LIBRARY_OUTPUT_PATH}/DICOMscope.jar
++ WORKING_DIRECTORY ${DICOMSCOPE_SOURCE_DIR}/DICOMscope
++ DEPENDS ${DICOMSCOPE_SOURCE_DIR}/DICOMscope/DICOMscope.class
++ COMMENT "jar cvf -> DICOMscope.jar"
++)
++
++ADD_CUSTOM_TARGET(dummy ALL
++ DEPENDS ${LIBRARY_OUTPUT_PATH}/DICOMscope.jar
++ COMMENT "building DICOMscope.jar"
++)
++
++ INSTALL(FILES ${reportfiles} DESTINATION ${DICOMSCOPE_INSTALL_JAVA_DIR}/reports COMPONENT Runtime)
++ INSTALL(FILES ${lutfiles} DESTINATION ${DICOMSCOPE_INSTALL_JAVA_DIR}/lut COMPONENT Runtime)
++ INSTALL(FILES ${DICOMSCOPE_SOURCE_DIR}/dicomscope DESTINATION ${DICOMSCOPE_INSTALL_BIN_DIR} COMPONENT Runtime)
++ INSTALL(FILES ${DICOMSCOPE_SOURCE_DIR}/DICOMscope/dcmpschk.tcl ${DICOMSCOPE_SOURCE_DIR}/DICOMscope/dcmpsdmp.tcl DESTINATION ${DICOMSCOPE_INSTALL_JAVA_DIR}/tcl COMPONENT Runtime)
++ INSTALL(FILES ${DICOMSCOPE_SOURCE_DIR}/DICOMscope/DICOMscope.cfg DESTINATION /etc/dcmtk COMPONENT Runtime)
++ INSTALL(FILES ${DICOMSCOPE_SOURCE_DIR}/DICOMscope/codes.dic DESTINATION /usr/share/dcmtk COMPONENT Runtime)
++ INSTALL(FILES ${LIBRARY_OUTPUT_PATH}/DICOMscope.jar ${DICOMSCOPE_SOURCE_DIR}/DICOMscope/codes.dic
++ DESTINATION ${DICOMSCOPE_INSTALL_JAVA_DIR} COMPONENT Runtime
++ )
++
More information about the debian-med-commit
mailing list