From 2f21472994e42acb04427f32ce133d07491b6891 Mon Sep 17 00:00:00 2001 From: Miguel de Icaza Date: Tue, 24 May 2016 17:43:21 -0400 Subject: [PATCH] [genproj] Handle resources properly, add helper scripts to bootstrap --- build-libs.bat | 4 ++++ build-libs.sh | 3 +++ .../Commons.Xml.Relaxng/Commons.Xml.Relaxng-net_4_x.csproj | 2 ++ mcs/class/Mono.Data.Sqlite/Mono.Data.Sqlite-net_4_x.csproj | 2 +- .../Novell.Directory.Ldap-net_4_x.csproj | 2 +- .../System.ComponentModel.Composition-net_4_x.csproj | 2 +- .../System.Data.Services.Client-net_4_x.csproj | 2 +- .../System.Json.Microsoft-net_4_x.csproj | 2 +- .../System.Net.Http.Formatting-net_4_x.csproj | 4 ++-- .../System.Reactive.Core-net_4_x.csproj | 2 +- .../System.Reactive.Linq-net_4_x.csproj | 2 +- .../System.Reactive.PlatformServices-net_4_x.csproj | 2 +- .../System.Reactive.Providers-net_4_x.csproj | 2 +- .../System.Reactive.Windows.Threading-net_4_x.csproj | 2 +- mcs/class/System.Web.Http/System.Web.Http-net_4_x.csproj | 4 ++-- mcs/class/System.Web.Mvc3/System.Web.Mvc3-net_4_x.csproj | 2 +- mcs/class/System.Web.Razor/System.Web.Razor-net_4_x.csproj | 4 ++-- .../System.Web.WebPages.Deployment-net_4_x.csproj | 4 ++-- .../System.Web.WebPages.Razor-net_4_x.csproj | 4 ++-- .../System.Web.WebPages/System.Web.WebPages-net_4_x.csproj | 4 ++-- mcs/class/System.Web/System.Web-net_4_x.csproj | 2 +- mcs/class/System.Web/System.Web-plainweb-net_4_x.csproj | 2 +- .../System.Windows.Forms-net_4_x.csproj | 2 +- mcs/nunit24/ClientUtilities/util/nunit.util-net_4_x.csproj | 2 +- msvc/scripts/Commons.Xml.Relaxng.pre | 1 + msvc/scripts/genproj.cs | 3 ++- msvc/scripts/prepare.cs | 6 ------ 27 files changed, 39 insertions(+), 34 deletions(-) create mode 100644 build-libs.bat create mode 100755 build-libs.sh create mode 100644 msvc/scripts/Commons.Xml.Relaxng.pre diff --git a/build-libs.bat b/build-libs.bat new file mode 100644 index 00000000000..df0d97868d6 --- /dev/null +++ b/build-libs.bat @@ -0,0 +1,4 @@ +@echo off +cd mcs\jay +vcbuild jay.vcxproj +msbuild net_4_x.sln diff --git a/build-libs.sh b/build-libs.sh new file mode 100755 index 00000000000..17b2e16e7ee --- /dev/null +++ b/build-libs.sh @@ -0,0 +1,3 @@ +#!/bin/sh +(cd mcs/jay; make) +msbuild net_4_x.sln 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 3b0863d2501..77b7e2ba8a3 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 @@ -97,9 +97,11 @@ --> +$(ProjectDir)\..\..\jay\jay -ct < $(ProjectDir)\..\..\jay\skeleton.cs $(ProjectDir)\Commons.Xml.Relaxng.Rnc\RncParser.jay > $(ProjectDir)\Commons.Xml.Relaxng.Rnc\RncParser.cs +$(ProjectDir)\..\..\jay\jay.exe -ct < $(ProjectDir)\..\..\jay\skeleton.cs $(ProjectDir)\Commons.Xml.Relaxng.Rnc\RncParser.jay > $(ProjectDir)\Commons.Xml.Relaxng.Rnc\RncParser.cs 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 9b5e7d736ab..a5ea5e1483d 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 @@ -128,7 +128,7 @@ - + SR.resources diff --git a/mcs/class/Novell.Directory.Ldap/Novell.Directory.Ldap-net_4_x.csproj b/mcs/class/Novell.Directory.Ldap/Novell.Directory.Ldap-net_4_x.csproj index 096323d61e7..a5ddfedcf19 100644 --- a/mcs/class/Novell.Directory.Ldap/Novell.Directory.Ldap-net_4_x.csproj +++ b/mcs/class/Novell.Directory.Ldap/Novell.Directory.Ldap-net_4_x.csproj @@ -304,7 +304,7 @@ - + ResultCodeMessages.resources diff --git a/mcs/class/System.ComponentModel.Composition.4.5/System.ComponentModel.Composition-net_4_x.csproj b/mcs/class/System.ComponentModel.Composition.4.5/System.ComponentModel.Composition-net_4_x.csproj index 8ae3cfccffd..bf63d7a400b 100644 --- a/mcs/class/System.ComponentModel.Composition.4.5/System.ComponentModel.Composition-net_4_x.csproj +++ b/mcs/class/System.ComponentModel.Composition.4.5/System.ComponentModel.Composition-net_4_x.csproj @@ -263,7 +263,7 @@ - + Microsoft.Internal.Strings.resources diff --git a/mcs/class/System.Data.Services.Client/System.Data.Services.Client-net_4_x.csproj b/mcs/class/System.Data.Services.Client/System.Data.Services.Client-net_4_x.csproj index 3d0f0ea86a5..840cebb9105 100644 --- a/mcs/class/System.Data.Services.Client/System.Data.Services.Client-net_4_x.csproj +++ b/mcs/class/System.Data.Services.Client/System.Data.Services.Client-net_4_x.csproj @@ -220,7 +220,7 @@ - + System.Data.Services.Client.resources diff --git a/mcs/class/System.Json.Microsoft/System.Json.Microsoft-net_4_x.csproj b/mcs/class/System.Json.Microsoft/System.Json.Microsoft-net_4_x.csproj index 08caf0b6865..9ae3c0813a1 100644 --- a/mcs/class/System.Json.Microsoft/System.Json.Microsoft-net_4_x.csproj +++ b/mcs/class/System.Json.Microsoft/System.Json.Microsoft-net_4_x.csproj @@ -126,7 +126,7 @@ - + System.Json.Properties.Resources.resources diff --git a/mcs/class/System.Net.Http.Formatting/System.Net.Http.Formatting-net_4_x.csproj b/mcs/class/System.Net.Http.Formatting/System.Net.Http.Formatting-net_4_x.csproj index 78ccedb9aa2..b3e1c9cb508 100644 --- a/mcs/class/System.Net.Http.Formatting/System.Net.Http.Formatting-net_4_x.csproj +++ b/mcs/class/System.Net.Http.Formatting/System.Net.Http.Formatting-net_4_x.csproj @@ -354,10 +354,10 @@ - + System.Net.Http.Properties.CommonWebApiResources.resources - + System.Net.Http.Properties.Resources.resources 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 ebdde2de08b..270278e7339 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 @@ -177,7 +177,7 @@ - + System.Reactive.Strings_Core.resources 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 b4ea1eed3cf..b13bf98e82b 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 @@ -274,7 +274,7 @@ - + System.Reactive.Strings_Linq.resources 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 64ed969e3c7..5e1435c3dfb 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 @@ -126,7 +126,7 @@ - + System.Reactive.Strings_PlatformServices.resources 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 6edf8555781..2dee913e113 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 @@ -119,7 +119,7 @@ - + System.Reactive.Strings_Providers.resources 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 8f784309377..d8eb8de10da 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 @@ -119,7 +119,7 @@ - + System.Reactive.Strings_WindowsThreading.resources diff --git a/mcs/class/System.Web.Http/System.Web.Http-net_4_x.csproj b/mcs/class/System.Web.Http/System.Web.Http-net_4_x.csproj index 31e60bb0b17..4cfba6d759e 100644 --- a/mcs/class/System.Web.Http/System.Web.Http-net_4_x.csproj +++ b/mcs/class/System.Web.Http/System.Web.Http-net_4_x.csproj @@ -386,10 +386,10 @@ - + System.Web.Http.Properties.CommonWebApiResources.resources - + System.Web.Http.Properties.SRResources.resources diff --git a/mcs/class/System.Web.Mvc3/System.Web.Mvc3-net_4_x.csproj b/mcs/class/System.Web.Mvc3/System.Web.Mvc3-net_4_x.csproj index 73d5328f898..3bed8a7d326 100644 --- a/mcs/class/System.Web.Mvc3/System.Web.Mvc3-net_4_x.csproj +++ b/mcs/class/System.Web.Mvc3/System.Web.Mvc3-net_4_x.csproj @@ -491,7 +491,7 @@ - + System.Web.Mvc.Resources.MvcResources.resources diff --git a/mcs/class/System.Web.Razor/System.Web.Razor-net_4_x.csproj b/mcs/class/System.Web.Razor/System.Web.Razor-net_4_x.csproj index fd459922df1..23422a60b2c 100644 --- a/mcs/class/System.Web.Razor/System.Web.Razor-net_4_x.csproj +++ b/mcs/class/System.Web.Razor/System.Web.Razor-net_4_x.csproj @@ -244,10 +244,10 @@ - + System.Web.Razor.Resources.RazorResources.resources - + System.Web.Razor.Common.CommonResources.resources diff --git a/mcs/class/System.Web.WebPages.Deployment/System.Web.WebPages.Deployment-net_4_x.csproj b/mcs/class/System.Web.WebPages.Deployment/System.Web.WebPages.Deployment-net_4_x.csproj index 16282251ad4..0aba08155ed 100644 --- a/mcs/class/System.Web.WebPages.Deployment/System.Web.WebPages.Deployment-net_4_x.csproj +++ b/mcs/class/System.Web.WebPages.Deployment/System.Web.WebPages.Deployment-net_4_x.csproj @@ -124,10 +124,10 @@ - + System.Web.WebPages.Deployment.Common.CommonResources.resources - + System.Web.WebPages.Deployment.Resources.ConfigurationResources.resources diff --git a/mcs/class/System.Web.WebPages.Razor/System.Web.WebPages.Razor-net_4_x.csproj b/mcs/class/System.Web.WebPages.Razor/System.Web.WebPages.Razor-net_4_x.csproj index 6df147742b1..72b548bd218 100644 --- a/mcs/class/System.Web.WebPages.Razor/System.Web.WebPages.Razor-net_4_x.csproj +++ b/mcs/class/System.Web.WebPages.Razor/System.Web.WebPages.Razor-net_4_x.csproj @@ -131,10 +131,10 @@ - + System.Web.WebPages.Razor.Resources.RazorWebResources.resources - + System.Web.WebPages.Razor.Common.CommonResources.resources diff --git a/mcs/class/System.Web.WebPages/System.Web.WebPages-net_4_x.csproj b/mcs/class/System.Web.WebPages/System.Web.WebPages-net_4_x.csproj index 6bb28d4513f..05b00144488 100644 --- a/mcs/class/System.Web.WebPages/System.Web.WebPages-net_4_x.csproj +++ b/mcs/class/System.Web.WebPages/System.Web.WebPages-net_4_x.csproj @@ -279,10 +279,10 @@ - + System.Web.WebPages.Resources.WebPageResources.resources - + System.Web.WebPages.Common.CommonResources.resources 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 1c4ef9bb5bf..0b2f0ba3ea7 100644 --- a/mcs/class/System.Web/System.Web-net_4_x.csproj +++ b/mcs/class/System.Web/System.Web-net_4_x.csproj @@ -1563,7 +1563,7 @@ - + TranslationResources.resources 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 52bfd6d852c..6d65c01cc37 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 @@ -1555,7 +1555,7 @@ - + TranslationResources.resources 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 c3ca632b42c..9e5f97d2627 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 @@ -1050,7 +1050,7 @@ System.Windows.Forms.DnDMove.cur - + keyboards.resources diff --git a/mcs/nunit24/ClientUtilities/util/nunit.util-net_4_x.csproj b/mcs/nunit24/ClientUtilities/util/nunit.util-net_4_x.csproj index 92c8f57f6f2..c56737e4394 100644 --- a/mcs/nunit24/ClientUtilities/util/nunit.util-net_4_x.csproj +++ b/mcs/nunit24/ClientUtilities/util/nunit.util-net_4_x.csproj @@ -159,7 +159,7 @@ - + NUnit.Util.Transform.resources diff --git a/msvc/scripts/Commons.Xml.Relaxng.pre b/msvc/scripts/Commons.Xml.Relaxng.pre new file mode 100644 index 00000000000..55520b7f48b --- /dev/null +++ b/msvc/scripts/Commons.Xml.Relaxng.pre @@ -0,0 +1 @@ +$(ProjectDir)\..\..\jay\jay.exe -ct < $(ProjectDir)\..\..\jay\skeleton.cs $(ProjectDir)\Commons.Xml.Relaxng.Rnc\RncParser.jay > $(ProjectDir)\Commons.Xml.Relaxng.Rnc\RncParser.cs diff --git a/msvc/scripts/genproj.cs b/msvc/scripts/genproj.cs index 49a862a2110..ccaa3b3149c 100644 --- a/msvc/scripts/genproj.cs +++ b/msvc/scripts/genproj.cs @@ -811,7 +811,8 @@ class MsbuildGenerator { foreach (var dk in embedded_resources) { var source = dk.Key; if (source.EndsWith (".resources")) - source.Replace (".resources", ".resx"); + source = source.Replace (".resources", ".resx"); + Console.WriteLine ("Got {0} -> {1}", dk.Key, source); resources.AppendFormat (" " + NewLine, source); resources.AppendFormat (" {0}" + NewLine, dk.Value); resources.AppendFormat (" " + NewLine); diff --git a/msvc/scripts/prepare.cs b/msvc/scripts/prepare.cs index 1d220e23fac..fba952f0701 100644 --- a/msvc/scripts/prepare.cs +++ b/msvc/scripts/prepare.cs @@ -28,12 +28,6 @@ class Prepare { } switch (args [1]){ - case "xml": - Filter (bdir + "/class/System.XML/System.Xml.XPath/Parser.jay", - bdir + "/class/System.XML/Mono.Xml.Xsl/PatternParser.jay", - (i, o) => o.Write (i.ReadToEnd ().Replace ("%start Expr", "%start Pattern"))); - break; - case "core": Filter (bdir + "/build/common/Consts.cs.in", bdir + "/build/common/Consts.cs", -- 2.25.1