db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fuzzylo...@apache.org
Subject svn commit: r290864 - in /db/derby/code/trunk: build.xml java/build/org/apache/derbyBuild/maintversion2props.java tools/ant/properties/packaging.properties tools/release/ tools/release/build.xml
Date Thu, 22 Sep 2005 00:11:36 GMT
Author: fuzzylogic
Date: Wed Sep 21 17:11:23 2005
New Revision: 290864

URL: http://svn.apache.org/viewcvs?rev=290864&view=rev
Log:
Merge tools/release part of 290863 to trunk.

Added:
    db/derby/code/trunk/java/build/org/apache/derbyBuild/maintversion2props.java   (props
changed)
      - copied unchanged from r290863, db/derby/code/branches/10.1/java/build/org/apache/derbyBuild/maintversion2props.java
    db/derby/code/trunk/tools/ant/properties/packaging.properties   (props changed)
      - copied unchanged from r290863, db/derby/code/branches/10.1/tools/ant/properties/packaging.properties
    db/derby/code/trunk/tools/release/
      - copied from r290863, db/derby/code/branches/10.1/tools/release/
    db/derby/code/trunk/tools/release/build.xml   (props changed)
      - copied unchanged from r290863, db/derby/code/branches/10.1/tools/release/build.xml
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=290864&r1=290863&r2=290864&view=diff
==============================================================================
--- db/derby/code/trunk/build.xml (original)
+++ db/derby/code/trunk/build.xml Wed Sep 21 17:11:23 2005
@@ -1274,16 +1274,16 @@
     <antcall target="publishedapi"/>
 
     <mkdir dir="${basedir}/snapshot"/>
-    <zip destfile="${basedir}/snapshot/incubating-derby-snapshot-${major}.${minor}-${changenumber}.zip">
-      <fileset dir="${basedir}/jars/insane" includes="*.jar,*.war"/>
-      <fileset dir="${basedir}" includes="COPYRIGHT,LICENSE,NOTICE,README,frameworks/**,javadoc/publishedapi/**"/>
-      <fileset dir="${basedir}/java" includes="demo/**"/>
+    <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/**"/>
     </zip>
-    <tar destfile="${basedir}/snapshot/incubating-derby-snapshot-${major}.${minor}-${changenumber}.tar.gz"
+    <tar destfile="${basedir}/snapshot/db-derby-snapshot-${major}.${minor}-${changenumber}.tar.gz"
          compression="gzip">
-      <tarfileset dir="${basedir}/jars/insane" includes="*.jar,*.war"/>
-      <tarfileset dir="${basedir}" includes="COPYRIGHT,LICENSE,NOTICE,README,frameworks/**,javadoc/publishedapi/**"/>
-      <tarfileset dir="${basedir}/java" includes="demo/**"/>
+      <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/**"/>
     </tar>
 
     <copy file="${basedir}/jars/insane/derby_core_plugin_${major}.${minor}.0.zip"

Propchange: db/derby/code/trunk/java/build/org/apache/derbyBuild/maintversion2props.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: db/derby/code/trunk/tools/ant/properties/packaging.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: db/derby/code/trunk/tools/release/build.xml
------------------------------------------------------------------------------
    svn:eol-style = native



Mime
View raw message