Siphalor/tweed5-commons-logging
1
0
Fork 0
Code Activity

Add version into jarname as done by maven, eg commons-logging-1.x.x.jar

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/jakarta/commons/proper/logging/trunk@190888 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Simon Kitching
2005-06-16 09:23:03 +00:00
parent c563002215
commit 2b9b9b6f24
2 changed files with 25 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
build.xml
View File

@@ -86,6 +86,10 @@
<property name="optional.home" value="optional"/>
<property name="optional.dist.home" value="${optional.home}/dist"/>
<!-- jar names -->
<property name="core.jar.name" value="commons-${component.name}-${component.version}.jar"/>
<property name="api.jar.name" value="commons-${component.name}-api-${component.version}.jar"/>
<property name="adapters.jar.name" value="commons-${component.name}-adapters-${component.version}.jar"/>
<!-- ========== Compiler Defaults ========================================= -->
@@ -295,7 +299,7 @@
<copy file="NOTICE.txt"
todir="${build.home}/classes/META-INF"/>
<jar jarfile="${build.home}/commons-${component.name}.jar"
<jar jarfile="${build.home}/${core.jar.name}"
basedir="${build.home}/classes"
manifest="${build.home}/conf/MANIFEST.MF">
<include name="org/apache/commons/logging/**" />
@@ -304,7 +308,7 @@
<exclude name="**/package.html"/>
</jar>
<jar jarfile="${build.home}/commons-${component.name}-api.jar"
<jar jarfile="${build.home}/${api.jar.name}"
basedir="${build.home}/classes"
manifest="${build.home}/conf/MANIFEST.MF">
<include name="org/apache/commons/logging/*.class" />
@@ -317,7 +321,7 @@
<exclude name="**/package.html"/>
</jar>
<jar jarfile="${build.home}/commons-${component.name}-adapters.jar"
<jar jarfile="${build.home}/${adapters.jar.name}"
basedir="${build.home}/classes"
manifest="${build.home}/conf/MANIFEST.MF">
<include name="org/apache/commons/logging/impl/**.class" />
@@ -461,12 +465,12 @@ limitations under the License.--&gt;'>
todir="${dist.home}"/>
<copy file="RELEASE-NOTES.txt"
todir="${dist.home}"/>
<copy file="${build.home}/commons-${component.name}.jar"
tofile="${dist.home}/commons-${component.name}.jar" />
<copy file="${build.home}/commons-${component.name}-api.jar"
tofile="${dist.home}/commons-${component.name}-api.jar" />
<copy file="${build.home}/commons-${component.name}-adapters.jar"
tofile="${dist.home}/commons-${component.name}-adapters.jar" />
<copy file="${build.home}/${core.jar.name}"
tofile="${dist.home}/${core.jar.name}" />
<copy file="${build.home}/${api.jar.name}"
tofile="${dist.home}/${api.jar.name}" />
<copy file="${build.home}/${adapters.jar.name}"
tofile="${dist.home}/${adapters.jar.name}" />
<!--
- Now build the optional jar in subdir "optional" and copy that into

21
optional/build.xml
View File

@@ -38,13 +38,6 @@
<property name="junit.home" value="/usr/local/junit3.5"/>
<property name="jakarta.home" value="../../.."/>
<!-- ========== Derived Values ============================================ -->
<!-- The locations of necessary jar files -->
<property name="junit.jar" value="${junit.home}/junit.jar"/>
<property name="commons-logging-core.jar" value="../dist/commons-logging.jar"/>
<!-- ========== Component Declarations ==================================== -->
@@ -75,6 +68,16 @@
<!-- The base directory for unit test sources -->
<property name="test.home" value="src/test"/>
<!-- jar name -->
<property name="optional.jar.name" value="commons-${component.name}-${component.version}.jar"/>
<!-- ========== Derived Values ============================================ -->
<!-- The locations of necessary jar files -->
<property name="junit.jar" value="${junit.home}/junit.jar"/>
<property name="commons-logging-core.jar" value="../dist/commons-logging-${component.version}.jar"/>
<!-- ========== Compiler Defaults ========================================= -->
@@ -171,7 +174,7 @@
<copy file="../NOTICE.txt"
todir="${build.home}/classes/META-INF"/>
<jar jarfile="${build.home}/commons-${component.name}.jar"
<jar jarfile="${build.home}/${optional.jar.name}"
basedir="${build.home}/classes"
manifest="${build.home}/conf/MANIFEST.MF">
<include name="org/apache/commons/logging/**" />
@@ -245,7 +248,7 @@ limitations under the License.--&gt;'>
</target>
<target name='dist' depends='compile, javadoc'>
<copy file='${build.home}/commons-${component.name}.jar' todir='${dist.home}'/>
<copy file='${build.home}/${optional.jar.name}' todir='${dist.home}'/>
</target>
<!-- ========== Unit Test Targets ========================================= -->