diff options
author | William S Fulton <wsf@fultondesigns.co.uk> | 2008-11-26 22:50:35 +0000 |
---|---|---|
committer | William S Fulton <wsf@fultondesigns.co.uk> | 2008-11-26 22:50:35 +0000 |
commit | b266e1f68cedf1601e386ecedca3cce324803661 (patch) | |
tree | d6c15c6d3413b0732a14baf662954a948c812d4a | |
parent | c3047165d60c0a562963ee1aadd1cc4c9f8a40e1 (diff) | |
download | swig-b266e1f68cedf1601e386ecedca3cce324803661.tar.gz |
modifying build system not to rely on the -I path to find the input files avoiding warning 125: move python .i files up one directory, some files have been renamed - prepended with python
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@10953 626c5289-ae23-0410-ae9c-e8d60b6d4f22
-rw-r--r-- | Examples/test-suite/argcargvtest.i (renamed from Examples/test-suite/python/argcargvtest.i) | 0 | ||||
-rw-r--r-- | Examples/test-suite/callback.i (renamed from Examples/test-suite/python/callback.i) | 0 | ||||
-rw-r--r-- | Examples/test-suite/complextest.i (renamed from Examples/test-suite/python/complextest.i) | 0 | ||||
-rw-r--r-- | Examples/test-suite/director_profile.i (renamed from Examples/test-suite/python/director_profile.i) | 0 | ||||
-rw-r--r-- | Examples/test-suite/director_stl.i (renamed from Examples/test-suite/python/director_stl.i) | 0 | ||||
-rw-r--r-- | Examples/test-suite/iadd.i (renamed from Examples/test-suite/python/iadd.i) | 0 | ||||
-rw-r--r-- | Examples/test-suite/inout.i (renamed from Examples/test-suite/python/inout.i) | 0 | ||||
-rw-r--r-- | Examples/test-suite/inplaceadd.i (renamed from Examples/test-suite/python/inplaceadd.i) | 0 | ||||
-rw-r--r-- | Examples/test-suite/input.i (renamed from Examples/test-suite/python/input.i) | 0 | ||||
-rw-r--r-- | Examples/test-suite/li_std_carray.i (renamed from Examples/test-suite/python/li_std_carray.i) | 0 | ||||
-rw-r--r-- | Examples/test-suite/li_std_vectora.i (renamed from Examples/test-suite/python/li_std_vectora.i) | 0 | ||||
-rw-r--r-- | Examples/test-suite/li_std_wstream.i (renamed from Examples/test-suite/python/li_std_wstream.i) | 0 | ||||
-rw-r--r-- | Examples/test-suite/python/Makefile.in | 5 | ||||
-rw-r--r-- | Examples/test-suite/python/python_abstractbase_runme3.py (renamed from Examples/test-suite/python/abstractbase_runme3.py) | 2 | ||||
-rw-r--r-- | Examples/test-suite/python/python_kwargs_runme.py (renamed from Examples/test-suite/python/kwargs_runme.py) | 2 | ||||
-rw-r--r-- | Examples/test-suite/python/python_nondynamic_runme.py (renamed from Examples/test-suite/python/nondynamic_runme.py) | 10 | ||||
-rw-r--r-- | Examples/test-suite/python/python_overload_simple_cast_runme.py (renamed from Examples/test-suite/python/overload_simple_cast_runme.py) | 2 | ||||
-rw-r--r-- | Examples/test-suite/python/python_pybuf_runme3.py (renamed from Examples/test-suite/python/pybuf_runme3.py) | 4 | ||||
-rw-r--r-- | Examples/test-suite/python/tag_no_clash_with_variable_runme.i | 3 | ||||
-rw-r--r-- | Examples/test-suite/python/vector.i | 51 | ||||
-rw-r--r-- | Examples/test-suite/python_abstractbase.i (renamed from Examples/test-suite/python/abstractbase.i) | 2 | ||||
-rw-r--r-- | Examples/test-suite/python_autodoc.i (renamed from Examples/test-suite/python/autodoc.i) | 2 | ||||
-rw-r--r-- | Examples/test-suite/python_kwargs.i (renamed from Examples/test-suite/python/kwargs.i) | 2 | ||||
-rw-r--r-- | Examples/test-suite/python_nondynamic.i (renamed from Examples/test-suite/python/nondynamic.i) | 2 | ||||
-rw-r--r-- | Examples/test-suite/python_overload_simple_cast.i (renamed from Examples/test-suite/python/overload_simple_cast.i) | 2 | ||||
-rw-r--r-- | Examples/test-suite/python_pybuf.i (renamed from Examples/test-suite/python/pybuf.i) | 2 | ||||
-rw-r--r-- | Examples/test-suite/simutry.i (renamed from Examples/test-suite/python/simutry.i) | 0 | ||||
-rw-r--r-- | Examples/test-suite/swigobject.i (renamed from Examples/test-suite/python/swigobject.i) | 0 | ||||
-rw-r--r-- | Examples/test-suite/template_matrix.i (renamed from Examples/test-suite/python/template_matrix.i) | 0 |
29 files changed, 19 insertions, 72 deletions
diff --git a/Examples/test-suite/python/argcargvtest.i b/Examples/test-suite/argcargvtest.i index ed5aa0985..ed5aa0985 100644 --- a/Examples/test-suite/python/argcargvtest.i +++ b/Examples/test-suite/argcargvtest.i diff --git a/Examples/test-suite/python/callback.i b/Examples/test-suite/callback.i index c4d50d3fe..c4d50d3fe 100644 --- a/Examples/test-suite/python/callback.i +++ b/Examples/test-suite/callback.i diff --git a/Examples/test-suite/python/complextest.i b/Examples/test-suite/complextest.i index 64c751a82..64c751a82 100644 --- a/Examples/test-suite/python/complextest.i +++ b/Examples/test-suite/complextest.i diff --git a/Examples/test-suite/python/director_profile.i b/Examples/test-suite/director_profile.i index 25ed895b5..25ed895b5 100644 --- a/Examples/test-suite/python/director_profile.i +++ b/Examples/test-suite/director_profile.i diff --git a/Examples/test-suite/python/director_stl.i b/Examples/test-suite/director_stl.i index cbcb4ba85..cbcb4ba85 100644 --- a/Examples/test-suite/python/director_stl.i +++ b/Examples/test-suite/director_stl.i diff --git a/Examples/test-suite/python/iadd.i b/Examples/test-suite/iadd.i index 76604c027..76604c027 100644 --- a/Examples/test-suite/python/iadd.i +++ b/Examples/test-suite/iadd.i diff --git a/Examples/test-suite/python/inout.i b/Examples/test-suite/inout.i index dc6db0ecb..dc6db0ecb 100644 --- a/Examples/test-suite/python/inout.i +++ b/Examples/test-suite/inout.i diff --git a/Examples/test-suite/python/inplaceadd.i b/Examples/test-suite/inplaceadd.i index 91ef84bd2..91ef84bd2 100644 --- a/Examples/test-suite/python/inplaceadd.i +++ b/Examples/test-suite/inplaceadd.i diff --git a/Examples/test-suite/python/input.i b/Examples/test-suite/input.i index 6cef3f9f5..6cef3f9f5 100644 --- a/Examples/test-suite/python/input.i +++ b/Examples/test-suite/input.i diff --git a/Examples/test-suite/python/li_std_carray.i b/Examples/test-suite/li_std_carray.i index b38e0e441..b38e0e441 100644 --- a/Examples/test-suite/python/li_std_carray.i +++ b/Examples/test-suite/li_std_carray.i diff --git a/Examples/test-suite/python/li_std_vectora.i b/Examples/test-suite/li_std_vectora.i index d95fdf648..d95fdf648 100644 --- a/Examples/test-suite/python/li_std_vectora.i +++ b/Examples/test-suite/li_std_vectora.i diff --git a/Examples/test-suite/python/li_std_wstream.i b/Examples/test-suite/li_std_wstream.i index e4d725f10..e4d725f10 100644 --- a/Examples/test-suite/python/li_std_wstream.i +++ b/Examples/test-suite/li_std_wstream.i diff --git a/Examples/test-suite/python/Makefile.in b/Examples/test-suite/python/Makefile.in index 1fd2f4846..7b2f12539 100644 --- a/Examples/test-suite/python/Makefile.in +++ b/Examples/test-suite/python/Makefile.in @@ -64,9 +64,10 @@ CPP_TEST_CASES += \ std_containers \ swigobject \ template_matrix \ - simutry \ - vector + simutry +# li_std_carray +# director_profile C_TEST_CASES += \ file_test \ diff --git a/Examples/test-suite/python/abstractbase_runme3.py b/Examples/test-suite/python/python_abstractbase_runme3.py index 13a87ee5e..e34777558 100644 --- a/Examples/test-suite/python/abstractbase_runme3.py +++ b/Examples/test-suite/python/python_abstractbase_runme3.py @@ -1,4 +1,4 @@ -from abstractbase import * +from python_abstractbase import * from collections import * assert issubclass(Mapii, MutableMapping) assert issubclass(Multimapii, MutableMapping) diff --git a/Examples/test-suite/python/kwargs_runme.py b/Examples/test-suite/python/python_kwargs_runme.py index 91812929d..fb6e191dd 100644 --- a/Examples/test-suite/python/kwargs_runme.py +++ b/Examples/test-suite/python/python_kwargs_runme.py @@ -1,4 +1,4 @@ -from kwargs import * +from python_kwargs import * class MyFoo(Foo): def __init__(self, a , b = 0): diff --git a/Examples/test-suite/python/nondynamic_runme.py b/Examples/test-suite/python/python_nondynamic_runme.py index 18230616d..27755db9c 100644 --- a/Examples/test-suite/python/nondynamic_runme.py +++ b/Examples/test-suite/python/python_nondynamic_runme.py @@ -1,6 +1,6 @@ -import nondynamic +import python_nondynamic -aa = nondynamic.A() +aa = python_nondynamic.A() aa.a = 1 aa.b = 2 @@ -14,10 +14,10 @@ if not err: raise RuntimeError, "A is not static" -class B(nondynamic.A): +class B(python_nondynamic.A): c = 4 def __init__(self): - nondynamic.A.__init__(self) + python_nondynamic.A.__init__(self) pass pass @@ -35,5 +35,5 @@ if not err: raise RuntimeError, "B is not static" -cc = nondynamic.C() +cc = python_nondynamic.C() cc.d = 3 diff --git a/Examples/test-suite/python/overload_simple_cast_runme.py b/Examples/test-suite/python/python_overload_simple_cast_runme.py index 87e6e5d43..1b3a5482c 100644 --- a/Examples/test-suite/python/overload_simple_cast_runme.py +++ b/Examples/test-suite/python/python_overload_simple_cast_runme.py @@ -1,4 +1,4 @@ -from overload_simple_cast import * +from python_overload_simple_cast import * class Ai: def __init__(self,x): diff --git a/Examples/test-suite/python/pybuf_runme3.py b/Examples/test-suite/python/python_pybuf_runme3.py index 9294c6b72..152aecdc0 100644 --- a/Examples/test-suite/python/pybuf_runme3.py +++ b/Examples/test-suite/python/python_pybuf_runme3.py @@ -1,7 +1,7 @@ #run: -# python pybuf_runme3.py benchmark +# python python_pybuf_runme3.py benchmark #for the benchmark, other wise the test case will be run -import pybuf +import python_pybuf import sys if len(sys.argv)>=2 and sys.argv[1]=="benchmark": #run the benchmark diff --git a/Examples/test-suite/python/tag_no_clash_with_variable_runme.i b/Examples/test-suite/python/tag_no_clash_with_variable_runme.i deleted file mode 100644 index 0f8fdafed..000000000 --- a/Examples/test-suite/python/tag_no_clash_with_variable_runme.i +++ /dev/null @@ -1,3 +0,0 @@ -import enum_tag_no_clash_with_variable - -error_action = error_action diff --git a/Examples/test-suite/python/vector.i b/Examples/test-suite/python/vector.i deleted file mode 100644 index 04c961cda..000000000 --- a/Examples/test-suite/python/vector.i +++ /dev/null @@ -1,51 +0,0 @@ -%module vector -%{ -#include <vector> -%} - -%define SWIG_STD_VECTOR_MINIMUM(CSTYPE, CTYPE...) - public: - typedef size_t size_type; - typedef CTYPE value_type; - size_type size() const; - vector(); - %extend { - static std::vector<CTYPE > *Repeat(const value_type& value, int count) /*throw (std::out_of_range)*/ { -// if (count < 0) -// throw std::out_of_range("count"); - return new std::vector<CTYPE >(count, value); - } - } -%enddef - -namespace std { - // primary (unspecialized) class template for std::vector - // does not require operator== to be defined - template<class T> class vector { - SWIG_STD_VECTOR_MINIMUM(T, T) - }; -} - -%define SWIG_STD_VECTOR_SPECIALIZE(CSTYPE, CTYPE...) -namespace std { - template<> class vector<CTYPE > { - SWIG_STD_VECTOR_MINIMUM(CSTYPE, CTYPE) - }; -} -%enddef - -SWIG_STD_VECTOR_SPECIALIZE(float, float) - -%inline %{ -typedef float Real; -%} - -#if 1 -//fails -namespace std { - %template(RealVector) vector<Real>; -} -#else -//works -%template(RealVector) std::vector<Real>; -#endif diff --git a/Examples/test-suite/python/abstractbase.i b/Examples/test-suite/python_abstractbase.i index 530f21921..f72688237 100644 --- a/Examples/test-suite/python/abstractbase.i +++ b/Examples/test-suite/python_abstractbase.i @@ -1,4 +1,4 @@ -%module abstractbase +%module python_abstractbase %include <pyabc.i> %include <std_map.i> %include <std_multimap.i> diff --git a/Examples/test-suite/python/autodoc.i b/Examples/test-suite/python_autodoc.i index c22cc02f0..c363e4384 100644 --- a/Examples/test-suite/python/autodoc.i +++ b/Examples/test-suite/python_autodoc.i @@ -1,4 +1,4 @@ -%module(docstring="hello") autodoc +%module(docstring="hello") python_autodoc %feature("autodoc"); diff --git a/Examples/test-suite/python/kwargs.i b/Examples/test-suite/python_kwargs.i index 83713d8c2..28089bbf1 100644 --- a/Examples/test-suite/python/kwargs.i +++ b/Examples/test-suite/python_kwargs.i @@ -1,4 +1,4 @@ -%module kwargs +%module python_kwargs %nocopyctor; %kwargs; diff --git a/Examples/test-suite/python/nondynamic.i b/Examples/test-suite/python_nondynamic.i index 2acc9bf8b..26c69644d 100644 --- a/Examples/test-suite/python/nondynamic.i +++ b/Examples/test-suite/python_nondynamic.i @@ -1,4 +1,4 @@ -%module nondynamic +%module python_nondynamic /* Use the %pythonnondynamic directuve to make the wrapped class a diff --git a/Examples/test-suite/python/overload_simple_cast.i b/Examples/test-suite/python_overload_simple_cast.i index d274722c0..e7f58d788 100644 --- a/Examples/test-suite/python/overload_simple_cast.i +++ b/Examples/test-suite/python_overload_simple_cast.i @@ -1,4 +1,4 @@ // Simple tests of overloaded functions -%module("castmode") overload_simple_cast +%module("castmode") python_overload_simple_cast %include overload_simple.i diff --git a/Examples/test-suite/python/pybuf.i b/Examples/test-suite/python_pybuf.i index 88dd1aa6a..8e1302582 100644 --- a/Examples/test-suite/python/pybuf.i +++ b/Examples/test-suite/python_pybuf.i @@ -1,4 +1,4 @@ -%module pybuf +%module python_pybuf %include<pybuffer.i> %include<cstring.i> /*functions for the test case*/ diff --git a/Examples/test-suite/python/simutry.i b/Examples/test-suite/simutry.i index addea14db..addea14db 100644 --- a/Examples/test-suite/python/simutry.i +++ b/Examples/test-suite/simutry.i diff --git a/Examples/test-suite/python/swigobject.i b/Examples/test-suite/swigobject.i index 2e77969b9..2e77969b9 100644 --- a/Examples/test-suite/python/swigobject.i +++ b/Examples/test-suite/swigobject.i diff --git a/Examples/test-suite/python/template_matrix.i b/Examples/test-suite/template_matrix.i index 27696542a..27696542a 100644 --- a/Examples/test-suite/python/template_matrix.i +++ b/Examples/test-suite/template_matrix.i |