Skip to content

C
core
Kaydet (Commit) 19746923 authored tarafından Stephan Bergmann's avatar Stephan Bergmann
Dosyalara gözat
Seçenekler

Adapt env var settings to MS command shell syntax 

Change-Id: Ie6d761a436a3c1b06f0da1dac7c93c50789230dd
üst b850ab57
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 3 deletions
ure/source/uretest/Makefile
Dosyayı görüntüle @ 19746923
...@@ -71,12 +71,17 @@ test-javatest: out.sdk/javamain.uno.jar out.sdk/types.rdb out.sdk/services.rdb ...@@ -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_TYPES=$(URLPREFIX)$(cwd)/out.sdk/types.rdb \
-env:URE_MORE_SERVICES=$(URLPREFIX)$(cwd)/out.sdk/services.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 .PHONY: test-javanative
test-javanative: out.sdk/runner.jar out.sdk/javanative.jar \ test-javanative: out.sdk/runner.jar out.sdk/javanative.jar \
out.sdk/services.rdb out.sdk/types.rdb out.sdk/services.rdb out.sdk/types.rdb
URE_MORE_TYPES=$(URLPREFIX)$(cwd)/out.sdk/types.rdb \ $(set_vars) $(GCCS_COMPAT) $(SDK_JAVA) -jar out.sdk/runner.jar \
URE_MORE_SERVICES=$(URLPREFIX)$(cwd)/out.sdk/services.rdb \
$(GCCS_COMPAT) $(SDK_JAVA) -jar out.sdk/runner.jar \
$(ure_java_url)/ $(URLPREFIX)$(cwd)/out.sdk/javanative.jar $(ure_java_url)/ $(URLPREFIX)$(cwd)/out.sdk/javanative.jar
do_server = $(GCCS_COMPAT) uno -c test.cpp.cppserver.Component \ do_server = $(GCCS_COMPAT) uno -c test.cpp.cppserver.Component \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment