ceki 2002/11/22 10:39:29
Modified: . build.xml
Removed: build manifest.mf
Log:
Slightly simplified the "log4j.jar" target. The manifest file is now built inline.
This requires a recent version of Ant. I think 1.4.x or later.
Revision Changes Path
1.41 +13 -13 jakarta-log4j/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-log4j/build.xml,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- build.xml 22 Nov 2002 13:08:04 -0000 1.40
+++ build.xml 22 Nov 2002 18:39:29 -0000 1.41
@@ -297,23 +297,15 @@
</target>
<!-- ================================================================= -->
- <!-- Remove the temporary manifest file, actual work is done in the -->
- <!-- dependencies. -->
+ <!-- Aactual work is done in the dependencies. -->
<!-- ================================================================= -->
<target name="jar" depends="log4j.jar">
- <delete file="${jar.dest}/manifest.mf"/>
- </target>
-
- <target name="prejar" depends="build">
- <filter token="version" value="${version}" />
- <copy file="${manifest.src}" tofile="${jar.dest}/manifest.mf"
- filtering="true"/>
</target>
<!-- ================================================================= -->
<!-- Create log4j.jar, excluding tests and other odds and ends. -->
<!-- ================================================================= -->
- <target name="log4j.jar" depends="prejar">
+ <target name="log4j.jar" depends="build">
<delete>
<fileset dir="${jar.dest}">
<include name="${log4j.jar}"/>
@@ -340,9 +332,17 @@
${stem}/or/sax/*.class,
${stem}/or/jms/*.class,
${stem}/config/*.class"
- excludes="**/UnitTest**"
- manifest="${jar.dest}/manifest.mf"
- />
+ excludes="**/UnitTest**">
+
+ <manifest>
+ <attribute name="Manifest-version" value="1.0"/>
+ <section name="org/apache/log4j/">
+ <attribute name="Implementation-Title" value="log4j"/>
+ <attribute name="Implementation-Version" value="${version}"/>
+ <attribute name="Implementation-Vendor" value="APache Software Foundation"/>
+ </section>
+ </manifest>
+ </jar>
</target>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
