Return-Path: 
 <commons-dev-return-98846-apmail-jakarta-commons-dev-archive=jakarta.apache.org@jakarta.apache.org>
Delivered-To: apmail-jakarta-commons-dev-archive@www.apache.org
Received: (qmail 77639 invoked from network); 7 Feb 2007 03:31:32 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 7 Feb 2007 03:31:32 -0000
Received: (qmail 10402 invoked by uid 500); 7 Feb 2007 03:31:38 -0000
Delivered-To: apmail-jakarta-commons-dev-archive@jakarta.apache.org
Received: (qmail 10291 invoked by uid 500); 7 Feb 2007 03:31:38 -0000
Mailing-List: contact commons-dev-help@jakarta.apache.org; run by ezmlm
Precedence: bulk
List-Unsubscribe: <mailto:commons-dev-unsubscribe@jakarta.apache.org>
List-Help: <mailto:commons-dev-help@jakarta.apache.org>
List-Post: <mailto:commons-dev@jakarta.apache.org>
List-Id: "Jakarta Commons Developers List" <commons-dev.jakarta.apache.org>
Reply-To: "Jakarta Commons Developers List" <commons-dev@jakarta.apache.org>
Delivered-To: mailing list commons-dev@jakarta.apache.org
Received: (qmail 10280 invoked by uid 500); 7 Feb 2007 03:31:38 -0000
Received: (qmail 10277 invoked by uid 99); 7 Feb 2007 03:31:38 -0000
Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 06 Feb 2007 19:31:38 -0800
X-ASF-Spam-Status: No, hits=-9.4 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 06 Feb 2007 19:31:30 -0800
Received: by eris.apache.org (Postfix, from userid 65534)
	id E876A1A981A; Tue,  6 Feb 2007 19:31:09 -0800 (PST)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r504424 -
 /jakarta/commons/proper/launcher/trunk/build.xml
Date: Wed, 07 Feb 2007 03:31:09 -0000
To: commons-cvs@jakarta.apache.org
From: niallp@apache.org
X-Mailer: svnmailer-1.1.0
Message-Id: <20070207033109.E876A1A981A@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

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