diff options
| author | Marek Safar <marek.safar@gmail.com> | 2012-03-30 18:13:18 +0400 |
|---|---|---|
| committer | Marek Safar <marek.safar@gmail.com> | 2012-03-30 18:14:11 +0400 |
| commit | ac706e0db80aa08afd97fdf1aa95fa1b81137511 (patch) | |
| tree | 6957cab631294b595fce1e47ac44a2d1849995a9 /mcs/class/System.Json | |
| parent | e4135cfcbb45643ec9793724c0e9ab501d4a9fb0 (diff) | |
Fix System.Json resources to be embedded
Diffstat (limited to 'mcs/class/System.Json')
| -rw-r--r-- | mcs/class/System.Json/Makefile | 26 | ||||
| -rw-r--r-- | mcs/class/System.Json/System.Json.dll.sources | 2 |
2 files changed, 5 insertions, 23 deletions
diff --git a/mcs/class/System.Json/Makefile b/mcs/class/System.Json/Makefile index 20398a5fe6f..f83e3ed6a98 100644 --- a/mcs/class/System.Json/Makefile +++ b/mcs/class/System.Json/Makefile @@ -2,19 +2,17 @@ thisdir = class/System.Json SUBDIRS = include ../../build/rules.make -UPSTREAM_DIR = ../../../external/aspnetwebstack/src -RESX_RESOURCES = $(UPSTREAM_DIR)/System.Json/Properties/Resources.resx -RESOURCES = $(subst $(UPSTREAM_DIR),$(build_libdir),$(RESX_RESOURCES:.resx=.resources)) +System.Json.Properties.Resources.resources: ../../../external/aspnetwebstack/src/System.Json/Properties/Resources.resx + $(RESGEN) "$<" "$@" LIBRARY = System.Json.dll -LIB_MCS_FLAGS = \ - /d:ASPNETMVC -keyfile:../winfx.pub -delaysign \ +LIB_MCS_FLAGS = /d:ASPNETMVC -keyfile:../winfx.pub -delaysign \ /r:System.dll \ /r:System.Xml.dll \ /r:System.Core.dll \ /r:System.Runtime.Serialization.dll \ /r:System.ServiceModel.Web.dll \ - $(RESOURCES:%=/resource:%) + /resource:System.Json.Properties.Resources.resources ifeq (4, $(FRAMEWORK_VERSION_MAJOR)) LIB_MCS_FLAGS += /r:Microsoft.CSharp.dll @@ -22,20 +20,6 @@ endif TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) -EXTRA_DISTFILES = $(RESX_RESOURCES) - include ../../build/library.make -$(the_lib): $(RESOURCES) - -# Canned recipe which would be useful, but make doesn't run it for some reason... -#define run-resgen = -# mkdir -p $(dir $@) -# $(RESGEN) $< $@ -#endef - -$(build_libdir)/System.Json/Properties/Resources.resources: $(UPSTREAM_DIR)/System.Json/Properties/Resources.resx -# Doesn't work for some reason -# $(run-resgen) - mkdir -p $(dir $@) - $(RESGEN) $< $@ +$(the_lib): System.Json.Properties.Resources.resources diff --git a/mcs/class/System.Json/System.Json.dll.sources b/mcs/class/System.Json/System.Json.dll.sources index 7e0d4bdeb13..f829400c4a5 100644 --- a/mcs/class/System.Json/System.Json.dll.sources +++ b/mcs/class/System.Json/System.Json.dll.sources @@ -1,6 +1,4 @@ ../../build/common/Consts.cs -../../build/common/Locale.cs -../../build/common/MonoTODOAttribute.cs Assembly/AssemblyInfo.cs ../../../external/aspnetwebstack/src/RS.cs |