ant-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hi...@apache.org
Subject svn commit: r823347 - /ant/ivy/ivyde/trunk/build.xml
Date Thu, 08 Oct 2009 22:23:10 GMT
Author: hibou
Date: Thu Oct  8 22:23:09 2009
New Revision: 823347

URL: http://svn.apache.org/viewvc?rev=823347&view=rev
Log:
Fix the build and fix the version qualifier

Modified:
    ant/ivy/ivyde/trunk/build.xml

Modified: ant/ivy/ivyde/trunk/build.xml
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/build.xml?rev=823347&r1=823346&r2=823347&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/build.xml (original)
+++ ant/ivy/ivyde/trunk/build.xml Thu Oct  8 22:23:09 2009
@@ -468,7 +468,7 @@
 
     <target name="hudson-check-unzip-eclipse">
         <condition property="hudson.eclipse.unzipped">
-            <available file="${hudson.eclipse.name}" />
+            <available file="${hudson.download.sdk.name}" />
         </condition>
     </target>
 
@@ -484,16 +484,20 @@
     <target name="hudson-prepare-properties">
         <tstamp />
         <property name="baseLocation" value="${basedir}/${hudson.eclipse.name}" />
+        <condition property="hudson.version.qualifier" value="${DSTAMP}${TSTAMP}-hudson-${env.BUILD_NUMBER}">
+            <length string="${version.qualifier}" trim="true" length="0" />
+        </condition>
+        <property name="hudson.version.qualifier" value="${version.qualifier}-${DSTAMP}${TSTAMP}-hudson-${env.BUILD_NUMBER}"
/>
         <echo file="local.build.properties">
-baseLocation=${basedir}/${hudson.eclipse.name}
-forceContextQualifier=${version.qualifier}-${DSTAMP}${TSTAMP}-hudson-${env.BUILD_NUMBER}
+baseLocation=${basedir}/${hudson.download.sdk.name}
+forceContextQualifier=${hudson.version.qualifier}
 </echo>
     </target>
 
     <target name="hudson-install-ivy">
         <ant antfile="build.xml" target="install-ivy">
             <property name="ivy.version" value="${hudson.ivy.version}" />
-            <property name="baseLocation" location="${basedir}/${hudson.eclipse.name}"
/>
+            <property name="baseLocation" location="${basedir}/${hudson.download.sdk.name}"
/>
         </ant>
     </target>
 



Mime
View raw message