db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From myrn...@apache.org
Subject svn commit: r1523861 - in /db/derby/docs/branches/10.10: ./ build.xml
Date Tue, 17 Sep 2013 00:45:05 GMT
Author: myrnavl
Date: Tue Sep 17 00:45:05 2013
New Revision: 1523861

URL: http://svn.apache.org/r1523861
Log:
DERBY-4847; Errors should be displayed if using wrong CLASSPATH to make documentation target
for release
  merging the fix of revision 1523858 to fail with an error from docs/trunk.

Modified:
    db/derby/docs/branches/10.10/   (props changed)
    db/derby/docs/branches/10.10/build.xml

Propchange: db/derby/docs/branches/10.10/
------------------------------------------------------------------------------
    svn:mergeinfo = /db/derby/docs/trunk:1523858

Modified: db/derby/docs/branches/10.10/build.xml
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/build.xml?rev=1523861&r1=1523860&r2=1523861&view=diff
==============================================================================
--- db/derby/docs/branches/10.10/build.xml (original)
+++ db/derby/docs/branches/10.10/build.xml Tue Sep 17 00:45:05 2013
@@ -210,8 +210,17 @@ limitations under the License.
     </antcall>
   </target>
     
+  <target name="check.fop" unless="hasFOP">
+    <!-- generating pdf files require fop.jar in the classpath -->
+    <!-- see dita.dir/conductor.xml, which gets deleted with ant clobber -->
+    <!-- That file however does not look for fop.jar in any good place, so -->
+    <!-- fail if classpath does not include fop.jar if we're doing pdfs -->
+    <fail message="Failed: DITA needs the basedir/lib/fop.jar in the classpath to build
pdf files, see DERBY-4847"/>
+  </target>
+ 
   <target name="pdf.dita">
     <!-- replace tokens with release variables -->
+    <antcall target="check.fop"/>
     <antcall target="preprocess"/>
 
     <mkdir dir="${dita.dir}/temp"/>



Mime
View raw message