[Libreoffice-commits] core.git: ure/source

[Stephan Bergmann]

 ure/source/uretest/Makefile |   11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

New commits:
commit 197469231675658bd353d225ec7f6bca1dbbd14f
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu Apr 18 13:57:01 2013 +0200

    Adapt env var settings to MS command shell syntax
    
    Change-Id: Ie6d761a436a3c1b06f0da1dac7c93c50789230dd

diff --git a/ure/source/uretest/Makefile b/ure/source/uretest/Makefile
index 1db5282..98d0cca 100644
--- a/ure/source/uretest/Makefile
+++ b/ure/source/uretest/Makefile
@@ -71,12 +71,17 @@ test-javatest: out.sdk/javamain.uno.jar out.sdk/types.rdb out.sdk/services.rdb
             -env:URE_MORE_TYPES=$(URLPREFIX)$(cwd)/out.sdk/types.rdb \
             -env:URE_MORE_SERVICES=$(URLPREFIX)$(cwd)/out.sdk/services.rdb
 
+ifeq "$(PLATFORM)" "windows"
+set_vars = set URE_MORE_TYPES=$(URLPREFIX)$(cwd)/out.sdk/types.rdb && \
+    set URE_MORE_SERVICES=$(URLPREFIX)$(cwd)/out.sdk/services.rdb &&
+else
+set_vars = URE_MORE_TYPES=$(URLPREFIX)$(cwd)/out.sdk/types.rdb \
+    URE_MORE_SERVICES=$(URLPREFIX)$(cwd)/out.sdk/services.rdb
+endif
 .PHONY: test-javanative
 test-javanative: out.sdk/runner.jar out.sdk/javanative.jar \
             out.sdk/services.rdb out.sdk/types.rdb
-	URE_MORE_TYPES=$(URLPREFIX)$(cwd)/out.sdk/types.rdb \
-            URE_MORE_SERVICES=$(URLPREFIX)$(cwd)/out.sdk/services.rdb \
-            $(GCCS_COMPAT) $(SDK_JAVA) -jar out.sdk/runner.jar \
+	$(set_vars) $(GCCS_COMPAT) $(SDK_JAVA) -jar out.sdk/runner.jar \
             $(ure_java_url)/ $(URLPREFIX)$(cwd)/out.sdk/javanative.jar
 
 do_server = $(GCCS_COMPAT) uno -c test.cpp.cppserver.Component \