From ff3bd8e65b273f7a0846b44cddbcb653743cc569 Mon Sep 17 00:00:00 2001
From: Xavier Hanin <xavier@apache.org>
Date: Thu, 9 Nov 2006 14:47:31 +0000
Subject: [PATCH] IMPROVE: add release target to build file (IVY-339)

git-svn-id: https://svn.apache.org/repos/asf/incubator/ivy/trunk@484583 13f79535-47bb-0310-9956-ffa450edef68
---
 CHANGES.txt      |  1 +
 build.properties |  1 +
 build.xml        | 84 +++++++++++++++++++++++++++++++++++++++++++++---
 3 files changed, 81 insertions(+), 5 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index cc27e675..fce031e1 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -10,6 +10,7 @@ for detailed view of each issue, please consult http://jira.jayasoft.org/
 - IMPROVE: ability to rebuild all dependent projects from a leaf (IVY-101)
 - IMPROVE: Artifact pattern list attribute for the ivy:publish (IVY-113)
 - IMPROVE: Measure code coverage (IVY-323)
+- IMPROVE: add release target to build file (IVY-339)
 - IMPROVE: Add a 'conf' parameter to the ivy 'publish' ant task (IVY-322) (thanks to Emmanuel Pellereau)
 
 - FIX: retrieve fails when resolve is done with useOrigin set to true (IVY-304)
diff --git a/build.properties b/build.properties
index 0d2930b7..238c986c 100644
--- a/build.properties
+++ b/build.properties
@@ -5,6 +5,7 @@ build.dir=${basedir}/build
 classes.build.dir=${basedir}/build/classes
 test.build.dir=${basedir}/build/test
 artifacts.build.dir=${basedir}/build/artifact
+distrib.dir=${basedir}/build/distrib
 doc.build.dir=${basedir}/doc/ivy
 test.xml.dir=${build.dir}/test-report
 test.report.dir=${doc.build.dir}/test-report
diff --git a/build.xml b/build.xml
index 0037bf05..f37563a9 100644
--- a/build.xml
+++ b/build.xml
@@ -112,17 +112,33 @@
 		        debug="${debug.mode}"/>
 	</target>
 
-	<target name="jar" depends="build">
+	<target name="jar" depends="build, default-version">
+		<!--  copy resources -->
 		<copy todir="${classes.build.dir}">
     		<fileset dir="${src.dir}">
       			<exclude name="**/*.java"/>
     		</fileset>
   		</copy>
+  		<!-- identify compiled ivy version -->
+		<echo message="version=${build.version}${line.separator}" file="${classes.build.dir}/module.properties" append="true"/>
+		<echo message="date=${pubdate}${line.separator}" file="${classes.build.dir}/module.properties" append="true"/>
+		
+		<!-- package the two ivy jars -->
   		<jar 	destfile="${artifacts.build.dir}/ivy.jar"
-				basedir="${classes.build.dir}"/>
+				basedir="${classes.build.dir}">
+			<manifest>
+				<attribute name="Build-Version" value="${build.version}"/>
+			</manifest>
+		</jar>
   		<jar 	destfile="${artifacts.build.dir}/ivy-core.jar"
 				basedir="${classes.build.dir}"
-  				excludes="fr/jayasoft/ivy/ant/*"/>
+  				excludes="fr/jayasoft/ivy/ant/*">
+			<manifest>
+				<attribute name="Build-Version" value="${build.version}"/>
+			</manifest>
+		</jar>
+		<!-- clean generated module properties file -->
+		<delete file="${classes.build.dir}/module.properties"/>
 	</target>
 	
 
@@ -250,8 +266,66 @@
 		</exec>
 	</target>
 	
-	<target name="zip-doc" description="zip the documentation">
-		<zip basedir="${basedir}/doc" destfile="${build.dir}/ivy-doc.zip"/>
+    <!-- =================================================================
+               DISTRIBUTION
+         ================================================================= -->
+	<target name="zip-doc" depends="default-version" description="zip the documentation">
+		<zip basedir="${basedir}/doc" destfile="${distrib.dir}/ivy-${build.version}-doc.zip"/>
 	</target>
 
+	<target name="snapshot-src" depends="default-version">
+		<mkdir dir="${distrib.dir}"/>
+		<zip destfile="${distrib.dir}/ivy-${build.version}-src.zip">
+			<zipfileset dir="${src.dir}" prefix="ivy-${build.version}/src/java"/>
+			<zipfileset dir="${basedir}/src/example" prefix="ivy-${build.version}/src/example"/>
+			<zipfileset dir="${test.dir}" prefix="ivy-${build.version}/test/java"/>
+			<zipfileset dir="${basedir}/test/repositories" prefix="ivy-${build.version}/test/repositories"/>
+			<zipfileset dir="${basedir}/test/buildlist" prefix="ivy-${build.version}/test/buildlist"/>
+			<zipfileset dir="${basedir}/test/triggers" prefix="ivy-${build.version}/test/triggers"/>
+			<zipfileset dir="${basedir}/test/xsl" prefix="ivy-${build.version}/test/xsl"/>
+			<zipfileset dir="${src.dir}/fr/jayasoft/ivy/xml" includes="ivy.xsd" fullpath="ivy-${build.version}/ivy.xsd"/>
+			<zipfileset dir="${basedir}" includes="LICENSE.txt" fullpath="ivy-${build.version}/LICENSE.txt"/>
+			<zipfileset dir="${basedir}" includes="CHANGES.txt" fullpath="ivy-${build.version}/CHANGES.txt"/>
+			<zipfileset dir="${basedir}" includes="ivyconf.xml" fullpath="ivy-${build.version}/ivyconf.xml"/>
+			<zipfileset dir="${basedir}" includes="build.properties" fullpath="ivy-${build.version}/build.properties"/>
+			<zipfileset dir="${basedir}" includes="ivy.xml" fullpath="ivy-${build.version}/ivy.xml"/>
+
+			<zipfileset dir="${basedir}" includes="build.xml" fullpath="ivy-${build.version}/build.xml"/>
+		</zip>
+	</target>
+
+	<target name="snapshot-bin" depends="default-version, jar">
+		<mkdir dir="${distrib.dir}"/>
+		<zip destfile="${distrib.dir}/ivy-${build.version}-bin.zip">
+			<zipfileset dir="${basedir}/src/example" prefix="ivy-${build.version}/src/example"/>
+			<zipfileset dir="${basedir}" includes="LICENSE.txt" fullpath="ivy-${build.version}/LICENSE.txt"/>
+			<zipfileset dir="${basedir}" includes="CHANGES.txt" fullpath="ivy-${build.version}/CHANGES.txt"/>
+			<zipfileset dir="${src.dir}/fr/jayasoft/ivy/xml" includes="ivy.xsd" fullpath="ivy-${build.version}/ivy.xsd"/>
+			<zipfileset dir="${basedir}" includes="ivy.xml" fullpath="ivy-${build.version}/ivy.xml"/>
+
+			<zipfileset dir="${lib.dir}" prefix="ivy-${build.version}/lib"/>
+			<zipfileset dir="${artifacts.build.dir}" includes="ivy.jar" fullpath="ivy-${build.version}/ivy-${build.version}.jar"/>
+			<zipfileset dir="${artifacts.build.dir}" includes="ivy-core.jar" fullpath="ivy-${build.version}/ivy-core-${build.version}.jar"/>
+		</zip>
+	</target>
+	
+	<target name="default-version">
+		<tstamp> 
+			<format property="pubdate" pattern="yyyyMMddHHmmss"/>  
+		</tstamp>
+		<property name="version.prefix" value="local-"/>
+		<property name="build.version" value="${version.prefix}${pubdate}"/>
+	</target>
+	
+	<target name="snapshot-version">
+		<property name="version.prefix" value=""/>
+	</target>
+	
+	<target name="release-version">
+		<input message="please enter version: " addproperty="build.version"/>
+	</target>
+	
+	<target name="snapshot" depends="snapshot-version, coverage-report" description="used for nightly and integration builds"/>
+	<target name="release" depends="release-version, coverage-report, snapshot-src, snapshot-bin, main-doc, javadoc, zip-doc" description="make a new release of Ivy"/>
+
 </project>