[Zorba-coders] [Merge] lp:~davidagraf/zorba/data-formatting-module-bug-989490 into lp:zorba/data-formatting-module
The proposal to merge lp:~davidagraf/zorba/data-formatting-module-bug-989490 into lp:zorba/data-formatting-module has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~davidagraf/zorba/data-formatting-module-bug-989490/+merge/110273 -- https://code.launchpad.net/~davidagraf/zorba/data-formatting-module-bug-989490/+merge/110273 Your team Zorba Coders is subscribed to branch lp:zorba/data-formatting-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~davidagraf/zorba/data-formatting-module-bug-989490 into lp:zorba/data-formatting-module
Validation queue job data-formatting-module-bug-989490-2012-11-07T11-12-30.016Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~davidagraf/zorba/data-formatting-module-bug-989490/+merge/110273 Your team Zorba Coders is subscribed to branch lp:zorba/data-formatting-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~davidagraf/zorba/data-formatting-module-bug-989490 into lp:zorba/data-formatting-module
Review: Approve I think you're correct, although at this point I'm not really sure either. For what it's worth, ZORBA_FIND_JNI() doesn't actually do the finding of JNI; it sets up JAVA_HOME in some magic way, and then just calls FIND_PACKAGE(JNI) anyway. So it depends on FindJNI.cmake existing somewhere. But FindJNI.cmake comes with CMake (at least recent versions), so I don't think we need to package it anywhere ourselves anymore. (Unless we have local hacks to it, which we may...) It would probably make sense for ZORBA_FIND_JNI() to also find Java, but one thing at a time. Let's see if this change goes in as it stands... -- https://code.launchpad.net/~davidagraf/zorba/data-formatting-module-bug-989490/+merge/110273 Your team Zorba Coders is subscribed to branch lp:zorba/data-formatting-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~davidagraf/zorba/data-formatting-module-bug-989490 into lp:zorba/data-formatting-module
The proposal to merge lp:~davidagraf/zorba/data-formatting-module-bug-989490 into lp:zorba/data-formatting-module has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~davidagraf/zorba/data-formatting-module-bug-989490/+merge/110273 -- https://code.launchpad.net/~davidagraf/zorba/data-formatting-module-bug-989490/+merge/110273 Your team Zorba Coders is subscribed to branch lp:zorba/data-formatting-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~davidagraf/zorba/data-formatting-module-bug-989490 into lp:zorba/data-formatting-module
Attempt to merge into lp:zorba/data-formatting-module failed due to conflicts: contents conflict in cmake_modules/FindJNI.cmake -- https://code.launchpad.net/~davidagraf/zorba/data-formatting-module-bug-989490/+merge/110273 Your team Zorba Coders is subscribed to branch lp:zorba/data-formatting-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~davidagraf/zorba/data-formatting-module-bug-989490 into lp:zorba/data-formatting-module
Hey Chris This merge proposal got lost. Do you know the status of this? I lost the overview. But I guess that FIND_PACKAGE(JNI) in all the java modules should be replaced with ZORBA_FIND_JNI(). Do you agree? -- https://code.launchpad.net/~davidagraf/zorba/data-formatting-module-bug-989490/+merge/110273 Your team Zorba Coders is subscribed to branch lp:zorba/data-formatting-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~davidagraf/zorba/data-formatting-module-bug-989490 into lp:zorba/data-formatting-module
David Graf has proposed merging
lp:~davidagraf/zorba/data-formatting-module-bug-989490 into
lp:zorba/data-formatting-module.
Requested reviews:
David Graf (davidagraf)
Chris Hillery (ceejatec)
For more details, see:
https://code.launchpad.net/~davidagraf/zorba/data-formatting-module-bug-989490/+merge/110273
bug #989490
--
https://code.launchpad.net/~davidagraf/zorba/data-formatting-module-bug-989490/+merge/110273
Your team Zorba Coders is subscribed to branch lp:zorba/data-formatting-module.
=== removed directory 'cmake_modules'
=== removed file 'cmake_modules/FindJNI.cmake'
--- cmake_modules/FindJNI.cmake 2011-08-02 15:06:36 +
+++ cmake_modules/FindJNI.cmake 1970-01-01 00:00:00 +
@@ -1,279 +0,0 @@
-# - Find JNI java libraries.
-# This module finds if Java is installed and determines where the
-# include files and libraries are. It also determines what the name of
-# the library is. This code sets the following variables:
-#
-# JNI_INCLUDE_DIRS = the include dirs to use
-# JNI_LIBRARIES = the libraries to use
-# JNI_FOUND = TRUE if JNI headers and libraries were found.
-# JAVA_AWT_LIBRARY = the path to the jawt library
-# JAVA_JVM_LIBRARY = the path to the jvm library
-# JAVA_INCLUDE_PATH = the include path to jni.h
-# JAVA_INCLUDE_PATH2= the include path to jni_md.h
-# JAVA_AWT_INCLUDE_PATH = the include path to jawt.h
-#
-
-#=
-# 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.
-#=
-# (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)
-# Determine java arch-specific library subdir
-# Mostly based on openjdk/jdk/make/common/shared/Platform.gmk as of openjdk
-# 1.6.0_18 + icedtea patches. However, it would be much better to base the
-# guess on the first part of the GNU config.guess platform triplet.
-IF(CMAKE_SYSTEM_PROCESSOR STREQUAL x86_64)
-SET(_java_libarch amd64)
-ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES ^i.86$)
-SET(_java_libarch i386)
-ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES ^alpha)
-SET(_java_libarch alpha)
-ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES ^arm)
-# Subdir is arm for both big-endian (arm) and little-endian (armel).
-SET(_java_libarch arm)
-ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES ^mips)
-# mips* machines are bi-endian mostly so processor does not tell
-# endianess of the underlying system.
-SET(_java_libarch ${CMAKE_SYSTEM_PROCESSOR} mips mipsel mipseb)
-ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES ^(powerpc|ppc)64)
-SET(_java_libarch ppc64)
-ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES ^(powerpc|ppc))
-SET(_java_libarch ppc)
-ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES ^sparc)
-# Both flavours can run on the same processor
-SET(_java_libarch ${CMAKE_SYSTEM_PROCESSOR} sparc sparcv9)
-ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES ^(parisc|hppa))
-SET(_java_libarch parisc parisc64)
-ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES ^s390)
-# s390 binaries can run on s390x machines
-SET(_java_libarch ${CMAKE_SYSTEM_PROCESSOR} s390 s390x)
-ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES ^sh)
-SET(_java_libarch sh)
-ELSE(CMAKE_SYSTEM_PROCESSOR STREQUAL x86_64)
-SET(_java_libarch ${CMAKE_SYSTEM_PROCESSOR})
-ENDIF(CMAKE_SYSTEM_PROCESSOR STREQUAL x86_64)
-
-# Append default list architectures if CMAKE_SYSTEM_PROCESSOR was empty or
-# system is non-Linux (where the code above has not been well tested)
-IF(NOT _java_libarch OR NOT CMAKE_SYSTEM_NAME MATCHES Linux)
-LIST(APPEND _java_libarch i386 amd64 ppc)
-ENDIF(NOT _java_libarch OR NOT CMAKE_SYSTEM_NAME MATCHES Linux)
-
-# Sometimes ${CMAKE_SYSTEM_PROCESSOR} is added to the list to prefer
-# current value to a hardcoded list. Remove possible duplicates.
-LIST(REMOVE_DUPLICATES _java_libarch)
-
-FOREACH(_path ${ARGN})
-IF(_path MATCHES {libarch})
-FOREACH(_libarch ${_java_libarch})
-STRING(REPLACE {libarch} ${_libarch} _newpath ${_path})
-LIST(APPEND ${_var} ${_newpath})
-ENDFOREACH(_libarch)
-ELSE(_path MATCHES {libarch})
-LIST(APPEND ${_var} ${_path})
-ENDIF(_path MATCHES {libarch})
-ENDFOREACH(_path)
-ENDMACRO(java_append_library_directories)
-
Re: [Zorba-coders] [Merge] lp:~davidagraf/zorba/data-formatting-module-bug-989490 into lp:zorba/data-formatting-module
Review: Needs Information Have you tested this on Windows? I'm actually not sure that you can delete the Windows/FindJNI.cmake file; it does something different. -- https://code.launchpad.net/~davidagraf/zorba/data-formatting-module-bug-989490/+merge/110273 Your team Zorba Coders is subscribed to branch lp:zorba/data-formatting-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~davidagraf/zorba/data-formatting-module-bug-989490 into lp:zorba/data-formatting-module
Review: Needs Information
Hello Chris. Unfortunately now :-(. Sorry. But before testing, I need to fix
something else. I just saw this:
bzr diff -c 31
=== modified file 'CMakeLists.txt'
--- CMakeLists.txt 2012-05-23 09:12:37 +
+++ CMakeLists.txt 2012-06-04 11:42:06 +
@@ -16,12 +16,14 @@
PROJECT (zorba_schema-tools_module)
-# The util-jvm tool finds Java and JNI, so all standard cached JAVA_
-# variables will be set. util-jvm also caches Java_FOUND and JNI_FOUND
-# for us.
FIND_PACKAGE (zorba_util-jvm_module QUIET)
IF (zorba_util-jvm_module_FOUND)
+ FIND_PACKAGE(JNI)
+ FIND_PACKAGE(Java)
+ FIND_PACKAGE (Zorba REQUIRED HINTS ${ZORBA_BUILD_DIR})
+ INCLUDE (${Zorba_USE_FILE})
+
IF (JNI_FOUND)
INCLUDE_DIRECTORIES (${zorba_util-jvm_module_INCLUDE_DIRS})
This is not merged into the sausalito code yet. Therefore, I didn't recognize
it. Why is this necessary? Can we somehow avoid this? If not, we need to do the
tricks we are now doing in the util-jvm module here too :-(.
--
https://code.launchpad.net/~davidagraf/zorba/data-formatting-module-bug-989490/+merge/110273
Your team Zorba Coders is subscribed to branch lp:zorba/data-formatting-module.
--
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~davidagraf/zorba/data-formatting-module-bug-989490 into lp:zorba/data-formatting-module
It is necessary for now, primarily to support building the data-formatting-module against an *installed* Zorba with the util-jvm module. In that case, util-jvm's CMakeLists.txt won't be run, so FIND_PACKAGE(Java) and (JNI) won't be run either. A better solution would probably be to add those two FIND_PACKAGE() calls, with the associated JAVA_HOME trickery, to util-jvm's use file (util-jvm-module/config/UtilJavaUse.cmake), and then have data-formatting and schema-tools include the use file in the same way that the EXI module does. (Ideally util-jvm's own CMakeLists.txt would also include its own use file so that the code would exist in exactly one place, but I'm not totally sure how to accomplish that.) -- https://code.launchpad.net/~davidagraf/zorba/data-formatting-module-bug-989490/+merge/110273 Your team Zorba Coders is subscribed to branch lp:zorba/data-formatting-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
