From c29098917a1118d4b435df2b5f542adc8505e123 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Wed, 12 Dec 2012 01:07:09 +0200 Subject: Get rid of (most uses of) GUI GUI only takes values UNX or WNT, so it is fairly pointless. One can check whether OS is WNT or not instead. Change-Id: I78ae32c03536a496a563e5deeb0fca78aebf9c34 Reviewed-on: https://gerrit.libreoffice.org/1304 Reviewed-by: Peter Foley Tested-by: Peter Foley --- bridges/test/java_uno/acquire/makefile.mk | 2 +- bridges/test/java_uno/any/makefile.mk | 2 +- bridges/test/java_uno/equals/makefile.mk | 2 +- bridges/test/java_uno/nativethreadpool/makefile.mk | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) (limited to 'bridges/test/java_uno') diff --git a/bridges/test/java_uno/acquire/makefile.mk b/bridges/test/java_uno/acquire/makefile.mk index 89f120e6b0d7..e7da44f59fb7 100644 --- a/bridges/test/java_uno/acquire/makefile.mk +++ b/bridges/test/java_uno/acquire/makefile.mk @@ -48,7 +48,7 @@ ALLTAR: \ $(BIN)$/testacquire-native-client \ $(BIN)$/testacquire-native-server -.IF "$(GUI)" == "WNT" +.IF "$(OS)" == "WNT" GIVE_EXEC_RIGHTS = @echo .ELSE # GUI, WNT GIVE_EXEC_RIGHTS = chmod +x diff --git a/bridges/test/java_uno/any/makefile.mk b/bridges/test/java_uno/any/makefile.mk index f29550a94e9c..549ea76fa2f9 100644 --- a/bridges/test/java_uno/any/makefile.mk +++ b/bridges/test/java_uno/any/makefile.mk @@ -26,7 +26,7 @@ ENABLE_EXCEPTIONS = TRUE .INCLUDE: settings.mk -.IF "$(GUI)" == "WNT" +.IF "$(OS)" == "WNT" GIVE_EXEC_RIGHTS = @echo .ELSE GIVE_EXEC_RIGHTS = chmod +x diff --git a/bridges/test/java_uno/equals/makefile.mk b/bridges/test/java_uno/equals/makefile.mk index fc6ad343f68f..a49dea6b5849 100644 --- a/bridges/test/java_uno/equals/makefile.mk +++ b/bridges/test/java_uno/equals/makefile.mk @@ -51,7 +51,7 @@ JARFILES = juh.jar jurt.jar ridl.jar ALLTAR: $(BIN)$/testequals -.IF "$(GUI)" == "WNT" +.IF "$(OS)" == "WNT" GIVE_EXEC_RIGHTS = @echo .ELSE # GUI, WNT GIVE_EXEC_RIGHTS = chmod +x diff --git a/bridges/test/java_uno/nativethreadpool/makefile.mk b/bridges/test/java_uno/nativethreadpool/makefile.mk index 97eee2b2965e..0d46ddb4d42d 100644 --- a/bridges/test/java_uno/nativethreadpool/makefile.mk +++ b/bridges/test/java_uno/nativethreadpool/makefile.mk @@ -88,7 +88,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" +.IF "$(OS)" == "WNT" ERROR -- missing platform .ELSE # GUI, WNT + export OO_JAVA_PROPERTIES='RuntimeLib=$(JVM_LIB_URL)' && \ @@ -98,7 +98,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" +.IF "$(OS)" == "WNT" ERROR -- missing platform .ELSE # GUI, WNT $(AUGMENT_LIBRARY_PATH) uno -c test.javauno.nativethreadpool.server \ -- cgit