ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-01-04 04:04:27 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

put test library in same directory as avian executable

Browse Source 
This is a workaround for the fact that there's no precise equivalent
to LD_LIBRARY_PATH available on Windows.
This commit is contained in:
Joel Dice 2012-08-02 12:56:15 -06:00
parent 296a1e5bab
commit 2fb2fd9bb0
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
makefile
View File

@ -86,7 +86,7 @@ ifeq ($(build-platform),darwin)
library-path-variable = DYLD_LIBRARY_PATH library-path-variable = DYLD_LIBRARY_PATH
endif endif
library-path = $(library-path-variable)=$(test-build) library-path = $(library-path-variable)=$(build)
ifneq ($(openjdk),) ifneq ($(openjdk),)
openjdk-arch = $(arch) openjdk-arch = $(arch)
@ -125,10 +125,10 @@ ifneq ($(openjdk),)
test-executable = $(shell pwd)/$(executable-dynamic) test-executable = $(shell pwd)/$(executable-dynamic)
ifeq ($(build-platform),darwin) ifeq ($(build-platform),darwin)
library-path = \ library-path = \
$(library-path-variable)=$(test-build):$(build):$(openjdk)/jre/lib $(library-path-variable)=$(build):$(openjdk)/jre/lib
else else
library-path = \ library-path = \
$(library-path-variable)=$(test-build):$(build):$(openjdk)/jre/lib/$(openjdk-arch) $(library-path-variable)=$(build):$(openjdk)/jre/lib/$(openjdk-arch)
endif endif
javahome = "$$($(native-path) "$(openjdk)/jre")" javahome = "$$($(native-path) "$(openjdk)/jre")"
endif endif
@ -821,7 +821,7 @@ test-sources += $(test-support-sources)
test-support-classes = $(call java-classes, $(test-support-sources),$(test),$(test-build)) test-support-classes = $(call java-classes, $(test-support-sources),$(test),$(test-build))
test-classes = $(call java-classes,$(test-sources),$(test),$(test-build)) test-classes = $(call java-classes,$(test-sources),$(test),$(test-build))
test-cpp-objects = $(call cpp-objects,$(test-cpp-sources),$(test),$(test-build)) test-cpp-objects = $(call cpp-objects,$(test-cpp-sources),$(test),$(test-build))
test-library = $(test-build)/$(so-prefix)test$(so-suffix) test-library = $(build)/$(so-prefix)test$(so-suffix)
test-dep = $(test-build).dep test-dep = $(test-build).dep
test-extra-sources = $(wildcard $(test)/extra/*.java) test-extra-sources = $(wildcard $(test)/extra/*.java)