summaryrefslogtreecommitdiff
path: root/bridges
diff options
context:
space:
mode:
authorsb <sb@openoffice.org>2010-01-12 18:49:59 +0100
committersb <sb@openoffice.org>2010-01-12 18:49:59 +0100
commit11370224ce0d0654e4aa1aa27e8da3ec3e2bab6b (patch)
tree56fb3beece13dd1831197b83f072af20de252b76 /bridges
parent50a6ab9c5c43f7226f29d11ce3e7481cffe51f38 (diff)
sb118: #i108269# first step of removing tcsh support
Diffstat (limited to 'bridges')
-rw-r--r--bridges/test/java_uno/acquire/makefile.mk16
-rw-r--r--bridges/test/java_uno/any/makefile.mk8
-rw-r--r--bridges/test/java_uno/equals/makefile.mk4
-rw-r--r--bridges/test/java_uno/nativethreadpool/makefile.mk4
4 files changed, 16 insertions, 16 deletions
diff --git a/bridges/test/java_uno/acquire/makefile.mk b/bridges/test/java_uno/acquire/makefile.mk
index d027c067dad7..dc4ad8658db1 100644
--- a/bridges/test/java_uno/acquire/makefile.mk
+++ b/bridges/test/java_uno/acquire/makefile.mk
@@ -56,10 +56,10 @@ JARFILES = OOoRunner.jar juh.jar jurt.jar ridl.jar
.INCLUDE: target.mk
ALLTAR: \
- $(BIN)$/testacquire-java-client$(SCRIPTEXT) \
- $(BIN)$/testacquire-java-server$(SCRIPTEXT) \
- $(BIN)$/testacquire-native-client$(SCRIPTEXT) \
- $(BIN)$/testacquire-native-server$(SCRIPTEXT)
+ $(BIN)$/testacquire-java-client \
+ $(BIN)$/testacquire-java-server \
+ $(BIN)$/testacquire-native-client \
+ $(BIN)$/testacquire-native-server
.IF "$(GUI)" == "WNT"
GIVE_EXEC_RIGHTS = @echo
@@ -90,7 +90,7 @@ $(SLOFILES) $(JAVACLASSFILES): $(BIN)$/$(TARGET).rdb
TEST_JAVAUNO_ACQUIRE_UNO_URL := \
\"'uno:socket,host=127.0.0.1,port=2002;urp;test'\"
-$(BIN)$/testacquire-java-client$(SCRIPTEXT):
+$(BIN)$/testacquire-java-client:
echo java -classpath \
..$/class$/test$(PATH_SEPERATOR)..$/class$(PATH_SEPERATOR)\
..$/class$/java_uno.jar$(PATH_SEPERATOR)$(EXEC_CLASSPATH) \
@@ -98,7 +98,7 @@ $(BIN)$/testacquire-java-client$(SCRIPTEXT):
$(TEST_JAVAUNO_ACQUIRE_UNO_URL) > $@
$(GIVE_EXEC_RIGHTS) $@
-$(BIN)$/testacquire-java-server$(SCRIPTEXT):
+$(BIN)$/testacquire-java-server:
echo java -classpath \
..$/class$/test$(PATH_SEPERATOR)..$/class$(PATH_SEPERATOR)\
..$/class$/java_uno.jar$(PATH_SEPERATOR)$(EXEC_CLASSPATH) \
@@ -106,14 +106,14 @@ $(BIN)$/testacquire-java-server$(SCRIPTEXT):
$(TEST_JAVAUNO_ACQUIRE_UNO_URL) > $@
$(GIVE_EXEC_RIGHTS) $@
-$(BIN)$/testacquire-native-client$(SCRIPTEXT):
+$(BIN)$/testacquire-native-client:
echo '$(AUGMENT_LIBRARY_PATH)' uno \
-c com.sun.star.test.bridges.testacquire.impl \
-l ../lib/$(SHL1TARGETN:f) -ro $(TARGET).rdb -- \
$(TEST_JAVAUNO_ACQUIRE_UNO_URL) > $@
$(GIVE_EXEC_RIGHTS) $@
-$(BIN)$/testacquire-native-server$(SCRIPTEXT):
+$(BIN)$/testacquire-native-server:
echo '$(AUGMENT_LIBRARY_PATH)' uno \
-c com.sun.star.test.bridges.testacquire.impl \
-l ../lib/$(SHL1TARGETN:f) -ro $(TARGET).rdb \
diff --git a/bridges/test/java_uno/any/makefile.mk b/bridges/test/java_uno/any/makefile.mk
index 1957194f856a..b649c609d5e8 100644
--- a/bridges/test/java_uno/any/makefile.mk
+++ b/bridges/test/java_uno/any/makefile.mk
@@ -104,16 +104,16 @@ $(SLOFILES) : $(MISC)$/gen_files.flag
$(JAVACLASSFILES) : $(MISC)$/gen_files.flag
ALLTAR : \
- $(OUT)$/bin$/TestRemote$(SCRIPTEXT) \
- $(OUT)$/bin$/TestJni$(SCRIPTEXT)
+ $(OUT)$/bin$/TestRemote \
+ $(OUT)$/bin$/TestJni
-$(OUT)$/bin$/TestRemote$(SCRIPTEXT) : $(JAVACLASSFILES)
+$(OUT)$/bin$/TestRemote : $(JAVACLASSFILES)
-rm -f $@
echo java -classpath ..$/class$/test$(PATH_SEPERATOR)..$/class$(PATH_SEPERATOR)$(EXEC_CLASSPATH) \
test.java_uno.anytest.TestRemote > $@
$(GIVE_EXEC_RIGHTS) $@
-$(OUT)$/bin$/TestJni$(SCRIPTEXT) : $(JAVACLASSFILES)
+$(OUT)$/bin$/TestJni : $(JAVACLASSFILES)
-rm -f $@
echo '$(AUGMENT_LIBRARY_PATH)' java -classpath \
.$(PATH_SEPERATOR)..$/class$(PATH_SEPERATOR)$(EXEC_CLASSPATH) \
diff --git a/bridges/test/java_uno/equals/makefile.mk b/bridges/test/java_uno/equals/makefile.mk
index 4064b5e48f09..f95f1c0adb14 100644
--- a/bridges/test/java_uno/equals/makefile.mk
+++ b/bridges/test/java_uno/equals/makefile.mk
@@ -62,7 +62,7 @@ JARFILES = juh.jar jurt.jar ridl.jar
.INCLUDE: target.mk
-ALLTAR: $(BIN)$/testequals$(SCRIPTEXT)
+ALLTAR: $(BIN)$/testequals
.IF "$(GUI)" == "WNT"
GIVE_EXEC_RIGHTS = @echo
@@ -85,7 +85,7 @@ $(MISC)$/$(TARGET).rdb: types.idl
$(SLOFILES) $(JAVACLASSFILES): $(MISC)$/$(TARGET).rdb
-$(BIN)$/testequals$(SCRIPTEXT): $(BIN)$/testequals_services.rdb
+$(BIN)$/testequals: $(BIN)$/testequals_services.rdb
echo '$(AUGMENT_LIBRARY_PATH)' java -classpath \
..$/class$/test$(PATH_SEPERATOR)..$/class$(PATH_SEPERATOR)\
..$/class$/java_uno.jar$(PATH_SEPERATOR)$(EXEC_CLASSPATH) \
diff --git a/bridges/test/java_uno/nativethreadpool/makefile.mk b/bridges/test/java_uno/nativethreadpool/makefile.mk
index c8f7a778f051..76f66031bdab 100644
--- a/bridges/test/java_uno/nativethreadpool/makefile.mk
+++ b/bridges/test/java_uno/nativethreadpool/makefile.mk
@@ -101,7 +101,7 @@ $(BIN)$/$(TARGET).rdb .ERRREMOVE: $(MISC)$/$(TARGET)$/types.rdb \
$(REGCOMP) -register -r $(MISC)$/$(TARGET)$/bootstrap.rdb \
-c javaloader.uno$(DLLPOST) -c javavm.uno$(DLLPOST) \
-c stocservices.uno$(DLLPOST)
-.IF "$(GUI)" == "WNT" || "$(USE_SHELL)" != "bash"
+.IF "$(GUI)" == "WNT"
ERROR -- missing platform
.ELSE # GUI, WNT
+ export OO_JAVA_PROPERTIES='RuntimeLib=$(JVM_LIB_URL)' && \
@@ -111,7 +111,7 @@ $(BIN)$/$(TARGET).rdb .ERRREMOVE: $(MISC)$/$(TARGET)$/types.rdb \
.ENDIF # GUI, WNT
test .PHONY: $(SHL1TARGETN) $(BIN)$/$(TARGET).uno.jar $(BIN)$/$(TARGET).rdb
-.IF "$(GUI)" == "WNT" || "$(USE_SHELL)" != "bash"
+.IF "$(GUI)" == "WNT"
ERROR -- missing platform
.ELSE # GUI, WNT
$(AUGMENT_LIBRARY_PATH) uno -c test.javauno.nativethreadpool.server \