Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug955040 into lp:zorba/data-formatting-module
Review: Approve Yay for removing unnecessary CMake flags! Looks good. -- https://code.launchpad.net/~zorba-coders/zorba/bug955040/+merge/98891 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:~zorba-coders/zorba/bug955040 into lp:zorba/data-formatting-module
The proposal to merge lp:~zorba-coders/zorba/bug955040 into lp:zorba/data-formatting-module has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug955040/+merge/98891 -- https://code.launchpad.net/~zorba-coders/zorba/bug955040/+merge/98891 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:~zorba-coders/zorba/bug955040 into lp:zorba/data-formatting-module
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug955040-2012-03-28T15-46-14.833Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/bug955040/+merge/98891 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:~zorba-coders/zorba/bug955040 into lp:zorba/data-formatting-module
Validation queue job bug955040-2012-03-28T15-46-14.833Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/bug955040/+merge/98891 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:~zorba-coders/zorba/bug955040 into lp:zorba/data-formatting-module
The proposal to merge lp:~zorba-coders/zorba/bug955040 into lp:zorba/data-formatting-module has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug955040/+merge/98891 -- https://code.launchpad.net/~zorba-coders/zorba/bug955040/+merge/98891 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:~zorba-coders/zorba/bug955040 into lp:zorba/data-formatting-module
The proposal to merge lp:~zorba-coders/zorba/bug955040 into lp:zorba/data-formatting-module has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug955040/+merge/98891 -- https://code.launchpad.net/~zorba-coders/zorba/bug955040/+merge/98891 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:~zorba-coders/zorba/bug955040 into lp:zorba/data-formatting-module
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug955040-2012-03-28T16-53-23.343Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/bug955040/+merge/98891 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:~zorba-coders/zorba/bug955040 into lp:zorba/data-formatting-module
Validation queue job bug955040-2012-03-28T16-53-23.343Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/bug955040/+merge/98891 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:~zorba-coders/zorba/bug955040 into lp:zorba/data-formatting-module
The proposal to merge lp:~zorba-coders/zorba/bug955040 into lp:zorba/data-formatting-module has been updated. Status: Approved = Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug955040/+merge/98891 -- https://code.launchpad.net/~zorba-coders/zorba/bug955040/+merge/98891 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:~zorba-coders/zorba/bug955040 into lp:zorba/data-formatting-module
ZORBA_WITH_FOP flag has been eliminated... -- https://code.launchpad.net/~zorba-coders/zorba/bug955040/+merge/98891 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:~zorba-coders/zorba/bug955040 into lp:zorba/data-formatting-module
Review: Approve Looks good. -- https://code.launchpad.net/~zorba-coders/zorba/bug955040/+merge/98891 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:~zorba-coders/zorba/bug955040 into lp:zorba/data-formatting-module
Sounds fine with me. So remove the ZORBA_WITH_FOP all together and work around cmake bugs. -- https://code.launchpad.net/~zorba-coders/zorba/bug955040/+merge/98891 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:~zorba-coders/zorba/bug955040 into lp:zorba/data-formatting-module
Rodolfo Ochoa has proposed merging lp:~zorba-coders/zorba/bug955040 into
lp:zorba/data-formatting-module.
Requested reviews:
Matthias Brantner (matthias-brantner)
Cezar Andrei (cezar-andrei)
Related bugs:
Bug #955040 in Zorba: XSL-FO module test added even if module is not built
https://bugs.launchpad.net/zorba/+bug/955040
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug955040/+merge/98891
Fixes on CMakeList to avoid submitting a test when module is not active.
Also added functionality to avoid testing for Java if module is not active.
--
https://code.launchpad.net/~zorba-coders/zorba/bug955040/+merge/98891
Your team Zorba Coders is subscribed to branch lp:zorba/data-formatting-module.
=== modified file 'CMakeLists.txt'
--- CMakeLists.txt 2012-03-14 14:23:36 +
+++ CMakeLists.txt 2012-03-22 18:12:23 +
@@ -12,6 +12,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+MESSAGE (STATUS BEGIN Configuring module Data-Formatting )
+
CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
PROJECT (zorba_data-formatting_module)
@@ -28,3 +30,5 @@
DONE_DECLARING_ZORBA_URIS ()
+
+MESSAGE (STATUS END Configuring module Data-Formatting )
=== modified file 'src/com/zorba-xquery/www/modules/CMakeLists.txt'
--- src/com/zorba-xquery/www/modules/CMakeLists.txt 2012-03-14 14:23:36 +
+++ src/com/zorba-xquery/www/modules/CMakeLists.txt 2012-03-22 18:12:23 +
@@ -12,96 +12,103 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-#
-# JNI JAVA
-#
-IF (ZORBA_SUPPRESS_JAVA)
- MESSAGE (STATUS ZORBA_SUPPRESS_JNI is true - not searching for Java)
-ELSE (ZORBA_SUPPRESS_JAVA)
- IF (NOT ZORBA_WITH_FOP)
-MESSAGE (STATUS Looking for Java)
+SET (ZORBA_WITH_FOP ON CACHE BOOL Compile Zorba with XSL-FO support FORCE)
+IF (ZORBA_WITH_FOP)
+
+ IF (ZORBA_SUPPRESS_JAVA)
+MESSAGE (STATUS ZORBA_SUPPRESS_JNI is true - not searching for Java)
+MESSAGE (STATUS Building Zorba without XSL-FO support.)
+ ELSE (ZORBA_SUPPRESS_JAVA)
+
FIND_PACKAGE(Java)
-
-MESSAGE (STATUS Looking for JNI)
FIND_PACKAGE(JNI)
IF (JNI_FOUND)
- IF (NOT DEFINED XSL_FOP_HOME)
-IF (WIN32)
- MESSAGE (STATUS Variable XSL_FOP_HOME not defined, trying defaults: ${Java_LIBRARIES})
- SET (XSL_FOP_HOME ${Java_LIBRARIES})
-ELSE (WIN32)
- MESSAGE (STATUS Variable XSL_FOP_HOME not defined, trying defaults: ${Java_LIBRARIES} /usr/share/java/ /usr/share/java/fop/)
- SET (XSL_FOP_HOME /usr/share/java/ /usr/share/java/fop/ ${Java_LIBRARIES})
-ENDIF (WIN32)
- ENDIF (NOT DEFINED XSL_FOP_HOME)
-
- MESSAGE (STATUS XSL-FOP HOME : ${XSL_FOP_HOME} )
-
+
+ IF (NOT DEFINED XSL_FOP_HOME)
+IF (DEFINED ENV{XSL_FOP_HOME})
+ SET(XSL_FOP_HOME $ENV{XSL_FOP_HOME})
+ENDIF (DEFINED ENV{XSL_FOP_HOME})
+ ENDIF (NOT DEFINED XSL_FOP_HOME)
+
+ IF (NOT DEFINED XSL_FOP_HOME)
+IF (WIN32)
+ MESSAGE (STATUS Environment variable XSL_FOP_HOME not defined, trying default: C:\\dev\\libraries\\fop-1.0)
+ SET (XSL_FOP_HOME C:\\dev\\libraries\\fop-1.0)
+ELSE (WIN32)
+ MESSAGE (STATUS Environment variable XSL_FOP_HOME not defined, trying defaults: ${Java_LIBRARIES} /usr/share/java/ /usr/share/java/fop/)
+ SET (XSL_FOP_HOME /usr/share/java/ /usr/share/java/fop/ ${Java_LIBRARIES})
+ENDIF (WIN32)
+ ENDIF (NOT DEFINED XSL_FOP_HOME)
+
+ STRING(REGEX REPLACE / XSL_FOP_HOME ${XSL_FOP_HOME})
+
+ MESSAGE (STATUS XSL-FOP HOME: ${XSL_FOP_HOME} )
FIND_FILE( FOP_JAR NAMES fop.jar
PATHS ${XSL_FOP_HOME} ${XSL_FOP_HOME}/build )
-
FIND_FILE( FOP_D1_JAR NAMES avalon-framework.jar
PATHS ${XSL_FOP_HOME} ${XSL_FOP_HOME}/lib )
-
FIND_FILE( FOP_D2_JAR NAMES batik-all.jar
PATHS ${XSL_FOP_HOME} ${XSL_FOP_HOME}/lib )
-
FIND_FILE( FOP_D3_JAR NAMES commons-io.jar
PATHS ${XSL_FOP_HOME} ${XSL_FOP_HOME}/lib )
-
FIND_FILE( FOP_D4_JAR NAMES commons-logging.jar
PATHS ${XSL_FOP_HOME} ${XSL_FOP_HOME}/lib )
-
FIND_FILE( FOP_D5_JAR NAMES serializer.jar
PATHS ${XSL_FOP_HOME} ${XSL_FOP_HOME}/lib )
-
FIND_FILE( FOP_D6_JAR NAMES xalan.jar xalan2.jar
PATHS ${XSL_FOP_HOME} ${XSL_FOP_HOME}/lib )
-
FIND_FILE( FOP_D7_JAR NAMES xmlgraphics-commons.jar
PATHS ${XSL_FOP_HOME} ${XSL_FOP_HOME}/lib )
- IF( EXISTS ${FOP_JAR} AND EXISTS ${FOP_D1_JAR} AND EXISTS ${FOP_D2_JAR} AND
- EXISTS ${FOP_D3_JAR} AND EXISTS ${FOP_D4_JAR} AND EXISTS ${FOP_D5_JAR} AND
- EXISTS ${FOP_D6_JAR} AND EXISTS ${FOP_D7_JAR})
-
-#SET (ZORBA_WITH_FOP ON CACHE BOOL Compile Zorba with XSL-FO support FORCE)
-#IF (ZORBA_WITH_FOP)
- INCLUDE (CMakeJavaInformation )
-
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug955040 into lp:zorba/data-formatting-module
The proposal to merge lp:~zorba-coders/zorba/bug955040 into lp:zorba/data-formatting-module has been updated. Commit Message changed to: Fixes on CMakeList to avoid submitting a test when module is not active. Also added functionality to avoid testing for Java if module is not active. For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug955040/+merge/98891 -- https://code.launchpad.net/~zorba-coders/zorba/bug955040/+merge/98891 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:~zorba-coders/zorba/bug955040 into lp:zorba/data-formatting-module
Review: Needs Fixing 1. ZORBA_WITH_FOP means I really want FOP. Ie if there is anything missing it's an error. So if ZORBA_WITH_FOP and ZORBA_SUPPRESS_JAVA are both true should be an error. 2. Why did you replace 1 IF with AND condition with 8 nested IF's ? -- https://code.launchpad.net/~zorba-coders/zorba/bug955040/+merge/98891 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:~zorba-coders/zorba/bug955040 into lp:zorba/data-formatting-module
Review: Needs Fixing I don't understand what ZORBA_WITH_FOP means at all. I'm not really a fan of having flags to enable functionality anyway, at least not in non-core module packages - if the user took the time to download the package, presumably they want the contents, so why force them to add another CMake flag to enable it? But with this change, ZORBA_WITH_FOP is completely meaningless, because it's now SET(ON FORCE). It will always be ON. So the IF(ZORBA_WITH_FOP) is pointless. I would suggest eliminating the flag entirely. If we really think we need a way to build the data-formatting module without FOP, have a ZORBA_SUPPRESS_FOP flag instead that skips the whole file. Cezar: Rodolfo had a comment about the nested IF thing - apparently IF(EXISTS a AND EXISTS b...) doesn't work, possibly a CMake bug. I haven't verified that bug myself, but it wouldn't surprise me; I've certainly seen other situations where IF(... AND ...) doesn't do what I'd expect in CMake. -- https://code.launchpad.net/~zorba-coders/zorba/bug955040/+merge/98891 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
