ant-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hi...@apache.org
Subject svn commit: r823344 - in /ant/ivy/ivyde/trunk: build.properties build.xml
Date Thu, 08 Oct 2009 22:07:43 GMT
Author: hibou
Date: Thu Oct  8 22:07:42 2009
New Revision: 823344

URL: http://svn.apache.org/viewvc?rev=823344&view=rev
Log:
Now IvyDE needs more than just the SDK to build

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

Modified: ant/ivy/ivyde/trunk/build.properties
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/build.properties?rev=823344&r1=823343&r2=823344&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/build.properties (original)
+++ ant/ivy/ivyde/trunk/build.properties Thu Oct  8 22:07:42 2009
@@ -26,11 +26,18 @@
 mirror.url=http://apache.multidist.com
 
 # properties for hudson build environment
-hudson.eclipse.name=eclipse-SDK-3.4.1-solaris-gtk
-hudson.eclipse.dropFile=R-3.4.1-200809111700/${hudson.eclipse.name}.zip
-hudson.eclipse.download.url=http://www.eclipse.org/downloads/download.php
-hudson.eclipse.mirror.url=http://eclipse.ialto.org/eclipse/downloads/drops
-hudson.eclipse.mirror.id=514
-hudson.eclipse.url=${hudson.eclipse.download.url}?file=/eclipse/downloads/drops/${hudson.eclipse.dropFile}&url=${hudson.eclipse.mirror.url}/${hudson.eclipse.dropFile}&mirror_id=${hudson.eclipse.mirror.id}
+hudson.download.baseurl=http://www.eclipse.org/downloads/download.php
+hudson.download.mirror.url=http://eclipse.ialto.org
+hudson.download.mirror.id=514
+hudson.download.sdk.name=eclipse-SDK-3.5.1-win32
+hudson.download.sdk.dropdir=eclipse/downloads/drops/R-3.5.1-200909170800
+hudson.download.wtp.name=wtp-R-3.1.1-20090917225226
+hudson.download.wtp.dropdir=webtools/downloads/drops/R3.1/R-3.1.1-20090917225226
+hudson.download.emf.name=emf-runtime-2.5.0
+hudson.download.emf.dropdir=modeling/emf/emf/downloads/drops/2.5.0/R200906151043
+hudson.download.xsd.name=xsd-runtime-2.5.0
+hudson.download.xsd.dropdir=modeling/emf/emf/downloads/drops/2.5.0/R200906151043
+hudson.download.gef.name=GEF-SDK-3.5.1
+hudson.download.gef.dropdir=tools/gef/downloads/drops/3.5.1/R200909151220
 
 hudson.ivy.version=2.0.0

Modified: ant/ivy/ivyde/trunk/build.xml
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/build.xml?rev=823344&r1=823343&r2=823344&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/build.xml (original)
+++ ant/ivy/ivyde/trunk/build.xml Thu Oct  8 22:07:42 2009
@@ -405,16 +405,67 @@
 
     <target name="hudson-prepare-eclipse" depends="hudson-get-eclipse,hudson-unzip-eclipse"
/>
 
-    <target name="hudson-check-download-eclipse">
-        <condition property="hudson.eclipse.downloaded">
-            <available file="${hudson.eclipse.name}.zip" />
+    <target name="hudson-check-download-sdk">
+        <condition property="hudson.sdk.downloaded">
+            <available file="${hudson.download.sdk.name}.zip" />
         </condition>
     </target>
 
-    <target name="hudson-get-eclipse" depends="hudson-check-download-eclipse" unless="hudson.eclipse.downloaded">
-        <get src="${hudson.eclipse.url}" dest="${hudson.eclipse.name}.zip" verbose="yes"
/>
+    <target name="hudson-get-sdk" depends="hudson-check-download-sdk" unless="hudson.sdk.downloaded">
+        <eclipse-download name="${hudson.download.sdk.name}" dropdir="${hudson.download.sdk.dropdir}"
/>
     </target>
 
+    <target name="hudson-check-download-wtp">
+        <condition property="hudson.wtp.downloaded">
+            <available file="${hudson.download.wtp.name}.zip" />
+        </condition>
+    </target>
+
+    <target name="hudson-get-wtp" depends="hudson-check-download-wtp" unless="hudson.wtp.downloaded">
+        <eclipse-download name="${hudson.download.wtp.name}" dropdir="${hudson.download.wtp.dropdir}"
/>
+    </target>
+
+    <target name="hudson-check-download-emf">
+        <condition property="hudson.emf.downloaded">
+            <available file="${hudson.download.emf.name}.zip" />
+        </condition>
+    </target>
+
+    <target name="hudson-get-emf" depends="hudson-check-download-emf" unless="hudson.emf.downloaded">
+        <eclipse-download name="${hudson.download.emf.name}" dropdir="${hudson.download.emf.dropdir}"
/>
+    </target>
+
+    <target name="hudson-check-download-xsd">
+        <condition property="hudson.xsd.downloaded">
+            <available file="${hudson.download.xsd.name}.zip" />
+        </condition>
+    </target>
+
+    <target name="hudson-get-xsd" depends="hudson-check-download-xsd" unless="hudson.xsd.downloaded">
+        <eclipse-download name="${hudson.download.xsd.name}" dropdir="${hudson.download.xsd.dropdir}"
/>
+    </target>
+
+    <target name="hudson-check-download-gef">
+        <condition property="hudson.gef.downloaded">
+            <available file="${hudson.download.gef.name}.zip" />
+        </condition>
+    </target>
+
+    <target name="hudson-get-gef" depends="hudson-check-download-gef" unless="hudson.gef.downloaded">
+        <eclipse-download name="${hudson.download.gef.name}" dropdir="${hudson.download.gef.dropdir}"
/>
+    </target>
+
+    <target name="hudson-get-eclipse" depends="hudson-get-sdk,hudson-get-wtp,hudson-get-emf,hudson-get-xsd,hudson-get-gef"
/>
+
+    <!-- wrapper of eclipse download urls which have a common pattern -->
+    <macrodef name="eclipse-download">
+        <attribute name="name" />
+        <attribute name="dropdir" />
+        <sequential>
+            <get src="${hudson.download.baseurl}?file=/@{dropdir}/@{name}.zip&amp;url=${hudson.download.mirror.url}/@{dropdir}/@{name}.zip&amp;mirror_id=${hudson.download.mirror.id}"
dest="@{name}.zip" verbose="yes" />            
+        </sequential>
+    </macrodef>
+
     <target name="hudson-check-unzip-eclipse">
         <condition property="hudson.eclipse.unzipped">
             <available file="${hudson.eclipse.name}" />
@@ -422,8 +473,12 @@
     </target>
 
     <target name="hudson-unzip-eclipse" depends="hudson-check-unzip-eclipse" unless="hudson.eclipse.unzipped">
-        <unzip src="${hudson.eclipse.name}.zip" dest="${basedir}" />
-        <move file="eclipse" tofile="${hudson.eclipse.name}" />
+        <unzip src="${hudson.download.sdk.name}.zip" dest="${basedir}" />
+        <unzip src="${hudson.download.wtp.name}.zip" dest="${basedir}" />
+        <unzip src="${hudson.download.emf.name}.zip" dest="${basedir}" />
+        <unzip src="${hudson.download.xsd.name}.zip" dest="${basedir}" />
+        <unzip src="${hudson.download.gef.name}.zip" dest="${basedir}" />
+        <move file="eclipse" tofile="${hudson.download.sdk.name}" />
     </target>
 
     <target name="hudson-prepare-properties">



Mime
View raw message