Merge branch 'TR-89.88.56.47.55'

Conflicts:
	.gitignore

1 files changed, 28 insertions, 0 deletions

diff --git a/python-twisted/Makefile b/python-twisted/Makefile
new file mode 100644
index 0000000..bf23137
--- /dev/null
+++ b/python-twisted/Makefile
@@ -0,0 +1,28 @@
+include ../Makefile.inc
+
+
+.PHONY: all
+all: build
+
+.PHONY: build
+build:
+	cat ../common/LICENSE_HEADER > ./Pubnub.py
+	echo "\n" >> ./Pubnub.py
+	cat ../common/PubnubCrypto.py >> ./Pubnub.py
+	echo "\n" >> ./Pubnub.py
+	cat ../common/PubnubBase.py >> ./Pubnub.py
+	echo "\n" >> ./Pubnub.py
+	cat ../common/PubnubCoreAsync.py >> ./Pubnub.py
+	echo "\n" >> ./Pubnub.py
+	cat ./unassembled/Platform.py >> ./Pubnub.py
+	find -name "Pubnub*py" | xargs sed -i "s/PubNub\ [0-9]\.[0-9]\.[0-9]/PubNub\ $(VERSION)/g"
+
+
+.PHONY: clean
+clean:
+	rm -f Pubnub.py*
+
+.PHONY: test
+test:
+	python tests/unit-tests.py
+