zorba-coders team mailing list archive
-
zorba-coders team
-
Mailing list archive
-
Message #22456
[Merge] lp:~zorba-coders/zorba/pdf-installer-fix into lp:zorba/read-pdf-module
Juan Zacarias has proposed merging lp:~zorba-coders/zorba/pdf-installer-fix into lp:zorba/read-pdf-module.
Commit message:
Fixes for Ubuntu Packages.
Requested reviews:
Juan Zacarias (juan457)
Chris Hillery (ceejatec)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/pdf-installer-fix/+merge/166107
Fixes for Ubuntu Packages.
--
https://code.launchpad.net/~zorba-coders/zorba/pdf-installer-fix/+merge/166107
Your team Zorba Coders is subscribed to branch lp:zorba/read-pdf-module.
=== modified file 'CMakeLists.txt'
--- CMakeLists.txt 2012-09-28 19:38:29 +0000
+++ CMakeLists.txt 2013-05-28 17:07:53 +0000
@@ -21,8 +21,16 @@
# variables will be set. util-jvm also caches Java_FOUND and JNI_FOUND
# for us.
FIND_PACKAGE (zorba_util-jvm_module QUIET)
+INCLUDE ("${zorba_util-jvm_module_USE_FILE}")
IF (zorba_util-jvm_module_FOUND)
+ FIND_PACKAGE (Zorba REQUIRED HINTS "${ZORBA_BUILD_DIR}")
+ INCLUDE ("${Zorba_USE_FILE}")
+
+ SET_CMAKE_MODULE_PATH ()
+ FIND_PACKAGE(JNI)
+ FIND_PACKAGE(Java)
+
IF (JNI_FOUND)
INCLUDE_DIRECTORIES (${zorba_util-jvm_module_INCLUDE_DIRS})
@@ -43,6 +51,11 @@
ZORBA_FIND_JAR( JEMPBOX_JAR NAMES jempbox PATHS ${PDFBOX_PATH} )
ZORBA_FIND_JAR( COMMLOG_JAR NAMES commons-logging PATHS ${PDFBOX_PATH} )
+ MESSAGE(STATUS "commons-logging.jar Found in: ${COMMLOG_JAR}")
+ MESSAGE(STATUS "jempbox.jar Found in: ${JEMPBOX_JAR}")
+ MESSAGE(STATUS "fontbox.jar Found in: ${FONTBOX_JAR}")
+ MESSAGE(STATUS "pdfbox.jar Found in: ${PDFBOX_JAR}")
+
SET(ALL_PDFBOX_JARS FALSE)
IF(EXISTS ${PDFBOX_JAR})
IF(EXISTS ${FONTBOX_JAR})
@@ -64,11 +77,6 @@
ENABLE_TESTING ()
INCLUDE (CTest)
- SET_CMAKE_MODULE_PATH ()
-
- FIND_PACKAGE (Zorba REQUIRED HINTS "${ZORBA_BUILD_DIR}")
- INCLUDE ("${Zorba_USE_FILE}")
-
ADD_SUBDIRECTORY ("src")
ADD_SUBDIRECTORY ("srcJava")
ADD_TEST_DIRECTORY("${PROJECT_SOURCE_DIR}/test")
@@ -86,4 +94,4 @@
MESSAGE (STATUS "Zorba's util-jvm module not found; skipping read-pdf module.")
ENDIF (zorba_util-jvm_module_FOUND)
-MESSAGE (STATUS " --- End module: read-pdf ---")
\ No newline at end of file
+MESSAGE (STATUS " --- End module: read-pdf ---")
=== modified file 'cmake_modules/FindJNI.cmake'
--- cmake_modules/FindJNI.cmake 2012-09-17 19:26:21 +0000
+++ cmake_modules/FindJNI.cmake 2013-05-28 17:07:53 +0000
@@ -14,17 +14,35 @@
#
#=============================================================================
-# Copyright 2001-2009 Kitware, Inc.
-#
-# Distributed under the OSI-approved BSD License (the "License");
-# see accompanying file Copyright.txt for details.
-#
-# This software is distributed WITHOUT ANY WARRANTY; without even the
-# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-# See the License for more information.
+# Copyright 2000-2009 Kitware, Inc., Insight Software Consortium
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# * Redistributions of source code must retain the above copyright notice,
+# this list of conditions and the following disclaimer.
+#
+# * Redistributions in binary form must reproduce the above copyright notice,
+# this list of conditions and the following disclaimer in the documentation
+# and/or other materials provided with the distribution.
+#
+# * Neither the names of Kitware, Inc., the Insight Software Consortium, nor
+# the names of their contributors may be used to endorse or promote products
+# derived from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
#=============================================================================
-# (To distribute this file outside of CMake, substitute the full
-# License text for the above reference.)
# Expand {libarch} occurences to java_libarch subdirectory(-ies) and set ${_var}
MACRO(java_append_library_directories _var)
@@ -101,6 +119,18 @@
${_JAVA_HOME}/jre/lib
${_JAVA_HOME}/lib
${_JAVA_HOME}
+ /usr/lib/jvm/java-6-openjdk/jre/lib
+ /usr/lib/jvm/java-6-openjdk-i386/jre/lib
+ /usr/lib/jvm/java-6-openjdk-amd64/jre/lib
+ /usr/lib/jvm/java-6-openjdk/jre/lib/{libarch}
+ /usr/lib/jvm/java-6-openjdk-i386/jre/lib/{libarch}
+ /usr/lib/jvm/java-6-openjdk-amd64/jre/lib/{libarch}
+ /usr/lib/jvm/java-7-openjdk/jre/lib
+ /usr/lib/jvm/java-7-openjdk-i386/jre/lib
+ /usr/lib/jvm/java-7-openjdk-amd64/jre/lib
+ /usr/lib/jvm/java-7-openjdk/jre/lib/{libarch}
+ /usr/lib/jvm/java-7-openjdk-i386/jre/lib/{libarch}
+ /usr/lib/jvm/java-7-openjdk-amd64/jre/lib/{libarch}
/usr/lib
/usr/local/lib
/usr/lib/jvm/java/lib
@@ -113,7 +143,6 @@
/usr/lib/jvm/java-6-sun/jre/lib/{libarch}
/usr/lib/jvm/java-1.5.0-sun/jre/lib/{libarch}
/usr/lib/jvm/java-6-sun-1.6.0.00/jre/lib/{libarch} # can this one be removed according to #8821 ? Alex
- /usr/lib/jvm/java-6-openjdk/jre/lib/{libarch}
/usr/lib/jvm/java-openjdk/jre/lib/{libarch}
# Debian specific paths for default JVM
/usr/lib/jvm/default-java/jre/lib/{libarch}
@@ -137,6 +166,9 @@
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.3;JavaHome]/include"
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\${java_install_version};JavaHome]/include"
${_JAVA_HOME}/include
+ /usr/lib/jvm/java-6-openjdk/include
+ /usr/lib/jvm/java-6-openjdk-amd64/include
+ /usr/lib/jvm/java-6-openjdk-i386/include
/usr/include
/usr/local/include
/usr/lib/java/include
@@ -233,6 +265,7 @@
${JAVA_INCLUDE_PATH}
)
+
IF (APPLE)
# On Mac, the java headers files are broken symlinks if the Apple Developer Tools for Java are not installed
EXECUTE_PROCESS(COMMAND cat ${JAVA_INCLUDE_PATH}/jni.h
@@ -275,5 +308,3 @@
SET(JNI_LIBRARIES "")
SET(JNI_INCLUDE_DIRS "")
ENDIF (JAVA_AWT_LIBRARY AND JAVA_JVM_LIBRARY AND JAVA_INCLUDE_PATH AND JAVA_INCLUDE_PATH2 AND JAVA_AWT_INCLUDE_PATH)
-
-
Follow ups
-
[Merge] lp:~zorba-coders/zorba/pdf-installer-fix into lp:zorba/read-pdf-module
From: noreply, 2013-05-28
-
[Merge] lp:~zorba-coders/zorba/pdf-installer-fix into lp:zorba/read-pdf-module
From: Zorba Build Bot, 2013-05-28
-
[Merge] lp:~zorba-coders/zorba/pdf-installer-fix into lp:zorba/read-pdf-module
From: Zorba Build Bot, 2013-05-28
-
Re: [Merge] lp:~zorba-coders/zorba/pdf-installer-fix into lp:zorba/read-pdf-module
From: Chris Hillery, 2013-05-28
-
Re: [Merge] lp:~zorba-coders/zorba/pdf-installer-fix into lp:zorba/read-pdf-module
From: Juan Zacarias, 2013-05-28
-
[Merge] lp:~zorba-coders/zorba/pdf-installer-fix into lp:zorba/read-pdf-module
From: Juan Zacarias, 2013-05-28
-
[Merge] lp:~zorba-coders/zorba/pdf-installer-fix into lp:zorba/read-pdf-module
From: Zorba Build Bot, 2013-05-28
-
Re: [Merge] lp:~zorba-coders/zorba/pdf-installer-fix into lp:zorba/read-pdf-module
From: Zorba Build Bot, 2013-05-28
-
[Merge] lp:~zorba-coders/zorba/pdf-installer-fix into lp:zorba/read-pdf-module
From: Zorba Build Bot, 2013-05-28
-
[Merge] lp:~zorba-coders/zorba/pdf-installer-fix into lp:zorba/read-pdf-module
From: Juan Zacarias, 2013-05-28