svn commit: r525152 - in /incubator/ivy/core/trunk: build-release.xml build.xml

[xa...@apache.org]

Author: xavier
Date: Tue Apr  3 06:01:39 2007
New Revision: 525152

URL: http://svn.apache.org/viewvc?view=rev&rev=525152
Log:
improve release script: generate tar.gz and checksums

Modified:
    incubator/ivy/core/trunk/build-release.xml
    incubator/ivy/core/trunk/build.xml

Modified: incubator/ivy/core/trunk/build-release.xml
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/build-release.xml?view=diff&rev=525152&r1=525151&r2=525152
==============================================================================
--- incubator/ivy/core/trunk/build-release.xml (original)
+++ incubator/ivy/core/trunk/build-release.xml Tue Apr  3 06:01:39 2007
@@ -69,61 +69,84 @@
 
 	<target name="all-doc" depends="javadoc, generate-doc" />
 	
-	<target name="snapshot-src" depends="default-version,all-doc">
+	<target name="init-snapshot" depends="default-version">
+		<property name="snapshot.full.name" value="apache-ivy-${build.version}" />
+	</target>
+	
+	<target name="snapshot-src" depends="init-snapshot,all-doc">
 		<mkdir dir="${distrib.dir}"/>
-		<zip destfile="${distrib.dir}/ivy-${build.version}-src.zip">
-			<zipfileset dir="${doc.build.dir}" prefix="ivy-${build.version}/doc"/>
-			<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}/org/apache/ivy/plugins/parser/xml" includes="ivy.xsd" fullpath="ivy-${build.version}/ivy.xsd"/>
-			<zipfileset dir="${basedir}" includes="DISCLAIMER" fullpath="ivy-${build.version}/DISCLAIMER"/>
-			<zipfileset dir="${basedir}" includes="NOTICE" fullpath="ivy-${build.version}/NOTICE"/>
-			<zipfileset dir="${basedir}" includes="LICENSE" fullpath="ivy-${build.version}/LICENSE"/>
-			<zipfileset dir="${basedir}" includes="CHANGES.txt" fullpath="ivy-${build.version}/CHANGES.txt"/>
-			<zipfileset dir="${basedir}" includes="RELEASE_NOTES" fullpath="ivy-${build.version}/RELEASE_NOTES"/>
-			<zipfileset dir="${basedir}" includes="ivysettings.xml" fullpath="ivy-${build.version}/ivysettings.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"/>
+		<zip destfile="${distrib.dir}/${snapshot.full.name}-src.zip">
+			<zipfileset dir="${doc.build.dir}" prefix="${snapshot.full.name}/doc"/>
+			<zipfileset dir="${src.dir}" prefix="${snapshot.full.name}/src/java"/>
+			<zipfileset dir="${basedir}/src/example" prefix="${snapshot.full.name}/src/example"/>
+			<zipfileset dir="${test.dir}" prefix="${snapshot.full.name}/test/java"/>
+			<zipfileset dir="${basedir}/test/repositories" prefix="${snapshot.full.name}/test/repositories"/>
+			<zipfileset dir="${basedir}/test/buildlist" prefix="${snapshot.full.name}/test/buildlist"/>
+			<zipfileset dir="${basedir}/test/triggers" prefix="${snapshot.full.name}/test/triggers"/>
+			<zipfileset dir="${basedir}/test/xsl" prefix="${snapshot.full.name}/test/xsl"/>
+			<zipfileset dir="${src.dir}/org/apache/ivy/plugins/parser/xml" includes="ivy.xsd" fullpath="${snapshot.full.name}/ivy.xsd"/>
+			<zipfileset dir="${basedir}" includes="DISCLAIMER" fullpath="${snapshot.full.name}/DISCLAIMER"/>
+			<zipfileset dir="${basedir}" includes="NOTICE" fullpath="${snapshot.full.name}/NOTICE"/>
+			<zipfileset dir="${basedir}" includes="LICENSE" fullpath="${snapshot.full.name}/LICENSE"/>
+			<zipfileset dir="${basedir}" includes="CHANGES.txt" fullpath="${snapshot.full.name}/CHANGES.txt"/>
+			<zipfileset dir="${basedir}" includes="RELEASE_NOTES" fullpath="${snapshot.full.name}/RELEASE_NOTES"/>
+			<zipfileset dir="${basedir}" includes="ivysettings.xml" fullpath="${snapshot.full.name}/ivysettings.xml"/>
+			<zipfileset dir="${basedir}" includes="build.properties" fullpath="${snapshot.full.name}/build.properties"/>
+			<zipfileset dir="${basedir}" includes="ivy.xml" fullpath="${snapshot.full.name}/ivy.xml"/>
 
-			<zipfileset dir="${basedir}" includes="build.xml" fullpath="ivy-${build.version}/build.xml"/>
+			<zipfileset dir="${basedir}" includes="build.xml" fullpath="${snapshot.full.name}/build.xml"/>
 		</zip>
+		<tar destfile="${distrib.dir}/${snapshot.full.name}-src.tar.gz" 
+			compression="gzip" longfile="gnu">
+			<zipfileset src="${distrib.dir}/${snapshot.full.name}-src.zip"/>
+		</tar>
 	</target>
 
-	<target name="snapshot-bin" depends="default-version, jar, all-doc">
+	<target name="snapshot-bin" depends="init-snapshot, jar, all-doc">
 		<mkdir dir="${distrib.dir}"/>
 		<ivy:deliver 
 			deliverpattern="${distrib.dir}/ivy.xml" 
 			pubrevision="${build.version}" 
 			pubdate="${pubdate}"
 		    status="${status}"/>
-		<zip destfile="${distrib.dir}/ivy-${build.version}-bin.zip">
-			<zipfileset dir="${doc.build.dir}" prefix="ivy-${build.version}/doc"/>
-			<zipfileset dir="${basedir}/src/example" prefix="ivy-${build.version}/src/example"/>
-			<zipfileset dir="${basedir}" includes="DISCLAIMER" fullpath="ivy-${build.version}/DISCLAIMER"/>
-			<zipfileset dir="${basedir}" includes="NOTICE" fullpath="ivy-${build.version}/NOTICE"/>
-			<zipfileset dir="${basedir}" includes="LICENSE" fullpath="ivy-${build.version}/LICENSE"/>
-			<zipfileset dir="${basedir}" includes="CHANGES.txt" fullpath="ivy-${build.version}/CHANGES.txt"/>
-			<zipfileset dir="${basedir}" includes="RELEASE_NOTES" fullpath="ivy-${build.version}/RELEASE_NOTES"/>
-			<zipfileset dir="${src.dir}/org/apache/ivy/plugins/parser/xml" includes="ivy.xsd" fullpath="ivy-${build.version}/ivy.xsd"/>
-			<zipfileset dir="${distrib.dir}" includes="ivy.xml" fullpath="ivy-${build.version}/ivy.xml"/>
+		<zip destfile="${distrib.dir}/${snapshot.full.name}-bin.zip">
+			<zipfileset dir="${doc.build.dir}" prefix="${snapshot.full.name}/doc"/>
+			<zipfileset dir="${basedir}/src/example" prefix="${snapshot.full.name}/src/example"/>
+			<zipfileset dir="${basedir}" includes="DISCLAIMER" fullpath="${snapshot.full.name}/DISCLAIMER"/>
+			<zipfileset dir="${basedir}" includes="NOTICE" fullpath="${snapshot.full.name}/NOTICE"/>
+			<zipfileset dir="${basedir}" includes="LICENSE" fullpath="${snapshot.full.name}/LICENSE"/>
+			<zipfileset dir="${basedir}" includes="CHANGES.txt" fullpath="${snapshot.full.name}/CHANGES.txt"/>
+			<zipfileset dir="${basedir}" includes="RELEASE_NOTES" fullpath="${snapshot.full.name}/RELEASE_NOTES"/>
+			<zipfileset dir="${src.dir}/org/apache/ivy/plugins/parser/xml" includes="ivy.xsd" fullpath="${snapshot.full.name}/ivy.xsd"/>
+			<zipfileset dir="${distrib.dir}" includes="ivy.xml" fullpath="${snapshot.full.name}/ivy.xml"/>
 
-			<zipfileset dir="${artifacts.build.dir}" includes="${final.name}" fullpath="ivy-${build.version}/ivy-${build.version}.jar"/>
-			<zipfileset dir="${artifacts.build.dir}" includes="${final.core.name}" fullpath="ivy-${build.version}/ivy-core-${build.version}.jar"/>
+			<zipfileset dir="${artifacts.build.dir}" includes="${final.name}" fullpath="${snapshot.full.name}/ivy-${build.version}.jar"/>
+			<zipfileset dir="${artifacts.build.dir}" includes="${final.core.name}" fullpath="${snapshot.full.name}/ivy-core-${build.version}.jar"/>
 		</zip>
-		<copy file="${basedir}/DISCLAIMER" todir="${distrib.dir}" />
-		<copy file="${basedir}/LICENSE" todir="${distrib.dir}" />
-		<copy file="${basedir}/CHANGES.txt" todir="${distrib.dir}" />
-		<copy file="${basedir}/RELEASE_NOTES" todir="${distrib.dir}" />
+		<tar destfile="${distrib.dir}/${snapshot.full.name}-bin.tar.gz" 
+			compression="gzip" longfile="gnu">
+			<zipfileset src="${distrib.dir}/${snapshot.full.name}-bin.zip"/>
+		</tar>
 		<copy file="${artifacts.build.dir}/${final.name}" todir="${distrib.dir}" />
 		<copy file="${artifacts.build.dir}/${final.core.name}" todir="${distrib.dir}" />
 		<copy file="${src.dir}/org/apache/ivy/plugins/parser/xml/ivy.xsd" todir="${distrib.dir}" />
 	</target>
 	
+	<target name="snapshot-checksums">
+		<checksum algorithm="md5">
+			<fileset dir="${distrib.dir}">
+				<include name="*.zip"/>
+				<include name="*.gz"/>
+			</fileset>
+		</checksum>
+		<checksum algorithm="sha">
+			<fileset dir="${distrib.dir}">
+				<include name="*.zip"/>
+				<include name="*.gz"/>
+			</fileset>
+		</checksum>
+	</target>
+	
 	<target name="snapshot-version">
 		<property name="version.prefix" value="${target.ivy.version}-dev-"/>
 	</target>
@@ -133,7 +156,8 @@
 		<input message="please enter status: (integration,milestone,release)" addproperty="status"/>
 	</target>
 	
-	<target name="snapshot" depends="localivy, clean-ivy-home, init-ivy, clean-all, snapshot-version, coverage-report, snapshot-src, snapshot-bin" description="used for nightly and integration builds"/>
+	<target name="snapshot" depends="localivy, clean-ivy-home, init-ivy, clean-all, snapshot-version, coverage-report, snapshot-src, snapshot-bin, snapshot-checksums" 
+			description="used for nightly and integration builds"/>
 	<target name="release" depends="release-version, snapshot" description="make a new release of Ivy"/>
 
 	<!-- 

Modified: incubator/ivy/core/trunk/build.xml
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/build.xml?view=diff&rev=525152&r1=525151&r2=525152
==============================================================================
--- incubator/ivy/core/trunk/build.xml (original)
+++ incubator/ivy/core/trunk/build.xml Tue Apr  3 06:01:39 2007
@@ -28,8 +28,8 @@
                internet and use it for ivy tasks of this build.
          ================================================================= -->
 	
-	<property name="final.name" value="ivy.jar" />
-	<property name="final.core.name" value="ivy-core.jar" />
+	<property name="final.name" value="apache-ivy.jar" />
+	<property name="final.core.name" value="apache-ivy-core.jar" />
 	
 	<target name="init-ivy-user-home" unless="ivy.use.local.home">
 		<condition property="ivy.home" value="${env.IVY_HOME}">