Skip to content

Commit 8f5617f

Browse files
[build] remove remaining $XA_INTEGRATION variables
Context: dotnet#368 Addressing the comments in dotnet#368, this removes more unused build targets, etc.
1 parent 64d1d1a commit 8f5617f

File tree

2 files changed

+2
-14
lines changed

2 files changed

+2
-14
lines changed

Makefile

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@ NATIVE_EXT = .so
1212
DLLMAP_OS_NAME = linux
1313
endif
1414

15-
XA_CONFIGURATION = Debug
16-
1715
GENDARME_URL = https://github.com/downloads/spouliot/gendarme/gendarme-2.10-bin.zip
1816

1917
PACKAGES = \
@@ -26,9 +24,6 @@ PREPARE_EXTERNAL_FILES = \
2624
DEPENDENCIES = \
2725
bin/Test$(CONFIGURATION)/libNativeTiming$(NATIVE_EXT)
2826

29-
XA_INTEGRATION_OUTPUTS = \
30-
bin/$(XA_CONFIGURATION)/Java.Interop.dll
31-
3227
TESTS = \
3328
bin/Test$(CONFIGURATION)/Java.Interop-Tests.dll \
3429
bin/Test$(CONFIGURATION)/Java.Interop.Dynamic-Tests.dll \
@@ -50,9 +45,7 @@ NUNIT_CONSOLE = packages/NUnit.ConsoleRunner.3.7.0/tools/nunit3-console.exe
5045
BUILD_PROPS = bin/Build$(CONFIGURATION)/JdkInfo.props bin/Build$(CONFIGURATION)/MonoInfo.props
5146

5247
all: $(BUILD_PROPS) src/Java.Runtime.Environment/Java.Runtime.Environment.dll.config \
53-
$(PACKAGES) $(DEPENDENCIES) $(TESTS) $(XA_INTEGRATION_OUTPUTS)
54-
55-
xa-all: $(PACKAGES) $(XA_INTEGRATION_OUTPUTS)
48+
$(PACKAGES) $(DEPENDENCIES) $(TESTS)
5649

5750
run-all-tests: run-tests run-test-jnimarshal run-test-generator-core run-ptests
5851

@@ -95,9 +88,6 @@ src/Java.Runtime.Environment/Java.Runtime.Environment.dll.config: src/Java.Runti
9588
bin/Build$(CONFIGURATION)/JdkInfo.props
9689
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) < $< > $@
9790

98-
xa-fxcop: lib/gendarme-2.10/gendarme.exe bin/$(XA_CONFIGURATION)/Java.Interop.dll
99-
$(RUNTIME) $< --html xa-gendarme.html $(if @(GENDARME_XML),--xml xa-gendarme.xml) --ignore gendarme-ignore.txt bin/$(XA_CONFIGURATION)/Java.Interop.dll
100-
10191
fxcop: lib/gendarme-2.10/gendarme.exe bin/GendarmeDebug/Java.Interop.dll
10292
cp src/Java.Interop/obj/Gendarme/Java.Interop.dll.mdb bin/GendarmeDebug/
10393
$(RUNTIME) $< --html gendarme.html $(if @(GENDARME_XML),--xml gendarme.xml) --ignore gendarme-ignore.txt bin/GendarmeDebug/Java.Interop.dll
@@ -142,7 +132,7 @@ bin/Test$(CONFIGURATION)/Android.Interop-Tests.dll: $(wildcard src/Android.Inter
142132
$(MSBUILD) $(MSBUILD_FLAGS)
143133
touch $@
144134

145-
bin/$(XA_CONFIGURATION)/Java.Interop.dll: $(wildcard src/Java.Interop/*/*.cs) src/Java.Interop/Java.Interop.csproj
135+
bin/$(CONFIGURATION)/Java.Interop.dll: $(wildcard src/Java.Interop/*/*.cs) src/Java.Interop/Java.Interop.csproj
146136
$(MSBUILD) $(if $(V),/v:diag,) /p:Configuration=$(XA_CONFIGURATION) $(if $(SNK),"/p:AssemblyOriginatorKeyFile=$(SNK)",)
147137

148138
bin/GendarmeDebug/Java.Interop.dll: $(wildcard src/Java.Interop/*/*.cs) src/Java.Interop/Java.Interop.csproj

src/Java.Interop/Java.Interop.csproj

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,6 @@
9393
<Compile Include="Java.Interop\JniPeerMembers.JniStaticFields.cs" />
9494
<Compile Include="Java.Interop\JniAddNativeMethodRegistrationAttribute.cs" />
9595
<Compile Include="Java.Interop\JniNativeMethodRegistrationArguments.cs" />
96-
</ItemGroup>
97-
<ItemGroup>
9896
<Compile Include="Java.Interop\JavaArray.cs" />
9997
<Compile Include="Java.Interop\JavaException.cs" />
10098
<Compile Include="Java.Interop\JavaObject.cs" />

0 commit comments

Comments
 (0)