[Commits] (markie) Bug 1679; new Twisted & ZopeInterface in external; r=heikki

[commits at osafoundation.org]

Commit by: markie
Modified files:
external/Makefile 1.37 1.38
external/twisted/Makefile 1.1 1.2
external/zope/Makefile None 1.1

Log message:
Bug 1679; new Twisted & ZopeInterface in external;r=heikki

ViewCVS links:
http://cvs.osafoundation.org/index.cgi/external/Makefile.diff?r1=text&tr1=1.37&r2=text&tr2=1.38
http://cvs.osafoundation.org/index.cgi/external/twisted/Makefile.diff?r1=text&tr1=1.1&r2=text&tr2=1.2
http://cvs.osafoundation.org/index.cgi/external/zope/Makefile?rev=1.1&content-type=text/vnd.viewcvs-markup

Index: external/Makefile
diff -u external/Makefile:1.37 external/Makefile:1.38
--- external/Makefile:1.37	Mon Jul 19 13:33:52 2004
+++ external/Makefile	Sun Aug  1 23:25:58 2004
@@ -1,5 +1,5 @@
 
-VERSION=0.3-10
+VERSION=0.3-11
 
 include Makefile.inc
 
@@ -17,6 +17,7 @@
         egenix-mx \
         jabber-py \
         SOAPpy \
+        zope \
         twisted \
         pychecker
 
@@ -36,7 +37,8 @@
         egenix-mx/egenix-mx-base-2.1.0.tar.gz \
         jabber-py/jabberpy0.4-0.tar.gz \
         SOAPpy/SOAPpy-0.10.2.tar.gz \
-        twisted/Twisted-1.3.0.tar.gz \
+        zope/ZopeInterface-3.0.0b1.tgz \
+        twisted/Twisted-r11108.tar.gz \
         pychecker/pychecker-0.8.13.tar.gz
 
 .PHONY: sources expand binaries $(SYSTEMS)

Index: external/twisted/Makefile
diff -u external/twisted/Makefile:1.1 external/twisted/Makefile:1.2
--- external/twisted/Makefile:1.1	Wed Jun  2 23:42:54 2004
+++ external/twisted/Makefile	Sun Aug  1 23:25:58 2004
@@ -1,5 +1,5 @@
 
-VERSION=1.3.0
+VERSION=r11108
 TWISTED=$(BUILD_ROOT)/twisted
 SRC=$(TWISTED)/Twisted-$(VERSION)
 
@@ -7,14 +7,7 @@
 
 BUILD=build_$(SNAP)
 
-.PHONY: patches-$(VERSION)
-
-apply: expand patches-$(VERSION)
-	if [ -f patches-$(VERSION) ]; then \
-            patch -Nup0 < patches-$(VERSION); echo ok; \
-        fi
-
-build: apply
+build:
 	cd $(SRC); \
 	$(PYTHON) setup.py build --build-base=$(BUILD) $(DIST_OPT) \
                            install --force
@@ -36,26 +29,10 @@
 snap: 
 	cd $(BUILD_ROOT); \
 	tar -cvzf $(TWISTED)/$(SNAP).tar.gz \
-			  $(SNAP)/$(SITE)/twisted \
-			  $(SNAP)/bin/ckeygen \
-			  $(SNAP)/bin/conch \
-			  $(SNAP)/bin/im \
-			  $(SNAP)/bin/lore \
-			  $(SNAP)/bin/mailmail \
-			  $(SNAP)/bin/manhole \
-			  $(SNAP)/bin/mktap \
-			  $(SNAP)/bin/t-im \
-			  $(SNAP)/bin/tap2deb \
-			  $(SNAP)/bin/tap2rpm \
-			  $(SNAP)/bin/tapconvert \
-			  $(SNAP)/bin/tkconch \
-			  $(SNAP)/bin/tkmktap \
-			  $(SNAP)/bin/trial \
-			  $(SNAP)/bin/twistd
-			  $(SNAP)/bin/websetroot \
+			  $(SNAP)/$(SITE)/twisted 
 
 endif
 
 clean:
-	cd $(SRC); rm -rf $(BUILD)
+	rm -rf  $(SRC)/$(BUILD)