diff options
| author | Miguel de Icaza <miguel@gnome.org> | 2016-06-14 23:57:09 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-14 23:57:09 +0300 |
| commit | aff1a51a389f09ca1865e54c16cfff4741435c8e (patch) | |
| tree | 53e628ad93f7ce1e25957e45561c381cfe926113 /mcs/class/System.Web.WebPages | |
| parent | 6b3a592de0eb47d9d92ce3a012ac771319afb868 (diff) | |
WIP [library.make] Make resource usage declarative in the class libraries (#3159)
[library.make] Make resource usage declarative in the class libraries
Diffstat (limited to 'mcs/class/System.Web.WebPages')
| -rw-r--r-- | mcs/class/System.Web.WebPages/Makefile | 16 | ||||
| -rw-r--r-- | mcs/class/System.Web.WebPages/System.Web.WebPages-net_4_x.csproj | 14 |
2 files changed, 11 insertions, 19 deletions
diff --git a/mcs/class/System.Web.WebPages/Makefile b/mcs/class/System.Web.WebPages/Makefile index 394f2043a11..3e9641f079c 100644 --- a/mcs/class/System.Web.WebPages/Makefile +++ b/mcs/class/System.Web.WebPages/Makefile @@ -5,24 +5,18 @@ include ../../build/rules.make LIBRARY = System.Web.WebPages.dll LIBRARY_NAME = System.Web.WebPages.dll -System.Web.WebPages.Common.CommonResources.resources: ../../../external/aspnetwebstack/src/CommonResources.resx - $(RESGEN) "$<" "$@" - -System.Web.WebPages.Resources.WebPageResources.resources: ../../../external/aspnetwebstack/src/System.Web.WebPages/Resources/WebPageResources.resx - $(RESGEN) "$<" "$@" +RESOURCE_DEFS = \ + System.Web.WebPages.Common.CommonResources,../../../external/aspnetwebstack/src/CommonResources.resx \ + System.Web.WebPages.Resources.WebPageResources,../../../external/aspnetwebstack/src/System.Web.WebPages/Resources/WebPageResources.resx LIB_REFS = Microsoft.CSharp Microsoft.Web.Infrastructure System System.ComponentModel.DataAnnotations System.Configuration System.Core System.Data.Linq System.Web System.Web.WebPages.Deployment System.Web.Razor System.Xml System.Xml.Linq + LIB_MCS_FLAGS = \ /warn:1 \ /keyfile:../winfx.pub \ /delaysign \ - /d:ASPNETWEBPAGES \ - /resource:System.Web.WebPages.Resources.WebPageResources.resources \ - /resource:System.Web.WebPages.Common.CommonResources.resources + /d:ASPNETWEBPAGES EXTRA_DISTFILES = $(RESX_DIST) include ../../build/library.make - -$(build_lib): System.Web.WebPages.Resources.WebPageResources.resources \ - System.Web.WebPages.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 2d7a70d2aa8..28ca085172c 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 @@ -208,12 +208,10 @@ -->
<PropertyGroup>
<PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' "> -cp $(ProjectDir)/../../../external/aspnetwebstack/src/CommonResources.resx $(ProjectDir)/System.Web.WebPages.Common.CommonResources.resx -cp $(ProjectDir)/../../../external/aspnetwebstack/src/System.Web.WebPages/Resources/WebPageResources.resx $(ProjectDir)/System.Web.WebPages.Resources.WebPageResources.resx + </PreBuildEvent>
<PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-cp $(ProjectDir)/../../../external/aspnetwebstack/src/CommonResources.resx $(ProjectDir)/System.Web.WebPages.Common.CommonResources.resx -cp $(ProjectDir)/../../../external/aspnetwebstack/src/System.Web.WebPages/Resources/WebPageResources.resx $(ProjectDir)/System.Web.WebPages.Resources.WebPageResources.resx
+
</PreBuildEvent>
<PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' "> @@ -280,12 +278,12 @@ cp $(ProjectDir)/../../../external/aspnetwebstack/src/System.Web.WebPages/Resour <Folder Include="Properties\" />
</ItemGroup>
<ItemGroup>
- <EmbeddedResource Include="System.Web.WebPages.Resources.WebPageResources.resx">
- <LogicalName>System.Web.WebPages.Resources.WebPageResources.resources</LogicalName>
- </EmbeddedResource>
- <EmbeddedResource Include="System.Web.WebPages.Common.CommonResources.resx">
+ <EmbeddedResource Include="../../../external/aspnetwebstack/src/CommonResources.resx">
<LogicalName>System.Web.WebPages.Common.CommonResources.resources</LogicalName>
</EmbeddedResource>
+ <EmbeddedResource Include="../../../external/aspnetwebstack/src/System.Web.WebPages/Resources/WebPageResources.resx">
+ <LogicalName>System.Web.WebPages.Resources.WebPageResources.resources</LogicalName>
+ </EmbeddedResource>
</ItemGroup>
</Project>
|