db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From myrn...@apache.org
Subject svn commit: r1414317 - in /db/derby/code/branches/10.9: ./ build.xml
Date Tue, 27 Nov 2012 19:07:13 GMT
Author: myrnavl
Date: Tue Nov 27 19:07:12 2012
New Revision: 1414317

URL: http://svn.apache.org/viewvc?rev=1414317&view=rev
Log:
DERBY-5462; ant release needs to accommodate for different ant executables on different systems
  merge from trunk of revsion 1414316

Modified:
    db/derby/code/branches/10.9/   (props changed)
    db/derby/code/branches/10.9/build.xml

Propchange: db/derby/code/branches/10.9/
------------------------------------------------------------------------------
  Merged /db/derby/code/trunk:r1414316

Modified: db/derby/code/branches/10.9/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.9/build.xml?rev=1414317&r1=1414316&r2=1414317&view=diff
==============================================================================
--- db/derby/code/branches/10.9/build.xml (original)
+++ db/derby/code/branches/10.9/build.xml Tue Nov 27 19:07:12 2012
@@ -34,6 +34,17 @@
   <property file="${properties.dir}/sane${sanity}.properties"/>
 
 
+<!-- These properties are used by the Release build process. -->
+  <condition property="isWindows">
+    <os family="windows"/>
+  </condition>
+
+  <condition property="isUnix">
+    <not>
+      <os family="windows"/>
+    </not>
+  </condition>
+
 <!-- Targets -->
 
   <target
@@ -2094,8 +2105,17 @@
 
    </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>
+
    <!-- 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"/>
 
@@ -2110,7 +2130,7 @@
 
      <ant dir="${docs.root}" target="clobber"/>
 
-     <exec executable="ant" dir="${docs.root}">
+     <exec executable="${ant.exec}" dir="${docs.root}">
        <env key="ANT_OPTS" value="-Xmx512m"/>
        <env key="CLASSPATH" path="${docs.root}/lib/fop.jar"/>
        <arg value="-Drelease.id.short=${eversion}"/>



Mime
View raw message