projects / mono.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: ac706e0)
Fix System.Web.Razor embedded resouces namespace
authorMarek Safar <marek.safar@gmail.com>
Fri, 30 Mar 2012 15:41:17 +0000 (16:41 +0100)
committerMarek Safar <marek.safar@gmail.com>
Fri, 30 Mar 2012 15:41:17 +0000 (16:41 +0100)
mcs/class/System.Web.Razor/Makefile patch | blob | history
mcs/class/System.Web.WebPages.Deployment/Makefile patch | blob | history
mcs/class/System.Web.WebPages.Razor/Makefile patch | blob | history
mcs/class/System.Web.WebPages/Makefile patch | blob | history

diff --git a/mcs/class/System.Web.Razor/Makefile b/mcs/class/System.Web.Razor/Makefile
index f2ea6ce90b463bf88ba55b389eef899f5ae4f51e..2ff684c77f0e6e0aa557a370b1a1b1589d038cf5 100644 (file)
--- a/mcs/class/System.Web.Razor/Makefile
+++ b/mcs/class/System.Web.Razor/Makefile
@@ -5,12 +5,11 @@ include ../../build/rules.make
 LIBRARY = System.Web.Razor.dll
 LIBRARY_NAME = System.Web.Razor.dll
 
-UPSTREAM_DIR = ../../../external/aspnetwebstack/src
-RESX_DIST = \
-       $(UPSTREAM_DIR)/System.Web.Razor/Resources/RazorResources.resx \
-       $(UPSTREAM_DIR)/CommonResources.resx
-
-RESOURCES = $(subst $(UPSTREAM_DIR),$(build_libdir),$(RESX_DIST:.resx=.resources))
+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) "$<" "$@"
 
 LIB_MCS_FLAGS = \
                /warn:1 \
@@ -19,28 +18,10 @@ LIB_MCS_FLAGS = \
                /r:System.dll \
                /r:System.Core.dll \
                /d:ASPNETWEBPAGES \
-               $(RESOURCES:%=/resource:%)
-
-EXTRA_DISTFILES = $(RESX_DIST)
+               /resource:System.Web.Razor.Resources.RazorResources.resources \
+               /resource:System.Web.Razor.Common.CommonResources.resources
 
 include ../../build/library.make
 
-$(build_lib): $(RESOURCES)
-
-# Canned recipe which would be useful, but make doesn't run it for some reason...
-#define run-resgen = 
-#      mkdir -p $(dir `echo $@ | $(PLATFORM_CHANGE_SEPARATOR_CMD)`)
-#      $(RESGEN) `echo $< | $(PLATFORM_CHANGE_SEPARATOR_CMD)` `echo $@ | $(PLATFORM_CHANGE_SEPARATOR_CMD)`
-#endef
-
-$(build_libdir)/System.Web.Razor/Resources/RazorResources.resources: $(UPSTREAM_DIR)/System.Web.Razor/Resources/RazorResources.resx
-#      Doesn't work for some reason
-#      $(run-resgen)
-       mkdir -p $(dir `echo $@ | $(PLATFORM_CHANGE_SEPARATOR_CMD)`)
-       $(RESGEN) `echo $< | $(PLATFORM_CHANGE_SEPARATOR_CMD)` `echo $@ | $(PLATFORM_CHANGE_SEPARATOR_CMD)`
-
-$(build_libdir)/CommonResources.resources: $(UPSTREAM_DIR)/CommonResources.resx
-#      Doesn't work for some reason
-#      $(run-resgen)
-       mkdir -p $(dir `echo $@ | $(PLATFORM_CHANGE_SEPARATOR_CMD)`)
-       $(RESGEN) `echo $< | $(PLATFORM_CHANGE_SEPARATOR_CMD)` `echo $@ | $(PLATFORM_CHANGE_SEPARATOR_CMD)`
+$(build_lib): System.Web.Razor.Resources.RazorResources.resources \
+               System.Web.Razor.Common.CommonResources.resources
diff --git a/mcs/class/System.Web.WebPages.Deployment/Makefile b/mcs/class/System.Web.WebPages.Deployment/Makefile
index f280b4b75cf5256eed504f3f5745acb14eb8a4c2..f828d7b5324433c36279603d851731b2078572d5 100644 (file)
--- a/mcs/class/System.Web.WebPages.Deployment/Makefile
+++ b/mcs/class/System.Web.WebPages.Deployment/Makefile
@@ -5,12 +5,11 @@ include ../../build/rules.make
 LIBRARY = System.Web.WebPages.Deployment.dll
 LIBRARY_NAME = System.Web.WebPages.Deployment.dll
 
-UPSTREAM_DIR = ../../../external/aspnetwebstack/src
-RESX_DIST = \
-       $(UPSTREAM_DIR)/System.Web.WebPages.Deployment/Resources/ConfigurationResources.resx \
-       $(UPSTREAM_DIR)/CommonResources.resx
-
-RESOURCES = $(subst $(UPSTREAM_DIR),$(build_libdir),$(RESX_DIST:.resx=.resources))
+System.Web.WebPages.Deployment.Common.CommonResources.resources: ../../../external/aspnetwebstack/src/CommonResources.resx
+       $(RESGEN) "$<" "$@"
+       
+System.Web.WebPages.Deployment.Resources.ConfigurationResources.resources: ../../../external/aspnetwebstack/src/System.Web.WebPages.Deployment/Resources/ConfigurationResources.resx
+       $(RESGEN) "$<" "$@"
 
 LIB_MCS_FLAGS = \
                /warn:1 \
@@ -22,28 +21,10 @@ LIB_MCS_FLAGS = \
                /r:System.Web.dll \
                /r:Microsoft.Web.Infrastructure.dll \
                /d:ASPNETWEBPAGES \
-               $(RESOURCES:%=/resource:%)
-
-EXTRA_DISTFILES = $(RESX_DIST)
+               /resource:System.Web.WebPages.Deployment.Common.CommonResources.resources \
+               /resource:System.Web.WebPages.Deployment.Resources.ConfigurationResources.resources
 
 include ../../build/library.make
 
-$(build_lib): $(RESOURCES)
-
-# Canned recipe which would be useful, but make doesn't run it for some reason...
-#define run-resgen = 
-#      mkdir -p $(dir `echo $@ | $(PLATFORM_CHANGE_SEPARATOR_CMD)`)
-#      $(RESGEN) `echo $< | $(PLATFORM_CHANGE_SEPARATOR_CMD)` `echo $@ | $(PLATFORM_CHANGE_SEPARATOR_CMD)`
-#endef
-
-$(build_libdir)/System.Web.WebPages.Deployment/Resources/ConfigurationResources.resources: $(UPSTREAM_DIR)/System.Web.WebPages.Deployment/Resources/ConfigurationResources.resx
-#      Doesn't work for some reason
-#      $(run-resgen)
-       mkdir -p $(dir `echo $@ | $(PLATFORM_CHANGE_SEPARATOR_CMD)`)
-       $(RESGEN) `echo $< | $(PLATFORM_CHANGE_SEPARATOR_CMD)` `echo $@ | $(PLATFORM_CHANGE_SEPARATOR_CMD)`
-
-$(build_libdir)/CommonResources.resources: $(UPSTREAM_DIR)/CommonResources.resx
-#      Doesn't work for some reason
-#      $(run-resgen)
-       mkdir -p $(dir `echo $@ | $(PLATFORM_CHANGE_SEPARATOR_CMD)`)
-       $(RESGEN) `echo $< | $(PLATFORM_CHANGE_SEPARATOR_CMD)` `echo $@ | $(PLATFORM_CHANGE_SEPARATOR_CMD)`
+$(build_lib): System.Web.WebPages.Deployment.Common.CommonResources.resources \
+               System.Web.WebPages.Deployment.Resources.ConfigurationResources.resources
diff --git a/mcs/class/System.Web.WebPages.Razor/Makefile b/mcs/class/System.Web.WebPages.Razor/Makefile
index 460e08cce107e2ae04bd18185cac7c8a0a42cece..d56f4d8e1cc166c5fcad111060c92cd07d133b48 100644 (file)
--- a/mcs/class/System.Web.WebPages.Razor/Makefile
+++ b/mcs/class/System.Web.WebPages.Razor/Makefile
@@ -5,12 +5,11 @@ include ../../build/rules.make
 LIBRARY = System.Web.WebPages.Razor.dll
 LIBRARY_NAME = System.Web.WebPages.Razor.dll
 
-UPSTREAM_DIR = ../../../external/aspnetwebstack/src
-RESX_DIST = \
-       $(UPSTREAM_DIR)/System.Web.WebPages.Razor/Resources/RazorWebResources.resx \
-       $(UPSTREAM_DIR)/CommonResources.resx
-
-RESOURCES = $(subst $(UPSTREAM_DIR),$(build_libdir),$(RESX_DIST:.resx=.resources))
+System.Web.WebPages.Razor.Common.CommonResources.resources: ../../../external/aspnetwebstack/src/CommonResources.resx
+       $(RESGEN) "$<" "$@"
+       
+System.Web.WebPages.Razor.Resources.RazorWebResources.resources: ../../../external/aspnetwebstack/src/System.Web.WebPages.Razor/Resources/RazorWebResources.resx
+       $(RESGEN) "$<" "$@"
 
 LIB_MCS_FLAGS = \
                /warn:1 \
@@ -24,28 +23,12 @@ LIB_MCS_FLAGS = \
                /r:System.Web.WebPages.dll \
                /r:System.Web.Razor.dll \
                /d:ASPNETWEBPAGES \
-               $(RESOURCES:%=/resource:%)
-
-EXTRA_DISTFILES = $(RESX_DIST)
+               /resource:System.Web.WebPages.Razor.Resources.RazorWebResources.resources \
+               /resource:System.Web.WebPages.Razor.Common.CommonResources.resources
 
 include ../../build/library.make
 
-$(build_lib): $(RESOURCES)
-
-# Canned recipe which would be useful, but make doesn't run it for some reason...
-#define run-resgen = 
-#      mkdir -p $(dir `echo $@ | $(PLATFORM_CHANGE_SEPARATOR_CMD)`)
-#      $(RESGEN) `echo $< | $(PLATFORM_CHANGE_SEPARATOR_CMD)` `echo $@ | $(PLATFORM_CHANGE_SEPARATOR_CMD)`
-#endef
+$(build_lib): System.Web.WebPages.Razor.Resources.RazorWebResources.resources \
+               System.Web.WebPages.Razor.Common.CommonResources.resources
 
-$(build_libdir)/System.Web.WebPages.Razor/Resources/RazorWebResources.resources: $(UPSTREAM_DIR)/System.Web.WebPages.Razor/Resources/RazorWebResources.resx
-#      Doesn't work for some reason
-#      $(run-resgen)
-       mkdir -p $(dir `echo $@ | $(PLATFORM_CHANGE_SEPARATOR_CMD)`)
-       $(RESGEN) `echo $< | $(PLATFORM_CHANGE_SEPARATOR_CMD)` `echo $@ | $(PLATFORM_CHANGE_SEPARATOR_CMD)`
 
-$(build_libdir)/CommonResources.resources: $(UPSTREAM_DIR)/CommonResources.resx
-#      Doesn't work for some reason
-#      $(run-resgen)
-       mkdir -p $(dir `echo $@ | $(PLATFORM_CHANGE_SEPARATOR_CMD)`)
-       $(RESGEN) `echo $< | $(PLATFORM_CHANGE_SEPARATOR_CMD)` `echo $@ | $(PLATFORM_CHANGE_SEPARATOR_CMD)`
diff --git a/mcs/class/System.Web.WebPages/Makefile b/mcs/class/System.Web.WebPages/Makefile
index 23bd17b7576184465aa35e967544b5d910aceea9..7bcf43bd9834234780b2650900ffac39fb1e341d 100644 (file)
--- a/mcs/class/System.Web.WebPages/Makefile
+++ b/mcs/class/System.Web.WebPages/Makefile
@@ -5,12 +5,11 @@ include ../../build/rules.make
 LIBRARY = System.Web.WebPages.dll
 LIBRARY_NAME = System.Web.WebPages.dll
 
-UPSTREAM_DIR = ../../../external/aspnetwebstack/src
-RESX_DIST = \
-       $(UPSTREAM_DIR)/System.Web.WebPages/Resources/WebPageResources.resx \
-       $(UPSTREAM_DIR)/CommonResources.resx
-
-RESOURCES = $(subst $(UPSTREAM_DIR),$(build_libdir),$(RESX_DIST:.resx=.resources))
+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) "$<" "$@"
 
 LIB_MCS_FLAGS = \
                /warn:1 \
@@ -30,28 +29,12 @@ LIB_MCS_FLAGS = \
                /r:System.Xml.dll \
                /r:System.Xml.Linq.dll \
                /d:ASPNETWEBPAGES \
-               $(RESOURCES:%=/resource:%)
+               /resource:System.Web.WebPages.Resources.WebPageResources.resources \
+               /resource:System.Web.WebPages.Common.CommonResources.resources
 
 EXTRA_DISTFILES = $(RESX_DIST)
 
 include ../../build/library.make
 
-$(build_lib): $(RESOURCES)
-
-# Canned recipe which would be useful, but make doesn't run it for some reason...
-#define run-resgen = 
-#      mkdir -p $(dir `echo $@ | $(PLATFORM_CHANGE_SEPARATOR_CMD)`)
-#      $(RESGEN) `echo $< | $(PLATFORM_CHANGE_SEPARATOR_CMD)` `echo $@ | $(PLATFORM_CHANGE_SEPARATOR_CMD)`
-#endef
-
-$(build_libdir)/System.Web.WebPages/Resources/WebPageResources.resources: $(UPSTREAM_DIR)/System.Web.WebPages/Resources/WebPageResources.resx
-#      Doesn't work for some reason
-#      $(run-resgen)
-       mkdir -p $(dir `echo $@ | $(PLATFORM_CHANGE_SEPARATOR_CMD)`)
-       $(RESGEN) `echo $< | $(PLATFORM_CHANGE_SEPARATOR_CMD)` `echo $@ | $(PLATFORM_CHANGE_SEPARATOR_CMD)`
-
-$(build_libdir)/CommonResources.resources: $(UPSTREAM_DIR)/CommonResources.resx
-#      Doesn't work for some reason
-#      $(run-resgen)
-       mkdir -p $(dir `echo $@ | $(PLATFORM_CHANGE_SEPARATOR_CMD)`)
-       $(RESGEN) `echo $< | $(PLATFORM_CHANGE_SEPARATOR_CMD)` `echo $@ | $(PLATFORM_CHANGE_SEPARATOR_CMD)`
+$(build_lib): System.Web.WebPages.Resources.WebPageResources.resources \
+               System.Web.WebPages.Common.CommonResources.resources
my mono mirror. check out Moved to http://github.com/mono/mono