You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by te...@apache.org on 2006/03/16 17:49:25 UTC

svn commit: r386377 - in /incubator/harmony/enhanced/classlib/trunk/make: depends.properties depends.xml

Author: tellison
Date: Thu Mar 16 08:49:23 2006
New Revision: 386377

URL: http://svn.apache.org/viewcvs?rev=386377&view=rev
Log:
Allow for proxy access to dependency download site

Modified:
    incubator/harmony/enhanced/classlib/trunk/make/depends.properties
    incubator/harmony/enhanced/classlib/trunk/make/depends.xml

Modified: incubator/harmony/enhanced/classlib/trunk/make/depends.properties
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/make/depends.properties?rev=386377&r1=386376&r2=386377&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/make/depends.properties (original)
+++ incubator/harmony/enhanced/classlib/trunk/make/depends.properties Thu Mar 16 08:49:23 2006
@@ -12,6 +12,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+# Uncomment the following line to use a HTTP proxy to download the
+# dependencies (and change the values as appropriate).
+# proxy.hostname=proxy.server.address
+proxy.port=80
 
 depends.dir=depends
 depends.jars=${depends.dir}/jars

Modified: incubator/harmony/enhanced/classlib/trunk/make/depends.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/make/depends.xml?rev=386377&r1=386376&r2=386377&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/make/depends.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/make/depends.xml Thu Mar 16 08:49:23 2006
@@ -20,87 +20,90 @@
  -->
 
 <project name="dependencies" default="check" basedir="..">
-  <description>
+	<description>
     Confirm that dependencies are present and fetch missing dependencies
     where possible.
-  </description>
+	</description>
 
-  <property file="make/depends.properties" />
-  
-  <target name="check">
-
-    <antcall target="check-one-jar">
-      <param name="src" value="${xalan.url}" />
-      <param name="dest" value="${xalan.jar}" />
-    </antcall>
-    
-    <antcall target="check-one-jar">
-      <param name="src" value="${resolver.url}" />
-      <param name="dest" value="${resolver.jar}" />
-    </antcall>
-
-    <antcall target="check-one-jar">
-      <param name="src" value="${xerces.impl.url}" />
-      <param name="dest" value="${xerces.impl.jar}" />
-    </antcall>
-
-    <antcall target="check-one-jar">
-      <param name="src" value="${xml.apis.url}" />
-      <param name="dest" value="${xml.apis.jar}" />
-    </antcall>
-
-    <antcall target="check-one-jar">
-      <param name="src" value="${junit.url}" />
-      <param name="dest" value="${junit.jar}" />
-    </antcall>
-    
-  </target>
-
-  <target name="download"
-    	  description="Download required jars">
-
-    <mkdir dir="${xalan.dir}" />
-    <antcall target="download-one-jar">
-      <param name="src" value="${xalan.url}" />
-      <param name="dest" value="${xalan.jar}" />
-    </antcall>
-
-    <mkdir dir="${xerces.dir}" />
-    <antcall target="download-one-jar">
-      <param name="src" value="${resolver.url}" />
-      <param name="dest" value="${resolver.jar}" />
-    </antcall>
-
-    <antcall target="download-one-jar">
-      <param name="src" value="${xerces.impl.url}" />
-      <param name="dest" value="${xerces.impl.jar}" />
-    </antcall>
-
-    <antcall target="download-one-jar">
-      <param name="src" value="${xml.apis.url}" />
-      <param name="dest" value="${xml.apis.jar}" />
-    </antcall>
-
-    <mkdir dir="${junit.dir}" />
-    <antcall target="download-one-jar">
-      <param name="src" value="${junit.url}" />
-      <param name="dest" value="${junit.jar}" />
-    </antcall>
-
-  </target>
-    	
-  <target name="download-one-jar">
-    <get src="${src}" dest="${dest}" usetimestamp="true" verbose="true" />
-  </target>
-
-  <target name="check-one-jar">
-    <available file="${dest}" type="file" property="${dest}.exists" />
-    <fail>
-      <condition>
-        <not>
-          <isset property="${dest}.exists"/>
-        </not>
-      </condition>
+	<property file="make/depends.properties" />
+
+	<target name="check">
+
+		<antcall target="check-one-jar">
+			<param name="src" value="${xalan.url}" />
+			<param name="dest" value="${xalan.jar}" />
+		</antcall>
+
+		<antcall target="check-one-jar">
+			<param name="src" value="${resolver.url}" />
+			<param name="dest" value="${resolver.jar}" />
+		</antcall>
+
+		<antcall target="check-one-jar">
+			<param name="src" value="${xerces.impl.url}" />
+			<param name="dest" value="${xerces.impl.jar}" />
+		</antcall>
+
+		<antcall target="check-one-jar">
+			<param name="src" value="${xml.apis.url}" />
+			<param name="dest" value="${xml.apis.jar}" />
+		</antcall>
+
+		<antcall target="check-one-jar">
+			<param name="src" value="${junit.url}" />
+			<param name="dest" value="${junit.jar}" />
+		</antcall>
+
+	</target>
+
+	<target name="download" depends="set-proxy" description="Download required jars">
+
+		<mkdir dir="${xalan.dir}" />
+		<antcall target="download-one-jar">
+			<param name="src" value="${xalan.url}" />
+			<param name="dest" value="${xalan.jar}" />
+		</antcall>
+
+		<mkdir dir="${xerces.dir}" />
+		<antcall target="download-one-jar">
+			<param name="src" value="${resolver.url}" />
+			<param name="dest" value="${resolver.jar}" />
+		</antcall>
+
+		<antcall target="download-one-jar">
+			<param name="src" value="${xerces.impl.url}" />
+			<param name="dest" value="${xerces.impl.jar}" />
+		</antcall>
+
+		<antcall target="download-one-jar">
+			<param name="src" value="${xml.apis.url}" />
+			<param name="dest" value="${xml.apis.jar}" />
+		</antcall>
+
+		<mkdir dir="${junit.dir}" />
+		<antcall target="download-one-jar">
+			<param name="src" value="${junit.url}" />
+			<param name="dest" value="${junit.jar}" />
+		</antcall>
+
+	</target>
+
+	<target name="download-one-jar">
+		<get src="${src}" dest="${dest}" usetimestamp="true" verbose="true" />
+	</target>
+
+	<target name="set-proxy" if="proxy.hostname">
+		<setproxy proxyhost="${proxy.hostname}" proxyport="${proxy.port}" />
+	</target>
+
+	<target name="check-one-jar">
+		<available file="${dest}" type="file" property="${dest}.exists" />
+		<fail>
+			<condition>
+				<not>
+					<isset property="${dest}.exists" />
+				</not>
+			</condition>
 ...
 
 Missing dependency.  The jar from:
@@ -111,8 +114,8 @@
 
   ${dest}
 
-(Run "ant -f make/depends.xml download" to automatically fetch this file.)
-    </fail>
-  </target>
+(Run "ant -f make/depends.xml download" to automatically fetch dependencies.)
+</fail>
+	</target>
 
 </project>