jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

remove -py3 related tests. Move py3 specific code to it's own module

Browse source
This commit is contained in:
Mike Romberg 2016-06-03 18:11:07 -06:00
commit 055ddc6dfc
21 changed files with 49 additions and 226 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Examples/python/import_packages/split_modules/Makefile
View file

@ -1,8 +1,8 @@
TOP = ../../..
LIBS =
subdirs = builtin vanilla builtin_split vanilla_split \
builtin_nopy3 vanilla_nopy3 builtin_split_nopy3 vanilla_split_nopy3
subdirs = builtin vanilla builtin_split vanilla_split
check: build
for s in $(subdirs); do \

18
Examples/python/import_packages/split_modules/builtin_nopy3/Makefile
View file

@ -1,18 +0,0 @@
TOP = ../../../..
SWIGEXE = $(TOP)/../swig
SWIG_LIB_DIR = $(TOP)/../$(TOP_BUILDDIR_TO_TOP_SRCDIR)Lib
SWIGOPT =
LIBS =
check: build
$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' python_run
build:
cd pkg1 && $(MAKE) build
static:
cd pkg1 && $(MAKE) static
clean:
$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' TARGET='foo' python_clean
cd pkg1 && $(MAKE) -f $(TOP)/../Makefile SRCDIR='$(SRCDIR)' TARGET='foo' python_clean

22
Examples/python/import_packages/split_modules/builtin_nopy3/pkg1/Makefile
View file

@ -1,22 +0,0 @@
TOP = ../../../../..
SWIGEXE = $(TOP)/../swig
SWIG_LIB_DIR = $(TOP)/../$(TOP_BUILDDIR_TO_TOP_SRCDIR)Lib
SWIGOPT = -builtin
LIBS =
build:
$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' \
SWIGPYTHON='$$(SWIG) -python' \
SWIG_LIB_DIR='$(SWIG_LIB_DIR)' SWIGEXE='$(SWIGEXE)' \
SWIGOPT='$(SWIGOPT)' LIBS='$(LIBS)' TARGET='foo' \
INTERFACE='foo.i' python_cpp
static:
$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' \
SWIG_LIB_DIR='$(SWIG_LIB_DIR)' SWIGEXE='$(SWIGEXE)' \
SWIGOPT='$(SWIGOPT)' LIBS='$(LIBS)' TARGET='foo' \
INTERFACE='foo.i' python_cpp_static
clean:
$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' TARGET='foo' python_clean

1
Examples/python/import_packages/split_modules/builtin_nopy3/pkg1/__init__.py
View file

@ -1 +0,0 @@
# killroy was here

10
Examples/python/import_packages/split_modules/builtin_nopy3/pkg1/foo.i
View file

@ -1,10 +0,0 @@
%module(package="pkg1") foo
%{
static unsigned count(void)
{
return 3;
}
%}
unsigned count(void);

3
Examples/python/import_packages/split_modules/builtin_nopy3/runme.py
View file

@ -1,3 +0,0 @@
import pkg1.foo
assert(pkg1.foo.count() == 3)

23
Examples/python/import_packages/split_modules/builtin_split_nopy3/Makefile
View file

@ -1,23 +0,0 @@
TOP = ../../../..
SWIGEXE = $(TOP)/../swig
SWIG_LIB_DIR = $(TOP)/../$(TOP_BUILDDIR_TO_TOP_SRCDIR)Lib
SWIGOPT = -builtin -outdir pkg1
LIBS =
check: build
$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' python_run
build:
$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' \
SWIGPYTHON='$$(SWIG) -python' \
SWIG_LIB_DIR='$(SWIG_LIB_DIR)' SWIGEXE='$(SWIGEXE)' \
SWIGOPT='$(SWIGOPT)' LIBS='$(LIBS)' TARGET='foo' INTERFACE='foo.i' python_cpp
static:
$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' \
SWIG_LIB_DIR='$(SWIG_LIB_DIR)' SWIGEXE='$(SWIGEXE)' \
SWIGOPT='$(SWIGOPT)' LIBS='$(LIBS)' TARGET='foo' INTERFACE='foo.i' python_cpp_static
clean:
$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' TARGET='foo' python_clean
cd pkg1 && $(MAKE) -f $(TOP)/../Makefile SRCDIR='$(SRCDIR)' TARGET='foo' python_clean

10
Examples/python/import_packages/split_modules/builtin_split_nopy3/foo.i
View file

@ -1,10 +0,0 @@
%module(package="pkg1") foo
%{
static unsigned count(void)
{
return 3;
}
%}
unsigned count(void);

1
Examples/python/import_packages/split_modules/builtin_split_nopy3/pkg1/__init__.py
View file

@ -1 +0,0 @@
# killroy was here

3
Examples/python/import_packages/split_modules/builtin_split_nopy3/runme.py
View file

@ -1,3 +0,0 @@
import pkg1.foo
assert(pkg1.foo.count() == 3)

18
Examples/python/import_packages/split_modules/vanilla_nopy3/Makefile
View file

@ -1,18 +0,0 @@
TOP = ../../../..
SWIGEXE = $(TOP)/../swig
SWIG_LIB_DIR = $(TOP)/../$(TOP_BUILDDIR_TO_TOP_SRCDIR)Lib
SWIGOPT =
LIBS =
check: build
$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' python_run
build:
cd pkg1 && $(MAKE) build
static:
cd pkg1 && $(MAKE) static
clean:
$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' TARGET='foo' python_clean
cd pkg1 && $(MAKE) -f $(TOP)/../Makefile SRCDIR='$(SRCDIR)' TARGET='foo' python_clean

19
Examples/python/import_packages/split_modules/vanilla_nopy3/pkg1/Makefile
View file

@ -1,19 +0,0 @@
TOP = ../../../../..
SWIGEXE = $(TOP)/../swig
SWIG_LIB_DIR = $(TOP)/../$(TOP_BUILDDIR_TO_TOP_SRCDIR)Lib
SWIGOPT =
LIBS =
build:
$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' \
SWIGPYTHON='$$(SWIG) -python' \
SWIG_LIB_DIR='$(SWIG_LIB_DIR)' SWIGEXE='$(SWIGEXE)' \
SWIGOPT='$(SWIGOPT)' LIBS='$(LIBS)' TARGET='foo' INTERFACE='foo.i' python_cpp
static:
$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' \
SWIG_LIB_DIR='$(SWIG_LIB_DIR)' SWIGEXE='$(SWIGEXE)' \
SWIGOPT='$(SWIGOPT)' LIBS='$(LIBS)' TARGET='foo' INTERFACE='foo.i' python_cpp_static
clean:
$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' TARGET='foo' python_clean

1
Examples/python/import_packages/split_modules/vanilla_nopy3/pkg1/__init__.py
View file

@ -1 +0,0 @@
# killroy was here

10
Examples/python/import_packages/split_modules/vanilla_nopy3/pkg1/foo.i
View file

@ -1,10 +0,0 @@
%module(package="pkg1") foo
%{
static unsigned count(void)
{
return 3;
}
%}
unsigned count(void);

3
Examples/python/import_packages/split_modules/vanilla_nopy3/runme.py
View file

@ -1,3 +0,0 @@
import pkg1.foo
assert(pkg1.foo.count() == 3)

23
Examples/python/import_packages/split_modules/vanilla_split_nopy3/Makefile
View file

@ -1,23 +0,0 @@
TOP = ../../../..
SWIGEXE = $(TOP)/../swig
SWIG_LIB_DIR = $(TOP)/../$(TOP_BUILDDIR_TO_TOP_SRCDIR)Lib
SWIGOPT = -outdir pkg1
LIBS =
check: build
$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' python_run
build:
$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' \
SWIGPYTHON='$$(SWIG) -python' \
SWIG_LIB_DIR='$(SWIG_LIB_DIR)' SWIGEXE='$(SWIGEXE)' \
SWIGOPT='$(SWIGOPT)' LIBS='$(LIBS)' TARGET='foo' INTERFACE='foo.i' python_cpp
static:
$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' \
SWIG_LIB_DIR='$(SWIG_LIB_DIR)' SWIGEXE='$(SWIGEXE)' \
SWIGOPT='$(SWIGOPT)' LIBS='$(LIBS)' TARGET='foo' INTERFACE='foo.i' python_cpp_static
clean:
$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' TARGET='foo' python_clean
cd pkg1 && $(MAKE) -f $(TOP)/../Makefile SRCDIR='$(SRCDIR)' TARGET='foo' python_clean

10
Examples/python/import_packages/split_modules/vanilla_split_nopy3/foo.i
View file

@ -1,10 +0,0 @@
%module(package="pkg1") foo
%{
static unsigned count(void)
{
return 3;
}
%}
unsigned count(void);

1
Examples/python/import_packages/split_modules/vanilla_split_nopy3/pkg1/__init__.py
View file

@ -1 +0,0 @@
# killroy was here

3
Examples/python/import_packages/split_modules/vanilla_split_nopy3/runme.py
View file

@ -1,3 +0,0 @@
import pkg1.foo
assert(pkg1.foo.count() == 3)