incubator-depot-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nickcha...@apache.org
Subject svn commit: rev 30833 - incubator/depot/trunk/update
Date Wed, 28 Jul 2004 07:56:12 GMT
Author: nickchalko
Date: Wed Jul 28 00:56:11 2004
New Revision: 30833

Modified:
   incubator/depot/trunk/update/build-ant-get.xml
   incubator/depot/trunk/update/build.xml
Log:
Added pre-make-antlet
Updated the ant get.

Modified: incubator/depot/trunk/update/build-ant-get.xml
==============================================================================
--- incubator/depot/trunk/update/build-ant-get.xml	(original)
+++ incubator/depot/trunk/update/build-ant-get.xml	Wed Jul 28 00:56:11 2004
@@ -1,83 +1,40 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--$Id: $-->
-<!--This is a autogenerated file designed to be checked in to Source Control-->
-<project default="get-all" name="">
-	<property name="depot.home" value="${user.home}/.apache.depot" />
-	<property name="repository.dir" value="${depot.home}/local-repository" />
-	<fileset id="depot-update.dependent.jars.fileset" dir="${repository.dir}">
-		<include name="log4j/jars/log4j-1.2.jar" />
-		<include name="commons-vfs/jars/commons-vfs-20030518103800.jar" />
-		<include name="commons-logging/jars/commons-logging-null.jar" />
-		<include name="commons-httpclient/jars/commons-httpclient-2.0.jar" />
-		<include name="commons-codec/jars/commons-codec-1.2.jar" />
-		<include name="regexp/jars/regexp-null.jar" />
-		<include name="junit/jars/junit-3.8.jar" />		
-		<include name="ant/jars/ant-1.6.1.jar" />		
-	</fileset>
-	<target name="get-all"
-	        depends="get-log4j,get-commons-vfs,get-commons-logging,get-commons-httpclient,get-commons-codec,
-	        get-regexp,get-junit,get-ant,get-xmlunit" />
-	<target name="get-log4j">
-		<mkdir dir="${repository.dir}/log4j/jars/" />
-		<get verbose="true"
-		     usetimestamp="true"
-		     dest="${repository.dir}/log4j/jars/log4j-1.2.jar"
-		     src="http://www.ibiblio.org/maven/log4j/jars/log4j-1.2.8.jar" />
-	</target>
-	<target name="get-commons-vfs">
-		<mkdir dir="${repository.dir}/commons-vfs/jars/" />
-		<get verbose="true"
-		     usetimestamp="true"
-		     dest="${repository.dir}/commons-vfs/jars/commons-vfs-20030518103800.jar"
-		     src="http://www.ibiblio.org/maven/commons-vfs/jars/commons-vfs-20030518103800.jar"
/>
-	</target>
-	<target name="get-commons-logging">
-		<mkdir dir="${repository.dir}/commons-logging/jars/" />
-		<get verbose="true"
-		     usetimestamp="true"
-		     dest="${repository.dir}/commons-logging/jars/commons-logging-null.jar"
-		     src="http://www.ibiblio.org/maven/commons-logging/jars/commons-logging-1.1-dev.jar"
/>
-	</target>
-	<target name="get-commons-httpclient">
-		<mkdir dir="${repository.dir}/commons-httpclient/jars/" />
-		<get verbose="true"
-		     usetimestamp="true"
-		     dest="${repository.dir}/commons-httpclient/jars/commons-httpclient-2.0.jar"
-		     src="http://www.ibiblio.org/maven/commons-httpclient/jars/commons-httpclient-2.0.jar"
/>
-	</target>
-	<target name="get-commons-codec">
-		<mkdir dir="${repository.dir}/commons-codec/jars/" />
-		<get verbose="true"
-		     usetimestamp="true"
-		     dest="${repository.dir}/commons-codec/jars/commons-codec-1.2.jar"
-		     src="http://www.ibiblio.org/maven/commons-codec/jars/commons-codec-1.2.jar" />
-	</target>
-	<target name="get-regexp">
-		<mkdir dir="${repository.dir}/regexp/jars/" />
-		<get verbose="true"
-		     usetimestamp="true"
-		     dest="${repository.dir}/regexp/jars/regexp-null.jar"
-		     src="http://www.ibiblio.org/maven/regexp/jars/regexp-1.3.jar" />
-	</target>
-	<target name="get-junit">
-		<mkdir dir="${repository.dir}/junit/jars/" />
-		<get verbose="true"
-		     usetimestamp="true"
-		     dest="${repository.dir}/junit/jars/junit-3.8.jar"
-		     src="http://www.ibiblio.org/maven/junit/jars/junit-3.8.jar" />
-	</target>	
-	<target name="get-ant">
-		<mkdir dir="${repository.dir}/ant/jars/" />
-		<get verbose="true"
-		     usetimestamp="true"
-		     dest="${repository.dir}/ant/jars/ant-1.6.1.jar"
-		     src="http://www.ibiblio.org/maven/ant/jars/ant-1.6.1.jar" />
-	</target>	
-	<target name="get-xmlunit">
-		<mkdir dir="${repository.dir}/xmlunit/jars/" />
-		<get verbose="true"
-		     usetimestamp="true"
-		     dest="${repository.dir}/xmlunit/jars/xmlunit-1.0.jar"
-		     src="http://www.ibiblio.org/maven/xmlunit/jars/xmlunit-1.0.jar" />
-	</target>	
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--$Id: $-->
+<!--This is a autogenerated file designed to be checked in to Source Control-->
+<project default="get-all" name="">
+<property name="depot.home" value="${user.home}/.apache.depot"/>
+<property name="repository.dir" value="${depot.home}/local-repository"/>
+<fileset id="depot-update.dependent.jars.fileset" dir="${repository.dir}">
+<include name="log4j/jars/log4j-1.2.8.jar"/>
+<include name="commons-vfs/jars/commons-vfs-515691106.jar"/>
+<include name="commons-logging/jars/commons-logging-1.1-dev.jar"/>
+<include name="commons-httpclient/jars/commons-httpclient-2.0.jar"/>
+<include name="commons-codec/jars/commons-codec-1.2.jar"/>
+<include name="regexp/jars/regexp-1.3.jar"/>
+</fileset>
+<target name="get-all" depends="get-log4j,get-commons-vfs,get-commons-logging,get-commons-httpclient,get-commons-codec,get-regexp"/>
+    <target name="get-log4j">
+<mkdir dir="${repository.dir}/log4j/jars/"/>
+<get verbose="true" usetimestamp="true" dest="${repository.dir}/log4j/jars/log4j-1.2.8.jar"
src="http://www.ibiblio.org/maven/log4j/jars/log4j-1.2.8.jar"/>
+</target>
+    <target name="get-commons-vfs">
+<mkdir dir="${repository.dir}/commons-vfs/jars/"/>
+<get verbose="true" usetimestamp="true" dest="${repository.dir}/commons-vfs/jars/commons-vfs-515691106.jar"
src="http://www.ibiblio.org/maven/commons-vfs/jars/commons-vfs-20030518103800.jar"/>
+</target>
+    <target name="get-commons-logging">
+<mkdir dir="${repository.dir}/commons-logging/jars/"/>
+<get verbose="true" usetimestamp="true" dest="${repository.dir}/commons-logging/jars/commons-logging-1.1-dev.jar"
src="http://www.ibiblio.org/maven/commons-logging/jars/commons-logging-1.1-dev.jar"/>
+</target>
+    <target name="get-commons-httpclient">
+<mkdir dir="${repository.dir}/commons-httpclient/jars/"/>
+<get verbose="true" usetimestamp="true" dest="${repository.dir}/commons-httpclient/jars/commons-httpclient-2.0.jar"
src="http://www.ibiblio.org/maven/commons-httpclient/jars/commons-httpclient-2.0.jar"/>
+</target>
+    <target name="get-commons-codec">
+<mkdir dir="${repository.dir}/commons-codec/jars/"/>
+<get verbose="true" usetimestamp="true" dest="${repository.dir}/commons-codec/jars/commons-codec-1.2.jar"
src="http://www.ibiblio.org/maven/commons-codec/jars/commons-codec-1.2.jar"/>
+</target>
+    <target name="get-regexp">
+<mkdir dir="${repository.dir}/regexp/jars/"/>
+<get verbose="true" usetimestamp="true" dest="${repository.dir}/regexp/jars/regexp-1.3.jar"
src="http://www.ibiblio.org/maven/regexp/jars/regexp-1.3.jar"/>
+</target>
+</project>

Modified: incubator/depot/trunk/update/build.xml
==============================================================================
--- incubator/depot/trunk/update/build.xml	(original)
+++ incubator/depot/trunk/update/build.xml	Wed Jul 28 00:56:11 2004
@@ -20,20 +20,18 @@
 		Depot Update is a Repository Updater 
 	</description>
 	<tstamp />
-	<typedef resource="org/krysalis/antworks/importer/antlib.xml"
-	         classpath="${user.home}/.antworks/lib/antworks-importer.jar" />
+	<typedef resource="org/krysalis/antworks/importer/antlib.xml" classpath="${user.home}/.antworks/lib/antworks-importer.jar"
/>
 
 	<property name="project.name" value="depot-update" />
 	<property name="project.version" value="0.1-dev-${DSTAMP}" />
-	<property name="project.vendor" value="Apache Software Foundation"/>
+	<property name="project.vendor" value="Apache Software Foundation" />
 
 	<property name="project.test.dir" value="src/test" />
 	<property name="project.package" value="org.apache.depot.update" />
 
 	<property name="makeantlet.antlet.src.dir" value="${basedir}/src/antlet" />
 
-	<property name="apache.antlet.svn.www.url"
-	          value="https://svn.apache.org/repos/asf/incubator/depot/trunk/www/update" />
+	<property name="apache.antlet.svn.www.url" value="https://svn.apache.org/repos/asf/incubator/depot/trunk/www/update"
/>
 	<property name="depot-version.antlet.isDependent" value="true" />
 
 
@@ -45,13 +43,10 @@
 	<selector id="needs.vfs">
 		<filename name="org/**/*Vfs*.java" casesensitive="false" />
 	</selector>
-	<available property="vfs.present"
-	           classname="org.apache.commons.vfs.VFS"
-	           classpathref="depot-update.classpath" />
+	<available property="vfs.present" classname="org.apache.commons.vfs.VFS" classpathref="depot-update.classpath"
/>
 
 
-	<property name="antlets.repo"
-	          value="http://antworks.sourceforge.net/library/antlets/" />
+	<property name="antlets.repo" value="http://antworks.sourceforge.net/library/antlets/"
/>
 	<importer name="init-0.1" href="${antlets.repo}" />
 	<importer name="java-0.1" href="${antlets.repo}" />
 	<importer name="junit-0.1" href="${antlets.repo}" />
@@ -59,8 +54,7 @@
 	<importer name="apache-0.1" href="${antlets.repo}" />
 	<importer name="makeantlet-0.2" href="${antlets.repo}" />
 
-	<importer name="depot-version-0.1"
-	          href="http://cvs.apache.org/~nickchalko/SNAPSHOTS/antlets/" />
+	<importer name="depot-version-0.1" href="http://cvs.apache.org/~nickchalko/SNAPSHOTS/antlets/"
/>
 
 	<fileset id="depot-update.dependent.jars.fileset" dir=".">
 		<include name="lib/*.jar" />
@@ -85,11 +79,29 @@
 	</selector>
 
 	<target name="all" depends="dist" />
-	<target name="compile"
-	        depends="-init-path,version-stamp,java.antlet.compile"
-	        description="Compile java source files." />
-	<target name="-init-path" depends="get-all"/>
+	<target name="compile" depends="-init-path,version-stamp,java.antlet.compile" description="Compile
java source files." />
+	<target name="-init-path" depends="get-all" />
 
 	<target name="gump" depends="compile,dist-jar" />
 	<target name="test" depends="junit.test" />
+
+
+	<!-- - - - - - - - - - - - - - - - - - 
+          target: pre-make-antlet                      
+         - - - - - - - - - - - - - - - - - -->
+	<target name="pre-make-antlet" depends="dist-jar">
+		<copy todir="${makeantlet.antlet.src.dir}/lib" flatten="true">
+			<fileset refid="depot-update.dependent.jars.fileset">
+			</fileset>
+			<fileset dir="${basedir}">
+				<include name="lib/*.jar" />
+			</fileset>
+			<fileset dir="${dist.dir}">
+				<include name="*.jar" />
+			</fileset>
+		</copy>
+
+	</target>
+
+
 </project>

Mime
View raw message