svn commit: r1141135 - /incubator/wookie/branches/0.9.x/ant/ivy-release-common.xml

[ps...@apache.org]

Author: psharples
Date: Wed Jun 29 15:41:35 2011
New Revision: 1141135

URL: http://svn.apache.org/viewvc?rev=1141135&view=rev
Log:
Updated so each build is contained within it's own '/source', '/binary/standalone' and 'binary/war' folders.  Reason is because once you run the gpg -armor --detach-sig, MD5 and SHA algorithms on each archive, we end up with lots of files, so it is easier to navigate each build this way. Also it will now reflect how the structure should look like on www.apache.org/dist/incubator/wookie.

Modified:
    incubator/wookie/branches/0.9.x/ant/ivy-release-common.xml

Modified: incubator/wookie/branches/0.9.x/ant/ivy-release-common.xml
URL: http://svn.apache.org/viewvc/incubator/wookie/branches/0.9.x/ant/ivy-release-common.xml?rev=1141135&r1=1141134&r2=1141135&view=diff
==============================================================================
--- incubator/wookie/branches/0.9.x/ant/ivy-release-common.xml (original)
+++ incubator/wookie/branches/0.9.x/ant/ivy-release-common.xml Wed Jun 29 15:41:35 2011
@@ -20,7 +20,7 @@
 	<import file="ivy-webapp-common.xml" />
 
 	<tstamp />
-	<property name="project.general.name" value="apache-wookie-0.9.0-incubating" />
+	<property name="project.general.name" value="apache-wookie-${version}-incubating" />
 	
 	<property name="wookie.source.folder.name" value="wookie-source" />
 	<property name="wookie.war.folder.name" value="wookie-war" />
@@ -34,15 +34,15 @@
 
 
 	<target name="build-release-all"
-		depends="build-release-src, build-release-standalone, build-release-war">
+		depends="build-release-src, build-release-standalone, build-release-war, add-extra-files">
 		<echo>Building all releases</echo>
 	</target>
 
 	<target name="build-release-src" depends="">
 		<echo>Building source release</echo>
-		<mkdir dir="${wookie.release.dir}/" />
+		<mkdir dir="${wookie.release.dir}/${version}-incubating/source" />
 		
-		<zip destfile="${wookie.release.dir}/${wookie.source.zip.name}.zip"
+		<zip destfile="${wookie.release.dir}/${version}-incubating/source/${wookie.source.zip.name}.zip"
 		       basedir="."
 			includes=".settings/, 
 			ant/, 
@@ -95,17 +95,17 @@
 		  />
 		
 		<!-- tar -->
-		<tar destfile="${wookie.release.dir}/${wookie.source.zip.name}.tar.gz"
+		<tar destfile="${wookie.release.dir}/${version}-incubating/source/${wookie.source.zip.name}.tar.gz"
 			compression="gzip">
-			<zipfileset src="${wookie.release.dir}/${wookie.source.zip.name}.zip" />
+			<zipfileset src="${wookie.release.dir}/${version}-incubating/source/${wookie.source.zip.name}.zip" />
 		</tar>
 		
 	</target>
 
 	<target name="build-release-war" depends="clean-build, compile-core, deploy-webapp, post-deploy-webapp">
 		<echo>Building war release</echo>
-		<delete dir="${wookie.release.dir}/${wookie.war.folder.name}" />
-		<mkdir dir="${wookie.release.dir}/${wookie.war.folder.name}/build/scripts/" />
+		<delete dir="${wookie.release.dir}/${version}-incubating/binary/war/${wookie.war.folder.name}" />
+		<mkdir dir="${wookie.release.dir}/${version}-incubating/binary/war/${wookie.war.folder.name}/build/scripts/" />
 		
 		<!-- back the widgetserver.properties file up -->
 		<copy file="${build.dir}/webapp/wookie/WEB-INF/classes/widgetserver.properties"
@@ -133,7 +133,7 @@
 
 		<!-- build war file -->
 		<war
-			destfile="${wookie.release.dir}/${wookie.war.folder.name}/build/wookie.war"
+			destfile="${wookie.release.dir}/${version}-incubating/binary/war/${wookie.war.folder.name}/build/wookie.war"
 			webxml="${build.dir}/webapp/wookie/WEB-INF/web.xml">	
 			<lib dir="${build.dir}/webapp/wookie/WEB-INF/lib">
 				<exclude name="derby-10.2.1.6.jar"/>
@@ -156,27 +156,27 @@
 		<delete file="${build.dir}/webapp/wookie/RUNTIME_LICENSE" />
 
 		<!-- copy sql scripts across -->
-		<copy todir="${wookie.release.dir}/${wookie.war.folder.name}/build/scripts/">
+		<copy todir="${wookie.release.dir}/${version}-incubating/binary/war/${wookie.war.folder.name}/build/scripts/">
 			<fileset dir="${build.dir}/classes/org/apache/wookie/beans/jpa/">
 				<include name="*.sql" />
 			</fileset>
 		</copy>
 
 		<!-- copy over project readme files-->
-		<copy file="DISCLAIMER" tofile="${wookie.release.dir}/${wookie.war.folder.name}/build/DISCLAIMER" overwrite="yes" />
-		<copy file="KEYS" tofile="${wookie.release.dir}/${wookie.war.folder.name}/build/KEYS" overwrite="yes" />
-		<copy file="LICENSE" tofile="${wookie.release.dir}/${wookie.war.folder.name}/build/LICENSE" overwrite="yes" />		
-		<copy file="etc/release/RUNTIME_LICENSE" tofile="${wookie.release.dir}/${wookie.war.folder.name}/build/RUNTIME_LICENSE" overwrite="yes" />			
-		<copy file="README" tofile="${wookie.release.dir}/${wookie.war.folder.name}/build/README" overwrite="yes" />
-		<copy file="RELEASE_NOTES" tofile="${wookie.release.dir}/${wookie.war.folder.name}/build/RELEASE_NOTES" overwrite="yes" />
-		<copy file="NOTICE" tofile="${wookie.release.dir}/${wookie.war.folder.name}/build/NOTICE" overwrite="yes" />
+		<copy file="DISCLAIMER" tofile="${wookie.release.dir}/${version}-incubating/binary/war/${wookie.war.folder.name}/build/DISCLAIMER" overwrite="yes" />
+		<copy file="KEYS" tofile="${wookie.release.dir}/${version}-incubating/binary/war/${wookie.war.folder.name}/build/KEYS" overwrite="yes" />
+		<copy file="LICENSE" tofile="${wookie.release.dir}/${version}-incubating/binary/war/${wookie.war.folder.name}/build/LICENSE" overwrite="yes" />		
+		<copy file="etc/release/RUNTIME_LICENSE" tofile="${wookie.release.dir}/${version}-incubating/binary/war/${wookie.war.folder.name}/build/RUNTIME_LICENSE" overwrite="yes" />			
+		<copy file="README" tofile="${wookie.release.dir}/${version}-incubating/binary/war/${wookie.war.folder.name}/build/README" overwrite="yes" />
+		<copy file="RELEASE_NOTES" tofile="${wookie.release.dir}/${version}-incubating/binary/war/${wookie.war.folder.name}/build/RELEASE_NOTES" overwrite="yes" />
+		<copy file="NOTICE" tofile="${wookie.release.dir}/${version}-incubating/binary/war/${wookie.war.folder.name}/build/NOTICE" overwrite="yes" />
 		<!-- copy WAR readme-->
 		<copy file="etc/release/war/WAR_BUILD_NOTES"
-			tofile="${wookie.release.dir}/${wookie.war.folder.name}/build/WAR_BUILD_NOTES"
+			tofile="${wookie.release.dir}/${version}-incubating/binary/war/${wookie.war.folder.name}/build/WAR_BUILD_NOTES"
 			overwrite="yes" />
 
 		<!-- update context for mysql -->
-		<copy file="${etc.dir}/tomcat/conf/jpa-context.xml" tofile="${wookie.release.dir}/${wookie.war.folder.name}/build/${ant.project.name}.xml" overwrite="true">
+		<copy file="${etc.dir}/tomcat/conf/jpa-context.xml" tofile="${wookie.release.dir}/${version}-incubating/binary/war/${wookie.war.folder.name}/build/${ant.project.name}.xml" overwrite="true">
 			<filterset>
 				<filter token="DATABASE_USER" value="java" />
 				<filter token="DATABASE_PASSWORD" value="java" />
@@ -186,28 +186,28 @@
 		</copy>
 
 		<!-- zip -->
-		<zip destfile="${wookie.release.dir}/${wookie.war.name}.zip" basedir="${wookie.release.dir}/${wookie.war.folder.name}/build/" update="true" />
+		<zip destfile="${wookie.release.dir}/${version}-incubating/binary/war/${wookie.war.name}.zip" basedir="${wookie.release.dir}/${version}-incubating/binary/war/${wookie.war.folder.name}/build/" update="true" />
 
 		<!-- tar -->
-		<tar destfile="${wookie.release.dir}/${wookie.war.name}.tar.gz"
+		<tar destfile="${wookie.release.dir}/${version}-incubating/binary/war/${wookie.war.name}.tar.gz"
 			compression="gzip">
-			<zipfileset src="${wookie.release.dir}/${wookie.war.name}.zip" />
+			<zipfileset src="${wookie.release.dir}/${version}-incubating/binary/war/${wookie.war.name}.zip" />
 		</tar>
 
 		<!-- clean up -->
-		<delete dir="${wookie.release.dir}/${wookie.war.folder.name}" />
+		<delete dir="${wookie.release.dir}/${version}-incubating/binary/war/${wookie.war.folder.name}" />
 
 	</target>
 
 	<target name="build-release-standalone" depends="clean-build, compile-core, deploy-webapp, post-deploy-webapp">
 
 		<echo>Building standalone release</echo>
-		<delete dir="${wookie.release.dir}/${wookie.standalone.folder.name}" />
-		<mkdir dir="${wookie.release.dir}/${wookie.standalone.folder.name}/build/" />
-		<mkdir dir="${wookie.release.dir}/${wookie.standalone.folder.name}/lib/" />
-		<mkdir dir="${wookie.release.dir}/${wookie.standalone.folder.name}/etc/" />
+		<delete dir="${wookie.release.dir}/${version}-incubating/binary/standalone/${wookie.standalone.folder.name}" />
+		<mkdir dir="${wookie.release.dir}/${version}-incubating/binary/standalone/${wookie.standalone.folder.name}/build/" />
+		<mkdir dir="${wookie.release.dir}/${version}-incubating/binary/standalone/${wookie.standalone.folder.name}/lib/" />
+		<mkdir dir="${wookie.release.dir}/${version}-incubating/binary/standalone/${wookie.standalone.folder.name}/etc/" />
 
-		<copy todir="${wookie.release.dir}/${wookie.standalone.folder.name}/build/">
+		<copy todir="${wookie.release.dir}/${version}-incubating/binary/standalone/${wookie.standalone.folder.name}/build/">
 			<fileset dir="${build.dir}/">
 				<exclude name="classes/" />
 				<exclude name="widgets/" />
@@ -215,35 +215,39 @@
 			</fileset>
 		</copy>
 
-		<copy todir="${wookie.release.dir}/${wookie.standalone.folder.name}/">
+		<copy todir="${wookie.release.dir}/${version}-incubating/binary/standalone/${wookie.standalone.folder.name}/">
 			<fileset dir="etc/release/standalone/" />
 		</copy>
 
-		<copy file="./etc/jetty-realm.properties" tofile="${wookie.release.dir}/${wookie.standalone.folder.name}/etc/jetty-realm.properties" />
-		<copy file="DISCLAIMER" tofile="${wookie.release.dir}/${wookie.standalone.folder.name}/DISCLAIMER" overwrite="yes" />
-		<copy file="KEYS" tofile="${wookie.release.dir}/${wookie.standalone.folder.name}/KEYS" overwrite="yes" />
-		<copy file="LICENSE" tofile="${wookie.release.dir}/${wookie.standalone.folder.name}/LICENSE" overwrite="yes" />
-		<copy file="README" tofile="${wookie.release.dir}/${wookie.standalone.folder.name}/README" overwrite="yes" />
-		<copy file="RELEASE_NOTES" tofile="${wookie.release.dir}/${wookie.standalone.folder.name}/RELEASE_NOTES" overwrite="yes" />
-		<copy file="NOTICE" tofile="${wookie.release.dir}/${wookie.standalone.folder.name}/NOTICE" overwrite="yes" />
-		<copy file="etc/release/RUNTIME_LICENSE" tofile="${wookie.release.dir}/${wookie.standalone.folder.name}/RUNTIME_LICENSE" overwrite="yes" />		
+		<copy file="./etc/jetty-realm.properties" tofile="${wookie.release.dir}/${version}-incubating/binary/standalone/${wookie.standalone.folder.name}/etc/jetty-realm.properties" />
+		<copy file="DISCLAIMER" tofile="${wookie.release.dir}/${version}-incubating/binary/standalone/${wookie.standalone.folder.name}/DISCLAIMER" overwrite="yes" />
+		<copy file="KEYS" tofile="${wookie.release.dir}/${version}-incubating/binary/standalone/${wookie.standalone.folder.name}/KEYS" overwrite="yes" />
+		<copy file="LICENSE" tofile="${wookie.release.dir}/${version}-incubating/binary/standalone/${wookie.standalone.folder.name}/LICENSE" overwrite="yes" />
+		<copy file="README" tofile="${wookie.release.dir}/${version}-incubating/binary/standalone/${wookie.standalone.folder.name}/README" overwrite="yes" />
+		<copy file="RELEASE_NOTES" tofile="${wookie.release.dir}/${version}-incubating/binary/standalone/${wookie.standalone.folder.name}/RELEASE_NOTES" overwrite="yes" />
+		<copy file="NOTICE" tofile="${wookie.release.dir}/${version}-incubating/binary/standalone/${wookie.standalone.folder.name}/NOTICE" overwrite="yes" />
+		<copy file="etc/release/RUNTIME_LICENSE" tofile="${wookie.release.dir}/${version}-incubating/binary/standalone/${wookie.standalone.folder.name}/RUNTIME_LICENSE" overwrite="yes" />		
 
 		<ivy:retrieve conf="runtime"
-			pattern="${wookie.release.dir}/${wookie.standalone.folder.name}/lib/[artifact]-[revision].[ext]" />
+			pattern="${wookie.release.dir}/${version}-incubating/binary/standalone/${wookie.standalone.folder.name}/lib/[artifact]-[revision].[ext]" />
 
 		<!-- duplicate -->
-		<delete file="${wookie.release.dir}/${wookie.standalone.folder.name}/lib/servlet-api-2.5.jar" />
+		<delete file="${wookie.release.dir}/${version}-incubating/binary/standalone/${wookie.standalone.folder.name}/lib/servlet-api-2.5.jar" />
 		
-		<zip destfile="${wookie.release.dir}/${wookie.standalone.zip.name}.zip"
-			basedir="${wookie.release.dir}/" includes="${wookie.standalone.folder.name}/"
+		<zip destfile="${wookie.release.dir}/${version}-incubating/binary/standalone/${wookie.standalone.zip.name}.zip"
+			basedir="${wookie.release.dir}/${version}-incubating/binary/standalone/" includes="${wookie.standalone.folder.name}/"
 			update="true" />
 
-		<tar destfile="${wookie.release.dir}/${wookie.standalone.zip.name}.tar.gz"
+		<tar destfile="${wookie.release.dir}/${version}-incubating/binary/standalone/${wookie.standalone.zip.name}.tar.gz"
 			compression="gzip">
-			<zipfileset src="${wookie.release.dir}/${wookie.standalone.zip.name}.zip" />
+			<zipfileset src="${wookie.release.dir}/${version}-incubating/binary/standalone/${wookie.standalone.zip.name}.zip" />
 		</tar>
 
-		<delete dir="${wookie.release.dir}/${wookie.standalone.folder.name}" />
+		<delete dir="${wookie.release.dir}/${version}-incubating/binary/standalone/${wookie.standalone.folder.name}" />
+	</target>
+	
+	<target name="add-extra-files" depends="">
+		<copy file="etc/release/runsignatures.bat" tofile="${wookie.release.dir}/runsignatures.bat" overwrite="yes" />			
 	</target>
 
 </project>
\ No newline at end of file