User: obo Date: 2008-01-07 09:46:29+0000 Modified: dba/connectivity/com/sun/star/sdbcx/comp/hsqldb/makefile.mk
Log: INTEGRATION: CWS sb80 (1.13.88); FILE MERGED 2007/11/20 08:34:57 sb 1.13.88.4: #i82422# At least on Mac OS X Tiger, System.loadLibrary(hsqldb2) does not find the hsqldb2 library on directory above sdbc_hsqldb.jar, even though .. is on the jar's Class-Path; added NativeLibraries.load to work around that. 2007/11/19 10:17:00 sb 1.13.88.3: #i82422# Removed dependency on NativeLibraryLoader (as finding jurt.jar is not trivial in OOo-wo-URE installations). 2007/11/14 13:37:02 sb 1.13.88.2: #i82422# Simplification of previous change (unoil.jar is always present next to sdbc_hsqldb.jar). 2007/11/14 13:21:22 sb 1.13.88.1: #i82422# Dirty tricks with the JARCLASSPATH so that URE jars are found in both plain OOo and OOo-wo-URE (to be cleaned up once OOo-wo-URE completely replaces plain OOo). 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.13&r2=1.14 Delta lines: +4 -3 ------------------- --- makefile.mk 2007-03-12 10:40:46+0000 1.13 +++ makefile.mk 2008-01-07 09:46:27+0000 1.14 @@ -45,7 +45,7 @@ # --- Files -------------------------------------------------------- -JARFILES = jurt.jar unoil.jar +JARFILES = unoil.jar .IF "$(SYSTEM_HSQLDB)" == "YES" XCLASSPATH!:=$(XCLASSPATH)$(PATH_SEPERATOR)$(HSQLDB_JAR) .ELSE @@ -60,14 +60,15 @@ StorageFileAccess.java\ StorageNativeInputStream.java\ StorageNativeOutputStream.java\ - FileSystemRuntimeException.java + FileSystemRuntimeException.java\ + NativeLibraries.java JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class) JARCOMPRESS = TRUE JARCLASSDIRS = $(PACKAGE) $(SECONDARY_PACKAGE) JARTARGET = $(TARGET).jar -JARCLASSPATH = $(JARFILES) +JARCLASSPATH = $(JARFILES) .. # --- Targets ------------------------------------------------------ .INCLUDE : target.mk --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
