[Debian-astro-commits] [gyoto] 188/221: Python: patch gyoto_doc.i doc accomodate for renamed nested classed in Screen

[Thibaut Jean-Claude Paumard]

This is an automated email from the git hooks/post-receive script.

thibaut pushed a commit to branch master
in repository gyoto.

commit 1cf513c3acb4a2df3b83644f08f5e3079295a186
Author: Thibaut Paumard <paumard at users.sourceforge.net>
Date:   Mon Jan 12 10:59:15 2015 +0100

    Python: patch gyoto_doc.i doc accomodate for renamed nested classed in Screen
---
 python/Makefile.in | 17 +++++++++++++++--
 python/gyoto.i     |  5 +++--
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/python/Makefile.in b/python/Makefile.in
index 6992436..a591be5 100644
--- a/python/Makefile.in
+++ b/python/Makefile.in
@@ -14,6 +14,7 @@ DISTFILES = PKG-INFO Makefile.in configure setup.py install-sh
 
 DESTDIR = 
 VPATH = @srcdir@
+SED = @SED@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
@@ -99,9 +100,21 @@ all: $(GYOTO_PYFILES) $(GYOTO_EXTENSIONS)
 ../doc/xml/index.xml:
 	cd ../doc; $(MAKE) doxygen.stamp
 
-gyoto_doc.i: ../doc/xml/index.xml
+gyoto_doc.i.orig: ../doc/xml/index.xml
 	$(PYTHON) $(srcdir)/doxy2swig.py --no-function-definition $< $@ || rm $@
 
+gyoto_doc.i: gyoto_doc.i.orig
+	$(SED) -e 's/Gyoto::Screen::Angles/Angles/' \
+	       -e 's/Gyoto::Screen::Bucket/Bucket/' \
+	       -e 's/Gyoto::Screen::Coord1dSet/Coord1dSet/' \
+	       -e 's/Gyoto::Screen::Coord2dSet/Coord2dSet/' \
+	       -e 's/Gyoto::Screen::Empty/Empty/' \
+	       -e 's/Gyoto::Screen::Grid/Grid/' \
+	       -e 's/Gyoto::Screen::Indices/Indices/' \
+	       -e 's/Gyoto::Screen::Range/Range/' \
+	       -e 's/Gyoto::Screen::RepeatAngle/RepeatAngle/' \
+	          $< > $@
+
 _gyoto$(PYTHON_EXTENSION_SUFFIX): gyoto_wrap.cxx
 	$(PYTHON) $(srcdir)/setup.py build_ext
 
@@ -161,7 +174,7 @@ uninstall:
 clean:
 	$(PYTHON) setup.py clean
 	-rm -Rf build
-	-rm gyoto*.py gyoto*_wrap.cxx *.pyc gyoto_doc.i
+	-rm gyoto*.py gyoto*_wrap.cxx *.pyc gyoto_doc.i gyoto_doc.i.orig
 
 # Clean up the output of configure
 distclean: clean 
diff --git a/python/gyoto.i b/python/gyoto.i
index 3a684b6..8defd1c 100644
--- a/python/gyoto.i
+++ b/python/gyoto.i
@@ -219,6 +219,9 @@ using namespace Gyoto;
   import_array();
  }
 
+// Rename operator++() -> increment() for everything
+%rename(increment) *::operator++;
+
 // ******** TYPEMAPS ******** //
 // Actually instanciate typemaps using de macros defined above
 
@@ -350,7 +353,6 @@ GyotoSmPtrClass(Screen)
 GyotoSmPtrClass(Scenery)
 GyotoSmPtrClass(Photon)
 %rename(AstrobjProperties) Gyoto::Astrobj::Properties;
-%rename(increment) Gyoto::Astrobj::Properties::operator++;
 GyotoSmPtrClassGeneric(Astrobj)
 
 GyotoSmPtrClassDerived(Astrobj, ThinDisk)
@@ -429,7 +431,6 @@ template <typename T, size_t sz> class GYOTO_ARRAY {
 %template(ARRAY_double_2) GYOTO_ARRAY<double, 2>;
 %template(ARRAY_size_t_2) GYOTO_ARRAY<size_t, 2>;
 
-%rename(increment) *::operator++;
 class Coord1dSet {
 public:
   const CoordType_e kind;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-astro/packages/gyoto.git