Can someone please apply my patch for the [GUMP] Build Failure - jakarta-ant-embed?
I reattach it here for simplicity.
Thanks, and excuse me for being a PITA ;-)
Nicola Ken Barozzi wrote:
---------------------------------------------------- This email is autogenerated from the output from: <http://cvs.apache.org/builds/gump/2002-11-20/jakarta-ant-embed.html> ----------------------------------------------------
Buildfile: build.xml
main: [mkdir] Created dir: /home/rubys/jakarta/jakarta-ant/proposal/embed/build/classes [javac] Compiling 13 source files to /home/rubys/jakarta/jakarta-ant/proposal/embed/build/classes [javac] Note: Some input files use or override a deprecated API. [javac] Note: Recompile with -deprecation for details. [copy] Copying 1 file to /home/rubys/jakarta/jakarta-ant/proposal/embed/build/classes
BUILD FAILED file:///home/rubys/jakarta/jakarta-ant/proposal/embed/build.xml:38: Manifest file: /home/rubys/jakarta/jakarta-ant/proposal/embed/src/java/META-INF/MANIFEST does not exist.
Total time: 12 seconds
-- Nicola Ken Barozzi [EMAIL PROTECTED] - verba volant, scripta manent - (discussions get forgotten, just code remains) ---------------------------------------------------------------------
Index: build.xml
===================================================================
RCS file: /home/cvspublic/jakarta-ant/proposal/embed/build.xml,v
retrieving revision 1.5
diff -u -r1.5 build.xml
--- build.xml 18 Oct 2002 21:50:31 -0000 1.5
+++ build.xml 19 Nov 2002 15:23:47 -0000
@@ -1,26 +1,23 @@
<project name="embed" default="main" basedir=".">
- <description>Embed proposal</description>
+
+ <description>Ant Embed proposal</description>
+
<property file="${user.home}/build.properties" />
- <property name="base.path" location="/usr/share/java"/>
<property name="ant.src" location="../.."/>
- <property name="commons.src" location="${ant.src}/../jakarta-commons"/>
- <property name="sandbox.src"
location="${ant.src}/../jakarta-commons-sandbox"/>
-
<property name="embed.build" location="build"/>
<property name="debug" value="true"/>
-
- <!-- Those 2 should be moved to JXPath and velocity. -->
- <property name="commons-logging.jar"
location="${commons.src}/logging/dist/commons-logging.jar" />
- <property name="jxpath.jar"
location="${commons.src}/jxpath/dist/commons-jxpath.jar" />
- <property name="velocity.jar"
location="${base.path}/velocity/velocity-20020220.jar" />
- <property name="velocity-dep.jar"
location="${base.path}/velocity/velocity-dep-20020220.jar" />
- <property name="jexl.jar"
location="${sandbox.src}/jexl/dist/commons-jexl.jar" />
-
- <property name="commons-discovery.jar"
location="${commons.src}/discovery/dist/commons-discovery.jar" />
-
+ <property name="lib" value="./lib"/>
+
+ <property name="commons-logging.jar" location="${lib}/commons-logging.jar"
/>
+ <property name="commons-discovery.jar"
location="${lib}/commons-discovery.jar" />
+ <property name="jxpath.jar" location="${lib}/commons-jxpath.jar" />
+ <property name="velocity.jar" location="${lib}/velocity.jar" />
+ <property name="velocity-dep.jar" location="${lib}/velocity-dep.jar" />
+ <property name="jexl.jar" location="${lib}/commons-jexl.jar" />
<target name="build" depends="main" />
+
<target name="main">
<mkdir dir="build/classes" />
<javac srcdir="src/java"
@@ -34,19 +31,10 @@
<fileset dir="src/java" includes="META-INF/**" />
</copy>
- <jar file="${embed.build}/ant-sax2.jar" basedir="${embed.build}/classes"
- manifest="src/java/META-INF/MANIFEST" >
+ <jar file="${embed.build}/ant-sax2.jar" basedir="${embed.build}/classes" >
<include name="**" />
</jar>
- <echo message="${embed.build}/ant-sax2.jar toDir=${ant.home}/lib"/>
-
- <copy file="${embed.build}/ant-sax2.jar" toDir="${ant.home}/lib"/>
- <copy file="${commons-logging.jar}" toDir="${ant.home}/lib"/>
- <copy file="${commons-discovery.jar}" toDir="${ant.home}/lib"/>
-
- <copy file="${commons-logging.jar}" toDir="${embed.build}"/>
- <copy file="${commons-discovery.jar}" toDir="${embed.build}"/>
</target>
<target name="embed-optional">
@@ -69,27 +57,35 @@
<fileset dir="src/java" includes="META-INF/**" />
</copy>
- <jar file="${embed.build}/optional-dynprop.jar"
basedir="${embed.build}/classes"
- manifest="src/java/META-INF/MANIFEST" >
+ <jar file="${embed.build}/optional-dynprop.jar"
basedir="${embed.build}/classes">
<include name="org/apache/tools/ant/taskdefs/optional/**" />
- </jar>
-
- <echo message="${embed.build}/ant-sax2.jar toDir=${ant.home}/lib"/>
-
- <copy file="${embed.build}/ant-sax2.jar" toDir="${ant.home}/lib"/>
- <copy file="${commons-logging.jar}" toDir="${ant.home}/lib"/>
- <copy file="${commons-discovery.jar}" toDir="${ant.home}/lib"/>
+ </jar>
<copy file="${commons-logging.jar}" toDir="${embed.build}"/>
<copy file="${commons-discovery.jar}" toDir="${embed.build}"/>
+
</target>
+ <target name="install" description="Installs built jars">
+ <echo message="${embed.build}/ant-sax2.jar toDir=${ant.home}/lib"/>
+
+ <copy file="${embed.build}/ant-sax2.jar" toDir="${ant.home}/lib"/>
+
+
+ </target>
+
+ <target name="install-embed" depends="main, install" description="Installs
core built jars"/>
+
+ <target name="install-embed-optional" depends="embed-optional, install"
description="Installs extra built jars">
+ <copy file="${commons-logging.jar}" toDir="${ant.home}/lib"/>
+ <copy file="${commons-discovery.jar}" toDir="${ant.home}/lib"/>
+ </target>
+
<target name="gump" description="Patch gump bootstrap ant" depends="main" >
<!-- What we'll do - in order to get around gump classpath use - is
to recreate ant.jar ( using build/classes ) to include our code -->
<unjar jar="${ant.src}/bootstrap/lib/ant.jar"
dest="${embed.build}/classes" />
<delete file="${ant.src}/bootstrap/lib/ant.jar" />
- <jar file="${ant.src}/bootstrap/lib/ant.jar"
basedir="${embed.build}/classes"
- manifest="${embed.build}/classes/META-INF/MANIFEST" includes="**" />
+ <jar file="${ant.src}/bootstrap/lib/ant.jar"
basedir="${embed.build}/classes"/>
</target>
</project>-- To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]> For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
