You are viewing a plain text version of this content. The canonical link for it is here.
Posted to derby-commits@db.apache.org by rh...@apache.org on 2014/01/10 20:36:42 UTC
svn commit: r1557234 - /db/derby/code/branches/10.8/build.xml
Author: rhillegas
Date: Fri Jan 10 19:36:42 2014
New Revision: 1557234
URL: http://svn.apache.org/r1557234
Log:
DERBY-2573: Incorporate more logic from the 10.10 build script to fix problem with running builduserdocs target on non-windows systems; checkin derby-2573-16-aa-useAntExec3.diff.
Modified:
db/derby/code/branches/10.8/build.xml
Modified: db/derby/code/branches/10.8/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.8/build.xml?rev=1557234&r1=1557233&r2=1557234&view=diff
==============================================================================
--- db/derby/code/branches/10.8/build.xml (original)
+++ db/derby/code/branches/10.8/build.xml Fri Jan 10 19:36:42 2014
@@ -1989,6 +1989,15 @@
</target>
+ <!-- Targets used to specify the correct ant executable -->
+ <target name="ant-exec-windows" unless="isUnix">
+ <property name="ant.exec" value="ant.bat"/>
+ </target>
+
+ <target name="ant-exec-unix" unless="isWindows">
+ <property name="ant.exec" value="ant"/>
+ </target>
+
<!--
Append a file to the notice file
@@ -2034,7 +2043,7 @@
</target>
<!-- Build the user documentation -->
- <target name="builduserdocs" depends="checkdocsroot">
+ <target name="builduserdocs" depends="ant-exec-windows,ant-exec-unix,checkdocsroot">
<property file="${properties.dir}/release.properties"/>