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, master has been updated via 476e5a9b3a255fb9669f63565bd20f11c18b7854 (commit) via 294e7a692f28db0543dd81d60d4f8f65b8303c99 (commit) via fb23aada76c6752285251c2931a77415544cb692 (commit) via 2e66c22cbfaf57bfff1a6a21500388b615a674ff (commit) from 96ac55e75beb4dd1f167ef34b5e9bad72f71c3aa (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/476e5a9b3a255fb9669f63565bd20f11c18b7...
commit 476e5a9b3a255fb9669f63565bd20f11c18b7854 Author: Cyril Hrubis metan@ucw.cz Date: Sat Apr 7 20:34:34 2012 +0200
build: Fix pywrap which wrongly includes config.gen.mk
That acutally breaks the build once config.mk is included in pre.mk rather then post.mk.
diff --git a/pywrap.mk b/pywrap.mk index d53041e..0ec5602 100644 --- a/pywrap.mk +++ b/pywrap.mk @@ -7,8 +7,6 @@ SWIG_PY=$(LIBNAME)_c.py SWIG_C=$(LIBNAME)_wrap.c SWIG_LIB=_$(LIBNAME)_c.so
-include $(TOPDIR)/config.gen.mk - ifneq ($(SWIG),)
INCLUDES+=$(addprefix -I$(TOPDIR)/include/, $(INCLUDE))
http://repo.or.cz/w/gfxprim.git/commit/294e7a692f28db0543dd81d60d4f8f65b8303...
commit 294e7a692f28db0543dd81d60d4f8f65b8303c99 Author: Cyril Hrubis metan@ucw.cz Date: Sat Apr 7 20:23:13 2012 +0200
build: Add missing pre.mk into tests Makefile
diff --git a/tests/core/Makefile b/tests/core/Makefile index 8ab278b..c848cb0 100644 --- a/tests/core/Makefile +++ b/tests/core/Makefile @@ -1,5 +1,7 @@ TOPDIR=../..
+include $(TOPDIR)/pre.mk + LIBNAME=core TESTSUITE=core_suite LDLIBS+=-lGP -L$(TOPDIR)/build/ -lcheck -lm -lSDL
http://repo.or.cz/w/gfxprim.git/commit/fb23aada76c6752285251c2931a77415544cb...
commit fb23aada76c6752285251c2931a77415544cb692 Author: Cyril Hrubis metan@ucw.cz Date: Sat Apr 7 20:18:33 2012 +0200
pylib: Fix resource IO warning by closing the config file.
diff --git a/pylib/gp_codegen/render_utils.py b/pylib/gp_codegen/render_utils.py index 0e781db..b4ca701 100644 --- a/pylib/gp_codegen/render_utils.py +++ b/pylib/gp_codegen/render_utils.py @@ -94,8 +94,10 @@ def load_gfxprimconfig(config_file = None): } # python 3.2 doesn't have execfile, curse you python devs # execfile(config_file, globals(), l) - exec(compile(open(config_file).read(), config_file, 'exec'), globals(), l) - + cf = open(config_file) + exec(compile(cf.read(), config_file, 'exec'), globals(), l) + cf.close() + config = l["config"] return config
http://repo.or.cz/w/gfxprim.git/commit/2e66c22cbfaf57bfff1a6a21500388b615a67...
commit 2e66c22cbfaf57bfff1a6a21500388b615a674ff Author: Cyril Hrubis metan@ucw.cz Date: Sat Apr 7 20:16:53 2012 +0200
build: Remove possible stray .lock in build dir on make clean
diff --git a/build/Makefile b/build/Makefile index 8a7ec11..7ac79b2 100644 --- a/build/Makefile +++ b/build/Makefile @@ -7,10 +7,10 @@ rebuild: all
clean: ifdef VERBOSE - rm -f libGP.a libGP.so libGP.so.0 + rm -rf libGP.a libGP.so libGP.so.0 .lock else - @echo "RM libGP.a libGP.so libGP.so.0" - @rm -f libGP.a libGP.so libGP.so.0 + @echo "RM libGP.a libGP.so libGP.so.0 .lock" + @rm -rf libGP.a libGP.so libGP.so.0 .lock endif
libGP.a:
-----------------------------------------------------------------------
Summary of changes: build/Makefile | 6 +++--- pylib/gp_codegen/render_utils.py | 6 ++++-- pywrap.mk | 2 -- tests/core/Makefile | 2 ++ 4 files changed, 9 insertions(+), 7 deletions(-)
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.