From: Miguel de Icaza <miguel@gnome.org>
Date: Tue, 31 May 2016 20:50:55 +0000 (-0400)
Subject: [genproj] support for using prebuilt resources
X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=commitdiff_plain;h=dd0b8f31d90a9303eece3522d3e3ad5f8332b0bc;p=mono.git

[genproj] support for using prebuilt resources
---

diff --git a/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng-net_4_x.csproj b/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng-net_4_x.csproj
index 3d843029406..2539a5b4b18 100644
--- a/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng-net_4_x.csproj
+++ b/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng-net_4_x.csproj
@@ -101,7 +101,7 @@ $(ProjectDir)\..\..\jay\jay -ct &lt; $(ProjectDir)\..\..\jay\skeleton.cs $(Proje
 
     </PreBuildEvent>
     <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-$(ProjectDir)\..\..\jay\jay.exe -ct &lt; $(ProjectDir)\..\..\jay\skeleton.cs $(ProjectDir)\Commons.Xml.Relaxng.Rnc\RncParser.jay > $(ProjectDir)\Commons.Xml.Relaxng.Rnc\RncParser.cs
+$(ProjectDir)\..\..\jay\jay -ct &lt; $(ProjectDir)\..\..\jay\skeleton.cs $(ProjectDir)\Commons.Xml.Relaxng.Rnc\RncParser.jay > $(ProjectDir)\Commons.Xml.Relaxng.Rnc\RncParser.cs
 
     </PreBuildEvent>
     <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
diff --git a/mcs/class/Microsoft.Build/Microsoft.Build-net_4_x.csproj b/mcs/class/Microsoft.Build/Microsoft.Build-net_4_x.csproj
index 2c795c82303..24dd6dd3751 100644
--- a/mcs/class/Microsoft.Build/Microsoft.Build-net_4_x.csproj
+++ b/mcs/class/Microsoft.Build/Microsoft.Build-net_4_x.csproj
@@ -171,7 +171,7 @@ $(ProjectDir)\..\..\jay\jay -ct &lt; $(ProjectDir)\..\..\jay\skeleton.cs $(Proje
 
     </PreBuildEvent>
     <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-$(ProjectDir)\..\..\jay\jay.exe -ct &lt; $(ProjectDir)\..\..\jay\skeleton.cs $(ProjectDir)\Microsoft.Build.Internal\ExpressionParser.jay > $(ProjectDir)\Microsoft.Build.Internal\ExpressionParser.cs
+$(ProjectDir)\..\..\jay\jay -ct &lt; $(ProjectDir)\..\..\jay\skeleton.cs $(ProjectDir)\Microsoft.Build.Internal\ExpressionParser.jay > $(ProjectDir)\Microsoft.Build.Internal\ExpressionParser.cs
 
     </PreBuildEvent>
     <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
diff --git a/mcs/class/Mono.Data.Sqlite/Mono.Data.Sqlite-net_4_x.csproj b/mcs/class/Mono.Data.Sqlite/Mono.Data.Sqlite-net_4_x.csproj
index 2b722aaff49..7a1ee0ced12 100644
--- a/mcs/class/Mono.Data.Sqlite/Mono.Data.Sqlite-net_4_x.csproj
+++ b/mcs/class/Mono.Data.Sqlite/Mono.Data.Sqlite-net_4_x.csproj
@@ -127,7 +127,7 @@
     <Folder Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="resources/SR.resx">
+    <EmbeddedResource Include="resources/SR.resources.prebuilt">
       <LogicalName>SR.resources</LogicalName>
     </EmbeddedResource>
     <EmbeddedResource Include="resources/SQLiteCommand.bmp">
diff --git a/mcs/class/RabbitMQ.Client/src/apigen/RabbitMQ.Client.Apigen-net_4_x.csproj b/mcs/class/RabbitMQ.Client/src/apigen/RabbitMQ.Client.Apigen-net_4_x.csproj
index 774bd89e35c..21fe03503f4 100644
--- a/mcs/class/RabbitMQ.Client/src/apigen/RabbitMQ.Client.Apigen-net_4_x.csproj
+++ b/mcs/class/RabbitMQ.Client/src/apigen/RabbitMQ.Client.Apigen-net_4_x.csproj
@@ -92,9 +92,9 @@ mono RabbitMQ.Client.Apigen.exe /n:v0_8qpid "/apiName:AMQP_0_8_QPID" $(ProjectDi
 
     </PostBuildEvent>
     <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
- RabbitMQ.Client.Apigen.exe /n:v0_9 "/apiName:AMQP_0_9" $(ProjectDir)..\..\docs\specs\amqp0-9.stripped.xml $(ProjectDir)..\..\docs\specs\net_4_x-api-0-9.cs
- RabbitMQ.Client.Apigen.exe /n:v0_8 "/apiName:AMQP_0_8" $(ProjectDir)..\..\docs\specs\amqp0-8.stripped.xml $(ProjectDir)..\..\docs\specs\net_4_x-api-0-8.cs
- RabbitMQ.Client.Apigen.exe /n:v0_8qpid "/apiName:AMQP_0_8_QPID" $(ProjectDir)..\..\docs\specs\qpid-amqp.0-8.stripped.xml $(ProjectDir)..\..\docs\specs\net_4_x-api-qpid-0-8.cs
+mono RabbitMQ.Client.Apigen.exe /n:v0_9 "/apiName:AMQP_0_9" $(ProjectDir)..\..\docs\specs\amqp0-9.stripped.xml $(ProjectDir)..\..\docs\specs\net_4_x-api-0-9.cs
+mono RabbitMQ.Client.Apigen.exe /n:v0_8 "/apiName:AMQP_0_8" $(ProjectDir)..\..\docs\specs\amqp0-8.stripped.xml $(ProjectDir)..\..\docs\specs\net_4_x-api-0-8.cs
+mono RabbitMQ.Client.Apigen.exe /n:v0_8qpid "/apiName:AMQP_0_8_QPID" $(ProjectDir)..\..\docs\specs\qpid-amqp.0-8.stripped.xml $(ProjectDir)..\..\docs\specs\net_4_x-api-qpid-0-8.cs
 
 
 
diff --git a/mcs/class/System.Reactive.Core/System.Reactive.Core-net_4_x.csproj b/mcs/class/System.Reactive.Core/System.Reactive.Core-net_4_x.csproj
index 0a372455e9c..7b3dfa248de 100644
--- a/mcs/class/System.Reactive.Core/System.Reactive.Core-net_4_x.csproj
+++ b/mcs/class/System.Reactive.Core/System.Reactive.Core-net_4_x.csproj
@@ -176,7 +176,7 @@
     <Folder Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="Strings_Core.resx">
+    <EmbeddedResource Include="Strings_Core.resources.prebuilt">
       <LogicalName>System.Reactive.Strings_Core.resources</LogicalName>
     </EmbeddedResource>
   </ItemGroup>
diff --git a/mcs/class/System.Reactive.Linq/System.Reactive.Linq-net_4_x.csproj b/mcs/class/System.Reactive.Linq/System.Reactive.Linq-net_4_x.csproj
index cd90704cc90..67b2b8a8844 100644
--- a/mcs/class/System.Reactive.Linq/System.Reactive.Linq-net_4_x.csproj
+++ b/mcs/class/System.Reactive.Linq/System.Reactive.Linq-net_4_x.csproj
@@ -273,7 +273,7 @@
     <Folder Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="Strings_Linq.resx">
+    <EmbeddedResource Include="Strings_Linq.resources.prebuilt">
       <LogicalName>System.Reactive.Strings_Linq.resources</LogicalName>
     </EmbeddedResource>
   </ItemGroup>
diff --git a/mcs/class/System.Reactive.PlatformServices/System.Reactive.PlatformServices-net_4_x.csproj b/mcs/class/System.Reactive.PlatformServices/System.Reactive.PlatformServices-net_4_x.csproj
index 6b5d1cfbe83..538ff9529d9 100644
--- a/mcs/class/System.Reactive.PlatformServices/System.Reactive.PlatformServices-net_4_x.csproj
+++ b/mcs/class/System.Reactive.PlatformServices/System.Reactive.PlatformServices-net_4_x.csproj
@@ -125,7 +125,7 @@
     <Folder Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="Strings_PlatformServices.resx">
+    <EmbeddedResource Include="Strings_PlatformServices.resources.prebuilt">
       <LogicalName>System.Reactive.Strings_PlatformServices.resources</LogicalName>
     </EmbeddedResource>
   </ItemGroup>
diff --git a/mcs/class/System.Reactive.Providers/System.Reactive.Providers-net_4_x.csproj b/mcs/class/System.Reactive.Providers/System.Reactive.Providers-net_4_x.csproj
index 3fd5344a43b..0099448bd54 100644
--- a/mcs/class/System.Reactive.Providers/System.Reactive.Providers-net_4_x.csproj
+++ b/mcs/class/System.Reactive.Providers/System.Reactive.Providers-net_4_x.csproj
@@ -118,7 +118,7 @@
     <Folder Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="Strings_Providers.resx">
+    <EmbeddedResource Include="Strings_Providers.resources.prebuilt">
       <LogicalName>System.Reactive.Strings_Providers.resources</LogicalName>
     </EmbeddedResource>
   </ItemGroup>
diff --git a/mcs/class/System.Reactive.Windows.Threading/System.Reactive.Windows.Threading-net_4_x.csproj b/mcs/class/System.Reactive.Windows.Threading/System.Reactive.Windows.Threading-net_4_x.csproj
index abb30575708..2399dc270ca 100644
--- a/mcs/class/System.Reactive.Windows.Threading/System.Reactive.Windows.Threading-net_4_x.csproj
+++ b/mcs/class/System.Reactive.Windows.Threading/System.Reactive.Windows.Threading-net_4_x.csproj
@@ -118,7 +118,7 @@
     <Folder Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="Strings_WindowsThreading.resx">
+    <EmbeddedResource Include="Strings_WindowsThreading.resources.prebuilt">
       <LogicalName>System.Reactive.Strings_WindowsThreading.resources</LogicalName>
     </EmbeddedResource>
   </ItemGroup>
diff --git a/mcs/class/System.Web/System.Web-net_4_x.csproj b/mcs/class/System.Web/System.Web-net_4_x.csproj
index c3cd7cc5262..109abe9ccc9 100644
--- a/mcs/class/System.Web/System.Web-net_4_x.csproj
+++ b/mcs/class/System.Web/System.Web-net_4_x.csproj
@@ -1488,9 +1488,13 @@
   -->
   <PropertyGroup>
     <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+mono $(ProjectDir)\..\lib\net_4_x\culevel.exe -o $(ProjectDir)\System.Web\UplevelHelper.cs $(ProjectDir)\UplevelHelperDefinitions.xml
+
 
     </PreBuildEvent>
     <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+mono $(ProjectDir)\..\lib\net_4_x\culevel.exe -o $(ProjectDir)\System.Web\UplevelHelper.cs $(ProjectDir)\UplevelHelperDefinitions.xml
+
 
     </PreBuildEvent>
     <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
diff --git a/mcs/class/System.Web/System.Web-plainweb-net_4_x.csproj b/mcs/class/System.Web/System.Web-plainweb-net_4_x.csproj
index 1cff7182230..9d01a0e6398 100644
--- a/mcs/class/System.Web/System.Web-plainweb-net_4_x.csproj
+++ b/mcs/class/System.Web/System.Web-plainweb-net_4_x.csproj
@@ -1488,9 +1488,13 @@
   -->
   <PropertyGroup>
     <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+mono $(ProjectDir)\..\lib\net_4_x\culevel.exe -o $(ProjectDir)\System.Web\UplevelHelper.cs $(ProjectDir)\UplevelHelperDefinitions.xml
+
 
     </PreBuildEvent>
     <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+mono $(ProjectDir)\..\lib\net_4_x\culevel.exe -o $(ProjectDir)\System.Web\UplevelHelper.cs $(ProjectDir)\UplevelHelperDefinitions.xml
+
 
     </PreBuildEvent>
     <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms-net_4_x.csproj b/mcs/class/System.Windows.Forms/System.Windows.Forms-net_4_x.csproj
index 52e2326bdce..c1e931e0a9b 100644
--- a/mcs/class/System.Windows.Forms/System.Windows.Forms-net_4_x.csproj
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms-net_4_x.csproj
@@ -1049,7 +1049,7 @@
     <EmbeddedResource Include="resources/DnDMove.cur">
       <LogicalName>System.Windows.Forms.DnDMove.cur</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="resources/keyboards.resx">
+    <EmbeddedResource Include="resources/keyboards.resources.prebuilt">
       <LogicalName>keyboards.resources</LogicalName>
     </EmbeddedResource>
     <EmbeddedResource Include="resources/16_computer.png">
diff --git a/mcs/class/monodoc/monodoc-net_4_x.csproj b/mcs/class/monodoc/monodoc-net_4_x.csproj
index 4413f8ae0f7..92b54f9ccdb 100644
--- a/mcs/class/monodoc/monodoc-net_4_x.csproj
+++ b/mcs/class/monodoc/monodoc-net_4_x.csproj
@@ -530,9 +530,13 @@
   -->
   <PropertyGroup>
     <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+$(ProjectDir)\..\..\jay\jay -ct &lt; $(ProjectDir)\..\..\jay\skeleton.cs $(ProjectDir)\Monodoc.Ecma\EcmaUrlParser.jay > $(ProjectDir)\Monodoc.Ecma\EcmaUrlParser.cs
+
 
     </PreBuildEvent>
     <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+$(ProjectDir)\..\..\jay\jay -ct &lt; $(ProjectDir)\..\..\jay\skeleton.cs $(ProjectDir)\Monodoc.Ecma\EcmaUrlParser.jay > $(ProjectDir)\Monodoc.Ecma\EcmaUrlParser.cs
+
 
     </PreBuildEvent>
     <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
diff --git a/mcs/ilasm/ilasm-net_4_x.csproj b/mcs/ilasm/ilasm-net_4_x.csproj
index 338a2ea7c56..cf8834c52c7 100644
--- a/mcs/ilasm/ilasm-net_4_x.csproj
+++ b/mcs/ilasm/ilasm-net_4_x.csproj
@@ -149,8 +149,8 @@ $(ProjectDir)\..\jay\jay -ct &lt; $(ProjectDir)\..\jay\skeleton.cs $(ProjectDir)
 
     </PreBuildEvent>
     <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-$(ProjectDir)\..\jay\jay.exe -ct &lt; $(ProjectDir)\..\jay\skeleton.cs $(ProjectDir)\parser\ILParser.jay > $(ProjectDir)\ILParser.cs
-
+$(ProjectDir)\..\jay\jay -ct &lt; $(ProjectDir)\..\jay\skeleton.cs $(ProjectDir)\parser\ILParser.jay > $(ProjectDir)\ILParser.cs
+
 
     </PreBuildEvent>
     <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
diff --git a/mcs/mcs/mcs-net_4_x.csproj b/mcs/mcs/mcs-net_4_x.csproj
index 5e67322f296..46bedb48612 100644
--- a/mcs/mcs/mcs-net_4_x.csproj
+++ b/mcs/mcs/mcs-net_4_x.csproj
@@ -128,7 +128,7 @@ $(ProjectDir)\..\jay\jay -ct &lt; $(ProjectDir)\..\jay\skeleton.cs $(ProjectDir)
 
     </PreBuildEvent>
     <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-$(ProjectDir)\..\jay\jay.exe -ct &lt; $(ProjectDir)\..\jay\skeleton.cs $(ProjectDir)\cs-parser.jay > $(ProjectDir)\cs-parser.cs
+$(ProjectDir)\..\jay\jay -ct &lt; $(ProjectDir)\..\jay\skeleton.cs $(ProjectDir)\cs-parser.jay > $(ProjectDir)\cs-parser.cs
 
 
     </PreBuildEvent>
diff --git a/msvc/scripts/genproj.cs b/msvc/scripts/genproj.cs
index 5205c6ed6ad..d442697c3ce 100644
--- a/msvc/scripts/genproj.cs
+++ b/msvc/scripts/genproj.cs
@@ -795,6 +795,15 @@ class MsbuildGenerator {
 				var source = dk.Key;
 				if (source.EndsWith (".resources"))
 					source = source.Replace (".resources", ".resx");
+
+				// try to find a pre-built resource, and use that instead of trying to build it
+				if (source.EndsWith (".resx")) {
+					var probe_prebuilt = Path.Combine (base_dir, source.Replace (".resx", ".resources.prebuilt"));
+					if (File.Exists (probe_prebuilt)) {
+						
+						source = GetRelativePath (base_dir + "/", probe_prebuilt);
+					}
+				}
 				resources.AppendFormat ("    <EmbeddedResource Include=\"{0}\">" + NewLine, source);
 				resources.AppendFormat ("      <LogicalName>{0}</LogicalName>" + NewLine, dk.Value);
 				resources.AppendFormat ("    </EmbeddedResource>" + NewLine);