Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/zorba-installer-with-thesaurus into lp:zorba
I tweaked this a bit to make ZORBA_WITH_THESAURUS a top-level config option. It also now defaults to ON. -- https://code.launchpad.net/~zorba-coders/zorba/zorba-installer-with-thesaurus/+merge/116385 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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:~zorba-coders/zorba/zorba-installer-with-thesaurus into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/zorba-installer-with-thesaurus/+merge/116385 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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:~zorba-coders/zorba/zorba-installer-with-thesaurus into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/zorba-installer-with-thesaurus into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/zorba-installer-with-thesaurus/+merge/116385 -- https://code.launchpad.net/~zorba-coders/zorba/zorba-installer-with-thesaurus/+merge/116385 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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:~zorba-coders/zorba/zorba-installer-with-thesaurus into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/zorba-installer-with-thesaurus-2012-08-03T02-00-11.743Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/zorba-installer-with-thesaurus/+merge/116385 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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:~zorba-coders/zorba/zorba-installer-with-thesaurus into lp:zorba
Voting does not meet specified criteria. Required: Approve 1, Disapprove 1, Needs Fixing 1, Pending 1. Got: 1 Approve, 1 Pending. -- https://code.launchpad.net/~zorba-coders/zorba/zorba-installer-with-thesaurus/+merge/116385 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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:~zorba-coders/zorba/zorba-installer-with-thesaurus into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/zorba-installer-with-thesaurus into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/zorba-installer-with-thesaurus/+merge/116385 -- https://code.launchpad.net/~zorba-coders/zorba/zorba-installer-with-thesaurus/+merge/116385 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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:~zorba-coders/zorba/zorba-installer-with-thesaurus into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/zorba-installer-with-thesaurus/+merge/116385 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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:~zorba-coders/zorba/zorba-installer-with-thesaurus into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/zorba-installer-with-thesaurus into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/zorba-installer-with-thesaurus/+merge/116385 -- https://code.launchpad.net/~zorba-coders/zorba/zorba-installer-with-thesaurus/+merge/116385 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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:~zorba-coders/zorba/zorba-installer-with-thesaurus into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/zorba-installer-with-thesaurus-2012-08-03T04-10-03.417Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/zorba-installer-with-thesaurus/+merge/116385 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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:~zorba-coders/zorba/zorba-installer-with-thesaurus into lp:zorba
Validation queue job zorba-installer-with-thesaurus-2012-08-03T04-10-03.417Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/zorba-installer-with-thesaurus/+merge/116385 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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:~zorba-coders/zorba/zorba-installer-with-thesaurus into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/zorba-installer-with-thesaurus into lp:zorba has been updated. Status: Approved = Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/zorba-installer-with-thesaurus/+merge/116385 -- https://code.launchpad.net/~zorba-coders/zorba/zorba-installer-with-thesaurus/+merge/116385 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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:~zorba-coders/zorba/zorba-installer-with-thesaurus into lp:zorba
Looks like you forgot to include the config/thesaurus directory and any contents. Fixed, sorry didn't notice this error Also, does this change set up a separate zorba-default-thesaurus Ubuntu package? Or is that all handled in those separate recipe branches we talked about? is handled in the separate recipes, it just adds the cmake variable -DZORBA_WITH_THESAURUS=ON and it will build the package with thesaurus -- https://code.launchpad.net/~zorba-coders/zorba/zorba-installer-with-thesaurus/+merge/116385 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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:~zorba-coders/zorba/zorba-installer-with-thesaurus into lp:zorba
Juan Zacarias has proposed merging
lp:~zorba-coders/zorba/zorba-installer-with-thesaurus into lp:zorba.
Requested reviews:
Juan Zacarias (juan457)
Chris Hillery (ceejatec)
Related bugs:
Bug #1014979 in Zorba: Make thesaurus optional component on Windows
https://bugs.launchpad.net/zorba/+bug/1014979
Bug #1014981 in Zorba: Make default thesaurus available as Ubuntu package
https://bugs.launchpad.net/zorba/+bug/1014981
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/zorba-installer-with-thesaurus/+merge/116385
Fix of bugs
Bug #1014979: Make thesaurus optional component on Windows
Bug #1014981: Make default thesaurus available as Ubuntu package
Also Fixed FindJNI.cmake to be found-able in the Ubuntu Installer
--
https://code.launchpad.net/~zorba-coders/zorba/zorba-installer-with-thesaurus/+merge/116385
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'CMakeCPack.cmake'
--- CMakeCPack.cmake 2012-07-12 17:29:55 +
+++ CMakeCPack.cmake 2012-07-23 22:39:20 +
@@ -32,6 +32,7 @@
SET(CPACK_COMPONENT_PYTHON_SWIG_DISPLAY_NAME Python API)
SET(CPACK_COMPONENT_RUBY_SWIG_DISPLAY_NAME Ruby API)
SET(CPACK_COMPONENT_XQJ_SWIG_DISPLAY_NAME Java XQJ API)
+SET(CPACK_COMPONENT_THESAURUS_DISPLAY_NAME Thesaurus)
SET(CPACK_COMPONENT_UNSPECIFIED_DESCRIPTION Zorba Required Files.)
SET(CPACK_COMPONENT_DOC_DESCRIPTION Files with the Description of different features of zorba.)
@@ -44,6 +45,7 @@
SET(CPACK_COMPONENT_PYTHON_SWIG_DESCRIPTION API for Python)
SET(CPACK_COMPONENT_RUBY_SWIG_DESCRIPTION API for Ruby)
SET(CPACK_COMPONENT_XQJ_SWIG_DESCRIPTION XQJ API for Java)
+SET(CPACK_COMPONENT_THESAURUS_DESCRIPTION Thesaurus for Zorba)
SET(CPACK_COMPONENT_DOC_GROUP Documents)
SET(CPACK_COMPONENT_PHP_EXAMPLES_GROUP Documents)
@@ -75,8 +77,8 @@
SET(CPACK_COMPONENT_RUBY_SWIG_INSTALL_TYPES Full)
SET(CPACK_COMPONENT_XQJ_SWIG_INSTALL_TYPES Full)
SET(CPACK_COMPONENT_UNSPECIFIED_INSTALL_TYPES Full Simple Lite)
+SET(CPACK_COMPONENT_THESAURUS_INSTALL_TYPE Full)
-SET(CPACK_COMPONENT_UNSPECIFIED_HIDDEN FALSE)
INCLUDE(${CMAKE_BINARY_DIR}/CMakeCPackModules.cmake)
=== modified file 'cmake_modules/FindJNI.cmake'
--- cmake_modules/FindJNI.cmake 2012-07-12 17:29:55 +
+++ cmake_modules/FindJNI.cmake 2012-07-23 22:39:20 +
@@ -101,6 +101,9 @@
${_JAVA_HOME}/jre/lib
${_JAVA_HOME}/lib
${_JAVA_HOME}
+ /usr/lib/jvm/java-6-openjdk/jre/lib/{libarch}
+ /usr/lib/jvm/java-6-openjdk-amd64/jre/lib/{libarch}
+ /usr/lib/jvm/java-6-openjdk-i386/jre/lib/{libarch}
/usr/lib
/usr/local/lib
/usr/lib/jvm/java/lib
@@ -113,7 +116,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}
=== modified file 'config/CMakeLists.txt'
--- config/CMakeLists.txt 2012-07-12 17:29:55 +
+++ config/CMakeLists.txt 2012-07-23 22:39:20 +
@@ -99,3 +99,4 @@
ADD_SUBDIRECTORY(fedora)
ADD_SUBDIRECTORY(debian)
+ADD_SUBDIRECTORY(thesaurus)
=== modified file 'test/rbkt/Queries/CMakeLists.txt'
--- test/rbkt/Queries/CMakeLists.txt 2012-07-13 06:47:59 +
+++ test/rbkt/Queries/CMakeLists.txt 2012-07-23 22:39:20 +
@@ -118,7 +118,8 @@
SET(ZORBA_WORDNET_FOUND 1)
# Kind of a weird place to put this directive, but convenient
INSTALL(FILES ${WORDNET_THESAURUS_FILE}
-DESTINATION ${ZORBA_CORE_LIB_DIR}/edu/princeton/wordnet)
+DESTINATION ${ZORBA_CORE_LIB_DIR}/edu/princeton/wordnet
+COMPONENT thesaurus)
ENDIF(EXISTS ${WORDNET_THESAURUS_FILE})
IF(ZORBA_SUPPRESS_CURL)
--
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:~zorba-coders/zorba/zorba-installer-with-thesaurus into lp:zorba
Review: Needs Fixing Looks like you forgot to include the config/thesaurus directory and any contents. Also, does this change set up a separate zorba-default-thesaurus Ubuntu package? Or is that all handled in those separate recipe branches we talked about? -- https://code.launchpad.net/~zorba-coders/zorba/zorba-installer-with-thesaurus/+merge/116385 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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
