[tools] Add resx2sr to "build" profile (#4807)

Similar to 9635b9cea0515432fead4c370b0533db91861bfe we
can now break the dependency on WinForms from resx2sr.

This allows us to add it to the "build" profile
and clean up the Makefile.

diff --git a/mcs/build/library.make b/mcs/build/library.make
index 9382401ab52712ef6e9ee7b836858e047a07233a..2e04a3a359555c76695cc522937ee4ddce2c1b30 100644 (file)
--- a/mcs/build/library.make
+++ b/mcs/build/library.make
@@ -385,11 +385,5 @@ $(the_libdir)/.doc-stamp: $(the_lib)
 gen-deps:
        @echo "$(DEPS_TARGET_DIR): $(DEP_DIRS) $(DEP_LIBS)" >> $(DEPS_FILE)
 
-# Should be $(BUILD_TOOLS_PROFILE) but still missing System.Windows.Forms
-resx2sr=$(topdir)/class/lib/net_4_x/resx2sr.exe
-
-update-corefx-sr: $(resx2sr) $(RESX_RESOURCE_STRING)
-       MONO_PATH="$(topdir)/class/lib/$(BUILD_TOOLS_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(RUNTIME) $(RUNTIME_FLAGS) $(resx2sr) $(RESX_RESOURCE_STRING) >corefx/SR.cs
-
-$(resx2sr):
-       $(MAKE) -C $(topdir)/tools/resx2sr
+update-corefx-sr: $(RESX_RESOURCE_STRING)
+       MONO_PATH="$(topdir)/class/lib/$(BUILD_TOOLS_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(RUNTIME) $(RUNTIME_FLAGS) $(topdir)/class/lib/$(BUILD_TOOLS_PROFILE)/resx2sr.exe $(RESX_RESOURCE_STRING) >corefx/SR.cs

diff --git a/mcs/tools/Makefile b/mcs/tools/Makefile
index d5426120a37a0c779d007b1fab6131978f61b132..2d1d7438b9e0c77fef16851eded6cc7097a940ae 100644 (file)
--- a/mcs/tools/Makefile
+++ b/mcs/tools/Makefile
@@ -49,7 +49,7 @@ net_4_5_dirs := \
        mono-symbolicate        \
        linker-analyzer
 
-build_SUBDIRS = resgen gacutil security culevel cil-stringreplacer commoncryptogenerator
+build_SUBDIRS = resgen gacutil security culevel cil-stringreplacer commoncryptogenerator resx2sr
 net_4_5_SUBDIRS = gacutil
 net_4_5_PARALLEL_SUBDIRS = $(net_4_5_dirs)
 

diff --git a/mcs/tools/resx2sr/Makefile b/mcs/tools/resx2sr/Makefile
index c9cac90e4d4ec60701c4d07052fed3b27544a518..82208a6ea374a8288becc2cfcc1ac42412b2a478 100644 (file)
--- a/mcs/tools/resx2sr/Makefile
+++ b/mcs/tools/resx2sr/Makefile
@@ -3,8 +3,9 @@ SUBDIRS =
 include ../../build/rules.make
 
 PROGRAM = resx2sr.exe
+NO_INSTALL = yes
 
-LIB_REFS = System System.Windows.Forms
-LOCAL_MCS_FLAGS =
+LIB_REFS = System System.Drawing System.Xml
+LOCAL_MCS_FLAGS = -unsafe
 
 include ../../build/executable.make

diff --git a/mcs/tools/resx2sr/resx2sr.exe.sources b/mcs/tools/resx2sr/resx2sr.exe.sources
index 49f8c241c7c7240823de48fda1375a1c2d7b7d84..17b8ebd1f22872184222851234c4130b792fceb0 100644 (file)
--- a/mcs/tools/resx2sr/resx2sr.exe.sources
+++ b/mcs/tools/resx2sr/resx2sr.exe.sources
@@ -1,2 +1,21 @@
+../../build/common/MonoTODOAttribute.cs
 resx2sr.cs
 ../../class/Mono.Options/Mono.Options/Options.cs
+../../class/System.Windows.Forms/System.Resources/AssemblyNamesTypeResolutionService.cs
+../../class/System.Windows.Forms/System.Resources/ResXDataNode.cs
+../../class/System.Windows.Forms/System.Resources/ResXResourceSet.cs
+../../class/System.Windows.Forms/System.Resources/ByteArrayFromResXHandler.cs
+../../class/System.Windows.Forms/System.Resources/ResXDataNodeHandler.cs
+../../class/System.Windows.Forms/System.Resources/ResXResourceWriter.cs
+../../class/System.Windows.Forms/System.Resources/FileRefHandler.cs
+../../class/System.Windows.Forms/System.Resources/ResXFileRef.cs
+../../class/System.Windows.Forms/System.Resources/SerializedFromResXHandler.cs
+../../class/System.Windows.Forms/System.Resources/InMemoryHandler.cs
+../../class/System.Windows.Forms/System.Resources/ResXNullRef.cs
+../../class/System.Windows.Forms/System.Resources/TypeConverterFromResXHandler.cs
+../../class/System.Windows.Forms/System.Resources/NullRefHandler.cs
+../../class/System.Windows.Forms/System.Resources/ResXResourceReader.cs
+../../class/System.Runtime.Serialization.Formatters.Soap/System.Runtime.Serialization.Formatters.Soap/SoapFormatter.cs
+../../class/System.Runtime.Serialization.Formatters.Soap/System.Runtime.Serialization.Formatters.Soap/SoapReader.cs
+../../class/System.Runtime.Serialization.Formatters.Soap/System.Runtime.Serialization.Formatters.Soap/SoapTypeMapper.cs
+../../class/System.Runtime.Serialization.Formatters.Soap/System.Runtime.Serialization.Formatters.Soap/SoapWriter.cs