[Commits] (markie) Bug 1475; Apply Robin's patches to SWIG in external; r=heikki

[commits at osafoundation.org]

Commit by: markie
Modified files:
external/Makefile 1.39 1.40
external/swig/patches-20Feb04 None 1.1
external/swig/Makefile 1.8 1.9

Log message:
Bug 1475;Apply Robin's patches to SWIG in external;r=heikki

ViewCVS links:
http://cvs.osafoundation.org/index.cgi/external/Makefile.diff?r1=text&tr1=1.39&r2=text&tr2=1.40
http://cvs.osafoundation.org/index.cgi/external/swig/patches-20Feb04?rev=1.1&content-type=text/vnd.viewcvs-markup
http://cvs.osafoundation.org/index.cgi/external/swig/Makefile.diff?r1=text&tr1=1.8&r2=text&tr2=1.9

Index: external/swig/Makefile
diff -u external/swig/Makefile:1.8 external/swig/Makefile:1.9
--- external/swig/Makefile:1.8	Sat Jul  3 16:48:44 2004
+++ external/swig/Makefile	Fri Aug 13 12:23:58 2004
@@ -1,7 +1,7 @@
 
 include ../Makefile.inc
 
-VERSION=1.3.21
+VERSION=20Feb04
 SWIG=$(BUILD_ROOT)/swig
 SRC=$(SWIG)/SWIG-$(VERSION)
 
@@ -32,7 +32,7 @@
 	$(MAKE) ; \
 	$(MAKE) install
 
-$(SRC)/$(BUILD)/Makefile:
+$(SRC)/$(BUILD)/Makefile: apply
 	cd $(SRC); \
 	mkdir -p $(BUILD); \
 	cd $(BUILD); \
@@ -50,7 +50,7 @@
 
 EXECUTABLE=
 
-$(SRC)/$(BUILD)/Makefile:
+$(SRC)/$(BUILD)/Makefile: apply
 	cd $(SRC); \
 	mkdir -p $(BUILD); \
 	cd $(BUILD); \
@@ -71,6 +71,9 @@
 
 endif
 
+apply: patches-$(VERSION)
+	patch -Nup0 < patches-$(VERSION)
+
 # snap target can be empty since we don't actually need swig when
 # running Chandler
 snap: 

Index: external/Makefile
diff -u external/Makefile:1.39 external/Makefile:1.40
--- external/Makefile:1.39	Wed Aug  4 22:57:52 2004
+++ external/Makefile	Fri Aug 13 12:23:51 2004
@@ -1,5 +1,5 @@
 
-VERSION=0.3-12
+VERSION=0.3-13
 
 include Makefile.inc
 
@@ -19,13 +19,14 @@
         SOAPpy \
         zope \
         twisted \
-        pychecker
+        pychecker \
+        yapps
 
 SOURCES=persistence/db/db-4.2.52.tar.gz \
         python/Python-2.3.3.tgz \
         python/bzip2-1.0.2.tar.gz \
         python/zlib-1.2.1.tar.gz \
-        swig/swig-1.3.21.tar.gz \
+        swig/swig-20Feb04.tar.gz \
         epydoc/epydoc-2.1.tar.gz \
         PyLucene/PyLucene-0.5.1.tar.gz \
         persistence/xerces-c/xerces-c-src2_4_0.tar.gz \
@@ -39,7 +40,8 @@
         SOAPpy/SOAPpy-0.10.2.tar.gz \
         zope/ZopeInterface-3.0.0b1.tgz \
         twisted/Twisted-r11245.tar.gz \
-        pychecker/pychecker-0.8.13.tar.gz
+        pychecker/pychecker-0.8.13.tar.gz \
+        yapps/yapps2.1.1.zip
 
 .PHONY: sources expand binaries $(SYSTEMS)