Hi Michael, On Tue, Feb 19, 2013 at 05:18:44PM -0500, Michael Lam wrote: > I am trying to update the build to use the latest source of HSQLDB > but the build is failing and I am not sure how to proceed. I already > updated main/external_deps.list as well as the makefile.mk and > version.mk within hsqldb. > > I am getting the following and not sure where it is configured > > dmake: Error: -- > `./unxlngx6.pro/misc/c2a47e08e95cdff1dc9bb2f8dd73d553-hsqldb_2_2_9.unpack' > not found, and can't be made
the new hsqldb source zip is named hsqldb-2.2.9.zip with the MD5 sum: c2a47e08e95cdff1dc9bb2f8dd73d553-hsqldb-2.2.9.zip You have to adapt the makefiles for this change, they are expecting "_" instead of "-" and "." The attached patch fix unzipping the sources (you'll get more problems to fix after that). Regards -- Ariel Constenla-Haile La Plata, Argentina
diff --git a/main/external_deps.lst b/main/external_deps.lst
index f20e911..80d1587 100644
--- a/main/external_deps.lst
+++ b/main/external_deps.lst
@@ -60,9 +60,9 @@ if (SYSTEM_LIBTEXTCAT != YES)
URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
if (SOLAR_JAVA == TRUE)
- MD5 = 17410483b5b5f267aa18b7e00b65e6e0
- name = hsqldb_1_8_0.zip
- URL1 =
http://sourceforge.net/projects/hsqldb/files/hsqldb/hsqldb_1_8_0/hsqldb_1_8_0_10.zip/download
+ MD5 = c2a47e08e95cdff1dc9bb2f8dd73d553
+ name = hsqldb-2.2.9.zip
+ URL1 =
http://sourceforge.net/projects/hsqldb/files/hsqldb/hsqldb_2_2/hsqldb-2.2.9.zip/download
URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
if ( true )
diff --git a/main/hsqldb/makefile.mk b/main/hsqldb/makefile.mk
index 45c318f..87e7cfd 100644
--- a/main/hsqldb/makefile.mk
+++ b/main/hsqldb/makefile.mk
@@ -40,10 +40,10 @@ ANT_BUILDFILE=build$/build.xml
.IF "$(SOLAR_JAVA)" != ""
# --- Files --------------------------------------------------------
-TARFILE_NAME=hsqldb_$(HSQLDB_VERSION)
-TARFILE_MD5=17410483b5b5f267aa18b7e00b65e6e0
+TARFILE_NAME=hsqldb-$(HSQLDB_VERSION)
+TARFILE_MD5=c2a47e08e95cdff1dc9bb2f8dd73d553
-TARFILE_ROOTDIR=hsqldb
+TARFILE_ROOTDIR=hsqldb-$(HSQLDB_VERSION)
CONVERTFILES=build$/build.xml \
src$/org$/hsqldb$/persist$/HsqlDatabaseProperties.java \
diff --git a/main/hsqldb/version.mk b/main/hsqldb/version.mk
index 062c1f2..1d64eef 100644
--- a/main/hsqldb/version.mk
+++ b/main/hsqldb/version.mk
@@ -20,7 +20,7 @@
# *************************************************************
# 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)
+HSQLDB_MAJOR=2
+HSQLDB_MINOR=2
+HSQLDB_MICRO=9
+HSQLDB_VERSION=$(HSQLDB_MAJOR).$(HSQLDB_MINOR).$(HSQLDB_MICRO)
pgpGUs8jGlIXf.pgp
Description: PGP signature
