Permalink
Browse files

Improve the build system for Mono and Mono for Android.

  • Loading branch information...
1 parent 201bac5 commit dac1c02f50e5dfb8c1b800966b1e63612df23515 @jdhardy committed Apr 20, 2012
@@ -148,7 +148,7 @@
<Name>IronPython</Name>
</ProjectReference>
</ItemGroup>
- <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+ <Import Project="$(CSharpTargets)" />
<Import Project="$(SolutionDir)Versioning.targets" />
<Target Name="BeforeBuild" DependsOnTargets="GenerateBuildInfo" />
</Project>
@@ -12,7 +12,7 @@
<DocumentationFile>$(OutputPath)\$(AssemblyName).xml</DocumentationFile>
<SQLiteCommon>SQLITE_DEBUG;TRUE;WIN32;_MSC_VER;SQLITE_ASCII;SQLITE_MEM_POOL;SQLITE_ENABLE_COLUMN_METADATA;SQLITE_OS_WIN;SQLITE_SYSTEM_MALLOC;VDBE_PROFILE_OFF</SQLiteCommon>
<SQLiteCommonOmit>SQLITE_OMIT_AUTHORIZATION;SQLITE_OMIT_DEPRECATED;SQLITE_OMIT_GET_TABLE;SQLITE_OMIT_INCRBLOB;SQLITE_OMIT_LOOKASIDE;SQLITE_OMIT_SHARED_CACHE;SQLITE_OMIT_UTF16;SQLITE_OMIT_WAL</SQLiteCommonOmit>
- <NoWarn>$(NoWarn);0168 ; 0169; 0414; 0618; 0649; 1587;219</NoWarn>
+ <NoWarn>$(NoWarn);0168;0169;0414;0618;0649;1587;219</NoWarn>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'FxCop|AnyCPU' ">
<DefineConstants>NET_40;$(DefineConstants);$(SQLiteCommon);$(SQLiteCommonOmit);SQLITE_MUTEX_W32;SQLITE_THREADSAFE;NDEBUG</DefineConstants>
@@ -61,17 +61,17 @@
<ProjectReference Include="..\..\..\Runtime\Microsoft.Scripting\Microsoft.Scripting.csproj">
<Project>{02FF0909-F5AD-48CF-A86A-345E721B7E40}</Project>
<Name>Microsoft.Scripting</Name>
- <Private>false</Private>
+ <Private>False</Private>
</ProjectReference>
<ProjectReference Include="..\..\..\Runtime\Microsoft.Dynamic\Microsoft.Dynamic.csproj">
<Project>{EB66B766-6354-4208-A3D4-AACBDCB5C3B3}</Project>
<Name>Microsoft.Dynamic</Name>
- <Private>false</Private>
+ <Private>False</Private>
</ProjectReference>
<ProjectReference Include="..\IronPython\IronPython.csproj">
<Project>{95289EA9-5778-489D-AB48-F81F2CE2DA32}</Project>
<Name>IronPython</Name>
- <Private>false</Private>
+ <Private>False</Private>
</ProjectReference>
<Reference Include="System.Management" Condition=" '$(IsFullFramework)' == 'true'" />
</ItemGroup>
@@ -176,7 +176,7 @@
<Compile Include="_sqlite.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
- <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+ <Import Project="$(CSharpTargets)" />
<Import Project="$(SolutionDir)Versioning.targets" />
<Target Name="BeforeBuild" DependsOnTargets="GenerateBuildInfo" />
</Project>
@@ -35,10 +35,8 @@
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Silverlight4Release|AnyCPU' ">
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Silverlight5Debug|AnyCPU' ">
- <NoWarn>1591;0429</NoWarn>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Silverlight5Release|AnyCPU' ">
- <NoWarn>1591;0429</NoWarn>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'AndroidDebug|AnyCPU' ">
</PropertyGroup>
@@ -535,7 +533,7 @@
<Name>Microsoft.Dynamic</Name>
</ProjectReference>
</ItemGroup>
- <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+ <Import Project="$(CSharpTargets)" />
<Import Project="$(SolutionDir)Versioning.targets" />
<Target Name="BeforeBuild" DependsOnTargets="GenerateBuildInfo;GenerateCurrentVersion" />
</Project>
@@ -34,6 +34,10 @@
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Silverlight4Release|AnyCPU' ">
</PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Silverlight5Debug|AnyCPU' ">
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Silverlight5Release|AnyCPU' ">
+ </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'AndroidDebug|AnyCPU' ">
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'AndroidRelease|AnyCPU' ">
@@ -453,5 +457,5 @@
<Name>Microsoft.Scripting.Metadata</Name>
</ProjectReference>
</ItemGroup>
- <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+ <Import Project="$(CSharpTargets)" />
</Project>
@@ -159,5 +159,5 @@
<ItemGroup Condition=" '$(IsFullFramework)' == 'true' ">
<Reference Include="System.Configuration" />
</ItemGroup>
- <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+ <Import Project="$(CSharpTargets)" />
</Project>
@@ -34,6 +34,10 @@
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Silverlight4Release|AnyCPU' ">
</PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Silverlight5Debug|AnyCPU' ">
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Silverlight5Release|AnyCPU' ">
+ </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'AndroidDebug|AnyCPU' ">
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'AndroidRelease|AnyCPU' ">
@@ -151,5 +155,5 @@
<Private>False</Private>
</ProjectReference>
</ItemGroup>
- <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+ <Import Project="$(CSharpTargets)" />
</Project>
@@ -6,7 +6,7 @@
<PropertyGroup>
<BaseConfiguration Condition=" '$(BaseConfiguration)' == '' ">Debug</BaseConfiguration>
<Mono Condition="'$(OS)' != 'Windows_NT'">true</Mono>
-
+
<Solution>IronPython.sln</Solution>
<BaseDir>$(MSBuildProjectDirectory)\..</BaseDir>
View
@@ -5,6 +5,7 @@
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<SolutionDir Condition=" '$(SolutionDir)' == '' ">$(MSBuildThisFileDirectory)</SolutionDir>
+ <Mono Condition="'$(OS)' != 'Windows_NT'">true</Mono>
<!-- The following two lines prevent csc.rsp and Microsoft.NETFramework.props from adding additional assembly references -->
<NoConfig>true</NoConfig>
@@ -45,6 +46,20 @@
<ReferencedPlatform Condition="'$(Configuration)' == 'AndroidRelease' or '$(Configuration)' == 'AndroidDebug'">Android</ReferencedPlatform>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Mono)' == 'true'">
+ <CscToolExeSuffix Condition="'$(OS)' == 'Windows_NT'">.bat</CscToolExeSuffix>
+ <CscToolExeSuffix Condition="'$(OS)' != 'Windows_NT'"></CscToolExeSuffix>
+
+ <CscToolExe>mcs$(CscToolExeSuffix)</CscToolExe>
+ <CscToolExe Condition="'$(ReferencedPlatform)' == 'V2'">gmcs$(CscToolExeSuffix)</CscToolExe>
+ <CscToolExe Condition="'$(ReferencedPlatform)' == 'V4'">dmcs$(CscToolExeSuffix)</CscToolExe>
+ </PropertyGroup>
+
+ <PropertyGroup>
+ <CSharpTargets Condition="'$(CSharpTargets)' == ''">$(MSBuildBinPath)\Microsoft.CSharp.targets</CSharpTargets>
+ <CSharpTargets Condition="'$(CSharpTargets)' == '' and '$(ReferencedPlatform)' == 'Android'">$(MSBuildExtensionsPath)\Novell\Novell.MonoDroid.CSharp.targets</CSharpTargets>
+ </PropertyGroup>
+
<!-- References -->
<PropertyGroup Condition="'$(ReferencedPlatform)' == 'V2'">
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
@@ -218,6 +233,11 @@
<HintPath>$(FrameworkReferences)\System.Numerics.dll</HintPath>
<Private>False</Private>
</Reference>
+ <Reference Include="Mono.Security, Version=2.0.5.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>$(FrameworkReferences)\Mono.Security.dll</HintPath>
+ <Private>False</Private>
+ </Reference>
</ItemGroup>
<ItemGroup Condition="'$(ReferencedPlatform)' == 'Silverlight4'">
<Reference Include="mscorlib, Version=2.0.5.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e">
Binary file not shown.

0 comments on commit dac1c02

Please sign in to comment.