User: starksm
Date: 02/02/17 10:32:07
Modified: catalina build.xml
Log:
Include version info the in jar manifests
Revision Changes Path
1.7 +25 -19 contrib/catalina/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/contrib/catalina/build.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- build.xml 17 Feb 2002 09:52:54 -0000 1.6
+++ build.xml 17 Feb 2002 18:32:07 -0000 1.7
@@ -12,7 +12,7 @@
<!-- -->
<!-- ====================================================================== -->
-<!-- $Id: build.xml,v 1.6 2002/02/17 09:52:54 user57 Exp $ -->
+<!-- $Id: build.xml,v 1.7 2002/02/17 18:32:07 starksm Exp $ -->
<project default="main" name="JBoss/Tomcat-4">
@@ -204,7 +204,7 @@
| documentation compiles.
-->
<target name="compile"
- depends="compile-classes, compile-resources"
+ depends="compile-classes, compile-resources, compile-etc"
description="Compile all source files."/>
<!-- Compile all class files -->
@@ -236,30 +236,35 @@
</copy>
</target>
+ <!-- Compile manifests -->
+ <target name="compile-etc" depends="init">
+ <mkdir dir="${build.etc}/manifest"/>
+ <!-- Copy with filtering to replace the following tokens that are
+ used to make up the jar manifest version information.
+ -->
+ <filter token="version.major" value="${version.major}"/>
+ <filter token="version.minor" value="${version.minor}"/>
+ <filter token="version.revision" value="${version.revision}"/>
+ <filter token="version.tag" value="${version.tag}"/>
+ <filter token="version.name" value="${version.name}"/>
+ <copy todir="${build.etc}/manifest" filtering="yes">
+ <fileset dir="${project.root}/build/etc">
+ <include name="version.mf"/>
+ </fileset>
+ </copy>
+ </target>
+
<!--
| Build all jar files.
-->
- <target name="create-manifest">
- <mkdir dir="${build.lib}"/>
- <echo file="${build.lib}/version.mf"
- append="false">Specification-Title: ${Name}-${module.version}
-Specification-Version: ${module.version}
-Specification-Vendor: JBoss Group, LLC
-Implementation-Title: ${Name}-${module.version} CVSTag=${version.name}
-Implementation-Version: ${module.version}.${build.id}
-Implementation-Vendor: JBoss Group, LLC
- </echo>
- <fixcrlf srcdir="${build.lib}" includes="version.mf" eol="crlf" />
- </target>
-
<target name="jars"
description="Build the Service Archive"
- depends="compile, create-manifest">
+ depends="compile">
<!-- Build the Tomcat service jars -->
<jar jarfile="${build.lib}/tomcat4-service.sar"
- manifest="${build.lib}/version.mf">
+ manifest="${build.etc}/manifest/version.mf">
<!-- jboss-service.xml for tomcat plugin -->
<metainf dir="${build.resources}" />
<!-- The service classes -->
@@ -271,7 +276,7 @@
<!-- The tomcat-test EJB jar -->
<jar jarfile="${build.lib}/tomcat-test.jar"
basedir="${build.classes}"
- manifest="${build.lib}/version.mf"
+ manifest="${build.etc}/manifest/version.mf"
>
<metainf dir="${source.resources}/test/META-INF" />
<include name="org/jboss/test/tomcat/ejb/**" />
@@ -279,7 +284,7 @@
<!-- The tomcat-test war -->
<war warfile="${build.lib}/tomcat-test.war"
webxml="${source.resources}/test/WEB-INF/web.xml"
- manifest="${build.lib}/version.mf"
+ manifest="${build.etc}/manifest/version.mf"
>
<webinf dir="${source.resources}/test/WEB-INF" />
<classes dir="${build.classes}">
@@ -291,6 +296,7 @@
</war>
<!-- The tomcat-test ear -->
<ear earfile="${build.lib}/tomcat-test.ear"
+ manifest="${build.etc}/manifest/version.mf"
appxml="${source.resources}/test/application.xml">
<fileset dir="${build.lib}">
<include name="tomcat-test.jar" />
_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development
