diff options
Diffstat (limited to 'mcs')
-rw-r--r-- | mcs/class/Makefile | 10 | ||||
-rw-r--r-- | mcs/class/Mono.Reactive.Testing/Makefile | 4 | ||||
-rw-r--r-- | mcs/class/System.Reactive.Core/Makefile | 6 | ||||
-rw-r--r-- | mcs/class/System.Reactive.Debugger/Makefile | 6 | ||||
-rw-r--r-- | mcs/class/System.Reactive.Experimental/Makefile | 6 | ||||
-rw-r--r-- | mcs/class/System.Reactive.Interfaces/Makefile | 6 | ||||
-rw-r--r-- | mcs/class/System.Reactive.Linq/Makefile | 6 | ||||
-rw-r--r-- | mcs/class/System.Reactive.PlatformServices/Makefile | 6 | ||||
-rw-r--r-- | mcs/class/System.Reactive.Providers/Makefile | 6 | ||||
-rw-r--r-- | mcs/class/System.Reactive.Runtime.Remoting/Makefile | 6 | ||||
-rw-r--r-- | mcs/class/System.Reactive.Windows.Forms/Makefile | 6 | ||||
-rw-r--r-- | mcs/class/System.Reactive.Windows.Threading/Makefile | 6 | ||||
-rw-r--r-- | mcs/class/build-rx-dll-sources.sh | 15 |
13 files changed, 72 insertions, 17 deletions
diff --git a/mcs/class/Makefile b/mcs/class/Makefile index a7af39076b0..59e8d219c28 100644 --- a/mcs/class/Makefile +++ b/mcs/class/Makefile @@ -216,6 +216,11 @@ net_4_0_dirs := \ System.Windows.Forms.DataVisualization \ System.Xaml \ WindowsBase \ + System.ServiceModel.Routing \ + System.ServiceModel.Discovery \ + System.Runtime.Caching \ + System.Runtime.DurableInstancing \ + Mono.Parallel \ System.Reactive.Interfaces \ System.Reactive.Core \ System.Reactive.Linq \ @@ -226,11 +231,6 @@ net_4_0_dirs := \ System.Reactive.Windows.Threading \ System.Reactive.Experimental \ System.Reactive.Debugger \ - System.ServiceModel.Routing \ - System.ServiceModel.Discovery \ - System.Runtime.Caching \ - System.Runtime.DurableInstancing \ - Mono.Parallel \ Microsoft.Web.Infrastructure \ WebMatrix.Data \ System.Data.Services.Client \ diff --git a/mcs/class/Mono.Reactive.Testing/Makefile b/mcs/class/Mono.Reactive.Testing/Makefile index c02117a6ddf..5f1854131d1 100644 --- a/mcs/class/Mono.Reactive.Testing/Makefile +++ b/mcs/class/Mono.Reactive.Testing/Makefile @@ -36,13 +36,13 @@ TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) -nowarn:0618 EXTRA_DISTFILES = more_build_args -VALID_PROFILE := $(filter 2 4, $(FRAMEWORK_VERSION_MAJOR)) +VALID_PROFILE := $(filter net_4_0 net_4_5, $(PROFILE)) ifndef VALID_PROFILE LIBRARY_NAME = dummy-System.Mono.Reactive.Testing.dll -NO_INSTALL = yes NO_TEST = yes endif +NO_INSTALL = yes NO_SIGN_ASSEMBLY = yes include ../../build/library.make diff --git a/mcs/class/System.Reactive.Core/Makefile b/mcs/class/System.Reactive.Core/Makefile index 1a09fb54bc4..e6395385c1b 100644 --- a/mcs/class/System.Reactive.Core/Makefile +++ b/mcs/class/System.Reactive.Core/Makefile @@ -35,13 +35,17 @@ TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) EXTRA_DISTFILES = more_build_args $(RESX_RESOURCES:.resources=.resx) $(PREBUILT) -VALID_PROFILE := $(filter 2 4, $(FRAMEWORK_VERSION_MAJOR)) +VALID_PROFILE := $(filter monotouch monodroid net_4_0 net_4_5, $(PROFILE)) ifndef VALID_PROFILE LIBRARY_NAME = dummy-System.System.Reactive.Core.dll NO_SIGN_ASSEMBLY = yes endif +INSTALL_PROFILE := $(filter net_4_5, $(PROFILE)) +ifndef INSTALL_PROFILE NO_INSTALL = yes +endif + NO_TEST = yes include ../../build/library.make diff --git a/mcs/class/System.Reactive.Debugger/Makefile b/mcs/class/System.Reactive.Debugger/Makefile index 24d6fa753aa..65d30c049ba 100644 --- a/mcs/class/System.Reactive.Debugger/Makefile +++ b/mcs/class/System.Reactive.Debugger/Makefile @@ -24,13 +24,17 @@ TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) EXTRA_DISTFILES = more_build_args -VALID_PROFILE := $(filter 2 4, $(FRAMEWORK_VERSION_MAJOR)) +VALID_PROFILE := $(filter monotouch monodroid net_4_0 net_4_5, $(PROFILE)) ifndef VALID_PROFILE LIBRARY_NAME = dummy-System.System.Reactive.Debugger.dll NO_SIGN_ASSEMBLY = yes endif +INSTALL_PROFILE := $(filter net_4_5, $(PROFILE)) +ifndef INSTALL_PROFILE NO_INSTALL = yes +endif + NO_TEST = yes include ../../build/library.make diff --git a/mcs/class/System.Reactive.Experimental/Makefile b/mcs/class/System.Reactive.Experimental/Makefile index effbc887c81..966b95daff9 100644 --- a/mcs/class/System.Reactive.Experimental/Makefile +++ b/mcs/class/System.Reactive.Experimental/Makefile @@ -24,13 +24,17 @@ TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) EXTRA_DISTFILES = more_build_args -VALID_PROFILE := $(filter 2 4, $(FRAMEWORK_VERSION_MAJOR)) +VALID_PROFILE := $(filter monotouch monodroid net_4_0 net_4_5, $(PROFILE)) ifndef VALID_PROFILE LIBRARY_NAME = dummy-System.System.Reactive.Experimental.dll NO_SIGN_ASSEMBLY = yes endif +INSTALL_PROFILE := $(filter net_4_5, $(PROFILE)) +ifndef INSTALL_PROFILE NO_INSTALL = yes +endif + NO_TEST = yes include ../../build/library.make diff --git a/mcs/class/System.Reactive.Interfaces/Makefile b/mcs/class/System.Reactive.Interfaces/Makefile index 79ccee23fd4..b001529523d 100644 --- a/mcs/class/System.Reactive.Interfaces/Makefile +++ b/mcs/class/System.Reactive.Interfaces/Makefile @@ -21,13 +21,17 @@ TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) EXTRA_DISTFILES = more_build_args -VALID_PROFILE := $(filter 2 4, $(FRAMEWORK_VERSION_MAJOR)) +VALID_PROFILE := $(filter monotouch monodroid net_4_0 net_4_5, $(PROFILE)) ifndef VALID_PROFILE LIBRARY_NAME = dummy-System.System.Reactive.Interfaces.dll NO_SIGN_ASSEMBLY = yes endif +INSTALL_PROFILE := $(filter net_4_5, $(PROFILE)) +ifndef INSTALL_PROFILE NO_INSTALL = yes +endif + NO_TEST = yes include ../../build/library.make diff --git a/mcs/class/System.Reactive.Linq/Makefile b/mcs/class/System.Reactive.Linq/Makefile index 853d222a4fb..690aa82dbc5 100644 --- a/mcs/class/System.Reactive.Linq/Makefile +++ b/mcs/class/System.Reactive.Linq/Makefile @@ -36,13 +36,17 @@ TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) EXTRA_DISTFILES = more_build_args $(RESX_RESOURCES:.resources=.resx) $(PREBUILT) -VALID_PROFILE := $(filter 2 4, $(FRAMEWORK_VERSION_MAJOR)) +VALID_PROFILE := $(filter monotouch monodroid net_4_0 net_4_5, $(PROFILE)) ifndef VALID_PROFILE LIBRARY_NAME = dummy-System.System.Reactive.Linq.dll NO_SIGN_ASSEMBLY = yes endif +INSTALL_PROFILE := $(filter net_4_5, $(PROFILE)) +ifndef INSTALL_PROFILE NO_INSTALL = yes +endif + NO_TEST = yes include ../../build/library.make diff --git a/mcs/class/System.Reactive.PlatformServices/Makefile b/mcs/class/System.Reactive.PlatformServices/Makefile index 05f493f33c7..e8b78f2d3bb 100644 --- a/mcs/class/System.Reactive.PlatformServices/Makefile +++ b/mcs/class/System.Reactive.PlatformServices/Makefile @@ -42,13 +42,17 @@ TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) -r:Mono.Reactive.Tests.dll EXTRA_DISTFILES = more_build_args $(RESX_RESOURCES:.resources=.resx) $(PREBUILT) -VALID_PROFILE := $(filter 2 4, $(FRAMEWORK_VERSION_MAJOR)) +VALID_PROFILE := $(filter monotouch monodroid net_4_0 net_4_5, $(PROFILE)) ifndef VALID_PROFILE LIBRARY_NAME = dummy-System.System.Reactive.PlatformServices.dll NO_SIGN_ASSEMBLY = yes endif +INSTALL_PROFILE := $(filter net_4_5, $(PROFILE)) +ifndef INSTALL_PROFILE NO_INSTALL = yes +endif + NO_TEST = yes include ../../build/library.make diff --git a/mcs/class/System.Reactive.Providers/Makefile b/mcs/class/System.Reactive.Providers/Makefile index 7ce54a26b51..44088a17101 100644 --- a/mcs/class/System.Reactive.Providers/Makefile +++ b/mcs/class/System.Reactive.Providers/Makefile @@ -37,13 +37,17 @@ TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) EXTRA_DISTFILES = more_build_args $(RESX_RESOURCES:.resources=.resx) $(PREBUILT) -VALID_PROFILE := $(filter 2 4, $(FRAMEWORK_VERSION_MAJOR)) +VALID_PROFILE := $(filter monodroid net_4_0 net_4_5, $(PROFILE)) ifndef VALID_PROFILE LIBRARY_NAME = dummy-System.System.Reactive.Providers.dll NO_SIGN_ASSEMBLY = yes endif +INSTALL_PROFILE := $(filter net_4_5, $(PROFILE)) +ifndef INSTALL_PROFILE NO_INSTALL = yes +endif + NO_TEST = yes include ../../build/library.make diff --git a/mcs/class/System.Reactive.Runtime.Remoting/Makefile b/mcs/class/System.Reactive.Runtime.Remoting/Makefile index 948dcef4f1b..deaf483c327 100644 --- a/mcs/class/System.Reactive.Runtime.Remoting/Makefile +++ b/mcs/class/System.Reactive.Runtime.Remoting/Makefile @@ -24,13 +24,17 @@ TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) EXTRA_DISTFILES = more_build_args -VALID_PROFILE := $(filter 2 4, $(FRAMEWORK_VERSION_MAJOR)) +VALID_PROFILE := $(filter net_4_0 net_4_5, $(PROFILE)) ifndef VALID_PROFILE LIBRARY_NAME = dummy-System.System.Reactive.Runtime.Remoting.dll NO_SIGN_ASSEMBLY = yes endif +INSTALL_PROFILE := $(filter net_4_5, $(PROFILE)) +ifndef INSTALL_PROFILE NO_INSTALL = yes +endif + NO_TEST = yes include ../../build/library.make diff --git a/mcs/class/System.Reactive.Windows.Forms/Makefile b/mcs/class/System.Reactive.Windows.Forms/Makefile index 7fb7d8fbf04..63b3fe0f4a5 100644 --- a/mcs/class/System.Reactive.Windows.Forms/Makefile +++ b/mcs/class/System.Reactive.Windows.Forms/Makefile @@ -25,13 +25,17 @@ TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) EXTRA_DISTFILES = more_build_args -VALID_PROFILE := $(filter 2 4, $(FRAMEWORK_VERSION_MAJOR)) +VALID_PROFILE := $(filter net_4_0 net_4_5, $(PROFILE)) ifndef VALID_PROFILE LIBRARY_NAME = dummy-System.System.Reactive.Windows.Forms.dll NO_SIGN_ASSEMBLY = yes endif +INSTALL_PROFILE := $(filter net_4_5, $(PROFILE)) +ifndef INSTALL_PROFILE NO_INSTALL = yes +endif + NO_TEST = yes include ../../build/library.make diff --git a/mcs/class/System.Reactive.Windows.Threading/Makefile b/mcs/class/System.Reactive.Windows.Threading/Makefile index ba111236f86..8e1641a8cb5 100644 --- a/mcs/class/System.Reactive.Windows.Threading/Makefile +++ b/mcs/class/System.Reactive.Windows.Threading/Makefile @@ -38,13 +38,17 @@ TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) EXTRA_DISTFILES = more_build_args $(RESX_RESOURCES:.resources=.resx) $(PREBUILT) -VALID_PROFILE := $(filter 2 4, $(FRAMEWORK_VERSION_MAJOR)) +VALID_PROFILE := $(filter net_4_0 net_4_5, $(PROFILE)) ifndef VALID_PROFILE LIBRARY_NAME = dummy-System.System.Reactive.Windows.Threading.dll NO_SIGN_ASSEMBLY = yes endif +INSTALL_PROFILE := $(filter net_4_5, $(PROFILE)) +ifndef INSTALL_PROFILE NO_INSTALL = yes +endif + NO_TEST = yes include ../../build/library.make diff --git a/mcs/class/build-rx-dll-sources.sh b/mcs/class/build-rx-dll-sources.sh index e12f2be893e..2ebd3f5817d 100644 --- a/mcs/class/build-rx-dll-sources.sh +++ b/mcs/class/build-rx-dll-sources.sh @@ -42,14 +42,29 @@ foreach (var ass in asses) { var pathPrefix = ass == "Tests.System.Reactive" ? "../../" : "../"; // tests are built under Mono.Reactive.Testing directory. + var sources = monoass == "Tests.System.Reactive" ? Path.Combine ("Mono.Reactive.Testing", "Mono.Reactive.Testing_test.dll.sources") : Path.Combine (monoass, monoass + ".dll.sources"); + var assdir = Path.Combine (monoass, "Assembly"); + var assinfo = Path.Combine (monoass, "Assembly", "AssemblyInfo.cs"); + + if (monoass != "Tests.System.Reactive") { + if (!Directory.Exists (assdir)) + Directory.CreateDirectory (assdir); + using (var tw = File.CreateText (assinfo)) { + tw.WriteLine ("// Due to InternalsVisibleTo issue we don't add versions so far..."); + tw.WriteLine ("// [assembly:System.Reflection.AssemblyVersion (\"0.0.0.0\")]"); + } + } + var doc = XDocument.Load (csproj); var rootNS = doc.XPathSelectElement ("//*[local-name()='RootNamespace']").Value; using (var tw = File.CreateText (sources)) { + //if (monoass != "Tests.System.Reactive") + // tw.WriteLine ("Assembly/AssemblyInfo.cs"); foreach (var path in doc.XPathSelectElements ("//*[local-name()='Compile']") .Select (el => el.Attribute ("Include").Value) .Select (s => s.Replace ("\\", "/"))) |