diff options
| author | Mikayla Hutchinson <m.j.hutchinson@gmail.com> | 2016-09-08 08:19:08 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-08 08:19:08 +0300 |
| commit | 746756c30125019d2e219424964603e28fc08963 (patch) | |
| tree | 7f2e710e9c506b92117f245bd6f850fd28d01909 | |
| parent | dea21552509fe421f20e43366a997bb8653637b1 (diff) | |
| parent | 97ebf484bc7624cb95b82ebdaa0bfb0803a58857 (diff) | |
Merge pull request #3533 from mhutch/buildtasks-resourcesmono-4.6.0.245cycle8-GM
Revert "[xbuild] Use RESOURCE_DEFS to compile resx"
| -rw-r--r-- | mcs/class/Microsoft.NuGet.Build.Tasks/Makefile | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/mcs/class/Microsoft.NuGet.Build.Tasks/Makefile b/mcs/class/Microsoft.NuGet.Build.Tasks/Makefile index e3561d4fb47..ceac5cfb33c 100644 --- a/mcs/class/Microsoft.NuGet.Build.Tasks/Makefile +++ b/mcs/class/Microsoft.NuGet.Build.Tasks/Makefile @@ -14,8 +14,6 @@ LIBRARY_INSTALL_DIR = $(NUGET_BUILDTASKS_TARGETS_DIR) KEY_FILE = $(NUGET_BUILDTASKS_REPO_DIR)/build/PublicKey.snk SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) -RESOURCE_DEFS = Microsoft.NuGet.Build.Tasks.Strings,$(NUGET_BUILDTASKS_REPO_DIR)/src/Microsoft.NuGet.Build.Tasks/Strings.resx - LIB_REFS = $(PARENT_PROFILE)System \ $(PARENT_PROFILE)System.Core \ $(PARENT_PROFILE)System.Data \ @@ -27,9 +25,18 @@ LIB_REFS = $(PARENT_PROFILE)System \ LIB_MCS_FLAGS = \ -nowarn:3021 \ - $(SIGN_FLAGS) + $(SIGN_FLAGS) \ + -resource:Microsoft.NuGet.Build.Tasks.Strings.resources + +CLEAN_FILES = Microsoft.NuGet.Build.Tasks.Strings.resources EXTRA_DISTFILES = \ + $(NUGET_BUILDTASKS_REPO_DIR)/src/Microsoft.NuGet.Build.Tasks/Strings.resx \ $(NUGET_BUILDTASKS_REPO_DIR)/build/PublicKey.snk include ../../build/library.make + +$(build_lib): Microsoft.NuGet.Build.Tasks.Strings.resources + +Microsoft.NuGet.Build.Tasks.Strings.resources: $(NUGET_BUILDTASKS_REPO_DIR)/src/Microsoft.NuGet.Build.Tasks/Strings.resx + MONO_PATH="$(topdir)/class/lib/$(BOOTSTRAP_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(RUNTIME) $(RUNTIME_FLAGS) $(topdir)/class/lib/net_4_x/resgen.exe "$<" "$@" |