summaryrefslogtreecommitdiff
path: root/hsqldb
diff options
context:
space:
mode:
authorVladimir Glazounov <vg@openoffice.org>2005-03-23 13:55:56 +0000
committerVladimir Glazounov <vg@openoffice.org>2005-03-23 13:55:56 +0000
commit3645cdbf754f723b3299ba05ce82ae61086a37c2 (patch)
tree3dc0f37df4cfa06c2eaa061e347be007f1736e3a /hsqldb
parent82a423595979385812c9e63ac2f00a828b9cd1c9 (diff)
INTEGRATION: CWS hsqldb3 (1.4.6); FILE MERGED
2005/03/23 09:10:50 fs 1.4.6.2: RESYNC: (1.4-1.5); FILE MERGED 2005/03/18 16:53:59 fs 1.4.6.1: #i44127# re-introduce patch file
Diffstat (limited to 'hsqldb')
-rwxr-xr-xhsqldb/makefile.mk12
1 files changed, 10 insertions, 2 deletions
diff --git a/hsqldb/makefile.mk b/hsqldb/makefile.mk
index febf08a0a425..1bf737451ab1 100755
--- a/hsqldb/makefile.mk
+++ b/hsqldb/makefile.mk
@@ -2,9 +2,9 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.5 $
+# $Revision: 1.6 $
#
-# last change: $Author: obo $ $Date: 2005-03-15 09:08:29 $
+# last change: $Author: vg $ $Date: 2005-03-23 14:55:56 $
#
# The Contents of this file are made available subject to the terms of
# either of the following licenses
@@ -75,6 +75,14 @@ TARFILE_NAME=hsqldb_$(HSQLDB_VERSION)
TARFILE_ROOTDIR=hsqldb
+PATCH_FILE_NAME=hsqldb_1_8_0
+
+ADDITIONAL_FILES= src$/org$/hsqldb$/Collation.java \
+ src$/org$/hsqldb$/TxManager.java \
+ src$/org$/hsqldb$/lib$/LongKeyIntValueHashMap.java \
+ src$/org$/hsqldb$/persist$/ScaledRAFileInJar.java \
+ src$/org$/hsqldb$/test$/TestCollation.java
+
.IF "$(ANT_HOME)" == ""
ANT_HOME*:=$(COMMON_BUILD_TOOLS)$/apache-ant-1.6.1
.EXPORT : ANT_HOME