'[Mono-patches] [mono/mono] 142d3ec2: Fix System.Web.Razor embedded resouces namespace'

[prev in list] [next in list] [prev in thread] [next in thread] 

List:       mono-patches
Subject:    [Mono-patches] [mono/mono] 142d3ec2: Fix System.Web.Razor embedded resouces namespace
From:       "Marek Safar (marek.safar () gmail ! com)" <mono-patches () lists ! ximian ! com>
Date:       2012-03-30 15:43:44
Message-ID: 000001366446cfc4-7551838d-a601-414b-96ab-0c7fc47e0930-000000 () email ! amazonses ! com
[Download RAW message or body]


   Branch: refs/heads/master
     Home: https://github.com/mono/mono
  Compare: https://github.com/mono/mono/compare/ac706e0...142d3ec

   Commit: 142d3ec25322f5beb4a82b2608c19cf7d651d967
   Author: Marek Safar <marek.safar@gmail.com> (marek-safar)
     Date: 2012-03-30 15:41:17 GMT
      URL: https://github.com/mono/mono/commit/142d3ec25322f5beb4a82b2608c19cf7d651d967


Fix System.Web.Razor embedded resouces namespace

Changed paths:
  M mcs/class/System.Web.Razor/Makefile
  M mcs/class/System.Web.WebPages.Deployment/Makefile
  M mcs/class/System.Web.WebPages.Razor/Makefile
  M mcs/class/System.Web.WebPages/Makefile

Modified: 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

Modified: 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

Modified: 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)`

Modified: 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


_______________________________________________
Mono-patches maillist  -  Mono-patches@lists.ximian.com
http://lists.ximian.com/mailman/listinfo/mono-patches


[prev in list] [next in list] [prev in thread] [next in thread] 
