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/22 02:04:24 UTC
svn commit: r290863 - in /db/derby/code/branches/10.1: ./
java/build/org/apache/derbyBuild/
java/testing/org/apache/derbyTesting/functionTests/master/
java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/
java/testing/org/apache/derbyTest...
Author: fuzzylogic
Date: Wed Sep 21 17:04:02 2005
New Revision: 290863
URL: http://svn.apache.org/viewcvs?rev=290863&view=rev
Log:
Bump version on 10.1 branch to 10.1.1.1. Also add tools/release directory.
Added:
db/derby/code/branches/10.1/java/build/org/apache/derbyBuild/maintversion2props.java (with props)
db/derby/code/branches/10.1/tools/ant/properties/packaging.properties (with props)
db/derby/code/branches/10.1/tools/release/
db/derby/code/branches/10.1/tools/release/build.xml (with props)
Modified:
db/derby/code/branches/10.1/build.xml
db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/metadata.out
db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/odbc_metadata.out
db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/dbMetaDataJdbc30.out
db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/metadata.out
db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/metadataJdbc20.out
db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/odbc_metadata.out
db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/master/metadata.out
db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/master/metadataJdbc20.out
db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/master/odbc_metadata.out
db/derby/code/branches/10.1/tools/ant/properties/release.properties
Modified: db/derby/code/branches/10.1/build.xml
URL: http://svn.apache.org/viewcvs/db/derby/code/branches/10.1/build.xml?rev=290863&r1=290862&r2=290863&view=diff
==============================================================================
--- db/derby/code/branches/10.1/build.xml (original)
+++ db/derby/code/branches/10.1/build.xml Wed Sep 21 17:04:02 2005
@@ -1252,16 +1252,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"
Added: db/derby/code/branches/10.1/java/build/org/apache/derbyBuild/maintversion2props.java
URL: http://svn.apache.org/viewcvs/db/derby/code/branches/10.1/java/build/org/apache/derbyBuild/maintversion2props.java?rev=290863&view=auto
==============================================================================
--- db/derby/code/branches/10.1/java/build/org/apache/derbyBuild/maintversion2props.java (added)
+++ db/derby/code/branches/10.1/java/build/org/apache/derbyBuild/maintversion2props.java Wed Sep 21 17:04:02 2005
@@ -0,0 +1,59 @@
+/*
+
+ Derby - Class org.apache.derbyBuild.classlister
+
+ Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ */
+
+package org.apache.derbyBuild;
+
+import java.io.*;
+import java.util.*;
+
+/**
+
+ A quick and dirty class for generating a properties file from the maint
+ property in DBMS.properties and release.properties. Useful for getting
+ the values of the third and fourth parts of the version number into Ant
+ as separate properties. It puts the third value into the output properties
+ as the property "interim", and the fourth value as "point".
+
+ Usage: java maintversion2props input_properties_file output_properties_file
+
+**/
+
+public class maintversion2props
+{
+ public static void main(String[] args) throws Exception
+ {
+ InputStream is = new FileInputStream(args[0]);
+ Properties p = new Properties();
+ p.load(is);
+ String maint = "";
+ if (args[0].indexOf("DBMS") > 0)
+ {
+ maint = p.getProperty("derby.version.maint");
+ } else if (args[0].indexOf("release") > 0)
+ {
+ maint = p.getProperty("maint");
+ }
+ Properties p2 = new Properties();
+ p2.setProperty("interim", Integer.toString(Integer.parseInt(maint) / 1000000));
+ p2.setProperty("point", Integer.toString(Integer.parseInt(maint) % 1000000));
+ OutputStream os = new FileOutputStream(args[1]);
+ p2.store(os, "");
+ }
+}
Propchange: db/derby/code/branches/10.1/java/build/org/apache/derbyBuild/maintversion2props.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/metadata.out
URL: http://svn.apache.org/viewcvs/db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/metadata.out?rev=290863&r1=290862&r2=290863&view=diff
==============================================================================
--- db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/metadata.out (original)
+++ db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/metadata.out Wed Sep 21 17:04:02 2005
@@ -48,7 +48,7 @@
nullsAreSortedAtStart(): false
nullsAreSortedAtEnd(): false
getDatabaseProductName(): Apache Derby
-getDatabaseProductVersion(): 10.1.1.0
+getDatabaseProductVersion(): 10.1.1.1
getDriverVersion(): EXPECTED VERSION
usesLocalFiles(): true
usesLocalFilePerTable(): true
Modified: db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/odbc_metadata.out
URL: http://svn.apache.org/viewcvs/db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/odbc_metadata.out?rev=290863&r1=290862&r2=290863&view=diff
==============================================================================
--- db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/odbc_metadata.out (original)
+++ db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/odbc_metadata.out Wed Sep 21 17:04:02 2005
@@ -78,7 +78,7 @@
nullsAreSortedAtStart(): false
nullsAreSortedAtEnd(): false
getDatabaseProductName(): Apache Derby
-getDatabaseProductVersion(): 10.1.1.0
+getDatabaseProductVersion(): 10.1.1.1
getDriverVersion(): EXPECTED VERSION
usesLocalFiles(): true
usesLocalFilePerTable(): true
Modified: db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/dbMetaDataJdbc30.out
URL: http://svn.apache.org/viewcvs/db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/dbMetaDataJdbc30.out?rev=290863&r1=290862&r2=290863&view=diff
==============================================================================
--- db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/dbMetaDataJdbc30.out (original)
+++ db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/dbMetaDataJdbc30.out Wed Sep 21 17:04:02 2005
@@ -1,5 +1,5 @@
Test dbMetaDataJdbc30 starting
-JDBC Driver 'Apache Derby Network Client JDBC Driver', version 10.1 (10.1.1.0)
+JDBC Driver 'Apache Derby Network Client JDBC Driver', version 10.1 (10.1.1.1)
The URL is: jdbc:derby://localhost:1527/wombat;create=true
supportsSavepoints() : true
supportsNamedParameters() : false
Modified: db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/metadata.out
URL: http://svn.apache.org/viewcvs/db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/metadata.out?rev=290863&r1=290862&r2=290863&view=diff
==============================================================================
--- db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/metadata.out (original)
+++ db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/metadata.out Wed Sep 21 17:04:02 2005
@@ -9,7 +9,7 @@
Column result scale after division is: 23
dc / 2 = 5.55000000000000000000000
dc / 2 = 5.55500000000000000000000
-JDBC Driver 'Apache Derby Network Client JDBC Driver', version 10.1 (10.1.1.0)
+JDBC Driver 'Apache Derby Network Client JDBC Driver', version 10.1 (10.1.1.1)
The URL is: jdbc:derby://localhost:1527/wombat;create=true
allTablesAreSelectable(): true
maxColumnNameLength(): 128
@@ -48,8 +48,8 @@
nullsAreSortedAtStart(): false
nullsAreSortedAtEnd(): false
getDatabaseProductName(): Apache Derby
-getDatabaseProductVersion(): 10.1.1.0
-getDriverVersion(): 10.1.1.0
+getDatabaseProductVersion(): 10.1.1.1
+getDriverVersion(): 10.1.1.1
usesLocalFiles(): true
usesLocalFilePerTable(): true
supportsMixedCaseIdentifiers(): false
Modified: db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/metadataJdbc20.out
URL: http://svn.apache.org/viewcvs/db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/metadataJdbc20.out?rev=290863&r1=290862&r2=290863&view=diff
==============================================================================
--- db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/metadataJdbc20.out (original)
+++ db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/metadataJdbc20.out Wed Sep 21 17:04:02 2005
@@ -1,5 +1,5 @@
Test metadataJdbc20 starting
-JDBC Driver 'Apache Derby Network Client JDBC Driver', version 10.1 (10.1.1.0)
+JDBC Driver 'Apache Derby Network Client JDBC Driver', version 10.1 (10.1.1.1)
The URL is: jdbc:derby://localhost:1527/wombat;create=true
getUDTs() with user-named types null :
TYPE_CAT,TYPE_SCHEM,TYPE_NAME,CLASS_NAME,DATA_TYPE,REMARKS
Modified: db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/odbc_metadata.out
URL: http://svn.apache.org/viewcvs/db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/odbc_metadata.out?rev=290863&r1=290862&r2=290863&view=diff
==============================================================================
--- db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/odbc_metadata.out (original)
+++ db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/odbc_metadata.out Wed Sep 21 17:04:02 2005
@@ -39,7 +39,7 @@
Column result scale after division is: 23
dc / 2 = 5.55000000000000000000000
dc / 2 = 5.55500000000000000000000
-JDBC Driver 'Apache Derby Network Client JDBC Driver', version 10.1 (10.1.1.0)
+JDBC Driver 'Apache Derby Network Client JDBC Driver', version 10.1 (10.1.1.1)
The URL is: jdbc:derby://localhost:1527/wombat;create=true
allTablesAreSelectable(): true
maxColumnNameLength(): 128
@@ -78,8 +78,8 @@
nullsAreSortedAtStart(): false
nullsAreSortedAtEnd(): false
getDatabaseProductName(): Apache Derby
-getDatabaseProductVersion(): 10.1.1.0
-getDriverVersion(): 10.1.1.0
+getDatabaseProductVersion(): 10.1.1.1
+getDriverVersion(): 10.1.1.1
usesLocalFiles(): true
usesLocalFilePerTable(): true
supportsMixedCaseIdentifiers(): false
Modified: db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/master/metadata.out
URL: http://svn.apache.org/viewcvs/db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/master/metadata.out?rev=290863&r1=290862&r2=290863&view=diff
==============================================================================
--- db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/master/metadata.out (original)
+++ db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/master/metadata.out Wed Sep 21 17:04:02 2005
@@ -9,7 +9,7 @@
Column result scale after division is: 23
dc / 2 = 5.55000000000000000000000
dc / 2 = 5.55500000000000000000000
-JDBC Driver 'Apache Derby Embedded JDBC Driver', version 10.1 (10.1.1.0)
+JDBC Driver 'Apache Derby Embedded JDBC Driver', version 10.1 (10.1.1.1)
The URL is: jdbc:derby:wombat
allTablesAreSelectable(): true
maxColumnNameLength(): 128
@@ -48,8 +48,8 @@
nullsAreSortedAtStart(): false
nullsAreSortedAtEnd(): false
getDatabaseProductName(): Apache Derby
-getDatabaseProductVersion(): 10.1.1.0
-getDriverVersion(): 10.1.1.0
+getDatabaseProductVersion(): 10.1.1.1
+getDriverVersion(): 10.1.1.1
usesLocalFiles(): true
usesLocalFilePerTable(): true
supportsMixedCaseIdentifiers(): false
Modified: db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/master/metadataJdbc20.out
URL: http://svn.apache.org/viewcvs/db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/master/metadataJdbc20.out?rev=290863&r1=290862&r2=290863&view=diff
==============================================================================
--- db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/master/metadataJdbc20.out (original)
+++ db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/master/metadataJdbc20.out Wed Sep 21 17:04:02 2005
@@ -1,5 +1,5 @@
Test metadataJdbc20 starting
-JDBC Driver 'Apache Derby Embedded JDBC Driver', version 10.1 (10.1.1.0)
+JDBC Driver 'Apache Derby Embedded JDBC Driver', version 10.1 (10.1.1.1)
The URL is: jdbc:derby:wombat
getUDTs() with user-named types null :
TYPE_CAT,TYPE_SCHEM,TYPE_NAME,CLASS_NAME,DATA_TYPE,REMARKS
Modified: db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/master/odbc_metadata.out
URL: http://svn.apache.org/viewcvs/db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/master/odbc_metadata.out?rev=290863&r1=290862&r2=290863&view=diff
==============================================================================
--- db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/master/odbc_metadata.out (original)
+++ db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/master/odbc_metadata.out Wed Sep 21 17:04:02 2005
@@ -39,7 +39,7 @@
Column result scale after division is: 23
dc / 2 = 5.55000000000000000000000
dc / 2 = 5.55500000000000000000000
-JDBC Driver 'Apache Derby Embedded JDBC Driver', version 10.1 (10.1.1.0)
+JDBC Driver 'Apache Derby Embedded JDBC Driver', version 10.1 (10.1.1.1)
The URL is: jdbc:derby:wombat
allTablesAreSelectable(): true
maxColumnNameLength(): 128
@@ -78,8 +78,8 @@
nullsAreSortedAtStart(): false
nullsAreSortedAtEnd(): false
getDatabaseProductName(): Apache Derby
-getDatabaseProductVersion(): 10.1.1.0
-getDriverVersion(): 10.1.1.0
+getDatabaseProductVersion(): 10.1.1.1
+getDriverVersion(): 10.1.1.1
usesLocalFiles(): true
usesLocalFilePerTable(): true
supportsMixedCaseIdentifiers(): false
Added: db/derby/code/branches/10.1/tools/ant/properties/packaging.properties
URL: http://svn.apache.org/viewcvs/db/derby/code/branches/10.1/tools/ant/properties/packaging.properties?rev=290863&view=auto
==============================================================================
--- db/derby/code/branches/10.1/tools/ant/properties/packaging.properties (added)
+++ db/derby/code/branches/10.1/tools/ant/properties/packaging.properties Wed Sep 21 17:04:02 2005
@@ -0,0 +1,20 @@
+# 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
+bin.html=${bin.dir}/docs/html
+bin.pdf=${bin.dir}/docs/pdf
+
+# sign executables
+md5.exec=md5
+md5.options=-q
+
+pgp.exec=gpg
+pgp.options=--detach-sign --armor
Propchange: db/derby/code/branches/10.1/tools/ant/properties/packaging.properties
------------------------------------------------------------------------------
svn:eol-style = native
Modified: db/derby/code/branches/10.1/tools/ant/properties/release.properties
URL: http://svn.apache.org/viewcvs/db/derby/code/branches/10.1/tools/ant/properties/release.properties?rev=290863&r1=290862&r2=290863&view=diff
==============================================================================
--- db/derby/code/branches/10.1/tools/ant/properties/release.properties (original)
+++ db/derby/code/branches/10.1/tools/ant/properties/release.properties Wed Sep 21 17:04:02 2005
@@ -1,9 +1,9 @@
-copyright.comment=Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+#Wed Sep 21 16:59:49 PDT 2005
+drdamaint=1
+maint=1000001
major=10
minor=1
-maint=1000000
-#drdamaint should be reset to 0 with every minor release
-drdamaint=1
+eversion=10.1
beta=false
+copyright.comment=Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
vendor=The Apache Software Foundation
-eversion=10.1
Added: db/derby/code/branches/10.1/tools/release/build.xml
URL: http://svn.apache.org/viewcvs/db/derby/code/branches/10.1/tools/release/build.xml?rev=290863&view=auto
==============================================================================
--- db/derby/code/branches/10.1/tools/release/build.xml (added)
+++ db/derby/code/branches/10.1/tools/release/build.xml Wed Sep 21 17:04:02 2005
@@ -0,0 +1,262 @@
+<?xml version="1.0"?>
+
+<project default="release" basedir="../..">
+
+<!-- Set Properties -->
+ <!-- User settings -->
+ <property file="${user.home}/ant.properties"/>
+ <!-- Set property lib dir -->
+ <property name="properties.dir" value="tools/ant/properties"/>
+ <!-- Significant dirs -->
+ <property file="${properties.dir}/dirs.properties"/>
+ <!-- Compiler settings -->
+ <property file="${properties.dir}/sane${sanity}.properties"/>
+ <property file="${properties.dir}/defaultcompiler.properties"/>
+ <property file="${properties.dir}/${build.compiler}.properties"/>
+ <!-- Compile-time classpath properties files -->
+ <property file="${properties.dir}/extrapath.properties"/>
+ <property file="${properties.dir}/compilepath.properties"/>
+ <!-- Release and version info -->
+ <property file="${properties.dir}/release.properties"/>
+ <property file="${properties.dir}/packaging.properties"/>
+
+<!-- Targets -->
+
+ <target name="release" depends="clean,bin,lib,src,sign"/>
+
+ <target name="init">
+
+ <java classname="org.apache.derbyBuild.maintversion2props">
+ <classpath path="${out.dir}"/>
+ <arg value="${out.dir}/org/apache/derby/info/DBMS.properties"/>
+ <arg value="maintversion.properties"/>
+ </java>
+
+ <property file="${release.dir}/maintversion.properties"/>
+ <property name="derby.basename" value="db-derby-${major}.${minor}.${interim}.${point}"/>
+ <property name="derby.bin" value="${derby.basename}-bin"/>
+ <property name="derby.lib" value="${derby.basename}-lib"/>
+ <property name="derby.src" value="${derby.basename}-src"/>
+
+ </target>
+
+ <!-- bin distribution -->
+ <target name="bin" depends="bin.zip,bin.tgz"/>
+ <target name="bin.zip" depends="init">
+ <zip destfile="${release.dir}/${derby.bin}.zip"
+ compress="true">
+ <!-- top-level -->
+ <zipfileset dir="${basedir}" includes="CHANGES,COPYRIGHT,LICENSE,KEYS,NOTICE"
+ prefix="${derby.bin}/"/>
+ <!-- demo -->
+ <zipfileset dir="${derby.demo.src.dir}" prefix="${derby.bin}/demo"/>
+ <zipfileset dir="${basedir}/classes" includes="SimpleApp.class"
+ prefix="${derby.bin}/demo/simple"/>
+ <zipfileset dir="${basedir}/classes" includes="SimpleNetwork*.class"
+ prefix="${derby.bin}/demo/nserverdemo"/>
+ <zipfileset dir="${basedir}/classes/nserverdemo" includes="*.class"
+ prefix="${derby.bin}/demo/nserverdemo"/>
+ <!-- docs -->
+ <zipfileset dir="${docs.out}" includes="**/*.html"
+ prefix="${derby.bin}/docs/html"/>
+ <zipfileset dir="${docs.out}" includes="**/*.pdf"
+ prefix="${derby.bin}/docs/pdf"/>
+ <!-- frameworks -->
+ <zipfileset dir="${basedir}/frameworks" prefix="${derby.bin}/frameworks"/>
+ <!-- javadoc -->
+ <zipfileset dir="${basedir}/javadoc/publishedapi" prefix="${derby.bin}/javadoc" includes="**"/>
+ <!-- lib -->
+ <zipfileset dir="${basedir}/jars/insane" prefix="${derby.bin}/lib" includes="derby*.*"
+ excludes="derby_core_plugin*"/>
+ </zip>
+ </target>
+
+ <target name="bin.tgz" depends="init">
+ <tar destfile="${release.dir}/${derby.bin}.tar.gz"
+ compression="gzip" longfile="gnu">
+ <!-- top-level -->
+ <tarfileset dir="${basedir}" includes="CHANGES,COPYRIGHT,LICENSE,KEYS,NOTICE"
+ prefix="${derby.bin}/"/>
+ <!-- demo -->
+ <tarfileset dir="${derby.demo.src.dir}" prefix="${derby.bin}/demo"/>
+ <tarfileset dir="${basedir}/classes" includes="SimpleApp.class"
+ prefix="${derby.bin}/demo/simple"/>
+ <tarfileset dir="${basedir}/classes" includes="SimpleNetwork*.class"
+ prefix="${derby.bin}/demo/nserverdemo"/>
+ <tarfileset dir="${basedir}/classes/nserverdemo" includes="*.class"
+ prefix="${derby.bin}/demo/nserverdemo"/>
+ <!-- docs -->
+ <tarfileset dir="${docs.out}" includes="**/*.html"
+ prefix="${derby.bin}/docs/html"/>
+ <tarfileset dir="${docs.out}" includes="**/*.pdf"
+ prefix="${derby.bin}/docs/pdf"/>
+ <!-- frameworks -->
+ <tarfileset dir="${basedir}/frameworks" prefix="${derby.bin}/frameworks"/>
+ <!-- javadoc -->
+ <tarfileset dir="${basedir}/javadoc/publishedapi" prefix="${derby.bin}/javadoc" includes="**"/>
+ <!-- lib -->
+ <tarfileset dir="${basedir}/jars/insane" prefix="${derby.bin}/lib" includes="derby*.*"
+ excludes="derby_core_plugin*"/>
+ </tar>
+ </target>
+
+ <!-- lib distribution -->
+ <target name="lib" depends="lib.zip,lib.tgz"/>
+ <target name="lib.zip" depends="init">
+ <zip destfile="${release.dir}/${derby.lib}.zip"
+ compress="true">
+ <zipfileset dir="${basedir}" includes="CHANGES,COPYRIGHT,LICENSE,KEYS,NOTICE"
+ prefix="${derby.lib}/"/>
+ <zipfileset dir="${basedir}/jars/insane" prefix="${derby.lib}/lib" includes="derby*.*"
+ excludes="derby_core_plugin*"/>
+ </zip>
+ </target>
+ <target name="lib.tgz">
+ <tar destfile="${release.dir}/${derby.lib}.tar.gz"
+ compression="gzip">
+ <tarfileset dir="${basedir}" includes="CHANGES,COPYRIGHT,LICENSE,KEYS,NOTICE"
+ prefix="${derby.lib}/"/>
+ <tarfileset dir="${basedir}/jars/insane" prefix="${derby.lib}/lib" includes="derby*.*"
+ excludes="derby_core_plugin*"/>
+ </tar>
+ </target>
+
+ <!-- src distribution -->
+ <target name="src" depends="src.zip,src.tgz"/>
+ <target name="src.zip" depends="init">
+ <zip destfile="${release.dir}/${derby.src}.zip">
+ <zipfileset dir="${basedir}" prefix="${derby.src}"
+ includes="BUILDING,CHANGES,COPYRIGHT,KEYS,LICENSE,NOTICE,STATUS,build.xml,frameworks/**,java/**,plugins/**,tools/**"
+ excludes="tools/release/**,tools/**/db2jcc*,tools/**/osgi.jar,tools/**/jdbc2_0*,tools/java/jce*,tools/**/packaging.properties,java/**/maintversion2props.java"/>
+ </zip>
+ </target>
+ <target name="src.tgz">
+ <tar destfile="${release.dir}/${derby.src}.tar.gz"
+ compression="gzip" longfile="gnu">
+ <tarfileset dir="${basedir}" prefix="${derby.src}"
+ includes="BUILDING,CHANGES,COPYRIGHT,KEYS,LICENSE,NOTICE,STATUS,build.xml,frameworks/**,java/**,plugins/**,tools/**"
+ excludes="tools/release/**,tools/**/db2jcc*,tools/**/osgi.jar,tools/**/jdbc2_0*,tools/java/jce*,tools/**/packaging.properties,java/**/maintversion2props.java"/>
+ </tar>
+ </target>
+
+ <!-- generate the md5 and pgp checksums for a target -->
+ <target name="sign" depends="sign.bin,sign.lib,sign.src"/>
+ <target name="sign.bin" depends="init">
+ <antcall target="md5">
+ <param name="sign.archive" value="${release.dir}/${derby.bin}.zip"/>
+ </antcall>
+ <antcall target="md5">
+ <param name="sign.archive" value="${release.dir}/${derby.bin}.tar.gz"/>
+ </antcall>
+ <antcall target="pgp">
+ <param name="sign.archive" value="${release.dir}/${derby.bin}.zip"/>
+ </antcall>
+ <antcall target="pgp">
+ <param name="sign.archive" value="${release.dir}/${derby.bin}.tar.gz"/>
+ </antcall>
+ </target>
+ <target name="sign.lib" depends="init">
+ <antcall target="md5">
+ <param name="sign.archive" value="${release.dir}/${derby.lib}.zip"/>
+ </antcall>
+ <antcall target="md5">
+ <param name="sign.archive" value="${release.dir}/${derby.lib}.tar.gz"/>
+ </antcall>
+ <antcall target="pgp">
+ <param name="sign.archive" value="${release.dir}/${derby.lib}.zip"/>
+ </antcall>
+ <antcall target="pgp">
+ <param name="sign.archive" value="${release.dir}/${derby.lib}.tar.gz"/>
+ </antcall>
+ </target>
+ <target name="sign.src" depends="init">
+ <antcall target="md5">
+ <param name="sign.archive" value="${release.dir}/${derby.src}.zip"/>
+ </antcall>
+ <antcall target="md5">
+ <param name="sign.archive" value="${release.dir}/${derby.src}.tar.gz"/>
+ </antcall>
+ <antcall target="pgp">
+ <param name="sign.archive" value="${release.dir}/${derby.src}.zip"/>
+ </antcall>
+ <antcall target="pgp">
+ <param name="sign.archive" value="${release.dir}/${derby.src}.tar.gz"/>
+ </antcall>
+ </target>
+
+ <target name="md5">
+ <exec executable="${md5.exec}" output="${sign.archive}.md5">
+ <arg line="${md5.options} ${sign.archive}"/>
+ </exec>
+ </target>
+
+ <target name="pgp">
+ <exec executable="${pgp.exec}">
+ <arg line="${pgp.options} ${sign.archive}"/>
+ </exec>
+ </target>
+
+ <!-- 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>
+ </target>
+
+ <!-- bumps the last part of the version string to the next digit. -->
+ <target name="bumplastdigit">
+ <propertyfile file="${basedir}/tools/ant/properties/release.properties">
+ <entry key="maint" type="int" operation="+" value="1" pattern="0000000"/>
+ </propertyfile>
+ <java classname="org.apache.derbyBuild.maintversion2props">
+ <classpath path="${out.dir}"/>
+ <arg value="${basedir}/tools/ant/properties/release.properties"/>
+ <arg value="maintversion.properties"/>
+ </java>
+ <antcall target="regex.masters"/>
+ </target>
+
+ <!-- this target contains the list of test masters which contain the version string. -->
+ <target name="regex.masters">
+ <property file="${release.dir}/maintversion.properties"/>
+ <antcall target="regex.version">
+ <param name="regex.file" value="java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/metadata.out"/>
+ </antcall>
+ <antcall target="regex.version">
+ <param name="regex.file" value="java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/odbc_metadata.out"/>
+ </antcall>
+ <antcall target="regex.version">
+ <param name="regex.file" value="java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/dbMetaDataJdbc30.out"/>
+ </antcall>
+ <antcall target="regex.version">
+ <param name="regex.file" value="java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/metadata.out"/>
+ </antcall>
+ <antcall target="regex.version">
+ <param name="regex.file" value="java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/metadataJdbc20.out"/>
+ </antcall>
+ <antcall target="regex.version">
+ <param name="regex.file" value="java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/odbc_metadata.out"/>
+ </antcall>
+ <antcall target="regex.version">
+ <param name="regex.file" value="java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/metadata.out"/>
+ </antcall>
+ <antcall target="regex.version">
+ <param name="regex.file" value="java/testing/org/apache/derbyTesting/functionTests/master/metadata.out"/>
+ </antcall>
+ <antcall target="regex.version">
+ <param name="regex.file" value="java/testing/org/apache/derbyTesting/functionTests/master/metadataJdbc20.out"/>
+ </antcall>
+ <antcall target="regex.version">
+ <param name="regex.file" value="java/testing/org/apache/derbyTesting/functionTests/master/odbc_metadata.out"/>
+ </antcall>
+ <antcall target="regex.version">
+ <param name="regex.file" value="java/testing/org/apache/derbyTesting/functionTests/master/metadata.out"/>
+ </antcall>
+ </target>
+
+ <target name="regex.version">
+ <replaceregexp file="${regex.file}" match="${major}\.${minor}\.\d+\.\d+"
+ replace="${major}.${minor}.${interim}.${point}" flags="g"/>
+ </target>
+
+</project>
Propchange: db/derby/code/branches/10.1/tools/release/build.xml
------------------------------------------------------------------------------
svn:eol-style = native