diff options
Diffstat (limited to 'hsqldb')
| -rwxr-xr-x | hsqldb/makefile.mk | 83 | ||||
| -rw-r--r-- | hsqldb/patches/i103528.patch | 11 | ||||
| -rw-r--r-- | hsqldb/patches/i104901.patch | 27 | ||||
| -rw-r--r-- | hsqldb/patches/i96823.patch | 94 | ||||
| -rw-r--r-- | hsqldb/patches/i97032.patch | 10 | ||||
| -rwxr-xr-x | hsqldb/prj/build.lst | 2 | ||||
| -rwxr-xr-x | hsqldb/prj/d.lst | 1 | ||||
| -rwxr-xr-x | hsqldb/version.mk | 6 |
8 files changed, 234 insertions, 0 deletions
diff --git a/hsqldb/makefile.mk b/hsqldb/makefile.mk new file mode 100755 index 000000000000..6b3166aad4c5 --- /dev/null +++ b/hsqldb/makefile.mk @@ -0,0 +1,83 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2010 Oracle and/or its affiliates. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# <http://www.openoffice.org/license.html> +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +PRJ=. + +PRJNAME=hsqldb +TARGET=so_hsqldb + +# --- Settings ----------------------------------------------------- + +.INCLUDE : settings.mk + +# override buildfile +ANT_BUILDFILE=build$/build.xml + +.INCLUDE : antsettings.mk + +.INCLUDE : version.mk + +.IF "$(SOLAR_JAVA)" != "" +# --- Files -------------------------------------------------------- + +TARFILE_NAME=hsqldb_$(HSQLDB_VERSION) +TARFILE_MD5=17410483b5b5f267aa18b7e00b65e6e0 + +TARFILE_ROOTDIR=hsqldb + +CONVERTFILES=build$/build.xml \ + src$/org$/hsqldb$/persist$/HsqlDatabaseProperties.java \ + src$/org$/hsqldb$/Library.java + +PATCH_FILES=patches$/i96823.patch \ + patches$/i97032.patch \ + patches$/i103528.patch \ + patches$/i104901.patch + +.IF "$(JAVACISGCJ)"=="yes" +JAVA_HOME= +.EXPORT : JAVA_HOME +BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar +.ELSE +.IF "$(debug)"!="" +BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -Dbuild.debug="on" -f $(ANT_BUILDFILE) jar +.ELSE +BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -f $(ANT_BUILDFILE) jar +.ENDIF +.ENDIF + +.ENDIF # $(SOLAR_JAVA)!= "" + +# --- Targets ------------------------------------------------------ + +.INCLUDE : set_ext.mk +.INCLUDE : target.mk + +.IF "$(SOLAR_JAVA)" != "" +.INCLUDE : tg_ext.mk +.ENDIF + diff --git a/hsqldb/patches/i103528.patch b/hsqldb/patches/i103528.patch new file mode 100644 index 000000000000..3cc7d2f1d80d --- /dev/null +++ b/hsqldb/patches/i103528.patch @@ -0,0 +1,11 @@ +--- misc/hsqldb/src/org/hsqldb/Library.java ++++ misc/build/hsqldb/src/org/hsqldb/Library.java +@@ -1957,7 +1957,7 @@ + functionMap.put("bitand", bitand); + functionMap.put("bitlength", bitLength); + functionMap.put("bitor", bitor); +- functionMap.put("bitxor", bitor); ++ functionMap.put("bitxor", bitxor); + functionMap.put("character", character); + functionMap.put("concat", concat); + functionMap.put("cot", cot); diff --git a/hsqldb/patches/i104901.patch b/hsqldb/patches/i104901.patch new file mode 100644 index 000000000000..a38773f4ba1e --- /dev/null +++ b/hsqldb/patches/i104901.patch @@ -0,0 +1,27 @@ +--- misc/hsqldb/src/org/hsqldb/Table.java 2007-10-19 23:59:07.000000000 +0200 ++++ misc/build/hsqldb/src/org/hsqldb/Table.java 2009-09-11 13:45:42.939231519 +0200 +@@ -149,10 +149,10 @@ + Constraint[] constraintList; // constrainst for the table + HsqlArrayList[] triggerLists; // array of trigger lists + private int[] colTypes; // fredt - types of columns +- private int[] colSizes; // fredt - copy of SIZE values for columns ++ int[] colSizes; // fredt - copy of SIZE values for columns + private int[] colScales; // fredt - copy of SCALE values for columns + private boolean[] colNullable; // fredt - modified copy of isNullable() values +- private Expression[] colDefaults; // fredt - expressions of DEFAULT values ++ Expression[] colDefaults; // fredt - expressions of DEFAULT values + private int[] defaultColumnMap; // fred - holding 0,1,2,3,... + private boolean hasDefaultValues; //fredt - shortcut for above + boolean sqlEnforceSize; // inherited from the database - +--- misc/hsqldb/src/org/hsqldb/TableWorks.java 2007-01-14 06:48:16.000000000 +0100 ++++ misc/build/hsqldb/src/org/hsqldb/TableWorks.java 2009-09-11 13:47:50.328667463 +0200 +@@ -670,7 +670,8 @@ + // default expressions can change + oldCol.setType(newCol); + oldCol.setDefaultExpression(newCol.getDefaultExpression()); +- table.setColumnTypeVars(colIndex); ++ table.colSizes[colIndex] = oldCol.getSize(); ++ table.colDefaults[colIndex] = oldCol.getDefaultExpression(); + table.resetDefaultsFlag(); + + return; diff --git a/hsqldb/patches/i96823.patch b/hsqldb/patches/i96823.patch new file mode 100644 index 000000000000..bea4a2b7e4f5 --- /dev/null +++ b/hsqldb/patches/i96823.patch @@ -0,0 +1,94 @@ +--- misc/hsqldb/src/org/hsqldb/Expression.java 2008-05-27 17:15:05.000000000 +0200 ++++ misc/build/hsqldb/src/org/hsqldb/Expression.java 2009-01-27 11:42:16.890625000 +0100 +@@ -803,61 +803,62 @@ + + case EXISTS : + buf.append(' ').append(Token.T_EXISTS).append(' '); +- break; ++ ++ return buf.toString(); + + case COUNT : + buf.append(' ').append(Token.T_COUNT).append('('); +- break; ++ if ( "(*)".equals(left))buf.append('*');else buf.append(left); buf.append(')'); return buf.toString(); + + case SUM : + buf.append(' ').append(Token.T_SUM).append('('); + buf.append(left).append(')'); +- break; ++ return buf.toString(); + + case MIN : + buf.append(' ').append(Token.T_MIN).append('('); + buf.append(left).append(')'); +- break; ++ return buf.toString(); + + case MAX : + buf.append(' ').append(Token.T_MAX).append('('); + buf.append(left).append(')'); +- break; ++ return buf.toString(); + + case AVG : + buf.append(' ').append(Token.T_AVG).append('('); + buf.append(left).append(')'); +- break; ++ return buf.toString(); + + case EVERY : + buf.append(' ').append(Token.T_EVERY).append('('); + buf.append(left).append(')'); +- break; ++ return buf.toString(); + + case SOME : + buf.append(' ').append(Token.T_SOME).append('('); + buf.append(left).append(')'); +- break; ++ return buf.toString(); + + case STDDEV_POP : + buf.append(' ').append(Token.T_STDDEV_POP).append('('); + buf.append(left).append(')'); +- break; ++ return buf.toString(); + + case STDDEV_SAMP : + buf.append(' ').append(Token.T_STDDEV_SAMP).append('('); + buf.append(left).append(')'); +- break; ++ return buf.toString(); + + case VAR_POP : + buf.append(' ').append(Token.T_VAR_POP).append('('); + buf.append(left).append(')'); +- break; ++ return buf.toString(); + + case VAR_SAMP : + buf.append(' ').append(Token.T_VAR_SAMP).append('('); + buf.append(left).append(')'); +- break; ++ return buf.toString(); + } + + throw Trace.error(Trace.EXPRESSION_NOT_SUPPORTED); +@@ -1522,6 +1523,16 @@ + if (exprType == COLUMN) { + return columnName; + } ++ if ( isAggregate(exprType) ) ++ { ++ try ++ { ++ return getDDL(); ++ } ++ catch(Exception e) ++ { ++ } ++ } + + return ""; + } diff --git a/hsqldb/patches/i97032.patch b/hsqldb/patches/i97032.patch new file mode 100644 index 000000000000..9703b89613d4 --- /dev/null +++ b/hsqldb/patches/i97032.patch @@ -0,0 +1,10 @@ +--- misc/hsqldb/src/org/hsqldb/persist/HsqlDatabaseProperties.java 2008-03-17 17:05:41.000000000 +0100 ++++ misc/build/hsqldb/src/org/hsqldb/persist/HsqlDatabaseProperties.java 2009-01-21 13:09:24.493470142 +0100 +@@ -429,6 +429,7 @@ + setProperty(hsqldb_log_size, 10); + setProperty(sql_enforce_strict_size, true); + setProperty(hsqldb_nio_data_file, false); ++ setProperty(hsqldb_lock_file, true); + } + + // OOo end diff --git a/hsqldb/prj/build.lst b/hsqldb/prj/build.lst new file mode 100755 index 000000000000..a7c06234df7f --- /dev/null +++ b/hsqldb/prj/build.lst @@ -0,0 +1,2 @@ +hs hsqldb : solenv NULL +hs hsqldb nmake - all hs_mkout NULL diff --git a/hsqldb/prj/d.lst b/hsqldb/prj/d.lst new file mode 100755 index 000000000000..8801f4fecfc8 --- /dev/null +++ b/hsqldb/prj/d.lst @@ -0,0 +1 @@ +..\%__SRC%\misc\build\hsqldb\lib\hsqldb.jar %_DEST%\bin%_EXT%\hsqldb.jar diff --git a/hsqldb/version.mk b/hsqldb/version.mk new file mode 100755 index 000000000000..36ab376a2846 --- /dev/null +++ b/hsqldb/version.mk @@ -0,0 +1,6 @@ +# when you want to change the HSQLDB version, you must update the d.lst +# in the HSQLDB_thon project accordingly !!! +HSQLDB_MAJOR=1 +HSQLDB_MINOR=8 +HSQLDB_MICRO=0 +HSQLDB_VERSION=$(HSQLDB_MAJOR)_$(HSQLDB_MINOR)_$(HSQLDB_MICRO) |