You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@depot.apache.org by ni...@apache.org on 2004/05/13 08:11:02 UTC
svn commit: rev 10624 - incubator/depot/trunk/update
Author: nickchalko
Date: Thu May 13 01:11:01 2004
New Revision: 10624
Modified:
incubator/depot/trunk/update/build-ant-get.xml
incubator/depot/trunk/update/build-depend.xml
incubator/depot/trunk/update/build.xml
Log:
Added regexp
Try using this from the main build.xml
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 Thu May 13 01:11:01 2004
@@ -1,47 +1,45 @@
-<?xml version="1.0" encoding="utf-8"?><!--$Id: $--><!--This is a autogenerated file designed to be checked in to Source Control--><project name="" default="get-all">
- <property name="depot.home" value="${user.home}/.apache.depot"/>
- <property name="repository.dir" value="${depot.home}/local-repository"/>
- <target name="get-all" depends="get-log4j,get-commons-vfs,get-commons-logging,get-commons-httpclient,get-depot-common,get-depot-version">
- <path id="depot-update-depends.dependent.jars.fileset">
- <fileset dir="${repository.dir}">
- <include name="log4j/jars/log4j-1.2.jars"/>
- <include name="commons-vfs/jars/commons-vfs-20030518103800.jars"/>
- <include name="commons-logging/jars/commons-logging-null.jars"/>
- <include name="commons-httpclient/jars/commons-httpclient-2.0.jars"/>
- <include name="depot-common/jars/depot-common-null.jars"/>
- <include name="depot-version/jars/depot-version-null.jars"/>
- </fileset>
- </path>
- </target>
-
- <target name="get-log4j">
- <mkdir dir="${repository.dir}/log4j/jars/"/>
- <get usetimestamp="true" verbose="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 usetimestamp="true" verbose="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 usetimestamp="true" verbose="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 usetimestamp="true" verbose="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-depot-common">
- <mkdir dir="${repository.dir}/depot-common/jars/"/>
- <get usetimestamp="true" verbose="true" dest="${repository.dir}/depot-common/jars/depot-common-null.jar" src="http://cvs.apache.org/~nickchalko/SNAPSHOTS/depot-common/jars/depot-common-0.1-dev-20040424.jar"/>
- </target>
-
- <target name="get-depot-version">
- <mkdir dir="${repository.dir}/depot-version/jars/"/>
- <get usetimestamp="true" verbose="true" dest="${repository.dir}/depot-version/jars/depot-version-null.jar" src="http://cvs.apache.org/~nickchalko/SNAPSHOTS/depot-version/jars/depot-version-dev-20040313.jar"/>
- </target>
-
-</project>
\ No newline at end of file
+<?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.jars"/>
+<include name="commons-vfs/jars/commons-vfs-20030518103800.jars"/>
+<include name="commons-logging/jars/commons-logging-null.jars"/>
+<include name="commons-httpclient/jars/commons-httpclient-2.0.jars"/>
+<include name="depot-common/jars/depot-common-null.jars"/>
+<include name="depot-version/jars/depot-version-null.jars"/>
+<include name="regexp/jars/regexp-null.jars"/>
+</fileset>
+<target name="get-all" depends="get-log4j,get-commons-vfs,get-commons-logging,get-commons-httpclient,get-depot-common,get-depot-version,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.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-depot-common">
+<mkdir dir="${repository.dir}/depot-common/jars/"/>
+<get verbose="true" usetimestamp="true" dest="${repository.dir}/depot-common/jars/depot-common-null.jar" src="http://cvs.apache.org/~nickchalko/SNAPSHOTS/depot-common/jars/depot-common-0.1-dev-20040424.jar"/>
+</target>
+<target name="get-depot-version">
+<mkdir dir="${repository.dir}/depot-version/jars/"/>
+<get verbose="true" usetimestamp="true" dest="${repository.dir}/depot-version/jars/depot-version-null.jar" src="http://cvs.apache.org/~nickchalko/SNAPSHOTS/depot-version/jars/depot-version-dev-20040313.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>
+</project>
Modified: incubator/depot/trunk/update/build-depend.xml
==============================================================================
--- incubator/depot/trunk/update/build-depend.xml (original)
+++ incubator/depot/trunk/update/build-depend.xml Thu May 13 01:11:01 2004
@@ -37,7 +37,7 @@
<resource name="commons-httpclient" ext="jar" version="2.0" repository="maven" />
<resource name="depot-common" ext="jar" repository="nickchalko-sandbox" />
<resource name="depot-version" ext="jar" repository="nickchalko-sandbox" />
- <resource name="jakart-regexp" ext="jar" repository="maven" />
+ <resource name="regexp" ext="jar" repository="maven" />
</cachedset>
Modified: incubator/depot/trunk/update/build.xml
==============================================================================
--- incubator/depot/trunk/update/build.xml (original)
+++ incubator/depot/trunk/update/build.xml Thu May 13 01:11:01 2004
@@ -38,23 +38,16 @@
<property name="project.src.dir" value="src/java" />
- <path id="depot-update.classpath">
- <fileset dir="lib">
- <include name="*.jar" />
- </fileset>
- </path>
+
<selector id="needs.vfs">
- <filename name="org/**/*Vfs*.java" casesensitive="false" />
+ <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}" />
@@ -64,21 +57,33 @@
<importer name="depot-version-0.1" />
- <!-- note this must be after the java antlet-->
- <selector id="conditional.compile">
- <not>
- <or>
- <selector refid="needs.vfs" unless="vfs.present" />
- </or>
- </not>
- </selector>
-
+ <fileset id="depot-update.dependent.jars.fileset" dir=".">
+ <include name="lib/*.jar" />
+ </fileset>
+ <import file="build-ant-get.xml" />
+
+ <path id="depot-update.classpath">
+ <fileset refid="depot-update.dependent.jars.fileset" />
+ </path>
+
+ <!-- note this must be after the java antlet-->
+ <selector id="conditional.compile">
+ <not>
+ <or>
+ <selector refid="needs.vfs" unless="vfs.present" />
+ </or>
+ </not>
+ </selector>
+
<target name="all" depends="compile" />
<target name="compile"
- depends="version-stamp,java.antlet.compile"
+ depends="-init-path,version-stamp,java.antlet.compile"
description="Compile java source files." />
+ <target name="-init-path" depends="get-all">
+
+ </target>
<target name="gump" depends="compile,dist-jar">