dion 2003/08/18 21:46:44
Modified: . build-bootstrap.xml build-bootstrap-core.xml
Log:
Switch stable branch back to HEAD
Revision Changes Path
1.204 +15 -4 maven/build-bootstrap.xml
Index: build-bootstrap.xml
===================================================================
RCS file: /home/cvs/maven/build-bootstrap.xml,v
retrieving revision 1.203
retrieving revision 1.204
diff -u -r1.203 -r1.204
--- build-bootstrap.xml 27 Jul 2003 23:50:36 -0000 1.203
+++ build-bootstrap.xml 19 Aug 2003 04:46:44 -0000 1.204
@@ -8,8 +8,12 @@
<property environment="env"/>
<property name="maven.home" value="${env.MAVEN_HOME}"/>
+ <target name="check-env" description="Check if environment variables are set">
+ <echo>maven.home = ${maven.home}</echo>
+ <fail unless="env.MAVEN_HOME" message="You MUST set MAVEN_HOME first"/>
+ </target>
- <target name="env" depends="check-properties">
+ <target name="env" depends="check-properties,check-env">
<echo>maven.home = ${maven.home}</echo>
<echo>maven.home.local = ${maven.home.local}</echo>
<echo>maven.repo.local = ${maven.repo.local}</echo>
@@ -178,11 +182,18 @@
<mkdir dir="${maven.bootstrap.install.dir}/lib/endorsed" />
<copy todir="${maven.bootstrap.install.dir}/lib/endorsed">
<fileset dir="${maven.bootstrap.install.dir}/lib">
- <include name="xml-apis*.jar" />
- <include name="xerces*.jar" />
- <include name="piccolo*.jar" />
+ <include name="xml-apis-*.jar" />
+ <include name="xerces-*.jar" />
</fileset>
</copy>
+
+ <!-- Don't duplicate endorsed files -->
+ <delete>
+ <fileset dir="${maven.bootstrap.install.dir}/lib">
+ <include name="xml-apis-*.jar" />
+ <include name="xerces-*.jar" />
+ </fileset>
+ </delete>
<!-- Install maven in the lib directory -->
1.5 +10 -3 maven/build-bootstrap-core.xml
Index: build-bootstrap-core.xml
===================================================================
RCS file: /home/cvs/maven/build-bootstrap-core.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- build-bootstrap-core.xml 27 Jul 2003 23:33:56 -0000 1.4
+++ build-bootstrap-core.xml 19 Aug 2003 04:46:44 -0000 1.5
@@ -178,11 +178,18 @@
<mkdir dir="${maven.bootstrap.install.dir}/lib/endorsed" />
<copy todir="${maven.bootstrap.install.dir}/lib/endorsed">
<fileset dir="${maven.bootstrap.install.dir}/lib">
- <include name="xml-apis*.jar" />
- <include name="xerces*.jar" />
- <include name="piccolo*.jar" />
+ <include name="xml-apis-*.jar" />
+ <include name="xerces-*.jar" />
</fileset>
</copy>
+
+ <!-- Don't duplicate endorsed files -->
+ <delete>
+ <fileset dir="${maven.bootstrap.install.dir}/lib">
+ <include name="xml-apis-*.jar" />
+ <include name="xerces-*.jar" />
+ </fileset>
+ </delete>
<!-- Install maven in the lib directory -->
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
