commons-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nia...@apache.org
Subject svn commit: r504424 - /jakarta/commons/proper/launcher/trunk/build.xml
Date Wed, 07 Feb 2007 03:31:09 GMT
Author: niallp
Date: Tue Feb  6 19:31:09 2007
New Revision: 504424

URL: http://svn.apache.org/viewvc?view=rev&rev=504424
Log:
Fix for LAUNCHER-2 - Binary tarball uncompresses into directory w/o version suffix - reported
by David Tonhofer

Modified:
    jakarta/commons/proper/launcher/trunk/build.xml

Modified: jakarta/commons/proper/launcher/trunk/build.xml
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/launcher/trunk/build.xml?view=diff&rev=504424&r1=504423&r2=504424
==============================================================================
--- jakarta/commons/proper/launcher/trunk/build.xml (original)
+++ jakarta/commons/proper/launcher/trunk/build.xml Tue Feb  6 19:31:09 2007
@@ -190,7 +190,7 @@
     <delete    dir="${build.home}"/>
     <delete    dir="${dist.home}"/>
     <delete    dir="${release.home}"/>
-    <delete   file="commons-${component.name}.jar"/>
+    <delete   file="commons-${component.name}-${release.version}.jar"/>
   </target>
 
 
@@ -279,7 +279,7 @@
    description="Create jar">
     <mkdir      dir="${dist.home}"/>
     <mkdir      dir="${dist.home}/bin"/>
-    <jar    jarfile="${dist.home}/bin/commons-${component.name}.jar"
+    <jar    jarfile="${dist.home}/bin/commons-${component.name}-${release.version}.jar"
             basedir="${build.home}/classes"
            manifest="${build.home}/conf/MANIFEST.MF">
        <metainf dir="${basedir}" includes="LICENSE.txt,NOTICE.txt"/>
@@ -293,7 +293,7 @@
    description="--> Installs jar file in ${lib.repo}">
     <copy todir="${lib.repo}" filtering="off">
       <fileset dir="${dist.home}">
-        <include name="commons-${component.name}.jar"/>
+        <include name="commons-${component.name}-${release.version}.jar"/>
       </fileset>
     </copy>
   </target>
@@ -308,17 +308,17 @@
     <!-- Create binary distributions -->
 	<tar compression="gzip"
      destfile="${release.home}/${ant.project.name}-${release.version}.tar.gz">
-	  <tarfileset dir="${dist.home}" prefix="${ant.project.name}"/>
+	  <tarfileset dir="${dist.home}" prefix="${ant.project.name}-${release.version}"/>
 	</tar>
 	<zip
      destfile="${release.home}/${ant.project.name}-${release.version}.zip">
-	  <zipfileset dir="${dist.home}" prefix="${ant.project.name}"/>
+	  <zipfileset dir="${dist.home}" prefix="${ant.project.name}-${release.version}"/>
 	</zip>
 
     <!-- Create source distributions -->
 	<tar compression="gzip"
      destfile="${release.home}/${ant.project.name}-${release.version}-src.tar.gz">
-	  <tarfileset dir="${basedir}" prefix="${ant.project.name}">
+	  <tarfileset dir="${basedir}" prefix="${ant.project.name}-${release.version}-src">
         <exclude name="**/CVS/**"/>
         <exclude name="${build.home}/**"/>
         <exclude name="${dist.home}/**"/>
@@ -330,7 +330,7 @@
 	</tar>
 	<zip
      destfile="${release.home}/${ant.project.name}-${release.version}-src.zip">
-	  <zipfileset dir="${basedir}" prefix="${ant.project.name}">
+	  <zipfileset dir="${basedir}" prefix="${ant.project.name}-${release.version}-src">
         <exclude name="**/CVS/**"/>
         <exclude name="${build.home}/**"/>
         <exclude name="${dist.home}/**"/>
@@ -348,7 +348,7 @@
       <tarfileset dir="${basedir}/example/dist" prefix="${ant.project.name}-example" />
     </tar>
     <zip destfile="${release.home}/${ant.project.name}-${release.version}-example.zip">
-      <zipfileset dir="${basedir}/example/dist" prefix="${ant.project.name}-example" />
+      <zipfileset dir="${basedir}/example/dist" prefix="${ant.project.name}-${release.version}-example"
/>
     </zip>
 
   </target>



---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org


Mime
View raw message