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 fu...@apache.org on 2005/09/23 21:57:00 UTC
svn commit: r291196 - /db/derby/code/trunk/build.xml
Author: fuzzylogic
Date: Fri Sep 23 12:56:58 2005
New Revision: 291196
URL: http://svn.apache.org/viewcvs?rev=291196&view=rev
Log:
Merge 219915 to trunk
Modified:
db/derby/code/trunk/build.xml
Modified: db/derby/code/trunk/build.xml
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/build.xml?rev=291196&r1=291195&r2=291196&view=diff
==============================================================================
--- db/derby/code/trunk/build.xml (original)
+++ db/derby/code/trunk/build.xml Fri Sep 23 12:56:58 2005
@@ -1274,20 +1274,26 @@
<antcall target="publishedapi"/>
<mkdir dir="${basedir}/snapshot"/>
- <zip destfile="${basedir}/snapshot/db-derby-snapshot-${major}.${minor}-${changenumber}.zip">
- <zipfileset prefix="db-derby-snapshot-${major}.${minor}-${changenumber}/lib" dir="${basedir}/jars/insane" includes="*.jar,*.war"/>
- <zipfileset prefix="db-derby-snapshot-${major}.${minor}-${changenumber}" dir="${basedir}" includes="COPYRIGHT,LICENSE,NOTICE,README,frameworks/**,javadoc/publishedapi/**"/>
- <zipfileset prefix="db-derby-snapshot-${major}.${minor}-${changenumber}" dir="${basedir}/java" includes="demo/**"/>
+ <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"/>
+ </java>
+ <property file="${basedir}/snapshot/maintversion.properties"/>
+ <zip destfile="${basedir}/snapshot/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="COPYRIGHT,LICENSE,NOTICE,README,frameworks/**,javadoc/publishedapi/**"/>
+ <zipfileset prefix="db-derby-snapshot-${major}.${minor}.${interim}.${point}-${changenumber}" dir="${basedir}/java" includes="demo/**"/>
</zip>
- <tar destfile="${basedir}/snapshot/db-derby-snapshot-${major}.${minor}-${changenumber}.tar.gz"
+ <tar destfile="${basedir}/snapshot/db-derby-snapshot-${major}.${minor}.${interim}.${point}-${changenumber}.tar.gz"
compression="gzip">
- <tarfileset prefix="db-derby-snapshot-${major}.${minor}-${changenumber}/lib" dir="${basedir}/jars/insane" includes="*.jar,*.war"/>
- <tarfileset prefix="db-derby-snapshot-${major}.${minor}-${changenumber}" dir="${basedir}" includes="COPYRIGHT,LICENSE,NOTICE,README,frameworks/**,javadoc/publishedapi/**"/>
- <tarfileset prefix="db-derby-snapshot-${major}.${minor}-${changenumber}" dir="${basedir}/java" includes="demo/**"/>
+ <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="COPYRIGHT,LICENSE,NOTICE,README,frameworks/**,javadoc/publishedapi/**"/>
+ <tarfileset prefix="db-derby-snapshot-${major}.${minor}.${interim}.${point}-${changenumber}" dir="${basedir}/java" includes="demo/**"/>
</tar>
- <copy file="${basedir}/jars/insane/derby_core_plugin_${major}.${minor}.0.zip"
- tofile="${basedir}/snapshot/derby_core_plugin_${major}.${minor}.0.${changenumber}.zip"/>
+ <copy file="${basedir}/jars/insane/derby_core_plugin_${major}.${minor}.${interim}.zip"
+ tofile="${basedir}/snapshot/derby_core_plugin_${major}.${minor}.${interim}.${changenumber}.zip"/>
</target>
<target name="snapshotError" if="is.sane">