Tag: cws_src680_systemjava
User: cmc     
Date: 06/03/22 06:07:43

Modified:
 /dba/connectivity/com/sun/star/sdbcx/comp/hsqldb/
  makefile.mk
 /dba/connectivity/prj/
  build.lst

Log:
 #i52974# support using the system hsqldb

File Changes:

Directory: /dba/connectivity/com/sun/star/sdbcx/comp/hsqldb/
============================================================

File [changed]: makefile.mk
Url: 
http://dba.openoffice.org/source/browse/dba/connectivity/com/sun/star/sdbcx/comp/hsqldb/makefile.mk?r1=1.6&r2=1.6.82.1
Delta lines:  +6 -1
-------------------
--- makefile.mk 8 Sep 2005 04:56:11 -0000       1.6
+++ makefile.mk 22 Mar 2006 14:07:40 -0000      1.6.82.1
@@ -43,7 +43,12 @@
 # --- Files --------------------------------------------------------  
 
 
-JARFILES = ridl.jar unoil.jar jurt.jar juh.jar hsqldb.jar
+JARFILES = ridl.jar unoil.jar jurt.jar juh.jar
+.IF "$(SYSTEM_HSQLDB)" == "YES"
+XCLASSPATH!:=$(XCLASSPATH)$(PATH_SEPERATOR)$(HSQLDB_JAR)
+.ELSE
+JARFILES+= hsqldb.jar
+.ENDIF
 JAVAFILES =\
        NativeInputStreamHelper.java\
        NativeOutputStreamHelper.java\

Directory: /dba/connectivity/prj/
=================================

File [changed]: build.lst
Url: 
http://dba.openoffice.org/source/browse/dba/connectivity/prj/build.lst?r1=1.27&r2=1.27.52.1
Delta lines:  +1 -1
-------------------
--- build.lst   21 Dec 2005 14:05:01 -0000      1.27
+++ build.lst   22 Mar 2006 14:07:41 -0000      1.27.52.1
@@ -1,4 +1,4 @@
-cn     connectivity    :       comphelper MOZ:moz SO:moz_prebuilt svtools 
UNIXODBC:unixODBC unoil jurt javaunohelper hsqldb NULL
+cn     connectivity    :       comphelper MOZ:moz SO:moz_prebuilt svtools 
UNIXODBC:unixODBC unoil jurt javaunohelper HSQLDB:hsqldb NULL
 cn     connectivity                                                    usr1    
-       all     cn_mkout NULL
 cn     connectivity\com\sun\star\sdbcx\comp\hsqldb     nmake   -       all     
cn_jhsqldbdb cn_hsqldb NULL
 cn     connectivity\source\types                       nmake   -       all     
cn_types NULL




---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to