@@ -12,8 +12,6 @@ NATIVE_EXT = .so
1212DLLMAP_OS_NAME = linux
1313endif
1414
15- XA_CONFIGURATION = Debug
16-
1715GENDARME_URL = https://github.com/downloads/spouliot/gendarme/gendarme-2.10-bin.zip
1816
1917PACKAGES = \
@@ -26,9 +24,6 @@ PREPARE_EXTERNAL_FILES = \
2624DEPENDENCIES = \
2725 bin/Test$(CONFIGURATION ) /libNativeTiming$(NATIVE_EXT )
2826
29- XA_INTEGRATION_OUTPUTS = \
30- bin/$(XA_CONFIGURATION ) /Java.Interop.dll
31-
3227TESTS = \
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
5045BUILD_PROPS = bin/Build$(CONFIGURATION ) /JdkInfo.props bin/Build$(CONFIGURATION ) /MonoInfo.props
5146
5247all : $(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 ) bin/$(CONFIGURATION ) /Java.Interop.dll
5649
5750run-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-
10191fxcop : 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,9 +132,6 @@ 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
146- $(MSBUILD ) $(if $(V ) ,/v:diag,) /p:Configuration=$(XA_CONFIGURATION ) $(if $(SNK ) ,"/p:AssemblyOriginatorKeyFile=$(SNK ) ",)
147-
148135bin/GendarmeDebug/Java.Interop.dll : $(wildcard src/Java.Interop/* /* .cs) src/Java.Interop/Java.Interop.csproj
149136 $(MSBUILD ) $(if $(V ) ,/v:diag,) /p:Configuration=" Gendarme" $(if $(SNK ) ,"/p:AssemblyOriginatorKeyFile=$(SNK ) ",) /p:CscToolExe=` which mcs` src/Java.Interop/Java.Interop.csproj
150137
0 commit comments