svn commit: r451234 - in /incubator/woden/trunk/java: build.properties build.xml

[hu...@apache.org]

Author: hughesj
Date: Fri Sep 29 04:15:55 2006
New Revision: 451234

URL: http://svn.apache.org/viewvc?view=rev&rev=451234
Log:
Add top level dir to distribution
Correct bz2 dist so it is a compressed tar instead of compressed gz!
Added 'apache-' to front of dist filenames

Modified:
    incubator/woden/trunk/java/build.properties
    incubator/woden/trunk/java/build.xml

Modified: incubator/woden/trunk/java/build.properties
URL: http://svn.apache.org/viewvc/incubator/woden/trunk/java/build.properties?view=diff&rev=451234&r1=451233&r2=451234
==============================================================================
--- incubator/woden/trunk/java/build.properties (original)
+++ incubator/woden/trunk/java/build.properties Fri Sep 29 04:15:55 2006
@@ -58,4 +58,5 @@
 ant.name  = woden-ant
 
 ! Woden Archive name
-archive.name = woden-incubating
+archive.name = apache-woden-incubating
+archive.root.prefix = woden-incubating

Modified: incubator/woden/trunk/java/build.xml
URL: http://svn.apache.org/viewvc/incubator/woden/trunk/java/build.xml?view=diff&rev=451234&r1=451233&r2=451234
==============================================================================
--- incubator/woden/trunk/java/build.xml (original)
+++ incubator/woden/trunk/java/build.xml Fri Sep 29 04:15:55 2006
@@ -84,6 +84,7 @@
 		<echo message="version=${version}" />
 		<echo message="milestone=${milestone}" />
 		<echo message="buildType=${buildType}" />
+		<echo message="archive.root.prefix=${archive.root.prefix}" />
 	</target>
 
 
@@ -105,7 +106,7 @@
 
 		<available classname="junit.framework.Test" property="junitAvailable" />
 
-		<property name="archiveDir" value="${build.output}/${archive.name}-${buildId}" />
+		<property name="archiveDir" value="${build.output}/${archive.root.prefix}-${buildId}" />
 
 	</target>
 
@@ -419,7 +420,7 @@
 	</target>
 
 	<!-- Create the zip and tar.gz archives -->
-	<target name="createArchives">
+	<target name="createArchives" depends="init">
 		<mkdir dir="${archiveDir}" />
 		<mkdir dir="${archiveDir}/lib" />
 		<mkdir dir="${archiveDir}/doc" />
@@ -457,22 +458,26 @@
 		</copy>
 
 		<antcall target="createZip" />
-		<antcall target="createTarGz" />
+		<antcall target="createTarGzBz2" />
 	</target>
 
 	<!-- Builds a zip of the distributable dir -->
 	<!-- This target is not meant to be called on its own -->
 	<target name="createZip" depends="init">
-		<zip destfile="${build.output}/${archive.name}-${buildId}.zip" basedir="${archiveDir}" />
+		<zip destfile="${build.output}/${archive.name}-${buildId}.zip">
+            <zipfileset dir="${archiveDir}" prefix="${archive.root.prefix}-${buildId}"/>
+        </zip>
 	</target>
 
-	<!-- Builds a tar.gz of the distributable dir -->
+	<!-- Builds a tar.gz and tar.bz2 of the distributable dir -->
 	<!-- This target is not meant to be called on its own -->
-	<target name="createTarGz" depends="init">
-		<tar tarfile="${build.output}/${archive.name}-${buildId}.tar" basedir="${archiveDir}" />
-		<gzip zipfile="${build.output}/${archive.name}-${buildId}.tar.gz" src="${build.output}/${archive.name}-${buildId}.tar" />
-		<bzip2 src="${build.output}/${archive.name}-${buildId}.tar.gz" destfile="${build.output}/${archive.name}-${buildId}.tar.bz2" />
-		<delete file="${build.output}/$archive.name}-${buildId}.tar" />
+	<target name="createTarGzBz2" depends="init">
+		<tar destfile="${build.output}/${archive.name}-${buildId}.tar">
+			<tarfileset dir="${archiveDir}" prefix="${archive.root.prefix}-${buildId}"/>
+		</tar>
+		<gzip destfile="${build.output}/${archive.name}-${buildId}.tar.gz" src="${build.output}/${archive.name}-${buildId}.tar" />
+		<bzip2 destfile="${build.output}/${archive.name}-${buildId}.tar.bz2" src="${build.output}/${archive.name}-${buildId}.tar" />
+		<delete file="${build.output}/${archive.name}-${buildId}.tar" />
 	</target>
 
 	<!-- Create checksums for the zip and tar.gz files -->



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