[Libreoffice-commits] .: Branch 'libreoffice-3-6' - connectivity/Jar_sdbc_hsqldb.mk

[Petr Mladek]

 connectivity/Jar_sdbc_hsqldb.mk |    8 ++++++++
 1 file changed, 8 insertions(+)

New commits:
commit 203707c0591021d827b1de855f977cdb4c8cfd47
Author: Petr Mladek <pmladek at suse.cz>
Date:   Wed Jun 6 16:40:21 2012 +0200

    make hsql database working again (fdo#50783)
    
    + set Class-Path in sdbc_hsqldb.jar/MANIFEST.MF
    
    + pack the missing org/hsqldb/lib/FileSystemRuntimeException.class
    
      heh, it is a crazy hack; the source file is under another path
      com/sun/star/sdbcx/comp/hsqldb
    
    Change-Id: I53078269f2298175fee52912d55e8defe01b259b

diff --git a/connectivity/Jar_sdbc_hsqldb.mk b/connectivity/Jar_sdbc_hsqldb.mk
index ea6df7b..34fcb7c 100644
--- a/connectivity/Jar_sdbc_hsqldb.mk
+++ b/connectivity/Jar_sdbc_hsqldb.mk
@@ -37,8 +37,16 @@ $(eval $(call gb_Jar_use_jars,sdbc_hsqldb,\
 ))
 endif
 
+$(eval $(call gb_Jar_set_jarclasspath,sdbc_hsqldb,\
+	hsqldb.jar \
+	$(HSQLDB_JAR) \
+	.. \
+))
+
 $(eval $(call gb_Jar_set_packageroot,sdbc_hsqldb,com))
 
+$(eval $(call gb_Jar_add_packagedir,sdbc_hsqldb,org))
+
 $(eval $(call gb_Jar_add_sourcefiles,sdbc_hsqldb,\
 	connectivity/com/sun/star/sdbcx/comp/hsqldb/FileSystemRuntimeException \
 	connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeInputStreamHelper \