From 6de5dc38feee49325e0ce52af107de1925aa8a8b Mon Sep 17 00:00:00 2001 From: Marcelo Matus Date: Tue, 8 Nov 2005 15:48:51 +0000 Subject: [PATCH] use preinst-swig in all the examples git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk/SWIG@7821 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Examples/python/callback/Makefile | 2 +- Examples/python/callback/runme.py | 8 -------- Examples/python/constants/Makefile | 2 +- Examples/python/contract/Makefile | 2 +- Examples/python/enum/Makefile | 2 +- Examples/python/exception/Makefile | 2 +- Examples/python/extend/Makefile | 2 +- Examples/python/extend/runme.py | 7 ------- Examples/python/funcptr/Makefile | 2 +- Examples/python/funcptr2/Makefile | 2 +- Examples/python/functor/Makefile | 2 +- Examples/python/libffi/Makefile | 2 +- Examples/python/mpointer/Makefile | 2 +- Examples/python/operator/Makefile | 2 +- Examples/python/pointer/Makefile | 2 +- Examples/python/reference/Makefile | 2 +- Examples/python/shadow/Makefile | 2 +- Examples/python/simple/Makefile | 2 +- Examples/python/smartptr/Makefile | 2 +- Examples/python/template/Makefile | 2 +- Examples/python/variables/Makefile | 2 +- 21 files changed, 19 insertions(+), 34 deletions(-) diff --git a/Examples/python/callback/Makefile b/Examples/python/callback/Makefile index 7588b72e0..ad36d7d7e 100644 --- a/Examples/python/callback/Makefile +++ b/Examples/python/callback/Makefile @@ -1,5 +1,5 @@ TOP = ../.. -SWIG = $(TOP)/../swig +SWIG = $(TOP)/../preinst-swig CXXSRCS = example.cxx TARGET = example INTERFACE = example.i diff --git a/Examples/python/callback/runme.py b/Examples/python/callback/runme.py index 5240973c2..5d93e8223 100644 --- a/Examples/python/callback/runme.py +++ b/Examples/python/callback/runme.py @@ -12,14 +12,6 @@ class PyCallback(example.Callback): example.Callback.__init__(self) def run(self): print "PyCallback.run()" - def __del__(self): - print "PyCallback.__del__()" - # for shadow class extensions that are not "disowned" and - # define a __del__ method, it is very important to call the - # base class __del__. otherwise the c++ objects will never - # be deleted. - example.Callback.__del__(self) - # Create an Caller instance diff --git a/Examples/python/constants/Makefile b/Examples/python/constants/Makefile index 5b726c2b1..01d0f943a 100644 --- a/Examples/python/constants/Makefile +++ b/Examples/python/constants/Makefile @@ -1,5 +1,5 @@ TOP = ../.. -SWIG = $(TOP)/../swig +SWIG = $(TOP)/../preinst-swig SRCS = TARGET = example INTERFACE = example.i diff --git a/Examples/python/contract/Makefile b/Examples/python/contract/Makefile index 87a0beb2b..c7b476995 100644 --- a/Examples/python/contract/Makefile +++ b/Examples/python/contract/Makefile @@ -1,5 +1,5 @@ TOP = ../.. -SWIG = $(TOP)/../swig +SWIG = $(TOP)/../preinst-swig SRCS = example.c TARGET = example INTERFACE = example.i diff --git a/Examples/python/enum/Makefile b/Examples/python/enum/Makefile index 19580883e..f331b8203 100644 --- a/Examples/python/enum/Makefile +++ b/Examples/python/enum/Makefile @@ -1,5 +1,5 @@ TOP = ../.. -SWIG = $(TOP)/../swig +SWIG = $(TOP)/../preinst-swig CXXSRCS = example.cxx TARGET = example INTERFACE = example.i diff --git a/Examples/python/exception/Makefile b/Examples/python/exception/Makefile index 3e5d97bb0..17c4f30b7 100644 --- a/Examples/python/exception/Makefile +++ b/Examples/python/exception/Makefile @@ -1,5 +1,5 @@ TOP = ../.. -SWIG = $(TOP)/../swig +SWIG = $(TOP)/../preinst-swig CXXSRCS = TARGET = example INTERFACE = example.i diff --git a/Examples/python/extend/Makefile b/Examples/python/extend/Makefile index 7588b72e0..ad36d7d7e 100644 --- a/Examples/python/extend/Makefile +++ b/Examples/python/extend/Makefile @@ -1,5 +1,5 @@ TOP = ../.. -SWIG = $(TOP)/../swig +SWIG = $(TOP)/../preinst-swig CXXSRCS = example.cxx TARGET = example INTERFACE = example.i diff --git a/Examples/python/extend/runme.py b/Examples/python/extend/runme.py index 97fad2de8..da4d46e8b 100644 --- a/Examples/python/extend/runme.py +++ b/Examples/python/extend/runme.py @@ -12,13 +12,6 @@ class CEO(example.Manager): example.Manager.__init__(self, name) def getPosition(self): return "CEO" - def __del__(self): - print "CEO.__del__(),", self.getName() - # for shadow class extensions that are not "disowned" and - # define a __del__ method, it is very important to call the - # base class __del__. otherwise the c++ objects will never - # be deleted. - example.Manager.__del__(self) # Create an instance of our employee extension class, CEO. The calls to diff --git a/Examples/python/funcptr/Makefile b/Examples/python/funcptr/Makefile index 754c4a029..4a1e1bb71 100644 --- a/Examples/python/funcptr/Makefile +++ b/Examples/python/funcptr/Makefile @@ -1,5 +1,5 @@ TOP = ../.. -SWIG = $(TOP)/../swig +SWIG = $(TOP)/../preinst-swig SRCS = example.c TARGET = example INTERFACE = example.i diff --git a/Examples/python/funcptr2/Makefile b/Examples/python/funcptr2/Makefile index 754c4a029..4a1e1bb71 100644 --- a/Examples/python/funcptr2/Makefile +++ b/Examples/python/funcptr2/Makefile @@ -1,5 +1,5 @@ TOP = ../.. -SWIG = $(TOP)/../swig +SWIG = $(TOP)/../preinst-swig SRCS = example.c TARGET = example INTERFACE = example.i diff --git a/Examples/python/functor/Makefile b/Examples/python/functor/Makefile index dbc78cd8d..c45536529 100644 --- a/Examples/python/functor/Makefile +++ b/Examples/python/functor/Makefile @@ -1,5 +1,5 @@ TOP = ../.. -SWIG = $(TOP)/../swig +SWIG = $(TOP)/../preinst-swig CXXSRCS = TARGET = example INTERFACE = example.i diff --git a/Examples/python/libffi/Makefile b/Examples/python/libffi/Makefile index 7a20396b8..8c7edfa65 100644 --- a/Examples/python/libffi/Makefile +++ b/Examples/python/libffi/Makefile @@ -1,5 +1,5 @@ TOP = ../.. -SWIG = $(TOP)/../swig +SWIG = $(TOP)/../preinst-swig SRCS = TARGET = example INTERFACE = example.i diff --git a/Examples/python/mpointer/Makefile b/Examples/python/mpointer/Makefile index 343f04f54..58d139643 100644 --- a/Examples/python/mpointer/Makefile +++ b/Examples/python/mpointer/Makefile @@ -1,5 +1,5 @@ TOP = ../.. -SWIG = $(TOP)/../swig +SWIG = $(TOP)/../preinst-swig CXXSRCS = example.cxx TARGET = example INTERFACE = example.i diff --git a/Examples/python/operator/Makefile b/Examples/python/operator/Makefile index dbc78cd8d..c45536529 100644 --- a/Examples/python/operator/Makefile +++ b/Examples/python/operator/Makefile @@ -1,5 +1,5 @@ TOP = ../.. -SWIG = $(TOP)/../swig +SWIG = $(TOP)/../preinst-swig CXXSRCS = TARGET = example INTERFACE = example.i diff --git a/Examples/python/pointer/Makefile b/Examples/python/pointer/Makefile index 754c4a029..4a1e1bb71 100644 --- a/Examples/python/pointer/Makefile +++ b/Examples/python/pointer/Makefile @@ -1,5 +1,5 @@ TOP = ../.. -SWIG = $(TOP)/../swig +SWIG = $(TOP)/../preinst-swig SRCS = example.c TARGET = example INTERFACE = example.i diff --git a/Examples/python/reference/Makefile b/Examples/python/reference/Makefile index 19580883e..f331b8203 100644 --- a/Examples/python/reference/Makefile +++ b/Examples/python/reference/Makefile @@ -1,5 +1,5 @@ TOP = ../.. -SWIG = $(TOP)/../swig +SWIG = $(TOP)/../preinst-swig CXXSRCS = example.cxx TARGET = example INTERFACE = example.i diff --git a/Examples/python/shadow/Makefile b/Examples/python/shadow/Makefile index 343f04f54..58d139643 100644 --- a/Examples/python/shadow/Makefile +++ b/Examples/python/shadow/Makefile @@ -1,5 +1,5 @@ TOP = ../.. -SWIG = $(TOP)/../swig +SWIG = $(TOP)/../preinst-swig CXXSRCS = example.cxx TARGET = example INTERFACE = example.i diff --git a/Examples/python/simple/Makefile b/Examples/python/simple/Makefile index 754c4a029..4a1e1bb71 100644 --- a/Examples/python/simple/Makefile +++ b/Examples/python/simple/Makefile @@ -1,5 +1,5 @@ TOP = ../.. -SWIG = $(TOP)/../swig +SWIG = $(TOP)/../preinst-swig SRCS = example.c TARGET = example INTERFACE = example.i diff --git a/Examples/python/smartptr/Makefile b/Examples/python/smartptr/Makefile index 343f04f54..58d139643 100644 --- a/Examples/python/smartptr/Makefile +++ b/Examples/python/smartptr/Makefile @@ -1,5 +1,5 @@ TOP = ../.. -SWIG = $(TOP)/../swig +SWIG = $(TOP)/../preinst-swig CXXSRCS = example.cxx TARGET = example INTERFACE = example.i diff --git a/Examples/python/template/Makefile b/Examples/python/template/Makefile index f00af7dba..a4f334311 100644 --- a/Examples/python/template/Makefile +++ b/Examples/python/template/Makefile @@ -1,5 +1,5 @@ TOP = ../.. -SWIG = $(TOP)/../swig +SWIG = $(TOP)/../preinst-swig CXXSRCS = TARGET = example INTERFACE = example.i diff --git a/Examples/python/variables/Makefile b/Examples/python/variables/Makefile index 754c4a029..4a1e1bb71 100644 --- a/Examples/python/variables/Makefile +++ b/Examples/python/variables/Makefile @@ -1,5 +1,5 @@ TOP = ../.. -SWIG = $(TOP)/../swig +SWIG = $(TOP)/../preinst-swig SRCS = example.c TARGET = example INTERFACE = example.i