added Makefile for building and packaging everything.

Also remove prebuilt dlls now that mcs doesn't generate broken dlls and
we don't have to resort to csc anymore.

11 files changed, 57 insertions, 3 deletions

diff --git a/Rx/NET/Source/Rx_Xamarin/android/libs/Mono.Reactive.Testing.dll b/Rx/NET/Source/Rx_Xamarin/android/libs/Mono.Reactive.Testing.dll
deleted file mode 100755
index 4571647..0000000
--- a/Rx/NET/Source/Rx_Xamarin/android/libs/Mono.Reactive.Testing.dll
+++ /dev/null
diff --git a/Rx/NET/Source/Rx_Xamarin/android/libs/System.Reactive.Core.dll b/Rx/NET/Source/Rx_Xamarin/android/libs/System.Reactive.Core.dll
deleted file mode 100755
index ac31f1f..0000000
--- a/Rx/NET/Source/Rx_Xamarin/android/libs/System.Reactive.Core.dll
+++ /dev/null
diff --git a/Rx/NET/Source/Rx_Xamarin/android/libs/System.Reactive.Debugger.dll b/Rx/NET/Source/Rx_Xamarin/android/libs/System.Reactive.Debugger.dll
deleted file mode 100755
index 3fcaa87..0000000
--- a/Rx/NET/Source/Rx_Xamarin/android/libs/System.Reactive.Debugger.dll
+++ /dev/null
diff --git a/Rx/NET/Source/Rx_Xamarin/android/libs/System.Reactive.Experimental.dll b/Rx/NET/Source/Rx_Xamarin/android/libs/System.Reactive.Experimental.dll
deleted file mode 100755
index 5f05cf5..0000000
--- a/Rx/NET/Source/Rx_Xamarin/android/libs/System.Reactive.Experimental.dll
+++ /dev/null
diff --git a/Rx/NET/Source/Rx_Xamarin/android/libs/System.Reactive.Interfaces.dll b/Rx/NET/Source/Rx_Xamarin/android/libs/System.Reactive.Interfaces.dll
deleted file mode 100755
index b08589d..0000000
--- a/Rx/NET/Source/Rx_Xamarin/android/libs/System.Reactive.Interfaces.dll
+++ /dev/null
diff --git a/Rx/NET/Source/Rx_Xamarin/android/libs/System.Reactive.Linq.dll b/Rx/NET/Source/Rx_Xamarin/android/libs/System.Reactive.Linq.dll
deleted file mode 100755
index dc1e421..0000000
--- a/Rx/NET/Source/Rx_Xamarin/android/libs/System.Reactive.Linq.dll
+++ /dev/null
diff --git a/Rx/NET/Source/Rx_Xamarin/android/libs/System.Reactive.PlatformServices.dll b/Rx/NET/Source/Rx_Xamarin/android/libs/System.Reactive.PlatformServices.dll
deleted file mode 100755
index 82c5df7..0000000
--- a/Rx/NET/Source/Rx_Xamarin/android/libs/System.Reactive.PlatformServices.dll
+++ /dev/null
diff --git a/Rx/NET/Source/Rx_Xamarin/android/libs/System.Reactive.Providers.dll b/Rx/NET/Source/Rx_Xamarin/android/libs/System.Reactive.Providers.dll
deleted file mode 100755
index b96f77a..0000000
--- a/Rx/NET/Source/Rx_Xamarin/android/libs/System.Reactive.Providers.dll
+++ /dev/null
diff --git a/Rx/NET/Source/Rx_Xamarin/android/libs/System.Reactive.Runtime.Remoting.dll b/Rx/NET/Source/Rx_Xamarin/android/libs/System.Reactive.Runtime.Remoting.dll
deleted file mode 100755
index e38a83e..0000000
--- a/Rx/NET/Source/Rx_Xamarin/android/libs/System.Reactive.Runtime.Remoting.dll
+++ /dev/null
diff --git a/xpkg/Makefile b/xpkg/Makefile
new file mode 100644
index 0000000..44bde20
--- /dev/null
+++ b/xpkg/Makefile
@@ -0,0 +1,53 @@
+
+all: package
+
+clean: android_clean iOS_clean
+
+.PHONY: android android_build android_copy android_sign
+android: Rx_Xamarin android_build android_copy #android_sign
+
+android_build:
+	xbuild Rx_Xamarin/Rx_Xamarin_android.sln /p:AssemblyOriginatorKeyFile=$(KEYFILE_SNK) /p:DelaySign=false
+
+android_copy:
+	for proj in Interfaces Core Linq PlatformServices Debugger Providers Runtime.Remoting Experimental ; \
+	do \
+		cp Rx_Xamarin/android/rx/System.Reactive.$$proj/bin/Debug/System.Reactive.$$proj.dll Rx_Xamarin/android/libs ; \
+	done
+
+android_sign:
+	for proj in Interfaces Core Linq PlatformServices Debugger Providers Runtime.Remoting Experimental ; \
+	do \
+		sn -R Rx_Xamarin/android/libs/System.Reactive.$$proj.dll $(KEYFILE_SNK) ; \
+	done
+
+.PHONY: iOS iOS_build iOS_copy iOS_sign
+iOS: Rx_Xamarin iOS_build iOS_sign #iOS_sign
+
+iOS_build:
+	xbuild Rx_Xamarin/Rx_Xamarin_iOS.sln
+
+iOS_copy:
+	for $$proj in Interfaces Core Linq PlatformServices Debugger Experimental \
+	do \
+		cp Rx_Xamarin/iOS/rx/System.Reactive.$(proj)/bin/Debug/System.Reactive.$(proj).dll Rx_Xamarin/iOS/libs \
+	done
+
+iOS_sign:
+	for $$proj in Interfaces Core Linq PlatformServices Debugger Experimental \
+	do \
+		sn -R Rx_Xamarin/iOS/libs/System.Reactive.$(proj).dll $(KEYFILE_SNNK) \
+	done
+
+package: android iOS
+	./build-package.sh
+
+Rx_Xamarin:
+	ln -s ../Rx/NET/Source/Rx_Xamarin Rx_Xamarin
+
+android_clean: Rx_Xamarin
+	xbuild Rx_Xamarin/Rx_Xamarin_android.sln /t:Clean
+
+iOS_clean: Rx_Xamarin
+	xbuild Rx_Xamarin/Rx_Xamarin_iOS.sln /t:Clean
+
diff --git a/xpkg/README b/xpkg/README
index 8a9f7ff..6be542f 100644
--- a/xpkg/README
+++ b/xpkg/README
@@ -1,6 +1,7 @@
-run:
+You need to prepare signing key file (sln) to sign those assemblies. Xamarin packages should be signed with its own key.
 
-	ln -s ../Rx/NET/Source/Rx_Xamarin Rx_Xamarin
-	./build-package.sh
+To build *signed* assemblies, you need to run: make KEYFILE_SNK=/path/to/yourkey.snk
+
+If you don't need any signing, simply build Rx_Xamarin/android/Rx_Xamarin_android.sln.