[Commits] (markie) Bug 1735;apply m2 patch to twisted;r=heikki

commits at osafoundation.org commits at osafoundation.org
Fri Aug 13 12:29:56 PDT 2004


Commit by: markie
Modified files:
external/twisted/Makefile 1.5 1.6

Log message:
Bug 1735;apply m2 patch to twisted;r=heikki

ViewCVS links:
http://cvs.osafoundation.org/index.cgi/external/twisted/Makefile.diff?r1=text&tr1=1.5&r2=text&tr2=1.6

Index: external/twisted/Makefile
diff -u external/twisted/Makefile:1.5 external/twisted/Makefile:1.6
--- external/twisted/Makefile:1.5	Fri Aug  6 19:49:32 2004
+++ external/twisted/Makefile	Fri Aug 13 12:29:55 2004
@@ -7,15 +7,15 @@
 
 BUILD=build_$(SNAP)
 
-# Temporary, use to test Twisted with M2Crypto
 applym2:
+	rm -f $(SRC)/twisted/internet/m2ssl.py ; \
 	cd $(SRC); \
 	patch -p0<../m2-patches
 
 apply: patches-$(VERSION)
 	patch -Nup0 < patches-$(VERSION);echo ok
 
-build: apply
+build: apply applym2
 	cd $(SRC); \
 	$(PYTHON) setup.py build --build-base=$(BUILD) $(DIST_OPT) \
                            install --force
@@ -23,24 +23,11 @@
 expand: Twisted-$(VERSION).tar.gz
 	tar xvzf Twisted-$(VERSION).tar.gz
 
-ifeq ($(OS),Cygwin)
-
-snap: 
-	cd $(BUILD_ROOT); \
-	tar -cvzf $(TWISTED)/$(SNAP).tar.gz \
-			  $(SNAP)/$(SITE)/twisted \
-			  $(SNAP)/bin/Scripts
-
-else
-
-
 snap: 
 	cd $(BUILD_ROOT); \
 	tar -cvzf $(TWISTED)/$(SNAP).tar.gz \
 			  $(SNAP)/$(SITE)/twisted 
 
-endif
-
 clean:
 	rm -rf  $(SRC)/$(BUILD)
 



More information about the Commits mailing list