summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--bean/test/makefile.mk4
-rw-r--r--bridges/test/java_uno/acquire/makefile.mk10
-rw-r--r--bridges/test/java_uno/any/makefile.mk10
-rw-r--r--bridges/test/java_uno/equals/makefile.mk8
-rw-r--r--bridges/test/java_uno/nativethreadpool/makefile.mk4
-rw-r--r--config_host.mk.in2
-rw-r--r--embeddedobj/test/Container1/makefile.mk8
-rw-r--r--extensions/qa/integration/extensions/makefile.mk2
-rw-r--r--jurt/workbench/com/sun/star/comp/urlresolver/makefile.mk2
9 files changed, 25 insertions, 25 deletions
diff --git a/bean/test/makefile.mk b/bean/test/makefile.mk
index 1e3c4932d1f6..f48ab8fdc79b 100644
--- a/bean/test/makefile.mk
+++ b/bean/test/makefile.mk
@@ -33,8 +33,8 @@ JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
MAXLINELENGTH = 100000
-OFFICE_CLASSPATH_TMP:=$(foreach,i,$(JARFILES) $(office)$/program$/classes$/$(i)$(PATH_SEPARATOR))
-OFFICE_CLASSPATH=$(OFFICE_CLASSPATH_TMP:t"")$(PATH_SEPARATOR)$(CLASSDIR)
+OFFICE_CLASSPATH_TMP:=$(foreach,i,$(JARFILES) $(office)$/program$/classes$/$(i)$(LIBO_PATH_SEPARATOR))
+OFFICE_CLASSPATH=$(OFFICE_CLASSPATH_TMP:t"")$(LIBO_PATH_SEPARATOR)$(CLASSDIR)
OOOBEAN_OPTIONS=-Dcom.sun.star.officebean.Options=--norestore
diff --git a/bridges/test/java_uno/acquire/makefile.mk b/bridges/test/java_uno/acquire/makefile.mk
index 837371076507..e38f9e8fa20e 100644
--- a/bridges/test/java_uno/acquire/makefile.mk
+++ b/bridges/test/java_uno/acquire/makefile.mk
@@ -56,7 +56,7 @@ GIVE_EXEC_RIGHTS = chmod +x
EXEC_CLASSPATH_TMP = $(foreach,i,$(JARFILES) $(SOLARBINDIR)$/$i)
EXEC_CLASSPATH = \
- $(strip $(subst,!,$(PATH_SEPARATOR) $(EXEC_CLASSPATH_TMP:s/ /!/)))
+ $(strip $(subst,!,$(LIBO_PATH_SEPARATOR) $(EXEC_CLASSPATH_TMP:s/ /!/)))
$(BIN)$/$(TARGET).rdb: types.idl
- rm $@
@@ -79,16 +79,16 @@ TEST_JAVAUNO_ACQUIRE_UNO_URL := \
$(BIN)$/testacquire-java-client:
echo java -classpath \
- ..$/class$/test$(PATH_SEPARATOR)..$/class$(PATH_SEPARATOR)\
-..$/class$/java_uno.jar$(PATH_SEPARATOR)$(EXEC_CLASSPATH) \
+ ..$/class$/test$(LIBO_PATH_SEPARATOR)..$/class$(LIBO_PATH_SEPARATOR)\
+..$/class$/java_uno.jar$(LIBO_PATH_SEPARATOR)$(EXEC_CLASSPATH) \
test.javauno.acquire.TestAcquire client \
$(TEST_JAVAUNO_ACQUIRE_UNO_URL) > $@
$(GIVE_EXEC_RIGHTS) $@
$(BIN)$/testacquire-java-server:
echo java -classpath \
- ..$/class$/test$(PATH_SEPARATOR)..$/class$(PATH_SEPARATOR)\
-..$/class$/java_uno.jar$(PATH_SEPARATOR)$(EXEC_CLASSPATH) \
+ ..$/class$/test$(LIBO_PATH_SEPARATOR)..$/class$(LIBO_PATH_SEPARATOR)\
+..$/class$/java_uno.jar$(LIBO_PATH_SEPARATOR)$(EXEC_CLASSPATH) \
test.javauno.acquire.TestAcquire server \
$(TEST_JAVAUNO_ACQUIRE_UNO_URL) > $@
$(GIVE_EXEC_RIGHTS) $@
diff --git a/bridges/test/java_uno/any/makefile.mk b/bridges/test/java_uno/any/makefile.mk
index e9975408ed46..b942e546ff69 100644
--- a/bridges/test/java_uno/any/makefile.mk
+++ b/bridges/test/java_uno/any/makefile.mk
@@ -39,13 +39,13 @@ JAVAFILES = \
.IF "$(XCLASSPATH)" == ""
XCLASSPATH := $(CLASSDIR)$/test
.ELSE
-XCLASSPATH !:= $(XCLASSPATH)$(PATH_SEPARATOR)$(CLASSDIR)$/test
+XCLASSPATH !:= $(XCLASSPATH)$(LIBO_PATH_SEPARATOR)$(CLASSDIR)$/test
.ENDIF
EXEC_CLASSPATH_TMP = \
- $(foreach,i,$(JARFILES) $(SOLARBINDIR)$/$i)$(PATH_SEPARATOR)$(XCLASSPATH)
+ $(foreach,i,$(JARFILES) $(SOLARBINDIR)$/$i)$(LIBO_PATH_SEPARATOR)$(XCLASSPATH)
EXEC_CLASSPATH = \
- $(strip $(subst,!,$(PATH_SEPARATOR) $(EXEC_CLASSPATH_TMP:s/ /!/)))
+ $(strip $(subst,!,$(LIBO_PATH_SEPARATOR) $(EXEC_CLASSPATH_TMP:s/ /!/)))
JARFILES = juh.jar jurt.jar ridl.jar
JAVACLASSFILES = \
@@ -96,14 +96,14 @@ ALLTAR : \
$(OUT)$/bin$/TestRemote : $(JAVACLASSFILES)
-rm -f $@
- echo java -classpath ..$/class$/test$(PATH_SEPARATOR)..$/class$(PATH_SEPARATOR)$(EXEC_CLASSPATH) \
+ echo java -classpath ..$/class$/test$(LIBO_PATH_SEPARATOR)..$/class$(LIBO_PATH_SEPARATOR)$(EXEC_CLASSPATH) \
test.java_uno.anytest.TestRemote > $@
$(GIVE_EXEC_RIGHTS) $@
$(OUT)$/bin$/TestJni : $(JAVACLASSFILES)
-rm -f $@
echo '$(AUGMENT_LIBRARY_PATH)' java -classpath \
- .$(PATH_SEPARATOR)..$/class$(PATH_SEPARATOR)$(EXEC_CLASSPATH) \
+ .$(LIBO_PATH_SEPARATOR)..$/class$(LIBO_PATH_SEPARATOR)$(EXEC_CLASSPATH) \
-Djava.library.path=..$/lib test.java_uno.anytest.TestJni >> $@
$(GIVE_EXEC_RIGHTS) $@
diff --git a/bridges/test/java_uno/equals/makefile.mk b/bridges/test/java_uno/equals/makefile.mk
index ae700d48c8b1..e6affc874683 100644
--- a/bridges/test/java_uno/equals/makefile.mk
+++ b/bridges/test/java_uno/equals/makefile.mk
@@ -30,7 +30,7 @@ ENABLE_EXCEPTIONS = TRUE
.IF "$(XCLASSPATH)" == ""
XCLASSPATH := $(CLASSDIR)$/test
.ELSE
-XCLASSPATH !:= $(XCLASSPATH)$(PATH_SEPARATOR)$(CLASSDIR)$/test
+XCLASSPATH !:= $(XCLASSPATH)$(LIBO_PATH_SEPARATOR)$(CLASSDIR)$/test
.ENDIF
DLLPRE = # no leading "lib" on .so files
@@ -59,7 +59,7 @@ GIVE_EXEC_RIGHTS = chmod +x
EXEC_CLASSPATH_TMP = $(foreach,i,$(JARFILES) $(SOLARBINDIR)$/$i)
EXEC_CLASSPATH = \
- $(strip $(subst,!,$(PATH_SEPARATOR) $(EXEC_CLASSPATH_TMP:s/ /!/)))
+ $(strip $(subst,!,$(LIBO_PATH_SEPARATOR) $(EXEC_CLASSPATH_TMP:s/ /!/)))
$(MISC)$/$(TARGET).rdb: types.idl
- rm $@
@@ -74,8 +74,8 @@ $(SLOFILES) $(JAVACLASSFILES): $(MISC)$/$(TARGET).rdb
$(BIN)$/testequals: $(BIN)$/testequals_services.rdb
echo '$(AUGMENT_LIBRARY_PATH)' java -classpath \
- ..$/class$/test$(PATH_SEPARATOR)..$/class$(PATH_SEPARATOR)\
-..$/class$/java_uno.jar$(PATH_SEPARATOR)$(EXEC_CLASSPATH) \
+ ..$/class$/test$(LIBO_PATH_SEPARATOR)..$/class$(LIBO_PATH_SEPARATOR)\
+..$/class$/java_uno.jar$(LIBO_PATH_SEPARATOR)$(EXEC_CLASSPATH) \
test.java_uno.equals.TestEquals $(SOLARBINDIR)$/types.rdb \
testequals_services.rdb > $@
$(GIVE_EXEC_RIGHTS) $@
diff --git a/bridges/test/java_uno/nativethreadpool/makefile.mk b/bridges/test/java_uno/nativethreadpool/makefile.mk
index dc485622e60d..504bcb1ac2cc 100644
--- a/bridges/test/java_uno/nativethreadpool/makefile.mk
+++ b/bridges/test/java_uno/nativethreadpool/makefile.mk
@@ -59,7 +59,7 @@ ALLTAR: test
EXEC_CLASSPATH_TMP = $(foreach,i,$(JARFILES) $(SOLARBINDIR)$/$i)
EXEC_CLASSPATH = \
- $(strip $(subst,!,$(PATH_SEPARATOR) $(EXEC_CLASSPATH_TMP:s/ /!/)))
+ $(strip $(subst,!,$(LIBO_PATH_SEPARATOR) $(EXEC_CLASSPATH_TMP:s/ /!/)))
$(MISC)$/$(TARGET)$/types.rdb: types.idl
- rm $@
@@ -105,7 +105,7 @@ test .PHONY: $(SHL1TARGETN) $(BIN)$/$(TARGET).uno.jar $(BIN)$/$(TARGET).rdb
-l $(SHL2TARGETN) -ro $(BIN)$/$(TARGET).rdb \
-u 'uno:socket,host=localhost,port=3830;urp;test' --singleaccept &
+ $(AUGMENT_LIBRARY_PATH) OO_JAVA_PROPERTIES='RuntimeLib=$(JVM_LIB_URL)' \
- CLASSPATH=$(EXEC_CLASSPATH)$(PATH_SEPARATOR)$(BIN)$/$(TARGET).uno.jar \
+ CLASSPATH=$(EXEC_CLASSPATH)$(LIBO_PATH_SEPARATOR)$(BIN)$/$(TARGET).uno.jar \
uno -c test.javauno.nativethreadpool.client -l $(SHL1TARGETN) \
-ro $(BIN)$/$(TARGET).rdb \
-env:URE_INTERNAL_JAVA_DIR=file://$(SOLARBINDIR)
diff --git a/config_host.mk.in b/config_host.mk.in
index 2c5167dd95df..7f755cd463b8 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -386,7 +386,7 @@ export OUTDIR=@OUTDIR@
export OUTDIR_FOR_BUILD=@OUTDIR_FOR_BUILD@
export OUTPATH=@OUTPATH@
export PATH=@LO_PATH@
-export PATH_SEPARATOR=@P_SEP@
+export LIBO_PATH_SEPARATOR=@P_SEP@
export PERL=@PERL@
export PKGFORMAT=@PKGFORMAT@
export PKGMK=@PKGMK@
diff --git a/embeddedobj/test/Container1/makefile.mk b/embeddedobj/test/Container1/makefile.mk
index fed903410b0e..f2523cae5a4f 100644
--- a/embeddedobj/test/Container1/makefile.mk
+++ b/embeddedobj/test/Container1/makefile.mk
@@ -25,9 +25,9 @@ PACKAGE = embeddedobj$/test
.INCLUDE: settings.mk
# EXEC_CLASSPATH_TMP = \
-# $(foreach,i,$(JARFILES) $(SOLARBINDIR)$/$i)$(PATH_SEPARATOR)
+# $(foreach,i,$(JARFILES) $(SOLARBINDIR)$/$i)$(LIBO_PATH_SEPARATOR)
# EXEC_CLASSPATH = \
-# $(strip $(subst,!,$(PATH_SEPARATOR) $(EXEC_CLASSPATH_TMP:s/ /!/)))
+# $(strip $(subst,!,$(LIBO_PATH_SEPARATOR) $(EXEC_CLASSPATH_TMP:s/ /!/)))
#----- compile .java files -----------------------------------------
@@ -66,11 +66,11 @@ JavaStorageTestExample : $(CLASSFILES)
# echo $(EXEC_CLASSPATH)
run: $(CLASSFILES)
- +set PATH=$(PATH)$(PATH_SEPARATOR)$(JDK14PATH)$/jre$/bin && \
+ +set PATH=$(PATH)$(LIBO_PATH_SEPARATOR)$(JDK14PATH)$/jre$/bin && \
java -classpath "$(OUT)$/class;$(OUT)$/lib;$(OUT)$/bin;$(JDK14PATH)$/jre$/bin;$(JDK14PATH)$/jre$/lib;$(CLASSPATH)" embeddedobj.test.EmbedContFrame
debug: $(CLASSFILES)
- +set PATH=$(PATH)$(PATH_SEPARATOR)$(JDK14PATH)$/jre$/bin && \
+ +set PATH=$(PATH)$(LIBO_PATH_SEPARATOR)$(JDK14PATH)$/jre$/bin && \
jdb -classpath "$(OUT)$/class;$(OUT)$/lib;$(OUT)$/bin;$(CLASSPATH)" embeddedobj.test.EmbedContFrame
clean :
diff --git a/extensions/qa/integration/extensions/makefile.mk b/extensions/qa/integration/extensions/makefile.mk
index 6861d1b63f92..ca524e0eb821 100644
--- a/extensions/qa/integration/extensions/makefile.mk
+++ b/extensions/qa/integration/extensions/makefile.mk
@@ -53,7 +53,7 @@ JARCOMPRESS = TRUE
.ENDIF
# classpath and argument list
-RUNNER_CLASSPATH = -cp $(CLASSPATH)$(PATH_SEPARATOR)$(SOLARBINDIR)$/OOoRunner.jar$(PATH_SEPARATOR)$(CLASSPATH)$(PATH_SEPARATOR)$(SOLARBINDIR)$/ConnectivityTools.jar
+RUNNER_CLASSPATH = -cp $(CLASSPATH)$(LIBO_PATH_SEPARATOR)$(SOLARBINDIR)$/OOoRunner.jar$(LIBO_PATH_SEPARATOR)$(CLASSPATH)$(LIBO_PATH_SEPARATOR)$(SOLARBINDIR)$/ConnectivityTools.jar
RUNNER_ARGS = org.openoffice.Runner -TestBase java_complex -cs $(RUNNER_CONNECTION_STRING)
# --- Targets ------------------------------------------------------
diff --git a/jurt/workbench/com/sun/star/comp/urlresolver/makefile.mk b/jurt/workbench/com/sun/star/comp/urlresolver/makefile.mk
index 2e59189c4e1e..8bdbbd8ccda3 100644
--- a/jurt/workbench/com/sun/star/comp/urlresolver/makefile.mk
+++ b/jurt/workbench/com/sun/star/comp/urlresolver/makefile.mk
@@ -32,7 +32,7 @@ JARFILES := ridl.jar juh.jar
.IF "$(XCLASSPATH)" == ""
XCLASSPATH := $(CLASSDIR)
.ELSE
-XCLASSPATH !:= $(XCLASSPATH)$(PATH_SEPARATOR)$(CLASSDIR)
+XCLASSPATH !:= $(XCLASSPATH)$(LIBO_PATH_SEPARATOR)$(CLASSDIR)
.ENDIF
CLASSDIR !:= $(CLASSDIR)$/workbench
generated by cgit (git 2.34.1) at 2024-06-18 11:13:20 +0000