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.Razor | |
| 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.Razor')
| -rw-r--r-- | mcs/class/System.Web.Razor/Makefile | 14 | ||||
| -rw-r--r-- | mcs/class/System.Web.Razor/System.Web.Razor-net_4_x.csproj | 14 |
2 files changed, 10 insertions, 18 deletions
diff --git a/mcs/class/System.Web.Razor/Makefile b/mcs/class/System.Web.Razor/Makefile index 542360275c1..e4472a96a0c 100644 --- a/mcs/class/System.Web.Razor/Makefile +++ b/mcs/class/System.Web.Razor/Makefile @@ -5,21 +5,15 @@ include ../../build/rules.make LIBRARY = System.Web.Razor.dll LIBRARY_NAME = System.Web.Razor.dll -System.Web.Razor.Common.CommonResources.resources: ../../../external/aspnetwebstack/src/CommonResources.resx - $(RESGEN) "$<" "$@" - -System.Web.Razor.Resources.RazorResources.resources: ../../../external/aspnetwebstack/src/System.Web.Razor/Resources/RazorResources.resx - $(RESGEN) "$<" "$@" +RESOURCE_DEFS = \ + System.Web.Razor.Common.CommonResources,../../../external/aspnetwebstack/src/CommonResources.resx \ + System.Web.Razor.Resources.RazorResources,../../../external/aspnetwebstack/src/System.Web.Razor/Resources/RazorResources.resx LIB_REFS = System System.Core LIB_MCS_FLAGS = \ /warn:1 \ /keyfile:../winfx.pub -delaysign \ - /d:ASPNETWEBPAGES \ - /resource:System.Web.Razor.Resources.RazorResources.resources \ - /resource:System.Web.Razor.Common.CommonResources.resources + /d:ASPNETWEBPAGES include ../../build/library.make -$(build_lib): System.Web.Razor.Resources.RazorResources.resources \ - System.Web.Razor.Common.CommonResources.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 561a784fa70..7b693416b89 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 @@ -213,12 +213,10 @@ -->
<PropertyGroup>
<PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' "> -resgen $(ProjectDir)\..\..\..\external\aspnetwebstack\src\CommonResources.resx $(ProjectDir)\System.Web.Razor.Common.CommonResources.resx -resgen $(ProjectDir)\..\..\..\external\aspnetwebstack\src\System.Web.Razor\Resources\RazorResources.resx $(ProjectDir)\System.Web.Razor.Resources.RazorResources.resx + </PreBuildEvent>
<PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-resgen $(ProjectDir)\..\..\..\external\aspnetwebstack\src\CommonResources.resx $(ProjectDir)\System.Web.Razor.Common.CommonResources.resx -resgen $(ProjectDir)\..\..\..\external\aspnetwebstack\src\System.Web.Razor\Resources\RazorResources.resx $(ProjectDir)\System.Web.Razor.Resources.RazorResources.resx
+
</PreBuildEvent>
<PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' "> @@ -245,12 +243,12 @@ resgen $(ProjectDir)\..\..\..\external\aspnetwebstack\src\System.Web.Razor\Resou <Folder Include="Properties\" />
</ItemGroup>
<ItemGroup>
- <EmbeddedResource Include="System.Web.Razor.Resources.RazorResources.resx">
- <LogicalName>System.Web.Razor.Resources.RazorResources.resources</LogicalName>
- </EmbeddedResource>
- <EmbeddedResource Include="System.Web.Razor.Common.CommonResources.resx">
+ <EmbeddedResource Include="../../../external/aspnetwebstack/src/CommonResources.resx">
<LogicalName>System.Web.Razor.Common.CommonResources.resources</LogicalName>
</EmbeddedResource>
+ <EmbeddedResource Include="../../../external/aspnetwebstack/src/System.Web.Razor/Resources/RazorResources.resx">
+ <LogicalName>System.Web.Razor.Resources.RazorResources.resources</LogicalName>
+ </EmbeddedResource>
</ItemGroup>
</Project>
|