You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@etch.apache.org by fi...@apache.org on 2011/07/26 18:43:32 UTC

svn commit: r1151162 - /incubator/etch/trunk/build-support/download_depends.xml

Author: fitzner
Date: Tue Jul 26 16:43:31 2011
New Revision: 1151162

URL: http://svn.apache.org/viewvc?rev=1151162&view=rev
Log:
ETCH-152 build server integration

Changed external download script

Modified:
    incubator/etch/trunk/build-support/download_depends.xml

Modified: incubator/etch/trunk/build-support/download_depends.xml
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/build-support/download_depends.xml?rev=1151162&r1=1151161&r2=1151162&view=diff
==============================================================================
--- incubator/etch/trunk/build-support/download_depends.xml (original)
+++ incubator/etch/trunk/build-support/download_depends.xml Tue Jul 26 16:43:31 2011
@@ -18,22 +18,70 @@
  * under the License.                                           *
  -->
 <project name="download_depends" default="download" basedir=".">
+
+
+    <!-- check parameters -->
+    <condition property="params.available">
+        <and>
+            <isset property="download-url"/>
+            <isset property="download-dirname"/>
+            <isset property="download-filename"/>
+            <isset property="dest-dirname"/>
+        </and>
+    </condition>
+
+    <!-- check externals folder -->
     <condition property="externals.available">
-     <available file="${unzip-dest}"/>
+        <available file="${unzip-dest}"/>
+    </condition>
+
+    <!-- check for os family -->
+    <condition property="do-download-windows">
+        <and>
+            <not><isset property="externals.available"/></not>
+            <os family="windows"/>
+        </and>
+    </condition>
+    <condition property="do-download-linux">
+        <and>
+            <not><isset property="externals.available"/></not>
+            <os family="unix"/>
+        </and>
     </condition>
 
-    <target name="download" unless="externals.available" depends="echo">
-      <get src="${download-url}" dest="${download-dest}"/>
-      <unzip src="${download-dest}" dest="${unzip-dest}"/>
+    <target name="check-params" unless="params.available">
+        <fail message="missing parameters."/>
     </target>
 
-    <target name="download-linux" unless="externals.available" depends="echo">
-      <get src="${download-url}" dest="${download-dest}"/>
-      <gunzip src="${download-dest}"/>
-      <untar src="${download-dest-tar}" dest="${unzip-dest}"/>
+    <target name="info" if="externals.available">
+        <echo message="${unzip-dest} already available, doing nothing"/>
     </target>
 
-    <target name="echo" if="externals.available">
-      <echo message="${unzip-dest} already available, doing nothing"/>
+    <target name="download" depends="check-params, info, download-windows, download-linux">
     </target>
+
+    <target name="download-windows" if="do-download-windows">
+        <echo message="downloading externals for windows"/>
+        <mkdir dir="${download-dirname}" />
+        <get src="${download-url}" dest="${download-dirname}${file.separator}${download-filename}"/>
+        <unzip src="${download-dirname}${file.separator}${download-filename}" dest="${dest-dirname}"/>
+    </target>
+    <target name="download-linux" if="do-download-linux">
+        <echo message="downloading externals for linux"/>
+	<mkdir dir="${download-dirname}" />
+        <get src="${download-url}" dest="${download-dirname}${file.separator}${download-filename}"/>
+        <mkdir dir="${dest-dirname}"/>
+        <exec executable="pwd"></exec>
+	<exec executable="tar" output="info.txt">
+            <arg value="-xvpzf" />
+            <arg value="${download-dirname}${file.separator}${download-filename}" />
+            <arg value="-C" />
+            <arg value="${dest-dirname}" /> 
+	</exec>
+    </target>
+
+    <target name="clean" depends="check-params">
+	<delete dir="${dest-dirname}" failonerror="true"/>
+    </target>
+
 </project>