Zorba

Merge lp:~zorba-coders/zorba/zorba-installer-with-thesaurus into lp:zorba

  1. zorba-installer-with-thesaurus
  2. Merge into trunk
Proposed by Juan Zacarias
Status: Merged
Approved by: Juan Zacarias
Approved revision: 10957
Merged at revision: 10967
Proposed branch: lp:~zorba-coders/zorba/zorba-installer-with-thesaurus
Merge into: lp:zorba
Diff against target: 159 lines (+45/-15)
6 files modified
CMakeCPack.cmake (+3/-1)
CMakeConfiguration.txt (+4/-0)
cmake_modules/FindJNI.cmake (+9/-1)
config/CMakeLists.txt (+1/-0)
config/thesaurus/CMakeLists.txt (+26/-0)
test/rbkt/Queries/CMakeLists.txt (+2/-13)
To merge this branch: bzr merge lp:~zorba-coders/zorba/zorba-installer-with-thesaurus
Reviewer Review Type Date Requested Status
Juan Zacarias Approve
Chris Hillery Approve
Review via email: mp+116385@code.launchpad.net

Commit message

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

Description of the change

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

To post a comment you must log in.
Revision history for this message
Chris Hillery (ceejatec) wrote :

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?

review: Needs Fixing
Revision history for this message
Juan Zacarias (juan457) wrote :

> 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

Revision history for this message
Chris Hillery (ceejatec) wrote :

I tweaked this a bit to make ZORBA_WITH_THESAURUS a top-level config option. It also now defaults to ON.

Revision history for this message
Chris Hillery (ceejatec) :
review: Approve
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

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

Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue job zorba-installer-with-thesaurus-2012-08-03T02-00-11.743Z is finished. The final status was:

All tests succeeded!

Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Voting does not meet specified criteria. Required: Approve > 1, Disapprove < 1, Needs Fixing < 1, Pending < 1. Got: 1 Approve, 1 Pending.

Revision history for this message
Juan Zacarias (juan457) :
review: Approve
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

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

Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue job zorba-installer-with-thesaurus-2012-08-03T04-10-03.417Z is finished. The final status was:

All tests succeeded!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeCPack.cmake'
2--- CMakeCPack.cmake 2012-07-24 08:48:48 +0000
3+++ CMakeCPack.cmake 2012-08-03 01:21:20 +0000
4@@ -32,6 +32,7 @@
5 SET(CPACK_COMPONENT_PYTHON_SWIG_DISPLAY_NAME "Python API")
6 SET(CPACK_COMPONENT_RUBY_SWIG_DISPLAY_NAME "Ruby API")
7 SET(CPACK_COMPONENT_XQJ_SWIG_DISPLAY_NAME "Java XQJ API")
8+SET(CPACK_COMPONENT_THESAURUS_DISPLAY_NAME "Thesaurus")
9
10 SET(CPACK_COMPONENT_UNSPECIFIED_DESCRIPTION "Zorba Required Files.")
11 SET(CPACK_COMPONENT_DOC_DESCRIPTION "Files with the Description of different features of zorba.")
12@@ -44,6 +45,7 @@
13 SET(CPACK_COMPONENT_PYTHON_SWIG_DESCRIPTION "API for Python")
14 SET(CPACK_COMPONENT_RUBY_SWIG_DESCRIPTION "API for Ruby")
15 SET(CPACK_COMPONENT_XQJ_SWIG_DESCRIPTION "XQJ API for Java")
16+SET(CPACK_COMPONENT_THESAURUS_DESCRIPTION "Thesaurus for Zorba")
17
18 SET(CPACK_COMPONENT_DOC_GROUP "Documents")
19 SET(CPACK_COMPONENT_PHP_EXAMPLES_GROUP "Documents")
20@@ -75,8 +77,8 @@
21 SET(CPACK_COMPONENT_RUBY_SWIG_INSTALL_TYPES Full)
22 SET(CPACK_COMPONENT_XQJ_SWIG_INSTALL_TYPES Full)
23 SET(CPACK_COMPONENT_UNSPECIFIED_INSTALL_TYPES Full Simple Lite)
24+SET(CPACK_COMPONENT_THESAURUS_INSTALL_TYPE Full)
25
26-SET(CPACK_COMPONENT_UNSPECIFIED_HIDDEN FALSE)
27
28 INCLUDE(${CMAKE_BINARY_DIR}/CMakeCPackModules.cmake)
29
30
31=== modified file 'CMakeConfiguration.txt'
32--- CMakeConfiguration.txt 2012-07-27 21:15:18 +0000
33+++ CMakeConfiguration.txt 2012-08-03 01:21:20 +0000
34@@ -155,6 +155,10 @@
35 SET(ZORBA_WITH_JSON ON CACHE BOOL "enable integrated JSON support")
36 MESSAGE(STATUS "ZORBA_WITH_JSON: " ${ZORBA_WITH_JSON})
37
38+SET(ZORBA_WITH_THESAURUS ON CACHE BOOL
39+ "enable installation of default English Wordnet thesaurus")
40+MESSAGE(STATUS "ZORBA_WITH_THESAURUS: " ${ZORBA_WITH_THESAURUS})
41+
42 IF (ZORBA_SUPPRESS_SWIG)
43 SET (no_swig ON)
44 ELSE (ZORBA_SUPPRESS_SWIG)
45
46=== modified file 'cmake_modules/FindJNI.cmake'
47--- cmake_modules/FindJNI.cmake 2012-07-24 08:48:48 +0000
48+++ cmake_modules/FindJNI.cmake 2012-08-03 01:21:20 +0000
49@@ -101,6 +101,12 @@
50 ${_JAVA_HOME}/jre/lib
51 ${_JAVA_HOME}/lib
52 ${_JAVA_HOME}
53+ /usr/lib/jvm/java-6-openjdk/jre/lib
54+ /usr/lib/jvm/java-6-openjdk-i386/jre/lib
55+ /usr/lib/jvm/java-6-openjdk-amd64/jre/lib
56+ /usr/lib/jvm/java-6-openjdk/jre/lib/{libarch}
57+ /usr/lib/jvm/java-6-openjdk-i386/jre/lib/{libarch}
58+ /usr/lib/jvm/java-6-openjdk-amd64/jre/lib/{libarch}
59 /usr/lib
60 /usr/local/lib
61 /usr/lib/jvm/java/lib
62@@ -113,7 +119,6 @@
63 /usr/lib/jvm/java-6-sun/jre/lib/{libarch}
64 /usr/lib/jvm/java-1.5.0-sun/jre/lib/{libarch}
65 /usr/lib/jvm/java-6-sun-1.6.0.00/jre/lib/{libarch} # can this one be removed according to #8821 ? Alex
66- /usr/lib/jvm/java-6-openjdk/jre/lib/{libarch}
67 /usr/lib/jvm/java-openjdk/jre/lib/{libarch}
68 # Debian specific paths for default JVM
69 /usr/lib/jvm/default-java/jre/lib/{libarch}
70@@ -137,6 +142,9 @@
71 "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.3;JavaHome]/include"
72 "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\${java_install_version};JavaHome]/include"
73 ${_JAVA_HOME}/include
74+ /usr/lib/jvm/java-6-openjdk/include
75+ /usr/lib/jvm/java-6-openjdk-amd64/include
76+ /usr/lib/jvm/java-6-openjdk-i386/include
77 /usr/include
78 /usr/local/include
79 /usr/lib/java/include
80
81=== modified file 'config/CMakeLists.txt'
82--- config/CMakeLists.txt 2012-07-24 08:48:48 +0000
83+++ config/CMakeLists.txt 2012-08-03 01:21:20 +0000
84@@ -99,3 +99,4 @@
85
86 ADD_SUBDIRECTORY(fedora)
87 ADD_SUBDIRECTORY(debian)
88+ADD_SUBDIRECTORY(thesaurus)
89
90=== added directory 'config/thesaurus'
91=== added file 'config/thesaurus/CMakeLists.txt'
92--- config/thesaurus/CMakeLists.txt 1970-01-01 00:00:00 +0000
93+++ config/thesaurus/CMakeLists.txt 2012-08-03 01:21:20 +0000
94@@ -0,0 +1,26 @@
95+# Copyright 2006-2010 The FLWOR Foundation.
96+#
97+# Licensed under the Apache License, Version 2.0 (the "License");
98+# you may not use this file except in compliance with the License.
99+# You may obtain a copy of the License at
100+#
101+# http://www.apache.org/licenses/LICENSE-2.0
102+#
103+# Unless required by applicable law or agreed to in writing, software
104+# distributed under the License is distributed on an "AS IS" BASIS,
105+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
106+# See the License for the specific language governing permissions and
107+# limitations under the License.
108+
109+#Add wordnet-en.zth to the correct directory
110+IF(ZORBA_WITH_THESAURUS)
111+ CONFIGURE_FILE(
112+ "${CMAKE_CURRENT_SOURCE_DIR}/wordnet-en.zth"
113+ "${CMAKE_BINARY_DIR}/LIB_PATH/edu/princeton/wordnet/wordnet-en.zth"
114+ COPYONLY
115+ )
116+
117+ INSTALL(FILES "${CMAKE_CURRENT_SOURCE_DIR}/wordnet-en.zth"
118+ DESTINATION "${ZORBA_CORE_LIB_DIR}/edu/princeton/wordnet"
119+ COMPONENT thesaurus)
120+ENDIF(ZORBA_WITH_THESAURUS)
121
122=== added file 'config/thesaurus/wordnet-en.zth'
123Binary files config/thesaurus/wordnet-en.zth 1970-01-01 00:00:00 +0000 and config/thesaurus/wordnet-en.zth 2012-08-03 01:21:20 +0000 differ
124=== modified file 'test/rbkt/Queries/CMakeLists.txt'
125--- test/rbkt/Queries/CMakeLists.txt 2012-07-27 21:15:18 +0000
126+++ test/rbkt/Queries/CMakeLists.txt 2012-08-03 01:21:20 +0000
127@@ -110,17 +110,6 @@
128 # way to do the lookup just once - ideally by moving those tests which
129 # depend on module features into the modules themselves.
130
131-
132-# Check if WordNet thesaurus is installed
133-SET(WORDNET_THESAURUS_FILE
134- "${CMAKE_BINARY_DIR}/LIB_PATH/edu/princeton/wordnet/wordnet-en.zth")
135-IF(EXISTS "${WORDNET_THESAURUS_FILE}")
136- SET(ZORBA_WORDNET_FOUND 1)
137- # Kind of a weird place to put this directive, but convenient
138- INSTALL(FILES "${WORDNET_THESAURUS_FILE}"
139- DESTINATION "${ZORBA_CORE_LIB_DIR}/edu/princeton/wordnet")
140-ENDIF(EXISTS "${WORDNET_THESAURUS_FILE}")
141-
142 IF(ZORBA_SUPPRESS_CURL)
143 MESSAGE(STATUS "ZORBA_SUPPRESS_CURL is true - not searching for cURL library")
144 ELSE(ZORBA_SUPPRESS_CURL)
145@@ -196,13 +185,13 @@
146 ENDIF(WIN32)
147
148 # If WordNet thesaurus not found, skip ft-thesaurus-true tests
149- IF (NOT ZORBA_WORDNET_FOUND)
150+ IF (NOT ZORBA_WITH_THESAURUS)
151 STRING(REGEX MATCH "zorba/fulltext/ft-thesaurus-true" NEEDS_WORDNET
152 "${TESTNAME}")
153 IF (NEEDS_WORDNET)
154 SET (SKIP_TEST 1)
155 ENDIF (NEEDS_WORDNET)
156- ENDIF (NOT ZORBA_WORDNET_FOUND)
157+ ENDIF (NOT ZORBA_WITH_THESAURUS)
158
159 IF(NOT SKIP_TEST)
160

Subscribers

People subscribed via source and target branches