Zorba

Merge lp:~zorba-coders/zorba/dataf-module-fix into lp:zorba/data-formatting-module

  1. dataf-module-fix
  2. Merge into data-formatting-module
Proposed by Matthias Brantner
Status: Superseded
Proposed branch: lp:~zorba-coders/zorba/dataf-module-fix
Merge into: lp:zorba/data-formatting-module
Diff against target: 96 lines (+27/-24)
3 files modified
src/com/zorba-xquery/www/modules/CMakeLists.txt (+25/-21)
test/ExpQueryResults/data-formatting/xslfo.xml.res (+1/-1)
test/Queries/data-formatting/xslfo.xq (+1/-2)
To merge this branch: bzr merge lp:~zorba-coders/zorba/dataf-module-fix
Reviewer Review Type Date Requested Status
Chris Hillery Pending
Matthias Brantner Pending
Review via email: mp+105122@code.launchpad.net

This proposal supersedes a proposal from 2012-05-08.

This proposal has been superseded by a proposal from 2012-05-08.

Commit message

Fix cmake script for finding fop.jar and it's dependencies on non win boxes.

Description of the change

Fix cmake script for finding fop.jar and it's dependencies on non win boxes.

To post a comment you must log in.
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote : Posted in a previous version of this proposal

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/dataf-module-fix-2012-05-08T17-16-38.082Z/log.html

Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote : Posted in a previous version of this proposal

Validation queue job dataf-module-fix-2012-05-08T17-16-38.082Z is finished. The final status was:

All tests succeeded!

Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote : Posted in a previous version of this proposal

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

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/dataf-module-fix-2012-05-08T20-37-40.21Z/log.html

Revision history for this message
Matthias Brantner (matthias-brantner) wrote :

I have hard-coded some version such that the jars are at least found with the current port version of xsl-fo. That's clearly not a long-term solution but given the fact that find_jar is not in cmake 2.8.5 I don't see any quick fix for this. The right solution is probably to come up with a FindFOP.cmake script that does all the magic.

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

Validation queue job dataf-module-fix-2012-05-08T20-37-40.21Z 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: 2 Pending.

lp:~zorba-coders/zorba/dataf-module-fix updated
37. By Matthias Brantner

fixed a typo

38. By Chris Hillery

Fix searching for FOP and dependent jars, using proper paths and the new
ZORBA_FIND_JAR() macro.

39. By Matthias Brantner

removed dead code

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/com/zorba-xquery/www/modules/CMakeLists.txt'
2--- src/com/zorba-xquery/www/modules/CMakeLists.txt 2012-04-11 16:06:04 +0000
3+++ src/com/zorba-xquery/www/modules/CMakeLists.txt 2012-05-08 21:15:24 +0000
4@@ -24,32 +24,33 @@
5 IF (NOT DEFINED XSL_FOP_HOME)
6 IF (WIN32)
7 MESSAGE (STATUS "Environment variable XSL_FOP_HOME not defined, trying default: C:\\dev\\libraries\\fop-1.0")
8- SET (XSL_FOP_HOME "C:\\dev\\libraries\\fop-1.0")
9+ SET (XSL_FOP_HOME "C:\\dev\\libraries\\fop-1.0 C:\\dev\\libraries\\fop-1.0\\lib")
10 ELSE (WIN32)
11- MESSAGE (STATUS "Environment variable XSL_FOP_HOME not defined, trying defaults: " ${Java_LIBRARIES} " /usr/share/java/ /usr/share/java/fop/")
12- SET (XSL_FOP_HOME "/usr/share/java/ /usr/share/java/fop/ ${Java_LIBRARIES}")
13+ SET (UNIX_FOP_DEFAULTS /usr/share/java/ /usr/share/java/fop/ /opt/local/share/java/fop/1.0/lib /opt/local/share/java/fop/1.0/build/ ${Java_LIBRARIES})
14+ MESSAGE (STATUS "Environment variable XSL_FOP_HOME not defined, trying defaults: " ${UNIX_FOP_DEFAULTS})
15+ SET (XSL_FOP_HOME ${UNIX_FOP_DEFAULTS})
16 ENDIF (WIN32)
17 ENDIF (NOT DEFINED XSL_FOP_HOME)
18
19 STRING(REGEX REPLACE "\\\\" "/" XSL_FOP_HOME "${XSL_FOP_HOME}")
20
21 MESSAGE (STATUS "XSL-FOP HOME: " ${XSL_FOP_HOME} )
22- FIND_FILE( FOP_JAR NAMES fop.jar
23- PATHS ${XSL_FOP_HOME} ${XSL_FOP_HOME}/build )
24- FIND_FILE( FOP_D1_JAR NAMES avalon-framework.jar
25- PATHS ${XSL_FOP_HOME} ${XSL_FOP_HOME}/lib )
26- FIND_FILE( FOP_D2_JAR NAMES batik-all.jar
27- PATHS ${XSL_FOP_HOME} ${XSL_FOP_HOME}/lib )
28- FIND_FILE( FOP_D3_JAR NAMES commons-io.jar
29- PATHS ${XSL_FOP_HOME} ${XSL_FOP_HOME}/lib )
30- FIND_FILE( FOP_D4_JAR NAMES commons-logging.jar
31- PATHS ${XSL_FOP_HOME} ${XSL_FOP_HOME}/lib )
32- FIND_FILE( FOP_D5_JAR NAMES serializer.jar
33- PATHS ${XSL_FOP_HOME} ${XSL_FOP_HOME}/lib )
34- FIND_FILE( FOP_D6_JAR NAMES xalan.jar xalan2.jar
35- PATHS ${XSL_FOP_HOME} ${XSL_FOP_HOME}/lib )
36- FIND_FILE( FOP_D7_JAR NAMES xmlgraphics-commons.jar
37- PATHS ${XSL_FOP_HOME} ${XSL_FOP_HOME}/lib )
38+ FIND_FILE( FOP_JAR NAMES fop.jar
39+ PATHS ${XSL_FOP_HOME} )
40+ FIND_FILE( FOP_D1_JAR NAMES avalon-framework.jar avalon-framework-4.2.0.jar
41+ PATHS ${XSL_FOP_HOME} )
42+ FIND_FILE( FOP_D2_JAR NAMES batik-all.jar batik-all-1.7.jar
43+ PATHS ${XSL_FOP_HOME} )
44+ FIND_FILE( FOP_D3_JAR NAMES commons-io.jar commons-io-1.3.1.jar
45+ PATHS ${XSL_FOP_HOME} )
46+ FIND_FILE( FOP_D4_JAR NAMES commons-logging.jar commons-logging-1.0.4.jar
47+ PATHS ${XSL_FOP_HOME} )
48+ FIND_FILE( FOP_D5_JAR NAMES serializer.jar serializer-2.7.0.jar
49+ PATHS ${XSL_FOP_HOME} )
50+ FIND_FILE( FOP_D6_JAR NAMES xalan.jar xalan2.jar xalan-2.7.0.jar
51+ PATHS ${XSL_FOP_HOME} )
52+ FIND_FILE( FOP_D7_JAR NAMES xmlgraphics-commons.jar xmlgraphics-commons-1.4.jar
53+ PATHS ${XSL_FOP_HOME} )
54
55 #MULTIPLE EXISTS CAN'T BE USED IN AN *IF* COMMAND, LOOKS LIKE A BUG ON CMAKE
56 SET(ALL_FOP FALSE)
57@@ -70,8 +71,7 @@
58 ENDIF ( EXISTS ${FOP_D2_JAR} )
59 ENDIF ( EXISTS ${FOP_D1_JAR} )
60 ENDIF ( EXISTS ${FOP_JAR} )
61- MESSAGE(STATUS "ALL_FOP:" ${ALL_FOP})
62-
63+
64 IF ( ALL_FOP )
65 MESSAGE(STATUS "FOP Libraries Found.")
66 INCLUDE (CMakeJavaInformation )
67@@ -101,5 +101,9 @@
68
69 ELSE ( ALL_FOP )
70 MESSAGE (STATUS "fop.jar and/or all its dependecies (avalon-framework.jar, batik-all.jar, commons-io.jar, commons-logging.jar, serializer.jar, xalan2.jar, xmlgraphics-commons.jar) not found skiping data-formating module")
71+ MESSAGE ( STATUS " fop: " ${FOP_JAR} "\n avalon: " ${FOP_D1_JAR}
72+ "\n batik: " ${FOP_D2_JAR} "\n io: " ${FOP_D3_JAR}
73+ "\n logging: " ${FOP_D4_JAR} "\n serializer: " ${FOP_D5_JAR} " "
74+ "\n xalan: " ${FOP_D6_JAR} "\n xmlgraphics: " ${FOP_D7_JAR} )
75 ENDIF ( ALL_FOP )
76
77
78=== modified file 'test/ExpQueryResults/data-formatting/xslfo.xml.res'
79--- test/ExpQueryResults/data-formatting/xslfo.xml.res 2012-03-12 22:08:04 +0000
80+++ test/ExpQueryResults/data-formatting/xslfo.xml.res 2012-05-08 21:15:24 +0000
81@@ -1,1 +1,1 @@
82-<pdf><len>6484</len><start>JVBERi0xLj</start><end>AolJUVPRgo=</end></pdf>
83+<pdf><len>true</len><start>JVBERi0xLj</start></pdf>
84
85=== modified file 'test/Queries/data-formatting/xslfo.xq'
86--- test/Queries/data-formatting/xslfo.xq 2012-03-12 22:08:04 +0000
87+++ test/Queries/data-formatting/xslfo.xq 2012-05-08 21:15:24 +0000
88@@ -21,7 +21,6 @@
89 let $len := fn:string-length($pdf)
90 return
91 <pdf>
92- <len> { $len }</len>
93+ <len> { $len gt 6000 }</len>
94 <start>{ fn:substring($pdf, 1, 10)}</start>
95- <end> { fn:substring($pdf, $len -10, $len)}</end>
96 </pdf>

Subscribers

People subscribed via source and target branches

to all changes: