summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGES.current31
-rw-r--r--Examples/test-suite/python/Makefile.in3
-rw-r--r--Lib/python/director.swg3
-rw-r--r--Lib/python/pyapi.swg2
4 files changed, 37 insertions, 2 deletions
diff --git a/CHANGES.current b/CHANGES.current
index 476a72dd1..fb66769b0 100644
--- a/CHANGES.current
+++ b/CHANGES.current
@@ -1,6 +1,37 @@
Version 1.3.23 (in progress)
============================
+10/20/2004: mmatus
+ - [Python] Initial fix for python/import example. Please
+ update the Makefile (autoconf, configure, etc, expert),
+ since now probably is only working with g++, icc and a
+ few other compilers that have the -shared option.
+
+ We need to create additional shared libraries for the
+ virtual destructors. Old and usually forgotten C++
+ requirement.
+
+ Same fix need to be used in perl, I think.
+
+ - [Python] Fix generation of header file for directors,
+ now directors.swg is also included, so, it can be really
+ used from C++, and it solves some problem with compiler
+ that require that, even with the simple swig inclusion.
+
+ - [Python] Reordering the methods and moving some bodies
+ outside the class declaration. This is needed due to
+ some gcc-2.96 internal compiler errors. It seems the
+ PYTHON class is getting too large to been declared and
+ defined at the same time.
+
+ - Add the -oh option to change the output header file if
+ needed.
+
+ swig -c++ -python test.i -o test.CC -oh test.H
+
+ this is mainly to use with directors, if the current
+ default header file name is not good for you.
+
10/20/2004: wsfulton
1) Compact default arguments feature added. This feature allows one
to use the default argument code generation that was used in
diff --git a/Examples/test-suite/python/Makefile.in b/Examples/test-suite/python/Makefile.in
index d83788d06..26f91a35b 100644
--- a/Examples/test-suite/python/Makefile.in
+++ b/Examples/test-suite/python/Makefile.in
@@ -4,6 +4,7 @@
#######################################################################
LANGUAGE = python
+PYTHON = python
SCRIPTSUFFIX = _runme.py
srcdir = @srcdir@
top_srcdir = @top_srcdir@
@@ -64,7 +65,7 @@ LIBS = -L.
# a file is found which has _runme.py appended after the testcase name.
run_testcase = \
if [ -f $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) ]; then ( \
- env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH PYTHONPATH=$(srcdir):$$PYTHONPATH python $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX);) \
+ env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH PYTHONPATH=$(srcdir):$$PYTHONPATH $(PYTHON) $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX);) \
fi;
# Clean: remove the generated .py file
diff --git a/Lib/python/director.swg b/Lib/python/director.swg
index 0c5ea7e21..92906f2f7 100644
--- a/Lib/python/director.swg
+++ b/Lib/python/director.swg
@@ -1,3 +1,5 @@
+#ifndef SWIG_DIRECTOR_PYTHON_HEADER_
+#define SWIG_DIRECTOR_PYTHON_HEADER_
/***********************************************************************
* director.swg
*
@@ -190,3 +192,4 @@ namespace Swig {
#endif /* __cplusplus */
+#endif
diff --git a/Lib/python/pyapi.swg b/Lib/python/pyapi.swg
index a97100a0e..767d09f3d 100644
--- a/Lib/python/pyapi.swg
+++ b/Lib/python/pyapi.swg
@@ -81,7 +81,7 @@ typedef struct swig_const_info {
not always safe.
*/
#if !defined(SWIG_NO_COBJECT_TYPES) && !defined(SWIG_COBJECT_TYPES)
-#define SWIG_COBJECT_TYPES
+ //#define SWIG_COBJECT_TYPES
#endif
/* Flags for pointer conversion */