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).
This commit is contained in:
parent
ab320f2c3f
commit
abdaf61270
1 changed files with 6 additions and 5 deletions
|
@ -4,9 +4,9 @@
|
|||
#
|
||||
# $RCSfile: makefile.mk,v $
|
||||
#
|
||||
# $Revision: 1.13 $
|
||||
# $Revision: 1.14 $
|
||||
#
|
||||
# last change: $Author: obo $ $Date: 2007-03-12 10:40:46 $
|
||||
# last change: $Author: obo $ $Date: 2008-01-07 09:46:27 $
|
||||
#
|
||||
# The Contents of this file are made available subject to
|
||||
# the terms of GNU Lesser General Public License Version 2.1.
|
||||
|
@ -45,7 +45,7 @@ SECONDARY_PACKAGE = org$/hsqldb$/lib
|
|||
# --- Files --------------------------------------------------------
|
||||
|
||||
|
||||
JARFILES = jurt.jar unoil.jar
|
||||
JARFILES = unoil.jar
|
||||
.IF "$(SYSTEM_HSQLDB)" == "YES"
|
||||
XCLASSPATH!:=$(XCLASSPATH)$(PATH_SEPERATOR)$(HSQLDB_JAR)
|
||||
.ELSE
|
||||
|
@ -60,14 +60,15 @@ JAVAFILES =\
|
|||
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
|
||||
|
|
Loading…
Reference in a new issue