Olena-patches

olena-patches@lrde.epita.fr

9625 discussions

olena-2.0-463-g4a0ee16 Fix path to other documentations.

by Guillaume Lazzara

* doc/Makefile.am, * doc/header.html, * doc/mainpage.dox: Here. --- ChangeLog | 8 ++++++++ doc/Makefile.am | 9 ++++++++- doc/header.html | 2 +- doc/mainpage.dox | 4 ++-- 4 files changed, 19 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 806acdb..7b1004e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2013-04-10 Guillaume Lazzara <z(a)lrde.epita.fr> + + Fix path to other documentations. + + * doc/Makefile.am, + * doc/header.html, + * doc/mainpage.dox: Here. + 2013-03-28 Guillaume Lazzara <z(a)lrde.epita.fr> * doc/Makefile.am: Add a missing dependency. diff --git a/doc/Makefile.am b/doc/Makefile.am index 36a14aa..c328b77 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -121,7 +121,9 @@ $(srcdir)/user-refman.stamp: $(srcdir)/$(DOXYFILE).in $(REFMAN_deps) $(DOXYGEN) $(DOXYFILE_USER) rm -rf $(srcdir)/$(USER_REFMAN) ## Fix path to the main page of the documentation. - sed -i -e "s,\@relcommondocpath\@,,g" $(USER_REFMAN).tmp/html/index.html + sed -i -e "s,\@relcommondocpath\@,$(abs_top_srcdir)/,g" \ + -e "s,\@userrefman\@,$(USER_REFMAN),g" \ + `find $(USER_REFMAN).tmp/html -name '*.html'` ## FIXME: Moving directories between file systems is not portable. mv $(USER_REFMAN).tmp $(srcdir)/$(USER_REFMAN) @mv -f $@.tmp $@ @@ -208,6 +210,11 @@ install-data-local: # # rm -rf $(DESTDIR)$(htmldir)/$(USER_REFMAN) cp -r $(srcdir)/$(USER_REFMAN)/html $(DESTDIR)$(htmldir)/$(USER_REFMAN) +# Fix documentation paths + sed -i -e "s,$(abs_top_srcdir)/milena/doc,../milena,g" \ + -e "s,$(abs_top_srcdir)/scribo/doc,../scribo,g" \ + -e "s,$(abs_top_srcdir)/doc/$(USER_REFMAN)/html,$(DESTDIR)$(htmldir)/$(USER_REFMAN),g" \ + `find $(DESTDIR)$(htmldir)/$(USER_REFMAN) -name '*.html'` ## Try GNU chmod's X mode before resorting to something slower but ## more standard. chmod -R a+rX $(DESTDIR)$(htmldir) || \ diff --git a/doc/header.html b/doc/header.html index 0d1b1cc..7e9e03a 100644 --- a/doc/header.html +++ b/doc/header.html @@ -25,7 +25,7 @@ $extrastylesheet <tbody> <tr style="height: 56px;">  - <td id="projectlogo"><a href="@relcommondocpath@$relpath$index.html"><img alt="Logo" src="$relpath$$projectlogo"/></a></td> + <td id="projectlogo"><a href="@relcommondocpath@doc/@userrefman@/html/index.html"><img alt="Logo" src="$relpath$$projectlogo"/></a></td>   <td style="padding-left: 0.5em;"> diff --git a/doc/mainpage.dox b/doc/mainpage.dox index e293b4c..65e5177 100644 --- a/doc/mainpage.dox +++ b/doc/mainpage.dox @@ -19,8 +19,8 @@ </td> <td> \li \ref moduleslist - \li <a class="el" href="../../milena/user-refman/html/index.html">Milena</a> - \li <a class="el" href="../../scribo/user-refman/html/index.html">Scribo</a> + \li <a class="el" href="@relcommondocpath@milena/doc/user-refman/html/index.html">Milena</a> + \li <a class="el" href="@relcommondocpath@scribo/doc/user-refman/html/index.html">Scribo</a> \li Swilena </td> <td> -- 1.7.2.5

11 years, 9 months

branch unstable/scribo updated: olena-2.0-462-ga1c740d

by git＠lrde.epita.fr

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 "Olena, a generic and efficient image processing platform". The branch unstable/scribo has been updated via a1c740d02538ff9dd3f68b07cd561c67af3cabdc (commit) via d6ac69cac5c35e0a47ace3f3b749c661e4c235b0 (commit) from d7ed1add8edcb87c4f347ad8ba4857057b3e05dc (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 ----------------------------------------------------------------- a1c740d tests/primitive/extract/Makefile.am: Add more files in EXTRA_DIST. d6ac69c headers.mk, tests/unit_test/unit-tests.mk: Regen. ----------------------------------------------------------------------- Summary of changes: scribo/ChangeLog | 10 ++++++++++ scribo/headers.mk | 1 + scribo/tests/primitive/extract/Makefile.am | 3 ++- scribo/tests/unit_test/unit-tests.mk | 1 + 4 files changed, 14 insertions(+), 1 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

11 years, 9 months

olena-2.0-462-ga1c740d tests/primitive/extract/Makefile.am: Add more files in EXTRA_DIST.

by Guillaume Lazzara

--- scribo/ChangeLog | 5 +++++ scribo/tests/primitive/extract/Makefile.am | 3 ++- 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index c84b418..a31ff19 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,10 @@ 2013-04-09 Guillaume Lazzara <z(a)lrde.epita.fr> + * tests/primitive/extract/Makefile.am: Add more files in + EXTRA_DIST. + +2013-04-09 Guillaume Lazzara <z(a)lrde.epita.fr> + * headers.mk, * tests/unit-tests.mk: Regen. diff --git a/scribo/tests/primitive/extract/Makefile.am b/scribo/tests/primitive/extract/Makefile.am index 047fdb8..3db2302 100644 --- a/scribo/tests/primitive/extract/Makefile.am +++ b/scribo/tests/primitive/extract/Makefile.am @@ -22,7 +22,8 @@ EXTRA_DIST = \ alignment_2.ref.pbm \ alignment_3.ref.pbm \ alignment_4.ref.pbm \ - lines_v_pattern.ref.pbm + lines_v_pattern.ref.pbm \ + lines_h_pattern.ref.pbm check_PROGRAMS = lines_discontinued \ lines_h_discontinued \ -- 1.7.2.5

11 years, 9 months

olena-2.0-461-gd6ac69c headers.mk, tests/unit_test/unit-tests.mk: Regen.

by Guillaume Lazzara

--- scribo/ChangeLog | 5 +++++ scribo/headers.mk | 1 + scribo/tests/unit_test/unit-tests.mk | 1 + 3 files changed, 7 insertions(+), 0 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index d1d0ebf..c84b418 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,8 @@ +2013-04-09 Guillaume Lazzara <z(a)lrde.epita.fr> + + * headers.mk, + * tests/unit-tests.mk: Regen. + 2013-04-08 Guillaume Lazzara <z(a)lrde.epita.fr> * scribo/filter/objects_in_borders.hh: New. diff --git a/scribo/headers.mk b/scribo/headers.mk index e360703..3160b85 100644 --- a/scribo/headers.mk +++ b/scribo/headers.mk @@ -125,6 +125,7 @@ scribo/filter/object_links_right_aligned.hh \ scribo/filter/object_links_top_aligned.hh \ scribo/filter/objects_h_thick.hh \ scribo/filter/objects_h_thin.hh \ +scribo/filter/objects_in_borders.hh \ scribo/filter/objects_large.hh \ scribo/filter/objects_on_border.hh \ scribo/filter/objects_size_ratio.hh \ diff --git a/scribo/tests/unit_test/unit-tests.mk b/scribo/tests/unit_test/unit-tests.mk index 0484b75..38946e1 100644 --- a/scribo/tests/unit_test/unit-tests.mk +++ b/scribo/tests/unit_test/unit-tests.mk @@ -300,6 +300,7 @@ scribo_filter_object_links_right_aligned \ scribo_filter_object_links_top_aligned \ scribo_filter_objects_h_thick \ scribo_filter_objects_h_thin \ +scribo_filter_objects_in_borders \ scribo_filter_objects_large \ scribo_filter_objects_on_border \ scribo_filter_objects_size_ratio \ -- 1.7.2.5

11 years, 9 months

olena-2.0-220-gab03443 common.mk: Fix include paths order.

by Guillaume Lazzara

--- scribo/ChangeLog | 4 ++++ scribo/common.mk | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 2b21225..c9d045a 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,7 @@ +2013-02-26 Guillaume Lazzara <z(a)lrde.epita.fr> + + * common.mk: Fix include paths order. + 2012-11-27 Guillaume Lazzara <z(a)lrde.epita.fr> Save full size region debug image. diff --git a/scribo/common.mk b/scribo/common.mk index 874f313..1c5c57d 100644 --- a/scribo/common.mk +++ b/scribo/common.mk @@ -24,5 +24,5 @@ AM_DEFAULT_SOURCE_EXT = .cc # Add paths to Scribo's headers. AM_CPPFLAGS = -I$(top_srcdir)/ -I$(top_builddir)/ \ - -I$(top_srcdir)/milena -I$(top_builddir)/milena \ - -I$(top_srcdir)/scribo -I$(top_builddir)/scribo + -I$(abs_top_srcdir)/scribo -I$(abs_top_builddir)/scribo \ + -I$(abs_top_srcdir)/milena -I$(abs_top_builddir)/milena -- 1.7.2.5

11 years, 9 months

olena-2.0-133-g04402f0 Get rid of `ltihooks' in Swilena.

by Roland Levillain

* python/ltihooks.py: Remove. * python/Makefile.am (python_PYTHON): Remove ltihooks.py. * python/swilena.py: No longer import `ltihooks'. * run.in: Help Python find actual dynamic modules in directory `.libs', as suggested by Alexandre Duret-Lutz in http://stackoverflow.com/a/5125879/1551751. --- swilena/ChangeLog | 11 ++++++++ swilena/python/Makefile.am | 4 +-- swilena/python/ltihooks.py | 60 -------------------------------------------- swilena/python/swilena.py | 4 +-- swilena/run.in | 46 +++++++++++++++++---------------- 5 files changed, 37 insertions(+), 88 deletions(-) delete mode 100644 swilena/python/ltihooks.py diff --git a/swilena/ChangeLog b/swilena/ChangeLog index 9bb6539..6781d78 100644 --- a/swilena/ChangeLog +++ b/swilena/ChangeLog @@ -1,3 +1,14 @@ +2012-07-27 Roland Levillain <roland(a)lrde.epita.fr> + + Get rid of `ltihooks' in Swilena. + + * python/ltihooks.py: Remove. + * python/Makefile.am (python_PYTHON): Remove ltihooks.py. + * python/swilena.py: No longer import `ltihooks'. + * run.in: Help Python find actual dynamic modules in directory + `.libs', as suggested by Alexandre Duret-Lutz in + http://stackoverflow.com/a/5125879/1551751. + 2010-12-03 Roland Levillain <roland(a)lrde.epita.fr> Perform install tests in Swilena. diff --git a/swilena/python/Makefile.am b/swilena/python/Makefile.am index 9f3c5fb..73ca060 100644 --- a/swilena/python/Makefile.am +++ b/swilena/python/Makefile.am @@ -53,10 +53,8 @@ edit = sed \ -e 's|@PYTHON[@]|$(PYTHON)|g' -# ltihooks.py: Python import hooks that understand Libtool libraries. -python_PYTHON = ltihooks.py # swilena.py: The whole Swilena suite. -python_PYTHON += swilena.py +python_PYTHON = swilena.py # data.py: Access to the data of the distribution (images, meshes, # etc.). diff --git a/swilena/python/ltihooks.py b/swilena/python/ltihooks.py deleted file mode 100644 index 7086365..0000000 --- a/swilena/python/ltihooks.py +++ /dev/null @@ -1,60 +0,0 @@ -# -*- Mode: Python; py-indent-offset: 4 -*- -# ltihooks.py: python import hooks that understand libtool libraries. -# Copyright (C) 2000 James Henstridge. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -import os, ihooks - -class LibtoolHooks(ihooks.Hooks): - def get_suffixes(self): - """Like normal get_suffixes, but adds .la suffixes to list""" - ret = ihooks.Hooks.get_suffixes(self) - ret.insert(0, ('module.la', 'rb', 3)) - ret.insert(0, ('.la', 'rb', 3)) - return ret - - def load_dynamic(self, name, filename, file=None): - """Like normal load_dynamic, but treat .la files specially""" - if len(filename) > 3 and filename[-3:] == '.la': - fp = open(filename, 'r') - dlname = '' - installed = 1 - line = fp.readline() - while line: - if len(line) > 7 and line[:7] == 'dlname=': - dlname = line[8:-2] - elif len(line) > 10 and line[:10] == 'installed=': - installed = line[10:-1] == 'yes' - line = fp.readline() - fp.close() - if dlname: - if installed: - filename = os.path.join(os.path.dirname(filename), - dlname) - else: - filename = os.path.join(os.path.dirname(filename), - '.libs', dlname) - return ihooks.Hooks.load_dynamic(self, name, filename, file) - -importer = ihooks.ModuleImporter() -importer.set_hooks(LibtoolHooks()) - -def install(): - importer.install() -def uninstall(): - importer.uninstall() - -install() diff --git a/swilena/python/swilena.py b/swilena/python/swilena.py index 260c4ce..969a2a1 100644 --- a/swilena/python/swilena.py +++ b/swilena/python/swilena.py @@ -1,6 +1,6 @@ #! /usr/bin/env python -# Copyright (C) 2008, 2009, 2010, 2013 EPITA Research and Development +# Copyright (C) 2008, 2009, 2010, 2012, 2013 EPITA Research and Development # Laboratory (LRDE) # # This file is part of Olena. @@ -20,8 +20,6 @@ # \file swilena.py # \brief The whole Swilena suite. -import ltihooks - import config from complex2 import * diff --git a/swilena/run.in b/swilena/run.in index 2f01b29..0a76964 100755 --- a/swilena/run.in +++ b/swilena/run.in @@ -1,7 +1,8 @@ -#!/bin/sh -# Copyright (C) 2003, 2004, 2006 Laboratoire d'Informatique de Paris 6 -# (LIP6), département Systèmes Répartis Coopératifs (SRC), Université -# Pierre et Marie Curie. +#! /bin/sh + +# Copyright (C) 2003, 2004, 2006, 2012 Laboratoire d'Informatique de +# Paris 6 (LIP6), département Systèmes Répartis Coopératifs (SRC), +# Université Pierre et Marie Curie. # # This file is part of Spot, a model checking library. # @@ -30,28 +31,29 @@ test -n "$srcdir" && test -z "$VERBOSE" && exec >/dev/null 2>&1 # path of dependent libraries in each library). modpath='.libs:@abs_top_builddir@/src/.libs' +# `@abs_builddir@/python' and `@abs_srcdir@/python' are for the *.py +# files, and `@abs_builddir@/python/.libs' for the *.so files. We +# used to rely on a module called `ltihooks' to teach the `import' +# statement how to load a Libtool library, but it started to cause +# issues with Python 2.6. +pypath='@abs_builddir@/python:@abs_builddir@/python/.libs:@abs_srcdir@/python':"$PYTHONPATH" + +# Likewise for Ruby: as some of our SWIG interfaces import other SWIG +# interfaces (with the `%import' keyword), we must add the `.libs' +# directory to SWILENA_RUBY_PATH so that the Ruby interpreter can load +# the corresponding dynamic module(s) (SWIG's `%import' statements +# generate code in dynamic modules that bypass Ruby's `Kernel.require' +# mechanism). +rbpath='@abs_builddir@/ruby:@abs_builddir@/ruby/.libs:@abs_srcdir@/ruby' + case $1 in - '' | *.py) - PYTHONPATH='@abs_builddir@/python:@abs_srcdir@/python':"$PYTHONPATH" \ - DYLD_LIBRARY_PATH=$modpath \ - exec @PYTHON@ "$@" - ;; - # What's the point in adding `.libs' to SWILENA_RUBY_PATH? - # - # As some of our SWIG interfaces import other SWIG interfaces - # (with the `%import' keyword), we must add the `.libs' directory - # to SWILENA_RUBY_PATH so that the Ruby interpreter can load the - # corresponding dynamic module(s) (SWIG's `%import' statements - # generate code in dynamic modules that bypass Ruby's - # `Kernel.require' mechanism). + *.py) + PYTHONPATH=$pypath DYLD_LIBRARY_PATH=$modpath exec @PYTHON@ "$@";; *.rb) - SWILENA_RUBY_PATH='@abs_builddir@/ruby:@abs_srcdir@/ruby:.libs' \ - DYLD_LIBRARY_PATH=$modpath \ - exec @RUBY@ "$@" - ;; + SWILENA_RUBY_PATH=$rbpath DYLD_LIBRARY_PATH=$modpath exec @RUBY@ "$@";; *.test) exec sh -x "$@";; *) - echo "Unknown extension" 2>&1 + echo "Unknown extension" >&2 exit 2;; esac -- 1.7.2.5

11 years, 9 months

olena-2.0-134-g42ff098 Update the local (build-time) Swilena Python Shell.

by Roland Levillain

* python/sps-local.in (PYTHONPATH): Add `@abs_builddir@/.libs'. --- swilena/ChangeLog | 6 ++++++ swilena/python/sps-local.in | 2 +- 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/swilena/ChangeLog b/swilena/ChangeLog index 6781d78..e4e7625 100644 --- a/swilena/ChangeLog +++ b/swilena/ChangeLog @@ -1,3 +1,9 @@ +2012-08-28 Roland Levillain <roland(a)lrde.epita.fr> + + Update the local (build-time) Swilena Python Shell. + + * python/sps-local.in (PYTHONPATH): Add `@abs_builddir@/.libs'. + 2012-07-27 Roland Levillain <roland(a)lrde.epita.fr> Get rid of `ltihooks' in Swilena. diff --git a/swilena/python/sps-local.in b/swilena/python/sps-local.in index 91b7d77..88ac50d 100644 --- a/swilena/python/sps-local.in +++ b/swilena/python/sps-local.in @@ -1,6 +1,6 @@ # -*- sh -*- # sps local version, for use from non installed distributions. -PYTHONPATH='@abs_builddir@:@abs_srcdir@':"$PYTHONPATH" \ +PYTHONPATH='@abs_builddir@:@abs_builddir@/.libs:@abs_srcdir@':"$PYTHONPATH" \ DYLD_LIBRARY_PATH='.libs:@abs_top_builddir@/src/.libs' \ exec @PYTHON@ -i @abs_srcdir@/sps.py "$@" -- 1.7.2.5

11 years, 9 months

olena-2.0-135-g7c236c7 Comment on an issue of Swilena highlighted by max-tree.py.

by Roland Levillain

* python/max-tree.py: Here. --- swilena/ChangeLog | 6 ++++++ swilena/python/max-tree.py | 14 ++++++++++++-- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/swilena/ChangeLog b/swilena/ChangeLog index e4e7625..80a3d5f 100644 --- a/swilena/ChangeLog +++ b/swilena/ChangeLog @@ -1,5 +1,11 @@ 2012-08-28 Roland Levillain <roland(a)lrde.epita.fr> + Comment on an issue of Swilena highlighted by max-tree.py. + + * python/max-tree.py: Here. + +2012-08-28 Roland Levillain <roland(a)lrde.epita.fr> + Update the local (build-time) Swilena Python Shell. * python/sps-local.in (PYTHONPATH): Add `@abs_builddir@/.libs'. diff --git a/swilena/python/max-tree.py b/swilena/python/max-tree.py index 05dd32a..236c75d 100644 --- a/swilena/python/max-tree.py +++ b/swilena/python/max-tree.py @@ -1,6 +1,6 @@ #! /usr/bin/env python -# Copyright (C) 2010 EPITA Research and Development Laboratory (LRDE) +# Copyright (C) 2010, 2012 EPITA Research and Development Laboratory (LRDE) # # This file is part of Olena. # @@ -37,8 +37,18 @@ for p, v in itertools.izip(ima.domain(), values): ima.set(p, int_u8(v)) image.println("ima =", ima) +# FIXME: The type of the (Python) object returned by this call, +# <type 'SwigPyObject'>, is wrong. The right type should be +# <class 'image2d_point2d.image2d_point2d'>, but the fact that the +# routine and the result object are located in two different +# (generated) Swilena submodules seems to confuse SWIG. A consequence +# of this issue is that `max_tree_parent' is not usable at all, hence +# the failure of the last line of this test. We should perhaps review +# Swilena's design and minimize or even completely get rid of the +# modular approach... max_tree_parent = image.max_tree(ima, c4()); -# FIXME: Why can't we use + +# FIXME: Overloading issue: Why can't we use # # image2d_point2d.println("max_tree_parent =", max_tree_parent) # -- 1.7.2.5

11 years, 9 months

olena-2.0-136-ge048c0b Fix build dependencies in Swilena.

by Roland Levillain

* python/Makefile.am (image2d_point2d-wrap.cc): Depend on $(top_srcdir)/swilena/concat.ixx. --- swilena/ChangeLog | 7 +++++++ swilena/python/Makefile.am | 1 + 2 files changed, 8 insertions(+), 0 deletions(-) diff --git a/swilena/ChangeLog b/swilena/ChangeLog index 80a3d5f..5043dd8 100644 --- a/swilena/ChangeLog +++ b/swilena/ChangeLog @@ -1,5 +1,12 @@ 2012-08-28 Roland Levillain <roland(a)lrde.epita.fr> + Fix build dependencies in Swilena. + + * python/Makefile.am (image2d_point2d-wrap.cc): Depend on + $(top_srcdir)/swilena/concat.ixx. + +2012-08-28 Roland Levillain <roland(a)lrde.epita.fr> + Comment on an issue of Swilena highlighted by max-tree.py. * python/max-tree.py: Here. diff --git a/swilena/python/Makefile.am b/swilena/python/Makefile.am index 73ca060..50b68f7 100644 --- a/swilena/python/Makefile.am +++ b/swilena/python/Makefile.am @@ -306,6 +306,7 @@ image2d_rgb8-wrap.cc: $(top_srcdir)/swilena/ppm.ixx image2d_rgb8-wrap.cc: $(top_srcdir)/swilena/fill.ixx image2d_rgb8-wrap.cc: $(top_srcdir)/swilena/println.ixx +image2d_point2d-wrap.cc: $(top_srcdir)/swilena/concat.ixx image2d_point2d-wrap.cc: $(top_srcdir)/swilena/image2d.ixx image2d_point2d-wrap.cc: $(top_srcdir)/swilena/fill.ixx image2d_point2d-wrap.cc: $(top_srcdir)/swilena/println.ixx -- 1.7.2.5

11 years, 9 months

olena-2.0-137-g3e5f8ac Add sps-gdb-local, a script to run the Swilena Python Shell in GDB.

by Roland Levillain

* python/sps-gdb-local.in: New. * python/Makefile.am (edit): Also substitute @LIBTOOL@. (noinst_SCRIPTS): Add sps-gdb-local. (EXTRA_DIST): Add sps-gdb-local.in. (sps-gdb-local): Adda a dependency on $(srcdir)/sps-gdb-local.in. --- swilena/ChangeLog | 10 ++++++++++ swilena/python/Makefile.am | 12 +++++++----- swilena/python/{sps-local.in => sps-gdb-local.in} | 2 +- 3 files changed, 18 insertions(+), 6 deletions(-) copy swilena/python/{sps-local.in => sps-gdb-local.in} (73%) diff --git a/swilena/ChangeLog b/swilena/ChangeLog index 5043dd8..a9dd111 100644 --- a/swilena/ChangeLog +++ b/swilena/ChangeLog @@ -1,5 +1,15 @@ 2012-08-28 Roland Levillain <roland(a)lrde.epita.fr> + Add sps-gdb-local, a script to run the Swilena Python Shell in GDB. + + * python/sps-gdb-local.in: New. + * python/Makefile.am (edit): Also substitute @LIBTOOL@. + (noinst_SCRIPTS): Add sps-gdb-local. + (EXTRA_DIST): Add sps-gdb-local.in. + (sps-gdb-local): Adda a dependency on $(srcdir)/sps-gdb-local.in. + +2012-08-28 Roland Levillain <roland(a)lrde.epita.fr> + Fix build dependencies in Swilena. * python/Makefile.am (image2d_point2d-wrap.cc): Depend on diff --git a/swilena/python/Makefile.am b/swilena/python/Makefile.am index 50b68f7..2593ad3 100644 --- a/swilena/python/Makefile.am +++ b/swilena/python/Makefile.am @@ -40,7 +40,7 @@ AM_LDFLAGS = -avoid-version -module -shared @AMDEP_FALSE@ $(SWIG) $(AM_SWIGFLAGS) $(SWIGFLAGS) -o $@ $< -# Use Make to generate `data.py' and shell scripts (`sps' and +# Use Make to generate `data.py' and shell scripts (such as `sps' and # `sps-local') instead of `configure', as advised by Autoconf's manual # (see section ``Installation Directory Variables''). edit = sed \ @@ -50,7 +50,8 @@ edit = sed \ -e 's|@abs_top_builddir[@]|$(abs_top_builddir)|g' \ -e 's|@libdir[@]|$(libdir)|g' \ -e 's|@pythondir[@]|$(pythondir)|g' \ - -e 's|@PYTHON[@]|$(PYTHON)|g' + -e 's|@PYTHON[@]|$(PYTHON)|g' \ + -e 's|@LIBTOOL[@]|$(LIBTOOL)|g' # swilena.py: The whole Swilena suite. @@ -321,11 +322,11 @@ python_PYTHON += sps.py # The script to be used in installed distributions. bin_SCRIPTS = sps # The script to be used in non-installed build trees. -noinst_SCRIPTS = sps-local +noinst_SCRIPTS = sps-local sps-gdb-local -EXTRA_DIST += sps-common.in sps.in sps-local.in +EXTRA_DIST += sps-common.in sps.in sps-local.in sps-gdb-local.in -sps sps-local: Makefile $(srcdir)/sps-common.in +$(bin_SCRIPTS) $(noinst_SCRIPTS): Makefile $(srcdir)/sps-common.in rm -f $@ $@.tmp srcdir=''; \ test -f ./$@.in || srcdir=$(srcdir)/; \ @@ -338,6 +339,7 @@ sps sps-local: Makefile $(srcdir)/sps-common.in sps: $(srcdir)/sps.in sps-local: $(srcdir)/sps-local.in +sps-gdb-local: $(srcdir)/sps-gdb-local.in CLEANFILES += $(bin_SCRIPTS) $(noinst_SCRIPTS) diff --git a/swilena/python/sps-local.in b/swilena/python/sps-gdb-local.in similarity index 73% copy from swilena/python/sps-local.in copy to swilena/python/sps-gdb-local.in index 88ac50d..f30b3d8 100644 --- a/swilena/python/sps-local.in +++ b/swilena/python/sps-gdb-local.in @@ -3,4 +3,4 @@ # sps local version, for use from non installed distributions. PYTHONPATH='@abs_builddir@:@abs_builddir@/.libs:@abs_srcdir@':"$PYTHONPATH" \ DYLD_LIBRARY_PATH='.libs:@abs_top_builddir@/src/.libs' \ -exec @PYTHON@ -i @abs_srcdir@/sps.py "$@" +exec @LIBTOOL@ --mode=execute gdb --args @PYTHON@ -i @abs_srcdir@/sps.py "$@" -- 1.7.2.5

11 years, 9 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Olena-patches