projects / mono.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: cf4dbf2)
2010-06-10 Jonathan Chambers <joncham@gmail.com>
authorJonathan Chambers <joncham@gmail.com>
Fri, 11 Jun 2010 17:17:16 +0000 (17:17 -0000)
committerJonathan Chambers <joncham@gmail.com>
Fri, 11 Jun 2010 17:17:16 +0000 (17:17 -0000)
       * Add start of building net_2_0 profile to MSBuild based build.

svn path=/trunk/mcs/; revision=158840

mcs/build/msbuild/Mono.Common.targets patch | blob | history
mcs/class/Mono.CompilerServices.SymbolWriter/Mono.CompilerServices.SymbolWriter.csproj patch | blob | history
mcs/class/Mono.Posix/Mono.Posix.csproj [new file with mode: 0644] patch | blob
mcs/class/System.Core/System.Core.csproj patch | blob | history
mcs/class/System.XML/System.Xml.csproj patch | blob | history
mcs/class/System/System.csproj patch | blob | history
mcs/class/corlib/corlib.csproj patch | blob | history
mcs/mcs.proj patch | blob | history
mcs/mcs/gmcs2.csproj patch | blob | history
mcs/tools/gacutil/gacutil.csproj patch | blob | history
mcs/tools/resgen/resgen.csproj [new file with mode: 0644] patch | blob

diff --git a/mcs/build/msbuild/Mono.Common.targets b/mcs/build/msbuild/Mono.Common.targets
index 29256681bec8af7c11c4be614958800bc72060bb..e4211cb21bfc9c08b75c38ea4e2371ea2292d938 100644 (file)
--- a/mcs/build/msbuild/Mono.Common.targets
+++ b/mcs/build/msbuild/Mono.Common.targets
@@ -11,6 +11,9 @@
   <PropertyGroup Condition=" '$(Configuration)' == 'net_2_0_bootstrap' ">\r
     <OutputPath Condition=" '$(OutputPath)' == '' ">$(MSBuildProjectDirectory)\..\lib\net_2_0_bootstrap\</OutputPath>\r
   </PropertyGroup>\r
+  <PropertyGroup>\r
+    <OutputPath Condition=" '$(OutputPath)' == '' ">$(MSBuildProjectDirectory)\..\lib\$(Configuration)\</OutputPath>\r
+  </PropertyGroup>\r
   <Target Name="SetupProject">\r
     <Copy SourceFiles="$(ResponseFile)" DestinationFiles="$(ResponseFile).msbuild"/>\r
          <MSBuild.ExtensionPack.FileSystem.File TaskAction="Replace" RegexPattern="/" Replacement="\" Files="$(ResponseFile).msbuild"/>\r
diff --git a/mcs/class/Mono.CompilerServices.SymbolWriter/Mono.CompilerServices.SymbolWriter.csproj b/mcs/class/Mono.CompilerServices.SymbolWriter/Mono.CompilerServices.SymbolWriter.csproj
index 9e76e06e25d489842526654b01d9bd61314fc495..7b22c39ca8ccd8ac1e408456a905c4308e80c731 100644 (file)
--- a/mcs/class/Mono.CompilerServices.SymbolWriter/Mono.CompilerServices.SymbolWriter.csproj
+++ b/mcs/class/Mono.CompilerServices.SymbolWriter/Mono.CompilerServices.SymbolWriter.csproj
@@ -11,6 +11,9 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'basic|AnyCPU' ">
     <DefineConstants>BOOTSTRAP_BASIC,NET_1_1,NET_2_0</DefineConstants>
   </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'net_2_0|AnyCPU' ">
+    <DefineConstants>NET_1_1,NET_2_0</DefineConstants>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="System.dll"/>
   </ItemGroup>
diff --git a/mcs/class/Mono.Posix/Mono.Posix.csproj b/mcs/class/Mono.Posix/Mono.Posix.csproj
new file mode 100644 (file)
index 0000000..43eebdc
--- /dev/null
+++ b/mcs/class/Mono.Posix/Mono.Posix.csproj
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="3.5" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <OutputType>Library</OutputType>
+    <AssemblyName>$(MSBuildProjectName)</AssemblyName>
+    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <NoWarn>0618,612</NoWarn>
+    <NoConfig>true</NoConfig>
+    <CodePage>65001</CodePage>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'net_2_0|AnyCPU' ">
+    <DefineConstants>NET_1_1,NET_2_0</DefineConstants>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System.dll"/>
+  </ItemGroup>
+  <Import Project="$(MSBuildProjectDirectory)\..\..\build\msbuild\Mono.Common.targets"/>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <Target Name="BeforeBuild" DependsOnTargets="SetupProject">
+  </Target>
+</Project>
\ No newline at end of file
diff --git a/mcs/class/System.Core/System.Core.csproj b/mcs/class/System.Core/System.Core.csproj
index 34633594c74cae1723336818332651e2edc1a933..c686772d01a8279a6c6abb399fb9af7968d69eb7 100644 (file)
--- a/mcs/class/System.Core/System.Core.csproj
+++ b/mcs/class/System.Core/System.Core.csproj
@@ -12,8 +12,14 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'basic|AnyCPU' ">
     <DefineConstants>BOOTSTRAP_BASIC,NET_1_1,NET_2_0,INSIDE_SYSCORE,LIBC,NET_3_5</DefineConstants>
   </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'net_2_0|AnyCPU' ">
+    <DefineConstants>NET_1_1,NET_2_0,INSIDE_SYSCORE,LIBC,NET_3_5</DefineConstants>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="System.dll"/>
+    <Reference Include="Mono.Posix">
+      <HintPath>..\lib\net_2_0\Mono.Posix.dll</HintPath>
+    </Reference>
   </ItemGroup>
   <Import Project="$(MSBuildProjectDirectory)\..\..\build\msbuild\Mono.Common.targets"/>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
diff --git a/mcs/class/System.XML/System.Xml.csproj b/mcs/class/System.XML/System.Xml.csproj
index 25e342e32c86eabae0bc961d3830edfa83b6d30b..4c9232ae99a61b6b99564fde826e93f3caa8d869 100644 (file)
--- a/mcs/class/System.XML/System.Xml.csproj
+++ b/mcs/class/System.XML/System.Xml.csproj
@@ -13,6 +13,9 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'basic|AnyCPU' ">
     <DefineConstants>BOOTSTRAP_BASIC,NET_1_1,NET_2_0</DefineConstants>
   </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'net_2_0|AnyCPU' ">
+    <DefineConstants>NET_1_1,NET_2_0</DefineConstants>
+  </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Xml.XPath\Parser.cs"/>
     <Compile Include="Mono.Xml.Xsl\PatternParser.cs"/>
diff --git a/mcs/class/System/System.csproj b/mcs/class/System/System.csproj
index ea6f73db381925cf6bbdd28b122aec760f9a2086..820c480c24724e419d55845dcd7af3c7bfcc3bfe 100644 (file)
--- a/mcs/class/System/System.csproj
+++ b/mcs/class/System/System.csproj
@@ -15,6 +15,9 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'basic_XML_DEP|AnyCPU' ">
     <DefineConstants>BOOTSTRAP_BASIC,NET_1_1,NET_2_0,CONFIGURATION_2_0,XML_DEP</DefineConstants>
   </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'net_2_0|AnyCPU' ">
+    <DefineConstants>NET_1_1,NET_2_0,CONFIGURATION_2_0</DefineConstants>
+  </PropertyGroup>
   <ItemGroup>
     <EmbeddedResource Include="resources\Asterisk.wav"/>
     <EmbeddedResource Include="resources\Beep.wav"/>
diff --git a/mcs/class/corlib/corlib.csproj b/mcs/class/corlib/corlib.csproj
index 65694d2c32c289b47aa5e294f0937753bedc8501..82c593733f5df6a0ecdc469a6ee817b667396af4 100644 (file)
--- a/mcs/class/corlib/corlib.csproj
+++ b/mcs/class/corlib/corlib.csproj
@@ -9,23 +9,26 @@
     <CodePage>65001</CodePage>
     <UseVSHostingProcess>false</UseVSHostingProcess>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <ProjectGuid>{72E6D902-9CE6-4F09-91E7-6D48B965DCFA}</ProjectGuid>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'basic|AnyCPU' ">
     <DefineConstants>INSIDE_CORLIB,NET_1_1,NET_2_0,LIBC,BOOTSTRAP_BASIC</DefineConstants>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'net_2_0_bootstrap|AnyCPU' ">
-    <DefineConstants>INSIDE_CORLIB,NET_1_1,NET_2_0,LIBC,BOOTSTRAP_BASIC</DefineConstants>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'net_2_0|AnyCPU' ">
+    <DefineConstants>INSIDE_CORLIB,NET_1_1,NET_2_0,LIBC</DefineConstants>
+    <SignAssembly>true</SignAssembly>
+    <AssemblyOriginatorKeyFile>..\mono.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
-    <EmbeddedResource Include="resources\collation.core.bin"/>
-    <EmbeddedResource Include="resources\collation.tailoring.bin"/>
-    <EmbeddedResource Include="resources\collation.cjkCHS.bin"/>
-    <EmbeddedResource Include="resources\collation.cjkCHT.bin"/>
-    <EmbeddedResource Include="resources\collation.cjkJA.bin"/>
-    <EmbeddedResource Include="resources\collation.cjkKO.bin"/>
-    <EmbeddedResource Include="resources\collation.cjkKOlv2.bin"/>
+    <EmbeddedResource Include="resources\collation.core.bin" />
+    <EmbeddedResource Include="resources\collation.tailoring.bin" />
+    <EmbeddedResource Include="resources\collation.cjkCHS.bin" />
+    <EmbeddedResource Include="resources\collation.cjkCHT.bin" />
+    <EmbeddedResource Include="resources\collation.cjkJA.bin" />
+    <EmbeddedResource Include="resources\collation.cjkKO.bin" />
+    <EmbeddedResource Include="resources\collation.cjkKOlv2.bin" />
   </ItemGroup>
-  <Import Project="$(MSBuildProjectDirectory)\..\..\build\msbuild\Mono.Common.targets"/>
+  <Import Project="$(MSBuildProjectDirectory)\..\..\build\msbuild\Mono.Common.targets" />
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <Target Name="BeforeBuild" DependsOnTargets="SetupProject">
   </Target>
diff --git a/mcs/mcs.proj b/mcs/mcs.proj
index e1b47d0e6bf267c0a5f5e4e649091097e4f3f714..993e9ec20922ef29dc3b28dbe124abf5ef8c6faf 100644 (file)
--- a/mcs/mcs.proj
+++ b/mcs/mcs.proj
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>\r
 <Project ToolsVersion="3.5" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
   <Target Name="Build">\r
+    <!-- basic profile -->\r
     <MSBuild Projects="build\build.proj"/>\r
-    <MSBuild Projects="mcs\gmcs2.csproj" Targets="Build" Properties="Configuration=basic;Platform=AnyCPU"/>\r
     <MSBuild Projects="jay\jay2008.vcproj"/>\r
+    <MSBuild Projects="mcs\gmcs2.csproj" Targets="Build" Properties="Configuration=basic;Platform=AnyCPU"/>\r
     <MSBuild Projects="class\corlib\corlib.csproj" Targets="Build" Properties="Configuration=basic;Platform=AnyCPU"/>\r
     <MSBuild Projects="class\System\System.csproj" Targets="Build" Properties="Configuration=basic;Platform=AnyCPU"/>\r
     <MSBuild Projects="class\System.Xml\System.Xml.csproj" Targets="Build" Properties="Configuration=basic;Platform=AnyCPU"/>\r
@@ -13,6 +14,16 @@
     <MSBuild Projects="class\System.Core\System.Core.csproj" Targets="Build" Properties="Configuration=basic;Platform=AnyCPU"/>\r
     <MSBuild Projects="tools\gacutil\gacutil.csproj" Targets="Build" Properties="Configuration=basic;Platform=AnyCPU"/>\r
     <MSBuild Projects="tools\security\security.proj" Targets="Build" Properties="Configuration=basic;Platform=AnyCPU"/>\r
+    <!-- net_2_0_bootstrap -->\r
+    <MSBuild Projects="tools\resgen\resgen.csproj" Targets="Build" Properties="Configuration=net_2_0_bootstrap;Platform=AnyCPU"/>\r
+    <!--<MSBuild Projects="tools\culevel\culevel.csproj" Targets="Build" Properties="Configuration=net_2_0_bootstrap;Platform=AnyCPU"/>-->\r
+    <!-- net_2_0 -->\r
+    <MSBuild Projects="class\corlib\corlib.csproj" Targets="Build" Properties="Configuration=net_2_0;Platform=AnyCPU"/>\r
+    <MSBuild Projects="class\System\System.csproj" Targets="Build" Properties="Configuration=net_2_0;Platform=AnyCPU"/>\r
+    <MSBuild Projects="class\System.Xml\System.Xml.csproj" Targets="Build" Properties="Configuration=net_2_0;Platform=AnyCPU"/>\r
+    <MSBuild Projects="class\Mono.CompilerServices.SymbolWriter\Mono.CompilerServices.SymbolWriter.csproj" Targets="Build" Properties="Configuration=net_2_0;Platform=AnyCPU"/>\r
+    <MSBuild Projects="class\Mono.Posix\Mono.Posix.csproj" Targets="Build" Properties="Configuration=net_2_0;Platform=AnyCPU"/>\r
+    <MSBuild Projects="class\System.Core\System.Core.csproj" Targets="Build" Properties="Configuration=net_2_0;Platform=AnyCPU"/>\r
   </Target>\r
   <Target Name="Clean">\r
     <!--<MSBuild Projects="build\build.proj" Targets="Clean" />-->\r
diff --git a/mcs/mcs/gmcs2.csproj b/mcs/mcs/gmcs2.csproj
index 9e1fd0c47ac95b5eb92b2f03b7672a668d6d3c58..26a8030e8de6b9992d234a4d20ab7693478d5b27 100644 (file)
--- a/mcs/mcs/gmcs2.csproj
+++ b/mcs/mcs/gmcs2.csproj
@@ -12,6 +12,9 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'basic|AnyCPU' ">
     <DefineConstants>BOOTSTRAP_BASIC,NET_1_1,NET_2_0</DefineConstants>
   </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'net_2_0|AnyCPU' ">
+    <DefineConstants>NET_1_1,NET_2_0</DefineConstants>
+  </PropertyGroup>
   <ItemGroup>
     <Compile Include="cs-parser.cs"/>
     <Reference Include="System.dll"/>
diff --git a/mcs/tools/gacutil/gacutil.csproj b/mcs/tools/gacutil/gacutil.csproj
index df672a7057f118ef1d82bdd899992d2e76833c25..4419f32aa906985b96739af910ebec13b5f000fa 100644 (file)
--- a/mcs/tools/gacutil/gacutil.csproj
+++ b/mcs/tools/gacutil/gacutil.csproj
@@ -2,9 +2,9 @@
 <Project ToolsVersion="3.5" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <AssemblyName>gacutil</AssemblyName>
+    <AssemblyName>$(MSBuildProjectName)</AssemblyName>
     <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-    <ResponseFile>gacutil.exe.sources</ResponseFile>
+    <ResponseFile>$(MSBuildProjectName).exe.sources</ResponseFile>
     <CodePage>65001</CodePage>
     <OutputPath>..\..\class\lib\basic\</OutputPath>
     <UseVSHostingProcess>false</UseVSHostingProcess>
diff --git a/mcs/tools/resgen/resgen.csproj b/mcs/tools/resgen/resgen.csproj
new file mode 100644 (file)
index 0000000..e10146c
--- /dev/null
+++ b/mcs/tools/resgen/resgen.csproj
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="3.5" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <AssemblyName>$(MSBuildProjectName)</AssemblyName>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <ResponseFile>$(MSBuildProjectName).exe.sources</ResponseFile>
+    <CodePage>65001</CodePage>
+    <OutputPath>..\..\class\lib\net_2_0_bootstrap\</OutputPath>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'net_2_0_bootstrap|AnyCPU' ">
+    <DefineConstants>NET_1_1,NET_2_0</DefineConstants>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System"/>
+    <Reference Include="System.Xml"/>
+  </ItemGroup>
+  <Import Project="$(MSBuildProjectDirectory)\..\..\build\msbuild\Mono.Common.targets"/>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <Target Name="BeforeBuild" DependsOnTargets="SetupProject">
+  </Target>
+</Project>
\ No newline at end of file
my mono mirror. check out Moved to http://github.com/mono/mono