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 3088a1c77b7ad67a580c40f65d8e9d84d218ba3d (commit) via 4e3bac15c5bd717e954cb7c431a12b6583691347 (commit) via 33609c5ab7aabd7b13a1d013cb849e2ef21ddb32 (commit) via ca726c8da26dfd21e5abd6f197ab3473b5133695 (commit) from 88080e9a2b9c406de4214a878cc42bc478785132 (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/3088a1c77b7ad67a580c40f65d8e9d84d218b... commit 3088a1c77b7ad67a580c40f65d8e9d84d218ba3d Author: Tomas Gavenciak <gavento@ucw.cz> Date: Thu Feb 23 12:26:35 2012 +0100 Add SWIGOPTS, supress selected SWIG warnings diff --git a/config.mk b/config.mk index b29461d..53bcc7c 100644 --- a/config.mk +++ b/config.mk @@ -11,3 +11,5 @@ PYTHON_INCLUDE=/usr/include/python2.6 # Command to run Python with pylib/ modules PYTHON=PYTHONPATH=$$PYTHONPATH:${PYLIBSDIR} ${PYTHON_BIN} -Werror + +SWIGOPTS=-Wextra -w322,314 -I/usr/include/ diff --git a/pywrap.mk b/pywrap.mk index b73a1d4..c99293d 100644 --- a/pywrap.mk +++ b/pywrap.mk @@ -12,18 +12,18 @@ all: _gfxprim_$(LIBNAME)_c.so gfxprim_$(LIBNAME)_c.py gfxprim_$(LIBNAME)_wrap.c gfxprim_$(LIBNAME)_c.py: gfxprim_$(LIBNAME).swig ifdef VERBOSE - $(SWIG) -python -Wall -I/usr/include/ $(INCLUDES) $< + $(SWIG) $(SWIGOPTS) -python $(INCLUDES) $< else # VERBOSE @echo "SWIG $(LIBNAME)" - @$(SWIG) -python -Wall -I/usr/include/ $(INCLUDES) $< + @$(SWIG) $(SWIGOPTS) -python $(INCLUDES) $< endif # VERBOSE _gfxprim_$(LIBNAME)_c.so: gfxprim_$(LIBNAME)_wrap.c ifdef VERBOSE - $(CC) gfxprim_$(LIBNAME)_wrap.c $(CFLAGS) $(LDFLAGS) -I$(PYTHON_INCLUDE) -dPIC --shared -lGP -L$(TOPDIR)/build/ -o _gfxprim_$(LIBNAME)_c.so + $(CC) gfxprim_$(LIBNAME)_wrap.c $(CFLAGS) $(LDFLAGS) -I$(PYTHON_INCLUDE) --shared -lGP -L$(TOPDIR)/build/ -o _gfxprim_$(LIBNAME)_c.so else # VERBOSE @echo "LD $@" - @$(CC) gfxprim_$(LIBNAME)_wrap.c $(CFLAGS) $(LDFLAGS) -I$(PYTHON_INCLUDE) -dPIC --shared -lGP -L$(TOPDIR)/build/ -o _gfxprim_$(LIBNAME)_c.so + @$(CC) gfxprim_$(LIBNAME)_wrap.c $(CFLAGS) $(LDFLAGS) -I$(PYTHON_INCLUDE) --shared -lGP -L$(TOPDIR)/build/ -o _gfxprim_$(LIBNAME)_c.so endif # VERBOSE endif # ifneq ($(SWIG),) http://repo.or.cz/w/gfxprim.git/commit/4e3bac15c5bd717e954cb7c431a12b6583691... commit 4e3bac15c5bd717e954cb7c431a12b6583691347 Author: Tomas Gavenciak <gavento@ucw.cz> Date: Thu Feb 23 10:46:58 2012 +0100 Always use CLEAN+= in pywrap.mk diff --git a/pywrap.mk b/pywrap.mk index aac3901..b73a1d4 100644 --- a/pywrap.mk +++ b/pywrap.mk @@ -13,18 +13,19 @@ all: _gfxprim_$(LIBNAME)_c.so gfxprim_$(LIBNAME)_c.py gfxprim_$(LIBNAME)_wrap.c gfxprim_$(LIBNAME)_c.py: gfxprim_$(LIBNAME).swig ifdef VERBOSE $(SWIG) -python -Wall -I/usr/include/ $(INCLUDES) $< -else +else # VERBOSE @echo "SWIG $(LIBNAME)" @$(SWIG) -python -Wall -I/usr/include/ $(INCLUDES) $< -endif +endif # VERBOSE _gfxprim_$(LIBNAME)_c.so: gfxprim_$(LIBNAME)_wrap.c ifdef VERBOSE $(CC) gfxprim_$(LIBNAME)_wrap.c $(CFLAGS) $(LDFLAGS) -I$(PYTHON_INCLUDE) -dPIC --shared -lGP -L$(TOPDIR)/build/ -o _gfxprim_$(LIBNAME)_c.so -else +else # VERBOSE @echo "LD $@" @$(CC) gfxprim_$(LIBNAME)_wrap.c $(CFLAGS) $(LDFLAGS) -I$(PYTHON_INCLUDE) -dPIC --shared -lGP -L$(TOPDIR)/build/ -o _gfxprim_$(LIBNAME)_c.so -endif +endif # VERBOSE + +endif # ifneq ($(SWIG),) CLEAN+=gfxprim_$(LIBNAME)_wrap.c gfxprim_$(LIBNAME)_c.py _gfxprim_$(LIBNAME)_c.so -endif http://repo.or.cz/w/gfxprim.git/commit/33609c5ab7aabd7b13a1d013cb849e2ef21dd... commit 33609c5ab7aabd7b13a1d013cb849e2ef21ddb32 Author: Tomas Gavenciak <gavento@ucw.cz> Date: Thu Feb 23 10:38:27 2012 +0100 Make pywrap compile properly, include into Makefiles * Fix pywrap.mk diff --git a/config.mk b/config.mk index 9718669..b29461d 100644 --- a/config.mk +++ b/config.mk @@ -4,6 +4,8 @@ CFLAGS+=-I$(TOPDIR)/include/ # path to local module directory PYLIBSDIR=$(TOPDIR)/pylib +PYTHON_INCLUDE=/usr/include/python2.6 + # To test with other python versions (example): #PYTHON_BIN=${TOPDIR}/virtualpy2.4/bin/python diff --git a/include/core/Makefile b/include/core/Makefile index bf82884..7eb72be 100644 --- a/include/core/Makefile +++ b/include/core/Makefile @@ -1,7 +1,7 @@ TOPDIR=../.. GENHEADERS=GP_Convert_Scale.gen.h GP_Pixel.gen.h GP_GetPutPixel.gen.h GP_Convert.gen.h GP_FnPerBpp.gen.h - GP_MixPixels.gen.h GP_GammaCorrection.gen.h + GP_MixPixels.gen.h GP_GammaCorrection.gen.h LIBNAME=core include $(TOPDIR)/gen.mk include $(TOPDIR)/include.mk diff --git a/pylib/Makefile b/pylib/Makefile index 2d01e96..6186075 100644 --- a/pylib/Makefile +++ b/pylib/Makefile @@ -1,4 +1,5 @@ TOPDIR=.. +SUBDIRS=gfxprim # # Add .pyc files to CLEAN list @@ -9,3 +10,4 @@ include $(TOPDIR)/include.mk all: @true + diff --git a/pylib/gfxprim/Makefile b/pylib/gfxprim/Makefile index 1004920..f5bf693 100644 --- a/pylib/gfxprim/Makefile +++ b/pylib/gfxprim/Makefile @@ -1,3 +1,3 @@ -TOPDIR=.. +TOPDIR=../.. SUBDIRS=core loaders include $(TOPDIR)/include.mk diff --git a/pylib/gfxprim/core/Makefile b/pylib/gfxprim/core/Makefile index eb25047..312df53 100644 --- a/pylib/gfxprim/core/Makefile +++ b/pylib/gfxprim/core/Makefile @@ -1,4 +1,4 @@ -TOPDIR=../.. +TOPDIR=../../.. LIBNAME=core include $(TOPDIR)/pywrap.mk include $(TOPDIR)/include.mk diff --git a/pylib/gfxprim/loaders/Makefile b/pylib/gfxprim/loaders/Makefile index b599253..196c9c1 100644 --- a/pylib/gfxprim/loaders/Makefile +++ b/pylib/gfxprim/loaders/Makefile @@ -1,4 +1,4 @@ -TOPDIR=../.. +TOPDIR=../../.. LIBNAME=loaders INCLUDE=core include $(TOPDIR)/pywrap.mk diff --git a/pywrap.mk b/pywrap.mk index fd60b0f..aac3901 100644 --- a/pywrap.mk +++ b/pywrap.mk @@ -8,27 +8,23 @@ ifneq ($(SWIG),) INCLUDES+=$(addprefix -I$(TOPDIR)/include/, $(INCLUDE)) -all: _gfxprim_$(LIBNAME)_c.so +all: _gfxprim_$(LIBNAME)_c.so gfxprim_$(LIBNAME)_c.py -gfxprim_$(LIBNAME).c: gfxprim_$(LIBNAME).swig - -gfxprim_$(LIBNAME).c: %.c: %.swig +gfxprim_$(LIBNAME)_wrap.c gfxprim_$(LIBNAME)_c.py: gfxprim_$(LIBNAME).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 +_gfxprim_$(LIBNAME)_c.so: gfxprim_$(LIBNAME)_wrap.c ifdef VERBOSE - $(CC) -fPIC -dPIC --shared -Wall -lGP -lpng -ljpeg -lm -ldl -o _gfxprim_$(LIBNAME)_c.so + $(CC) gfxprim_$(LIBNAME)_wrap.c $(CFLAGS) $(LDFLAGS) -I$(PYTHON_INCLUDE) -dPIC --shared -lGP -L$(TOPDIR)/build/ -o _gfxprim_$(LIBNAME)_c.so else @echo "LD $@" - @$(CC) -fPIC -dPIC --shared -Wall -lGP -lpng -ljpeg -lm -ldl -o _gfxprim_$(LIBNAME)_c.so + @$(CC) gfxprim_$(LIBNAME)_wrap.c $(CFLAGS) $(LDFLAGS) -I$(PYTHON_INCLUDE) -dPIC --shared -lGP -L$(TOPDIR)/build/ -o _gfxprim_$(LIBNAME)_c.so endif -CLEAN+=gfxprim_$(LIBNAME).c gfxprim_$(LIBNAME)_c.py gfxprim_$(LIBNAME)_wrap.c _gfxprim_$(LIBNAME)_c.so +CLEAN+=gfxprim_$(LIBNAME)_wrap.c gfxprim_$(LIBNAME)_c.py _gfxprim_$(LIBNAME)_c.so endif http://repo.or.cz/w/gfxprim.git/commit/ca726c8da26dfd21e5abd6f197ab3473b5133... commit ca726c8da26dfd21e5abd6f197ab3473b5133695 Author: Tomas Gavenciak <gavento@ucw.cz> Date: Thu Feb 23 10:36:56 2012 +0100 Move pywrap into pylib/gfxprim diff --git a/Makefile b/Makefile index 2fcd174..142c98c 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ TOPDIR=. -SUBDIRS=include libs tests pylib demos pywrap +SUBDIRS=include libs tests pylib demos include include.mk # diff --git a/pylib/gfxprim/Makefile b/pylib/gfxprim/Makefile index 03e42fa..1004920 100644 --- a/pylib/gfxprim/Makefile +++ b/pylib/gfxprim/Makefile @@ -1,16 +1,3 @@ -TOPDIR=../.. - +TOPDIR=.. +SUBDIRS=core loaders include $(TOPDIR)/include.mk - -# Core -core/gfxprim_core_c.py core/gfxprim_core_wrap.c: $(TOPDIR)/include/core/gfxprim_core.swig - swig -python -Wall -I/usr/include/ - $(TOPDIR)/include/core/gfxprim_core.swig - -$(TOPDIR)/build/_gfxprim_core_c.so: core/gfxprim_core_wrap.c - gcc -shared core/gfxprim_core_wrap.c -L $(TOPDIR)/build/ -I /usr/include/python2.6/ -I$(TOPDIR)/include/ - -fPIC -Wall -lGP -lpng -ljpeg -lm -ldl -o $(TOPDIR)/build/_gfxprim_core_c.so - - -all: $(TOPDIR)/build/_gfxprim_core_c.so - diff --git a/pywrap/core/Makefile b/pylib/gfxprim/core/Makefile similarity index 100% rename from pywrap/core/Makefile rename to pylib/gfxprim/core/Makefile diff --git a/pywrap/core/gfxprim_core.swig b/pylib/gfxprim/core/gfxprim_core.swig similarity index 100% rename from pywrap/core/gfxprim_core.swig rename to pylib/gfxprim/core/gfxprim_core.swig diff --git a/pywrap/loaders/Makefile b/pylib/gfxprim/loaders/Makefile similarity index 100% rename from pywrap/loaders/Makefile rename to pylib/gfxprim/loaders/Makefile diff --git a/pywrap/loaders/gfxprim_loaders.swig b/pylib/gfxprim/loaders/gfxprim_loaders.swig similarity index 100% rename from pywrap/loaders/gfxprim_loaders.swig rename to pylib/gfxprim/loaders/gfxprim_loaders.swig diff --git a/pywrap/Makefile b/pywrap/Makefile deleted file mode 100644 index 1004920..0000000 --- a/pywrap/Makefile +++ /dev/null @@ -1,3 +0,0 @@ -TOPDIR=.. -SUBDIRS=core loaders -include $(TOPDIR)/include.mk diff --git a/pywrap/loaders/gfxprim_loaders_c.so b/pywrap/loaders/gfxprim_loaders_c.so deleted file mode 100755 index b809122..0000000 Binary files a/pywrap/loaders/gfxprim_loaders_c.so and /dev/null differ ----------------------------------------------------------------------- Summary of changes: Makefile | 2 +- config.mk | 4 ++ include/core/Makefile | 2 +- pylib/Makefile | 2 + pylib/gfxprim/Makefile | 15 +--------- {pywrap => pylib/gfxprim}/core/Makefile | 2 +- {pywrap => pylib/gfxprim}/core/gfxprim_core.swig | 0 {pywrap => pylib/gfxprim}/loaders/Makefile | 2 +- .../gfxprim}/loaders/gfxprim_loaders.swig | 0 pywrap.mk | 31 +++++++++----------- pywrap/Makefile | 3 -- pywrap/loaders/gfxprim_loaders_c.so | Bin 6141 -> 0 bytes 12 files changed, 25 insertions(+), 38 deletions(-) rename {pywrap => pylib/gfxprim}/core/Makefile (81%) rename {pywrap => pylib/gfxprim}/core/gfxprim_core.swig (100%) rename {pywrap => pylib/gfxprim}/loaders/Makefile (84%) rename {pywrap => pylib/gfxprim}/loaders/gfxprim_loaders.swig (100%) delete mode 100644 pywrap/Makefile delete 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.")