Skip to content

Commit 43d568c

Browse files
radekdoulikjonpryor
authored andcommitted
[Java.Runtime.Environment] Allow injection of dllmap's to config (#324)
Make it possible to inject `<dllmap/>` entries into `src/Java.Runtime.Environment/Java.Runtime.Environment.dll.config` by providing a `Java.Runtime.Environment.Override.dllmap` file in the Java.Interop root directory In case the file is missing, the line containing `@JAVA_RUNTIME_ENVIRONMENT_DLLMAP@` is removed.
1 parent 4bd9297 commit 43d568c

File tree

2 files changed

+9
-1
lines changed

2 files changed

+9
-1
lines changed

Makefile

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,9 +77,16 @@ include build-tools/scripts/jdk.mk
7777
$(PACKAGES) $(NUNIT_CONSOLE):
7878
nuget restore
7979

80+
JAVA_RUNTIME_ENVIRONMENT_DLLMAP_OVERRIDE = Java.Runtime.Environment.Override.dllmap
81+
ifeq ($(wildcard $(JAVA_RUNTIME_ENVIRONMENT_DLLMAP_OVERRIDE)),)
82+
JAVA_RUNTIME_ENVIRONMENT_DLLMAP_OVERRIDE_CMD = '/@JAVA_RUNTIME_ENVIRONMENT_DLLMAP@/d'
83+
else
84+
JAVA_RUNTIME_ENVIRONMENT_DLLMAP_OVERRIDE_CMD = '/@JAVA_RUNTIME_ENVIRONMENT_DLLMAP@/ {' -e 'r $(JAVA_RUNTIME_ENVIRONMENT_DLLMAP_OVERRIDE)' -e 'd' -e '}'
85+
endif
86+
8087
src/Java.Runtime.Environment/Java.Runtime.Environment.dll.config: src/Java.Runtime.Environment/Java.Runtime.Environment.dll.config.in \
8188
bin/Build$(CONFIGURATION)/JdkInfo.props
82-
sed -e 's#@JI_JVM_PATH@#$(JI_JVM_PATH)#g' -e 's#@OS_NAME@#$(DLLMAP_OS_NAME)#g' < $< > $@
89+
sed -e 's#@JI_JVM_PATH@#$(JI_JVM_PATH)#g' -e 's#@OS_NAME@#$(DLLMAP_OS_NAME)#g' -e $(JAVA_RUNTIME_ENVIRONMENT_DLLMAP_OVERRIDE_CMD) < $< > $@
8390

8491
xa-fxcop: lib/gendarme-2.10/gendarme.exe bin/$(XA_CONFIGURATION)/Java.Interop.dll
8592
$(RUNTIME) $< --html xa-gendarme.html $(if @(GENDARME_XML),--xml xa-gendarme.xml) --ignore gendarme-ignore.txt bin/$(XA_CONFIGURATION)/Java.Interop.dll
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
<configuration>
22
<dllmap dll="jvm.dll" os="@OS_NAME@" target="@JI_JVM_PATH@"/>
3+
@JAVA_RUNTIME_ENVIRONMENT_DLLMAP@
34
</configuration>

0 commit comments

Comments
 (0)