diff options
| author | Atsushi Eno <atsushieno@gmail.com> | 2013-12-16 22:30:39 +0400 |
|---|---|---|
| committer | Atsushi Eno <atsushieno@gmail.com> | 2013-12-16 22:30:39 +0400 |
| commit | d4afca2276672ec761ad2f9f99c6d835d3fa7fd8 (patch) | |
| tree | 548a32aeec206d37f71df1d96af79c744493b806 /mcs/class/System.Reactive.Observable.Aliases | |
| parent | 2c4d09109c5b9aa6eac9f51f409bce1d2c7dd3ae (diff) | |
Updated Rx to 2.2 release.
Diffstat (limited to 'mcs/class/System.Reactive.Observable.Aliases')
4 files changed, 68 insertions, 0 deletions
diff --git a/mcs/class/System.Reactive.Observable.Aliases/Assembly/AssemblyInfo.cs b/mcs/class/System.Reactive.Observable.Aliases/Assembly/AssemblyInfo.cs new file mode 100644 index 00000000000..e69de29bb2d --- /dev/null +++ b/mcs/class/System.Reactive.Observable.Aliases/Assembly/AssemblyInfo.cs diff --git a/mcs/class/System.Reactive.Observable.Aliases/Makefile b/mcs/class/System.Reactive.Observable.Aliases/Makefile new file mode 100644 index 00000000000..23a462f80a1 --- /dev/null +++ b/mcs/class/System.Reactive.Observable.Aliases/Makefile @@ -0,0 +1,62 @@ +thisdir = class/System.Reactive.Observable.Aliases +SUBDIRS = +include ../../build/rules.make + +LIBRARY = System.Reactive.Observable.Aliases.dll +LIB_MCS_FLAGS = \ + @more_build_args \ + -r:System.dll \ + -r:System.Core.dll \ + -r:System.Reactive.Interfaces.dll \ + -r:System.Reactive.Core.dll \ + -r:System.Reactive.Linq.dll \ + -r:System.Reactive.Providers.dll + +ifeq (true, $(GENERATE_RESOURCES)) +LIB_MCS_FLAGS += /define:GENERATING_RESOURCES +endif + +CLEAN_FILES += $(RESX_RESOURCES) + +RESOURCES = $(RESX_RESOURCES) + +PREBUILT = $(RESX_RESOURCES:=.prebuilt) + +ifeq (2.1, $(FRAMEWORK_VERSION)) +LIB_MCS_FLAGS += -d:NO_TASK_DELAY -d:HAS_AWAIT +endif + +NET_4_5 := $(filter 4.5, $(FRAMEWORK_VERSION)) +ifdef NET_4_5 +LIB_MCS_FLAGS += -d:HAS_EDI -d:PREFERASYNC -d:PREFER_ASYNC -d:HAS_AWAIT +endif + +TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) + +EXTRA_DISTFILES = more_build_args $(RESX_RESOURCES:.resources=.resx) $(PREBUILT) + +VALID_PROFILE := $(filter monodroid net_4_0 net_4_5, $(PROFILE)) +ifndef VALID_PROFILE +LIBRARY_NAME = dummy-System.System.Reactive.Observable.Aliases.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 + +$(the_lib): $(RESOURCES) + +$(RESX_RESOURCES): %.resources: %.resx + $(RESGEN) $< || cp $@.prebuilt $@ + +$(PREBUILT): %.prebuilt: % + cp $* $@ + +dist-default: $(PREBUILT) + diff --git a/mcs/class/System.Reactive.Observable.Aliases/System.Reactive.Observable.Aliases.dll.sources b/mcs/class/System.Reactive.Observable.Aliases/System.Reactive.Observable.Aliases.dll.sources new file mode 100644 index 00000000000..b157222f944 --- /dev/null +++ b/mcs/class/System.Reactive.Observable.Aliases/System.Reactive.Observable.Aliases.dll.sources @@ -0,0 +1,3 @@ +Assembly/AssemblyInfo.cs +../../../external/rx/Rx/NET/Source/System.Reactive.Observable.Aliases/Observable.Aliases.cs +../../../external/rx/Rx/NET/Source/System.Reactive.Observable.Aliases/Qbservable.Aliases.Generated.cs diff --git a/mcs/class/System.Reactive.Observable.Aliases/more_build_args b/mcs/class/System.Reactive.Observable.Aliases/more_build_args new file mode 100644 index 00000000000..a53ee7b7f9c --- /dev/null +++ b/mcs/class/System.Reactive.Observable.Aliases/more_build_args @@ -0,0 +1,3 @@ +-d:SIGNED +-delaysign +-keyfile:../reactive.pub |