Tag: cws_src680_sb80
User: sb      
Date: 2007-11-14 13:21:24+0000
Modified:
   dba/connectivity/com/sun/star/sdbcx/comp/hsqldb/makefile.mk

Log:
 #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.13.88.1
Delta lines:  +9 -4
-------------------
--- makefile.mk 2007-03-12 10:40:46+0000        1.13
+++ makefile.mk 2007-11-14 13:21:22+0000        1.13.88.1
@@ -4,9 +4,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.13 $
+#   $Revision: 1.13.88.1 $
 #
-#   last change: $Author: obo $ $Date: 2007/03/12 10:40:46 $
+#   last change: $Author: sb $ $Date: 2007/11/14 13:21:22 $
 #
 #   The Contents of this file are made available subject to
 #   the terms of GNU Lesser General Public License Version 2.1.
@@ -50,6 +50,7 @@
 XCLASSPATH!:=$(XCLASSPATH)$(PATH_SEPERATOR)$(HSQLDB_JAR)
 .ELSE
 JARFILES+= hsqldb.jar
+JARCLASSPATH = hsqldb.jar
 .ENDIF
 
 JAVAFILES =\
@@ -67,7 +68,11 @@
 JARCOMPRESS    = TRUE
 JARCLASSDIRS = $(PACKAGE) $(SECONDARY_PACKAGE)
 JARTARGET      = $(TARGET).jar
-JARCLASSPATH = $(JARFILES)
+JARCLASSPATH += jurt.jar ../../ure-link/share/java/jurt.jar
+    # jurt.jar is included twice, to be found in both plain OOo and in
+    # OOo-wo-URE (this needs to be cleaned up again in the future); unoil.jar
+    # is not included, as only com.sun.star.embed.ElementModes constant
+    # variables are referenced from it.
 
 # --- Targets ------------------------------------------------------  
 .INCLUDE :  target.mk 




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

Reply via email to