projects / mono.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: da3d13a)
2010-06-08 Jonathan Chambers <joncham@gmail.com>
authorJonathan Chambers <joncham@gmail.com>
Wed, 9 Jun 2010 02:41:00 +0000 (02:41 -0000)
committerJonathan Chambers <joncham@gmail.com>
Wed, 9 Jun 2010 02:41:00 +0000 (02:41 -0000)
* Build jay and run before gmcs and System.Xml. The basic profile should build now.

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

mcs/build/build.proj [new file with mode: 0644] patch | blob
mcs/build/msbuild/Mono.Common.targets patch | blob | history
mcs/class/Mono.CompilerServices.SymbolWriter/Mono.CompilerServices.SymbolWriter.csproj patch | blob | history
mcs/class/Mono.Security/Mono.Security.csproj patch | blob | history
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 [new file with mode: 0644] patch | blob

diff --git a/mcs/build/build.proj b/mcs/build/build.proj
new file mode 100644 (file)
index 0000000..725fcd0
--- /dev/null
+++ b/mcs/build/build.proj
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="3.5" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <Import Project="$(MSBuildExtensionsPath)\ExtensionPack\MSBuild.ExtensionPack.tasks"/>\r
+  <Target Name="Build">\r
+   <Copy SourceFiles="common\Consts.cs.in" DestinationFiles="common\Consts.cs"/>\r
+   <MSBuild.ExtensionPack.FileSystem.File TaskAction="Replace" RegexPattern="@MONO_VERSION@" Replacement="2.7.0.0" Files="common\Consts.cs"/>\r
+  </Target>\r
+</Project>
\ No newline at end of file
diff --git a/mcs/build/msbuild/Mono.Common.targets b/mcs/build/msbuild/Mono.Common.targets
index 761132b52a0c4c8adc06b13c98a791c194e34438..29256681bec8af7c11c4be614958800bc72060bb 100644 (file)
--- a/mcs/build/msbuild/Mono.Common.targets
+++ b/mcs/build/msbuild/Mono.Common.targets
@@ -6,17 +6,20 @@
     <CscToolPath>C:\MonoExperimental2.5.0\bin</CscToolPath>\r
   </PropertyGroup>\r
   <PropertyGroup Condition=" ('$(Configuration)' == 'basic' Or '$(Configuration)' == 'basic_XML_DEP') ">\r
-    <OutputPath>$(MSBuildProjectDirectory)\..\lib\basic\</OutputPath>\r
+    <OutputPath Condition=" '$(OutputPath)' == '' ">$(MSBuildProjectDirectory)\..\lib\basic\</OutputPath>\r
   </PropertyGroup>\r
   <PropertyGroup Condition=" '$(Configuration)' == 'net_2_0_bootstrap' ">\r
-    <OutputPath>$(MSBuildProjectDirectory)\..\lib\net_2_0_bootstrap\</OutputPath>\r
+    <OutputPath Condition=" '$(OutputPath)' == '' ">$(MSBuildProjectDirectory)\..\lib\net_2_0_bootstrap\</OutputPath>\r
   </PropertyGroup>\r
   <Target Name="SetupProject">\r
-    <Copy SourceFiles="$(MSBuildProjectName).dll.sources" DestinationFiles="$(MSBuildProjectName).dll.msbuild.sources"/>\r
-         <MSBuild.ExtensionPack.FileSystem.File TaskAction="Replace" RegexPattern="/" Replacement="\" Files="$(MSBuildProjectName).dll.msbuild.sources"/>\r
+    <Copy SourceFiles="$(ResponseFile)" DestinationFiles="$(ResponseFile).msbuild"/>\r
+         <MSBuild.ExtensionPack.FileSystem.File TaskAction="Replace" RegexPattern="/" Replacement="\" Files="$(ResponseFile).msbuild"/>\r
          <MakeDir Directories="$(OutputDirectory)"/>\r
   </Target>\r
-  <ItemGroup>\r
-    <ResponseFile Include="$(MSBuildProjectName).dll.msbuild.sources"/>\r
-  </ItemGroup>\r
+  <PropertyGroup Condition=" '$(ResponseFile)' == '' ">\r
+    <ResponseFile>$(MSBuildProjectName).dll.sources</ResponseFile>\r
+  </PropertyGroup>\r
+  <PropertyGroup>\r
+    <CompilerResponseFile>$(ResponseFile).msbuild</CompilerResponseFile>\r
+  </PropertyGroup>\r
 </Project>
\ No newline at end of file
diff --git a/mcs/class/Mono.CompilerServices.SymbolWriter/Mono.CompilerServices.SymbolWriter.csproj b/mcs/class/Mono.CompilerServices.SymbolWriter/Mono.CompilerServices.SymbolWriter.csproj
index f6d5eac033da287b8ee201c5f124267fa2984922..9e76e06e25d489842526654b01d9bd61314fc495 100644 (file)
--- a/mcs/class/Mono.CompilerServices.SymbolWriter/Mono.CompilerServices.SymbolWriter.csproj
+++ b/mcs/class/Mono.CompilerServices.SymbolWriter/Mono.CompilerServices.SymbolWriter.csproj
@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="3.5" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildProjectDirectory)\..\..\build\msbuild\Mono.Common.targets"/>
   <PropertyGroup>
     <OutputType>Library</OutputType>
     <AssemblyName>$(MSBuildProjectName)</AssemblyName>
     <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
-    <CompilerResponseFile>@(ResponseFile)</CompilerResponseFile>
     <NoConfig>true</NoConfig>
     <CodePage>65001</CodePage>
     <UseVSHostingProcess>false</UseVSHostingProcess>
@@ -16,6 +14,7 @@
   <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>
diff --git a/mcs/class/Mono.Security/Mono.Security.csproj b/mcs/class/Mono.Security/Mono.Security.csproj
index df70ba87465ddd564f3de20e097b28e534e7b347..3ee0deceeb4ec5ff9ed1a3fa3d1de4ce55cf9412 100644 (file)
--- a/mcs/class/Mono.Security/Mono.Security.csproj
+++ b/mcs/class/Mono.Security/Mono.Security.csproj
@@ -5,7 +5,6 @@
     <OutputType>Library</OutputType>
     <AssemblyName>$(MSBuildProjectName)</AssemblyName>
     <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
-    <CompilerResponseFile>@(ResponseFile)</CompilerResponseFile>
     <NoConfig>true</NoConfig>
     <CodePage>65001</CodePage>
     <UseVSHostingProcess>false</UseVSHostingProcess>
diff --git a/mcs/class/System.Core/System.Core.csproj b/mcs/class/System.Core/System.Core.csproj
index b061351775e5c34133dca50b41f052cfa8b88dea..34633594c74cae1723336818332651e2edc1a933 100644 (file)
--- a/mcs/class/System.Core/System.Core.csproj
+++ b/mcs/class/System.Core/System.Core.csproj
@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="3.5" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildProjectDirectory)\..\..\build\msbuild\Mono.Common.targets"/>
   <PropertyGroup>
     <OutputType>Library</OutputType>
     <AssemblyName>$(MSBuildProjectName)</AssemblyName>
     <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
-    <CompilerResponseFile>@(ResponseFile)</CompilerResponseFile>
     <NoConfig>true</NoConfig>
     <NoWarn>1720</NoWarn>
     <CodePage>65001</CodePage>
@@ -17,6 +15,7 @@
   <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>
diff --git a/mcs/class/System.XML/System.Xml.csproj b/mcs/class/System.XML/System.Xml.csproj
index 18af33685602669bc34e1d0d9e9ceee9635629f9..25e342e32c86eabae0bc961d3830edfa83b6d30b 100644 (file)
--- a/mcs/class/System.XML/System.Xml.csproj
+++ b/mcs/class/System.XML/System.Xml.csproj
@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="3.5" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildProjectDirectory)\..\..\build\msbuild\Mono.Common.targets"/>
   <PropertyGroup>
     <OutputType>Library</OutputType>
     <AssemblyName>$(MSBuildProjectName)</AssemblyName>
     <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
-    <CompilerResponseFile>@(ResponseFile)</CompilerResponseFile>
     <NoWarn>0618,0612,0642</NoWarn>
     <NoConfig>true</NoConfig>
     <CodePage>65001</CodePage>
@@ -21,7 +19,13 @@
     <Compile Include="Mono.Xml.Xsl\PatternTokenizer.cs"/>
     <Reference Include="System.dll"/>
   </ItemGroup>
+  <Import Project="$(MSBuildProjectDirectory)\..\..\build\msbuild\Mono.Common.targets"/>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <Target Name="BeforeBuild" DependsOnTargets="SetupProject">
+    <Exec Command="..\..\jay\jay.exe -ct &lt; ..\..\jay\skeleton.cs System.Xml.XPath\Parser.jay &gt; System.Xml.XPath\Parser.cs"/>
+    <Exec Command="echo #define XSLT_PATTERN &gt; Mono.Xml.Xsl\PatternParser.cs"/>
+    <Exec Command="..\..\jay\jay.exe -ct Mono.Xml.Xsl\PatternParser.jay &lt; ..\..\jay\skeleton.cs &gt;&gt; Mono.Xml.Xsl\PatternParser.cs"/>
+    <Exec Command="echo #define XSLT_PATTERN &gt; Mono.Xml.Xsl\PatternTokenizer.cs"/>
+    <Exec Command="type System.Xml.XPath\Tokenizer.cs &gt;&gt; Mono.Xml.Xsl\PatternTokenizer.cs"/>
   </Target>
 </Project>
\ No newline at end of file
diff --git a/mcs/class/System/System.csproj b/mcs/class/System/System.csproj
index 62bb2ddbf444c66d5e66b9391f8f26b136f6e37a..ea6f73db381925cf6bbdd28b122aec760f9a2086 100644 (file)
--- a/mcs/class/System/System.csproj
+++ b/mcs/class/System/System.csproj
@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="3.5" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildProjectDirectory)\..\..\build\msbuild\Mono.Common.targets"/>
   <PropertyGroup>
     <OutputType>Library</OutputType>
     <AssemblyName>$(MSBuildProjectName)</AssemblyName>
     <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
-    <CompilerResponseFile>@(ResponseFile)</CompilerResponseFile>
     <NoConfig>true</NoConfig>
     <CodePage>65001</CodePage>
     <UseVSHostingProcess>false</UseVSHostingProcess>
@@ -18,15 +16,16 @@
     <DefineConstants>BOOTSTRAP_BASIC,NET_1_1,NET_2_0,CONFIGURATION_2_0,XML_DEP</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
-    <EmbeddedResource Include="resources/Asterisk.wav"/>
-    <EmbeddedResource Include="resources/Beep.wav"/>
-    <EmbeddedResource Include="resources/Exclamation.wav"/>
-    <EmbeddedResource Include="resources/Hand.wav"/>
-    <EmbeddedResource Include="resources/Question.wav"/>
+    <EmbeddedResource Include="resources\Asterisk.wav"/>
+    <EmbeddedResource Include="resources\Beep.wav"/>
+    <EmbeddedResource Include="resources\Exclamation.wav"/>
+    <EmbeddedResource Include="resources\Hand.wav"/>
+    <EmbeddedResource Include="resources\Question.wav"/>
   </ItemGroup>
   <ItemGroup Condition=" '$(Configuration)|$(Platform)' == 'basic_XML_DEP|AnyCPU' ">
     <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>
diff --git a/mcs/class/corlib/corlib.csproj b/mcs/class/corlib/corlib.csproj
index 7ba01d82f5f9c12d2425e7cab6f035ad72409d65..65694d2c32c289b47aa5e294f0937753bedc8501 100644 (file)
--- a/mcs/class/corlib/corlib.csproj
+++ b/mcs/class/corlib/corlib.csproj
@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="3.5" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildProjectDirectory)\..\..\build\msbuild\Mono.Common.targets"/>
   <PropertyGroup>
     <OutputType>Library</OutputType>
     <AssemblyName>mscorlib</AssemblyName>
     <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
-    <CompilerResponseFile>@(ResponseFile)</CompilerResponseFile>
     <NoConfig>true</NoConfig>
     <NoStdLib>true</NoStdLib>
     <CodePage>65001</CodePage>
@@ -19,14 +17,15 @@
     <DefineConstants>INSIDE_CORLIB,NET_1_1,NET_2_0,LIBC,BOOTSTRAP_BASIC</DefineConstants>
   </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="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <Target Name="BeforeBuild" DependsOnTargets="SetupProject">
   </Target>
diff --git a/mcs/mcs.proj b/mcs/mcs.proj
index 5db751ca5ff47f9beabe6f0e1691979e928fc3d8..3c8f82ae4695b643c86e0fa3b4334ad7577848d0 100644 (file)
--- a/mcs/mcs.proj
+++ b/mcs/mcs.proj
@@ -1,7 +1,9 @@
 <?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
-    <!--<MSBuild Projects="mcs\mcs\gmcs.proj"/>-->\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="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
@@ -10,4 +12,15 @@
     <MSBuild Projects="class\Mono.CompilerServices.SymbolWriter\Mono.CompilerServices.SymbolWriter.csproj" Targets="Build" Properties="Configuration=basic;Platform=AnyCPU"/>\r
     <MSBuild Projects="class\System.Core\System.Core.csproj" Targets="Build" Properties="Configuration=basic;Platform=AnyCPU"/>\r
   </Target>\r
+  <Target Name="Clean">\r
+    <!--<MSBuild Projects="build\build.proj" Targets="Clean" />-->\r
+    <!--<MSBuild Projects="mcs\mcs\gmcs.proj"/>-->\r
+    <MSBuild Projects="class\corlib\corlib.csproj" Targets="Clean" Properties="Configuration=basic;Platform=AnyCPU"/>\r
+    <MSBuild Projects="class\System\System.csproj" Targets="Clean" Properties="Configuration=basic;Platform=AnyCPU"/>\r
+    <MSBuild Projects="class\System.Xml\System.Xml.csproj" Targets="Clean" Properties="Configuration=basic;Platform=AnyCPU"/>\r
+    <MSBuild Projects="class\System\System.csproj" Targets="Clean" Properties="Configuration=Basic_XML_DEP;Platform=AnyCPU"/>\r
+    <MSBuild Projects="class\Mono.Security\Mono.Security.csproj" Targets="Clean" Properties="Configuration=basic;Platform=AnyCPU"/>\r
+    <MSBuild Projects="class\Mono.CompilerServices.SymbolWriter\Mono.CompilerServices.SymbolWriter.csproj" Targets="Clean" Properties="Configuration=basic;Platform=AnyCPU"/>\r
+    <MSBuild Projects="class\System.Core\System.Core.csproj" Targets="Clean" Properties="Configuration=basic;Platform=AnyCPU"/>\r
+  </Target>\r
 </Project>
\ No newline at end of file
diff --git a/mcs/mcs/gmcs2.csproj b/mcs/mcs/gmcs2.csproj
new file mode 100644 (file)
index 0000000..9e1fd0c
--- /dev/null
+++ b/mcs/mcs/gmcs2.csproj
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="3.5" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <AssemblyName>gmcs</AssemblyName>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <ResponseFile>gmcs.exe.sources</ResponseFile>
+    <CodePage>65001</CodePage>
+    <OutputPath>..\class\lib\basic\</OutputPath>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'basic|AnyCPU' ">
+    <DefineConstants>BOOTSTRAP_BASIC,NET_1_1,NET_2_0</DefineConstants>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="cs-parser.cs"/>
+    <Reference Include="System.dll"/>
+    <Reference Include="System.Core.dll"/>
+    <Reference Include="System.XML.dll"/>
+  </ItemGroup>
+  <Import Project="$(MSBuildProjectDirectory)\..\build\msbuild\Mono.Common.targets"/>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <Target Name="BeforeBuild" DependsOnTargets="SetupProject">
+    <Exec Command="..\jay\jay.exe -cvt &lt; ..\jay\skeleton.cs cs-parser.jay &gt; cs-parser.cs"/>
+  </Target>
+</Project>
\ No newline at end of file
my mono mirror. check out Moved to http://github.com/mono/mono