Skip to content

Commit 5ef5bb8

Browse files
[build] fixes for $(Configuration)=Gendarme
I'm not exactly sure how this was working before: - Gendarme config had no way to import `JdkInfo.props` - There was a cp command for a non-existant mdb file
1 parent 1cacd6e commit 5ef5bb8

File tree

2 files changed

+10
-6
lines changed

2 files changed

+10
-6
lines changed

Configuration.props

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,26 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<!-- Note: MUST be imported *after* $(Configuration) is set! -->
4+
<PropertyGroup>
5+
<_Configuration Condition=" '$(Configuration)' != 'Gendarme' ">$(Configuration)</_Configuration>
6+
<_Configuration Condition=" '$(Configuration)' == 'Gendarme' ">Debug</_Configuration>
7+
<_OutputPath>$(MSBuildThisFileDirectory)bin\Build$(_Configuration)\</_OutputPath>
8+
</PropertyGroup>
49
<Import
510
Project="$(MSBuildThisFileDirectory)Configuration.Override.props"
611
Condition="Exists('$(MSBuildThisFileDirectory)Configuration.Override.props')"
712
/>
813
<Import
9-
Project="$(MSBuildThisFileDirectory)bin\Build$(Configuration)\JdkInfo.props"
10-
Condition="Exists('$(MSBuildThisFileDirectory)bin\Build$(Configuration)\JdkInfo.props')"
14+
Project="$(_OutputPath)JdkInfo.props"
15+
Condition="Exists('$(_OutputPath)JdkInfo.props')"
1116
/>
1217
<Import
13-
Project="$(MSBuildThisFileDirectory)bin\Build$(Configuration)\MonoInfo.props"
14-
Condition="Exists('$(MSBuildThisFileDirectory)bin\Build$(Configuration)\MonoInfo.props')"
18+
Project="$(_OutputPath)MonoInfo.props"
19+
Condition="Exists('$(_OutputPath)MonoInfo.props')"
1520
/>
1621
<PropertyGroup>
1722
<CecilSourceDirectory Condition=" '$(CecilSourceDirectory)' == '' ">$(MSBuildThisFileDirectory)external\cecil</CecilSourceDirectory>
18-
<UtilityOutputFullPath Condition=" '$(UtilityOutputFullPath)' == '' ">$(MSBuildThisFileDirectory)bin\$(Configuration)\</UtilityOutputFullPath>
23+
<UtilityOutputFullPath Condition=" '$(UtilityOutputFullPath)' == '' ">$(MSBuildThisFileDirectory)bin\$(_Configuration)\</UtilityOutputFullPath>
1924
<XamarinAndroidToolsDirectory Condition=" '$(XamarinAndroidToolsDirectory)' == '' ">$(MSBuildThisFileDirectory)external\xamarin-android-tools</XamarinAndroidToolsDirectory>
2025
</PropertyGroup>
2126
<PropertyGroup>

Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,6 @@ src/Java.Runtime.Environment/Java.Runtime.Environment.dll.config: src/Java.Runti
8989
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) < $< > $@
9090

9191
fxcop: lib/gendarme-2.10/gendarme.exe bin/GendarmeDebug/Java.Interop.dll
92-
cp src/Java.Interop/obj/Gendarme/Java.Interop.dll.mdb bin/GendarmeDebug/
9392
$(RUNTIME) $< --html gendarme.html $(if @(GENDARME_XML),--xml gendarme.xml) --ignore gendarme-ignore.txt bin/GendarmeDebug/Java.Interop.dll
9493

9594
lib/gendarme-2.10/gendarme.exe:

0 commit comments

Comments
 (0)