This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project gfxprim.git. The branch, pywrap has been updated via 0f2c026b6360e700cf3f1a87d0031a5760523886 (commit) via 79e7ced60aec15842bb5c7c8620b69d5a2689f1b (commit) via 9800d72f27df325aa25aaa5b35851551ef010921 (commit) via ee7841b92486c22488a2efcb8fe29ea8642f863c (commit) via c2d53d78b138cc441a28c025b8899f6d3b80f29e (commit) via 97f2975708403ba5aff97ad8c4c9bad612046342 (commit) via 1a2763d0c3acb1b96f6aa658c8f28abef429eb04 (commit) via 5cdba1dbc960776f21bdd7e9a07a4546ad918ea3 (commit) via 86f0ef66d88f47ebb9ac8b9a1a30a83e3b449d2b (commit) via eb0fe417461ded37e79ffa76e90cedf1b39af555 (commit) from ce520ce10439ac3e63d5819e136ee623d5531206 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://repo.or.cz/w/gfxprim.git/commit/0f2c026b6360e700cf3f1a87d0031a5760523... commit 0f2c026b6360e700cf3f1a87d0031a5760523886 Author: Cyril Hrubis <metan@ucw.cz> Date: Tue Nov 29 12:13:39 2011 +0100 build: sketch of build systems for pywrap. diff --git a/Makefile b/Makefile index 142c98c..2fcd174 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ TOPDIR=. -SUBDIRS=include libs tests pylib demos +SUBDIRS=include libs tests pylib demos pywrap include include.mk # diff --git a/configure b/configure index 12c3a89..3157690 100755 --- a/configure +++ b/configure @@ -140,6 +140,7 @@ if __name__ == '__main__': cfg = {'CC' : ['gcc', 'Path/name of the C compiler'], 'CFLAGS' : ['-W -Wall -Wextra -fPIC -O2', 'C compiler flags'], 'PYTHON_BIN' : ['python', 'Path/name of python interpreter'], + 'SWIG' : ['swig', 'Simplified Wrapper and Interface Generator'], 'include_path': ['/usr/include', 'Path to the system headers']} # diff --git a/include/core/swigify.sh b/include/core/swigify.sh deleted file mode 100755 index d275dc4..0000000 --- a/include/core/swigify.sh +++ /dev/null @@ -1,9 +0,0 @@ -set -e - -swig -python -Wall -I/usr/include/ gfxprim_core.swig -gcc -shared gfxprim_core_wrap.c -L ../../build/ -I /usr/include/python2.6/ -I.. - -fPIC -Wall -lGP -lpng -ljpeg -lm -ldl -o ../../build/_gfxprim_core_c.so -mv gfxprim_core_c.py ../../pylib/ -rm gfxprim_core_wrap.c - -echo Swigified! diff --git a/include/loaders/swigify.sh b/include/loaders/swigify.sh deleted file mode 100755 index e0514ec..0000000 --- a/include/loaders/swigify.sh +++ /dev/null @@ -1,9 +0,0 @@ -set -e - -swig -python -Wall -I/usr/include/ gfxprim_loaders.swig -gcc -shared gfxprim_loaders_wrap.c -L ../../build/ -I /usr/include/python2.6/ -I.. - -fPIC -Wall -lGP -lpng -ljpeg -lm -ldl -o ../../build/_gfxprim_loaders_c.so -mv gfxprim_loaders_c.py ../../pylib/ -rm gfxprim_loaders_wrap.c - -echo Swigified! diff --git a/pywrap.mk b/pywrap.mk new file mode 100644 index 0000000..fd60b0f --- /dev/null +++ b/pywrap.mk @@ -0,0 +1,34 @@ +ifndef LIBNAME +$(error LIBNAME not defined, fix your library Makefile) +endif + +include $(TOPDIR)/config.gen.mk + +ifneq ($(SWIG),) + +INCLUDES+=$(addprefix -I$(TOPDIR)/include/, $(INCLUDE)) + +all: _gfxprim_$(LIBNAME)_c.so + +gfxprim_$(LIBNAME).c: gfxprim_$(LIBNAME).swig + +gfxprim_$(LIBNAME).c: %.c: %.swig +ifdef VERBOSE + $(SWIG) -python -Wall -I/usr/include/ $(INCLUDES) $< + cp gfxprim_$(LIBNAME)_c.py ../../pylib/ +else + @echo "SWIG $(LIBNAME)" + @$(SWIG) -python -Wall -I/usr/include/ $(INCLUDES) $< + @cp gfxprim_$(LIBNAME)_c.py ../../pylib/ +endif + +_gfxprim_$(LIBNAME)_c.so: gfxprim_$(LIBNAME).c +ifdef VERBOSE + $(CC) -fPIC -dPIC --shared -Wall -lGP -lpng -ljpeg -lm -ldl -o _gfxprim_$(LIBNAME)_c.so +else + @echo "LD $@" + @$(CC) -fPIC -dPIC --shared -Wall -lGP -lpng -ljpeg -lm -ldl -o _gfxprim_$(LIBNAME)_c.so +endif + +CLEAN+=gfxprim_$(LIBNAME).c gfxprim_$(LIBNAME)_c.py gfxprim_$(LIBNAME)_wrap.c _gfxprim_$(LIBNAME)_c.so +endif diff --git a/pywrap/Makefile b/pywrap/Makefile new file mode 100644 index 0000000..1004920 --- /dev/null +++ b/pywrap/Makefile @@ -0,0 +1,3 @@ +TOPDIR=.. +SUBDIRS=core loaders +include $(TOPDIR)/include.mk diff --git a/pywrap/core/Makefile b/pywrap/core/Makefile new file mode 100644 index 0000000..eb25047 --- /dev/null +++ b/pywrap/core/Makefile @@ -0,0 +1,4 @@ +TOPDIR=../.. +LIBNAME=core +include $(TOPDIR)/pywrap.mk +include $(TOPDIR)/include.mk diff --git a/include/core/gfxprim_core.swig b/pywrap/core/gfxprim_core.swig similarity index 100% rename from include/core/gfxprim_core.swig rename to pywrap/core/gfxprim_core.swig diff --git a/pywrap/loaders/Makefile b/pywrap/loaders/Makefile new file mode 100644 index 0000000..b599253 --- /dev/null +++ b/pywrap/loaders/Makefile @@ -0,0 +1,5 @@ +TOPDIR=../.. +LIBNAME=loaders +INCLUDE=core +include $(TOPDIR)/pywrap.mk +include $(TOPDIR)/include.mk diff --git a/include/loaders/gfxprim_loaders.swig b/pywrap/loaders/gfxprim_loaders.swig similarity index 100% rename from include/loaders/gfxprim_loaders.swig rename to pywrap/loaders/gfxprim_loaders.swig diff --git a/pywrap/loaders/gfxprim_loaders_c.so b/pywrap/loaders/gfxprim_loaders_c.so new file mode 100755 index 0000000..b809122 Binary files /dev/null and b/pywrap/loaders/gfxprim_loaders_c.so differ http://repo.or.cz/w/gfxprim.git/commit/79e7ced60aec15842bb5c7c8620b69d5a2689... commit 79e7ced60aec15842bb5c7c8620b69d5a2689f1b Merge: ce520ce 9800d72 Author: Cyril Hrubis <metan@ucw.cz> Date: Tue Nov 29 00:41:52 2011 +0100 Merge branch 'master' into pywrap ----------------------------------------------------------------------- Summary of changes: Makefile | 7 +- build/Makefile | 1 + configure | 1 + demos/fbshow/fbshow.c | 8 +- doc/context.txt | 23 ++- doc/drawing_api.txt | 62 +++++-- gen.mk | 7 +- {demos => include}/Makefile | 2 +- include/core/Makefile | 6 + include/core/swigify.sh | 9 - include/loaders/swigify.sh | 9 - libs/core/Makefile | 2 - libs/filters/GP_Linear.c | 216 +++++++++++++++++++++- pywrap.mk | 34 ++++ {demos => pywrap}/Makefile | 2 +- pywrap/core/Makefile | 4 + {include => pywrap}/core/gfxprim_core.swig | 0 {libs => pywrap}/loaders/Makefile | 5 +- {include => pywrap}/loaders/gfxprim_loaders.swig | 0 pywrap/loaders/gfxprim_loaders_c.so | Bin 0 -> 6141 bytes 20 files changed, 334 insertions(+), 64 deletions(-) copy {demos => include}/Makefile (62%) create mode 100644 include/core/Makefile delete mode 100755 include/core/swigify.sh delete mode 100755 include/loaders/swigify.sh create mode 100644 pywrap.mk copy {demos => pywrap}/Makefile (62%) create mode 100644 pywrap/core/Makefile rename {include => pywrap}/core/gfxprim_core.swig (100%) copy {libs => pywrap}/loaders/Makefile (58%) rename {include => pywrap}/loaders/gfxprim_loaders.swig (100%) create mode 100755 pywrap/loaders/gfxprim_loaders_c.so repo.or.cz automatic notification. Contact project admin jiri.bluebear.dluhos@gmail.com if you want to unsubscribe, or site admin admin@repo.or.cz if you receive no reply. -- gfxprim.git ("A simple 2D graphics library with emphasis on correctness and well-defined operation.")