You are viewing a plain text version of this content. The canonical link for it is here.
Posted to derby-commits@db.apache.org by rh...@apache.org on 2010/10/01 20:11:59 UTC
svn commit: r1003607 - in /db/derby/code/trunk: ./ build.xml
tools/ant/properties/dirs.properties tools/ant/properties/packaging.tmpl
tools/release/build.xml
Author: rhillegas
Date: Fri Oct 1 18:11:58 2010
New Revision: 1003607
URL: http://svn.apache.org/viewvc?rev=1003607&view=rev
Log:
DERBY-3986: Drop release artifacts into a directory tree outside subversion-controlled space.
Modified:
db/derby/code/trunk/ (props changed)
db/derby/code/trunk/build.xml
db/derby/code/trunk/tools/ant/properties/dirs.properties
db/derby/code/trunk/tools/ant/properties/packaging.tmpl
db/derby/code/trunk/tools/release/build.xml
Propchange: db/derby/code/trunk/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri Oct 1 18:11:58 2010
@@ -6,3 +6,5 @@ jars
javadoc
junit_*
generated
+release
+
Modified: db/derby/code/trunk/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/build.xml?rev=1003607&r1=1003606&r2=1003607&view=diff
==============================================================================
--- db/derby/code/trunk/build.xml (original)
+++ db/derby/code/trunk/build.xml Fri Oct 1 18:11:58 2010
@@ -48,6 +48,7 @@
<tstamp/>
<mkdir dir="${out.dir}"/>
<antcall target="make-generated-dirs"/>
+ <antcall target="make-release-dirs"/>
<!-- Create the emtpy dir that we put in the boot classpath to
prevent the default Java runtime libraries from being loaded.
@@ -77,6 +78,14 @@
</target>
+ <target name="make-release-dirs">
+
+ <mkdir dir="${release.base}"/>
+ <mkdir dir="${release.dir}"/>
+ <mkdir dir="${snapshot.dir}"/>
+
+ </target>
+
<target name="setissane">
<condition property="is.sane">
<equals arg1="${sanity}" arg2="true"/>
@@ -579,7 +588,7 @@
<!-- =================================================================== -->
<!-- Remove all built objects (except jars) -->
<!-- =================================================================== -->
- <target name="clobber" depends="clean,cleangenerated,cleanstate"/>
+ <target name="clobber" depends="clean,cleangenerated,cleanstate,cleanreleasefiles"/>
<!-- =================================================================== -->
<!-- Remove the tree of generated intermediate sources -->
@@ -1860,36 +1869,35 @@
<antcall target="plugin"/>
<antcall target="publishedapi"/>
- <mkdir dir="${basedir}/snapshot"/>
<java classname="org.apache.derbyBuild.maintversion2props">
<classpath path="${out.dir}"/>
<arg value="${out.dir}/org/apache/derby/info/DBMS.properties"/>
- <arg value="${basedir}/snapshot/maintversion.properties"/>
+ <arg value="${snapshot.dir}/maintversion.properties"/>
</java>
- <property file="${basedir}/snapshot/maintversion.properties"/>
- <zip destfile="${basedir}/snapshot/db-derby-snapshot-${major}.${minor}.${interim}.${point}-${changenumber}.zip">
+ <property file="${snapshot.dir}/maintversion.properties"/>
+ <zip destfile="${snapshot.dir}/db-derby-snapshot-${major}.${minor}.${interim}.${point}-${changenumber}.zip">
<zipfileset prefix="db-derby-snapshot-${major}.${minor}.${interim}.${point}-${changenumber}/lib" dir="${basedir}/jars/insane" includes="*.jar,*.war"/>
<zipfileset prefix="db-derby-snapshot-${major}.${minor}.${interim}.${point}-${changenumber}" dir="${basedir}" includes="bin/**,LICENSE,NOTICE,README,javadoc/publishedapi/**" excludes="bin/templates/**"/>
</zip>
- <tar destfile="${basedir}/snapshot/db-derby-snapshot-${major}.${minor}.${interim}.${point}-${changenumber}.tar.gz"
+ <tar destfile="${snapshot.dir}/db-derby-snapshot-${major}.${minor}.${interim}.${point}-${changenumber}.tar.gz"
compression="gzip">
<tarfileset prefix="db-derby-snapshot-${major}.${minor}.${interim}.${point}-${changenumber}/lib" dir="${basedir}/jars/insane" includes="*.jar,*.war"/>
<tarfileset prefix="db-derby-snapshot-${major}.${minor}.${interim}.${point}-${changenumber}" dir="${basedir}" includes="bin/**,LICENSE,NOTICE,README,javadoc/publishedapi/**" excludes="bin/templates/**"/>
</tar>
<!-- debug archives - DERBY-178 -->
- <zip destfile="${basedir}/snapshot/db-derby-snapshot-debug-${major}.${minor}.${interim}.${point}-${changenumber}.zip">
+ <zip destfile="${snapshot.dir}/db-derby-snapshot-debug-${major}.${minor}.${interim}.${point}-${changenumber}.zip">
<zipfileset prefix="db-derby-snapshot-debug-${major}.${minor}.${interim}.${point}-${changenumber}/lib" dir="${basedir}/jars/sane" includes="*.jar,*.war"/>
<zipfileset prefix="db-derby-snapshot-debug-${major}.${minor}.${interim}.${point}-${changenumber}" dir="${basedir}" includes="bin/**,LICENSE,NOTICE,CHANGES,README,javadoc/publishedapi/**" excludes="bin/templates/**"/>
</zip>
- <tar destfile="${basedir}/snapshot/db-derby-snapshot-debug-${major}.${minor}.${interim}.${point}-${changenumber}.tar.gz"
+ <tar destfile="${snapshot.dir}/db-derby-snapshot-debug-${major}.${minor}.${interim}.${point}-${changenumber}.tar.gz"
compression="gzip">
<tarfileset prefix="db-derby-snapshot-debug-${major}.${minor}.${interim}.${point}-${changenumber}/lib" dir="${basedir}/jars/sane" includes="*.jar,*.war"/>
<tarfileset prefix="db-derby-snapshot-debug-${major}.${minor}.${interim}.${point}-${changenumber}" dir="${basedir}" includes="bin/**,LICENSE,NOTICE,README,javadoc/publishedapi/**" excludes="bin/templates/**"/>
</tar>
<copy file="${basedir}/jars/insane/derby_core_plugin_${major}.${minor}.${interim}.zip"
- tofile="${basedir}/snapshot/derby_core_plugin_${major}.${minor}.${interim}.${changenumber}.zip"/>
+ tofile="${snapshot.dir}/derby_core_plugin_${major}.${minor}.${interim}.${changenumber}.zip"/>
</target>
<target name="snapshotError" if="is.sane">
@@ -2355,9 +2363,7 @@ you should not have to do this.
</target>
<!-- do most of the ant calls to prepare a release -->
- <target name="prepareforrelease" depends="checkstateremoved,checksanenotset,checkforpackagingfile,cleanalljars,cleandocs,cleansnapshot,clobber,cleanreleasefiles">
- <!-- check that tools/ant/properties/packaging.properties exists -->
- <fail unless="packaging.present" message="Need to know what md5 and pgp tools you want to use and their settings, please create tools/ant/properties/packaging.properties from tools/ant/properties/packaging.tmpl"/>
+ <target name="prepareforrelease" depends="checkstateremoved,checksanenotset,cleanalljars,cleandocs,clobber,cleanreleasefiles">
<!-- other possible checks? maybe no checked out files? -->
<!-- maybe try to force a doc build? call to ant release will check for docs out -->
<!-- assume svn update has been done to the desired level -->
@@ -2406,22 +2412,8 @@ you should not have to do this.
</fail>
</target>
- <target name="checkforpackagingfile">
- <available file="${basedir}/tools/ant/properties/packaging.properties" property="packaging.present"/>
- </target>
-
- <target name="cleansnapshot">
- <delete dir="${basedir}/snapshot"/>
- </target>
-
<target name="cleanreleasefiles">
- <delete dir="${basedir}/tools/release/crlf"/>
- <delete dir="${basedir}/tools/release/lf"/>
- <delete file="${basedir}/tools/release/*.md5"/>
- <delete file="${basedir}/tools/release/*.asc"/>
- <delete file="${basedir}/tools/release/*.zip"/>
- <delete file="${basedir}/tools/release/*.tar.gz"/>
- <delete file="${basedir}/tools/release/maintversion.properties"/>
+ <delete dir="${release.base}"/>
</target>
<target name="cleanalljars">
Modified: db/derby/code/trunk/tools/ant/properties/dirs.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/tools/ant/properties/dirs.properties?rev=1003607&r1=1003606&r2=1003607&view=diff
==============================================================================
--- db/derby/code/trunk/tools/ant/properties/dirs.properties (original)
+++ db/derby/code/trunk/tools/ant/properties/dirs.properties Fri Oct 1 18:11:58 2010
@@ -102,6 +102,10 @@ generated.sql.dir=${generated.src.dir}/$
generated.engine.locale.dir=${generated.src.dir}/${derby.dir}/loc
generated.cache.dir=${generated.src.dir}/${derby.dir}/iapi/services/cache
+release.base=${out.base}/release
+release.dir=${release.base}/distributions
+snapshot.dir=${release.base}/snapshot
+
derby.testing.dir=org/apache/derbyTesting
derby.testing.out.dir=${out.dir}/${derby.testing.dir}
Modified: db/derby/code/trunk/tools/ant/properties/packaging.tmpl
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/tools/ant/properties/packaging.tmpl?rev=1003607&r1=1003606&r2=1003607&view=diff
==============================================================================
--- db/derby/code/trunk/tools/ant/properties/packaging.tmpl (original)
+++ db/derby/code/trunk/tools/ant/properties/packaging.tmpl Fri Oct 1 18:11:58 2010
@@ -15,12 +15,6 @@
# properties needed for the build.xml in tools/release
-#####
-#
-# important directories
-
-release.dir=${basedir}/tools/release
-
# location of documentation
docs.out=/derby-docs-10.1/out
Modified: db/derby/code/trunk/tools/release/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/tools/release/build.xml?rev=1003607&r1=1003606&r2=1003607&view=diff
==============================================================================
--- db/derby/code/trunk/tools/release/build.xml (original)
+++ db/derby/code/trunk/tools/release/build.xml Fri Oct 1 18:11:58 2010
@@ -20,6 +20,7 @@
<!-- Set Properties -->
<!-- User settings -->
+ <property environment="env"/>
<property file="${user.home}/ant.properties"/>
<!-- Set property lib dir -->
<property name="properties.dir" value="tools/ant/properties"/>
@@ -34,7 +35,7 @@
<property file="${properties.dir}/compilepath.properties"/>
<!-- Release and version info -->
<property file="${properties.dir}/release.properties"/>
- <property file="${properties.dir}/packaging.properties"/>
+ <property file="${properties.dir}/packaging.tmpl"/>
<!-- Files to be included with and excluded from the source distribution -->
@@ -43,7 +44,7 @@
<property name="src.dirs.includes" value="java/**,plugins/**,bin/**,maven2/**"/>
<property name="src.includes" value="${src.top.includes},${src.tools.includes},${src.dirs.includes}"/>
- <property name="src.excludes" value="tools/**/db2jcc*,tools/**/osgi.jar,tools/**/junit.jar,tools/**/jdbc2_0*,tools/java/jce*,tools/**/packaging.properties,java/demo/toursdb/toursdb/**,java/demo/toursdb/toursdb.out,java/demo/toursdb/toursdb.jar,tools/testing/derby/**,**/derby.log"/>
+ <property name="src.excludes" value="tools/**/db2jcc*,tools/**/osgi.jar,tools/**/junit.jar,tools/**/jdbc2_0*,tools/java/jce*,java/demo/toursdb/toursdb/**,java/demo/toursdb/toursdb.out,java/demo/toursdb/toursdb.jar,tools/testing/derby/**,**/derby.log"/>
<!-- Doc Source Files to be included with and excluded from the source distribution -->
<property name="src.docstop.includes" value="COPYRIGHT,LICENSE,NOTICE,build.xml,docs.properties"/>
@@ -79,10 +80,12 @@
<target name="init">
+ <mkdir dir="${release.dir}"/>
+
<java classname="org.apache.derbyBuild.maintversion2props">
<classpath path="${out.dir}"/>
<arg value="${out.dir}/org/apache/derby/info/DBMS.properties"/>
- <arg value="maintversion.properties"/>
+ <arg value="${release.dir}/maintversion.properties"/>
</java>
<property file="${release.dir}/maintversion.properties"/>
@@ -93,8 +96,8 @@
<property name="derby.src" value="${derby.basename}-src"/>
<property name="derby.docssrc" value="${derby.basename}-doc-src"/>
- <property name="crlf.dir" value="${basedir}/tools/release/crlf"/>
- <property name="lf.dir" value="${basedir}/tools/release/lf"/>
+ <property name="crlf.dir" value="${release.dir}/crlf"/>
+ <property name="lf.dir" value="${release.dir}/lf"/>
<mkdir dir="${crlf.dir}"/>
<mkdir dir="${lf.dir}"/>
<fixcrlf srcdir="${basedir}" destdir="${crlf.dir}" eol="crlf"
@@ -403,9 +406,7 @@
<!-- remove all the files generated by the release targets. -->
<target name="clean">
- <delete>
- <fileset dir="${release.dir}" includes="maintversion.properties,db-derby*.zip*,db-derby*.tar.gz*"/>
- </delete>
+ <delete dir="${release.dir}"/>
</target>
<!-- bumps the last part of the version string to the next digit. -->