ant-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From br...@apache.org
Subject svn commit: r946848 - in /ant/core/trunk: fetch.xml lib/optional/
Date Fri, 21 May 2010 01:35:24 GMT
Author: bruce
Date: Fri May 21 01:35:23 2010
New Revision: 946848

URL: http://svn.apache.org/viewvc?rev=946848&view=rev
Log:
Add NetRexxC library, add support for FTP and temp cache, delete obsolete comment, update
ignores for IBM license

Modified:
    ant/core/trunk/fetch.xml
    ant/core/trunk/lib/optional/   (props changed)

Modified: ant/core/trunk/fetch.xml
URL: http://svn.apache.org/viewvc/ant/core/trunk/fetch.xml?rev=946848&r1=946847&r2=946848&view=diff
==============================================================================
--- ant/core/trunk/fetch.xml (original)
+++ ant/core/trunk/fetch.xml Fri May 21 01:35:23 2010
@@ -60,6 +60,10 @@
   <!-- load in our properties table -->
   <property file="${lib.dir}/libraries.properties"/>
 
+  <!-- Temporary cache for working files -->
+  <property name="temp.dir" location="${user.home}/.ant/tempcache" />
+  <property name="keep.temp.dir" value="true" />
+
   <import file="get-m2.xml" />
 
   <target name="pick-dest">
@@ -102,7 +106,7 @@ Set -Ddest=LOCATION on the command line
       <attribute name="repository" default="${m2.repo}"/>
       <sequential>
         <fail>
-        Unknown archive @{archive} -no property @{archive}.version defined.
+        Unknown archive @{archive} -no property @{archive}.version defined in ${lib.dir}/libraries.properties.
           <condition>
             <not>
             <isset property="@{archive}.version"/>
@@ -125,11 +129,71 @@ Set -Ddest=LOCATION on the command line
     </macrodef>
   </target>
 
+  <target name="nonm2-macros" depends="pick-dest">
+    <macrodef name="get-ftp-file">
+      <attribute name="host" />
+      <attribute name="port" default="21"/>
+      <attribute name="remotedir" />
+      <attribute name="filename" />
+      <attribute name="localdir" default="${dest.dir}" />
+      <attribute name="user" default="anonymous"/>
+      <attribute name="pw" default="anonymous"/>
+      <sequential>
+        <ftp server="@{host}" port="@{port}" userid="@{user}" password="@{pw}" passive="true"
+            remotedir="@{remotedir}" action="get" depends="true" preserveLastModified="true"
+            skipFailedTransfers="true">
+          <fileset dir="@{localdir}">
+            <include name="@{filename}" />
+          </fileset>
+        </ftp>
+      </sequential>
+    </macrodef>
+
+  </target>
+
 
 
   <!-- any init stuff -->
   <target name="init" depends="macros" />
 
+  <target name="init-no-m2" depends="nonm2-macros" />
+
+  <target name="init-cache">
+    <available property="temp.cache.already.exists" file="${temp.dir}" type="dir" />
+    <condition property="user.wants.temp.cache">
+      <and>
+        <isset property="keep.temp.dir" />
+        <not>
+          <or>
+            <equals arg1="${keep.temp.dir}" arg2="false" casesensitive="false" />
+            <equals arg1="${keep.temp.dir}" arg2="no" casesensitive="false" />
+            <equals arg1="${keep.temp.dir}" arg2="off" casesensitive="false" />
+          </or>
+        </not>
+      </and>
+    </condition>
+    <condition property="delete.temp.cache">
+      <and>
+        <not>
+          <isset property="temp.cache.already.exists" />
+        </not>
+        <not>
+          <isset property="user.wants.temp.cache" />
+        </not>
+      </and>
+    </condition>
+  </target>
+
+  <target name="-setup-temp-cache" depends="init-cache" unless="temp.cache.already.exists"
+          description="Setup temporary cache for downloaded files">
+    <mkdir dir="${temp.dir}" />
+  </target>
+
+  <target name="-cleanup-temp-cache" depends="init-cache" if="delete.temp.cache"
+          description="Gets rid of the temporary cache directory">
+    <delete dir="${temp.dir}" />
+  </target>
+
 
   <target name="diag" depends="init">
     <echoproperties />
@@ -155,11 +219,6 @@ Set -Ddest=LOCATION on the command line
     <f2 project="xml-resolver" />
   </target>
 
-  <!--
-   This is not used as
-   we like to get the more recent artifacts than are in the repo at the time of writing (2006-12-21)
-   -->
-
   <target name="networking"
     description="load networking libraries (commons-net; jsch)"
     depends="init">
@@ -243,15 +302,30 @@ Set -Ddest=LOCATION on the command line
     <f2 project="tomcat" archive="jasper-runtime"/>
     <f2 project="javax.servlet" archive="servlet-api"/>
   </target>
-  
+
   <target name="jai" depends="init"
           description="load java advanced imaging">
     <f2 project="javax.media" archive="jai-core" repository="http://repository.jboss.org/maven2"/>
     <f2 project="com.sun.media" archive="jai-codec" repository="http://repository.jboss.org/maven2"/>
   </target>
 
+  <target name="netrexx" depends="init-no-m2,-setup-temp-cache,-fetch-netrexx,-cleanup-temp-cache"
+          description="load NetRexx compiler" />
+
+  <target name="-fetch-netrexx" depends="-setup-temp-cache"
+          description="FTPs NetRexx compiler from IBM site">
+    <get-ftp-file host="ftp.software.ibm.com" remotedir="/software/awdtools/netrexx"
+            filename="NetRexx.zip" localdir="${temp.dir}" />
+    <copy todir="${dest.dir}" flatten="true">
+      <zipfileset src="${temp.dir}/NetRexx.zip">
+        <include name="NetRexx\lib\NetRexxC.jar" />
+        <include name="NetRexx\browse\license.txt" />
+      </zipfileset>
+    </copy>
+  </target>
+
   <target name="all"
     description="load all the libraries (except jython)"
-    depends="logging,junit,xml,networking,regexp,antlr,bcel,jdepend,bsf,debugging,script,javamail,jspc,jai"
/>
+    depends="logging,junit,xml,networking,regexp,antlr,bcel,jdepend,bsf,debugging,script,javamail,jspc,jai,netrexx"
/>
 
 </project>

Propchange: ant/core/trunk/lib/optional/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri May 21 01:35:23 2010
@@ -20,6 +20,7 @@ jruby-*.jar
 js-*.jar
 jsch-*.jar
 jython-*.jar
+license.txt
 log4j-*.jar
 mail-*.jar
 maven-artifact-ant-*-dep.jar



Mime
View raw message