- Olena-patches

[PATCH 03/12] Introduce an Automake helper to factor extra recursive targets.
by Roland Levillain 08 Jun '09

08 Jun '09

* build-aux/extra-recursive-targets.mk: New. --- ChangeLog | 6 ++++ build-aux/extra-recursive-targets.mk | 46 ++++++++++++++++++++++++++++++++++ 2 files changed, 52 insertions(+), 0 deletions(-) create mode 100644 build-aux/extra-recursive-targets.mk diff --git a/ChangeLog b/ChangeLog index ab8d657..4c8240a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2009-06-08 Roland Levillain <roland(a)lrde.epita.fr> + Introduce an Automake helper to factor extra recursive targets. + + * build-aux/extra-recursive-targets.mk: New. + +2009-06-08 Roland Levillain <roland(a)lrde.epita.fr> + * configure.ac: Configure scribo/tests/unit_test/Makefile. 2009-06-08 Roland Levillain <roland(a)lrde.epita.fr> diff --git a/build-aux/extra-recursive-targets.mk b/build-aux/extra-recursive-targets.mk new file mode 100644 index 0000000..7c1ef1e --- /dev/null +++ b/build-aux/extra-recursive-targets.mk @@ -0,0 +1,46 @@ +# extra-recursive-targets.mk -*- Automake -*- +# Factor the installation of additional recursive targets. + +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005, 2006, 2008 Free Software Foundation, Inc. +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +EXTRA_RECURSIVE_TARGETS = + +# Copied from a generated Makefile.in (rule `$(RECURSIVE_TARGETS)'). +# (Automake does not allow us to interact with the code it generates +# in Makefile.in.) We might want to propose this as a patch to the +# Automake project. +$(EXTRA_RECURSIVE_TARGETS): + @failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ + *k*) failcom='fail=yes';; \ + esac; \ + done; \ + dot_seen=no; \ + target=`echo $@ | sed s/-recursive//`; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + echo "Making $$target in $$subdir"; \ + if test "$$subdir" = "."; then \ + dot_seen=yes; \ + local_target="$$target-am"; \ + else \ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || eval $$failcom; \ + done; \ + if test "$$dot_seen" = "no"; then \ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ + fi; test -z "$$fail" + +.PHONY: $(EXTRA_RECURSIVE_TARGETS) -- 1.6.1.2

1 0

[PATCH 02/12] Rename Make target `regen-dist' as `regen'.
by Roland Levillain 08 Jun '09

08 Jun '09

* Makefile.am, doc/Makefile.am (regen-dist): Rename target as... (regen): ...this. (.PHONY): Adjust. --- milena/ChangeLog | 8 ++++++++ milena/Makefile.am | 8 ++++---- milena/doc/Makefile.am | 4 ++-- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index ff07487..ebc6fcc 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,13 @@ 2009-06-08 Roland Levillain <roland(a)lrde.epita.fr> + Rename Make target `regen-dist' as `regen'. + + * Makefile.am, doc/Makefile.am (regen-dist): Rename target as... + (regen): ...this. + (.PHONY): Adjust. + +2009-06-08 Roland Levillain <roland(a)lrde.epita.fr> + Help Swilena to compile again. * mln/core/alias/neighb2d.hh (mln::c6_2d): Declare it. diff --git a/milena/Makefile.am b/milena/Makefile.am index 30cf50a..666888c 100644 --- a/milena/Makefile.am +++ b/milena/Makefile.am @@ -25,14 +25,14 @@ tools: $(MAKE) -C tools all # Force the regeneration of `headers.mk'. -.PHONY: regen-dist -regen-dist: +.PHONY: regen +regen: cd $(srcdir) && ./generate_dist_headers.sh EXTRA_DIST = generate_dist_headers.sh # We do not delegate the action of regenerating `headers.mk' to -# `regen-dist' like this: +# `regen' like this: # -# $(MAKE) $(AM_MAKEFLAGS) regen-dist +# $(MAKE) $(AM_MAKEFLAGS) regen # # to avoid an infinite recursion, since # diff --git a/milena/doc/Makefile.am b/milena/doc/Makefile.am index 9e5b840..7ca4373 100644 --- a/milena/doc/Makefile.am +++ b/milena/doc/Makefile.am @@ -14,7 +14,7 @@ DOXYGEN = doxygen .PHONY: doc-all doc doc-html doc-dev doc-dev-html ref-doc-dev ref-doc-dev-html\ ref-doc ref-doc-html tutorial tutorial-html white-paper \ white-paper-html ref-guide ref-guide-html examples fix-refdata \ - fig-convert regen-dist + fig-convert regen # Doxygen documentation output directory. @@ -119,7 +119,7 @@ edit_user = sed -e 's,OUTPUT_DIRECTORY = ./complete/,OUTPUT_DIRECTORY -e 's,EXCLUDE_SYMBOLS =,EXCLUDE_SYMBOLS = *::internal* *_ mln::trait::*,g' -regen-dist: $(srcdir)/headers.stamp +regen: $(srcdir)/headers.stamp $(srcdir)/examples/examples.mk: $(srcdir)/headers.stamp $(srcdir)/figures/figures.mk: $(srcdir)/headers.stamp -- 1.6.1.2

1 0

[PATCH 01/12] configure.ac: Configure scribo/tests/unit_test/Makefile.
by Roland Levillain 08 Jun '09

08 Jun '09

--- ChangeLog | 4 ++++ configure.ac | 1 + 2 files changed, 5 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 422190c..ab8d657 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2009-06-08 Roland Levillain <roland(a)lrde.epita.fr> + * configure.ac: Configure scribo/tests/unit_test/Makefile. + +2009-06-08 Roland Levillain <roland(a)lrde.epita.fr> + * configure.ac (HAVE_SWIG_1_3_39): New conditional. 2009-06-08 Roland Levillain <roland(a)lrde.epita.fr> diff --git a/configure.ac b/configure.ac index d00b0e6..50b612b 100644 --- a/configure.ac +++ b/configure.ac @@ -214,6 +214,7 @@ AC_CONFIG_FILES([ scribo/tests/preprocessing/Makefile scribo/tests/table/Makefile scribo/tests/text/Makefile + scribo/tests/unit_test/Makefile ]) -- 1.6.1.2

1 0

[Olena] #180: algebra::vec's != operators cannot be used.
by Olena 08 Jun '09

08 Jun '09

#180: algebra::vec's != operators cannot be used. ---------------------+------------------------------------------------------ Reporter: lazzara | Owner: Olena Team Type: defect | Status: new Priority: major | Milestone: Olena 1.0 Component: Milena | Version: 1.0 Keywords: | ---------------------+------------------------------------------------------ The following example does not compile. test.cc: {{{ # include <mln/algebra/vec.hh> int main() { using namespace mln::algebra; vec<3, float> a, b; bool c = (a != b); } }}} g++ -I. test.cc {{{ test.cc: In function 'int main()': test.cc:6: error: cannot convert 'mln::algebra::vec<3u, bool>' to 'bool' in initialization ./mln/core/routine/ops.hh: In function 'typename mln::trait::op::neq<L, R>::ret mln::operator!=(const mln::Object<E>&, const mln::Object<O2>&) [with O1 = mln::algebra::vec<3u, float>, O2 = mln::algebra::vec<3u, float>]': test.cc:6: instantiated from here ./mln/core/routine/ops.hh:528: error: conversion from 'bool' to non-scalar type 'mln::algebra::vec<3u, bool>' requested }}} Note that if '(a != b)' is replaced by '(a == b)' or '!(a == b)', this example compiles. -- Ticket URL: <https://trac.lrde.org/olena/ticket/180> Olena <http://olena.lrde.epita.fr> Olena, a generic and efficient C++ image processing library.

2 1

[PATCH 7/7] Disable test python/dynamic-image2d-misc.py with SWIG < 1.3.39.
by Roland Levillain 08 Jun '09

08 Jun '09

* python/Makefile.am (TESTS) [!HAVE_SWIG_1_3_39]: Remove dynamic-image2d-misc.py. --- swilena/ChangeLog | 7 +++++++ swilena/python/Makefile.am | 8 +++++++- 2 files changed, 14 insertions(+), 1 deletions(-) diff --git a/swilena/ChangeLog b/swilena/ChangeLog index 878fe63..1d9abbc 100644 --- a/swilena/ChangeLog +++ b/swilena/ChangeLog @@ -1,5 +1,12 @@ 2009-06-08 Roland Levillain <roland(a)lrde.epita.fr> + Disable test python/dynamic-image2d-misc.py with SWIG < 1.3.39. + + * python/Makefile.am (TESTS) [!HAVE_SWIG_1_3_39]: Remove + dynamic-image2d-misc.py. + +2009-06-08 Roland Levillain <roland(a)lrde.epita.fr> + * python/image2d-misc.py: Have this test pass with SWIG < 1.3.39. 2009-06-08 Roland Levillain <roland(a)lrde.epita.fr> diff --git a/swilena/python/Makefile.am b/swilena/python/Makefile.am index eb49d04..1525d5d 100644 --- a/swilena/python/Makefile.am +++ b/swilena/python/Makefile.am @@ -212,5 +212,11 @@ $(srcdir)/run.stamp: $(RUN_IN) # as `--python' to `run'. TESTS = \ box2d-misc.py \ - image2d-misc.py morpho-fun.py morpho-segm.py dynamic-image2d-misc.py + image2d-misc.py morpho-fun.py morpho-segm.py + +# Do no exercise tests known to fail with old versions of SWIG. +if HAVE_SWIG_1_3_39 +TESTS += dynamic-image2d-misc.py +endif HAVE_SWIG_1_3_39 + EXTRA_DIST += $(TESTS) -- 1.6.2.4

1 0

[PATCH 6/7] configure.ac (HAVE_SWIG_1_3_39): New conditional.
by Roland Levillain 08 Jun '09

08 Jun '09

--- ChangeLog | 4 ++++ configure.ac | 5 +++++ 2 files changed, 9 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 69be6ad..422190c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2009-06-08 Roland Levillain <roland(a)lrde.epita.fr> + * configure.ac (HAVE_SWIG_1_3_39): New conditional. + +2009-06-08 Roland Levillain <roland(a)lrde.epita.fr> + Require SWIG >= 1.3.36 for Swilena. * m4/with-swilena.m4 (_OLN_WITH_SWIG): Here. diff --git a/configure.ac b/configure.ac index 7bcd9bb..d00b0e6 100644 --- a/configure.ac +++ b/configure.ac @@ -169,6 +169,11 @@ AC_CONFIG_SUBDIRS([external/trimesh]) OLN_WITH_SWILENA([enable_swilena=yes], []) AM_CONDITIONAL([ENABLE_SWILENA], [test x$enable_swilena = xyes]) +AS_VERSION_COMPARE([$swig_version], [1.3.39], + [have_swig_1_3_39=false], + [have_swig_1_3_39=true], + [have_swig_1_3_39=true]) +AM_CONDITIONAL([HAVE_SWIG_1_3_39], [$have_swig_1_3_39]) AC_CONFIG_FILES([swilena/Makefile swilena/python/Makefile]) -- 1.6.2.4

1 0

[PATCH 5/7] python/image2d-misc.py: Have this test pass with SWIG < 1.3.39.
by Roland Levillain 08 Jun '09

08 Jun '09

--- swilena/ChangeLog | 4 ++++ swilena/python/image2d-misc.py | 13 ++++++++++++- 2 files changed, 16 insertions(+), 1 deletions(-) diff --git a/swilena/ChangeLog b/swilena/ChangeLog index 912b495..878fe63 100644 --- a/swilena/ChangeLog +++ b/swilena/ChangeLog @@ -1,5 +1,9 @@ 2009-06-08 Roland Levillain <roland(a)lrde.epita.fr> + * python/image2d-misc.py: Have this test pass with SWIG < 1.3.39. + +2009-06-08 Roland Levillain <roland(a)lrde.epita.fr> + New Swilena module: config. * config.i: New. diff --git a/swilena/python/image2d-misc.py b/swilena/python/image2d-misc.py index 737b39b..a7933d1 100644 --- a/swilena/python/image2d-misc.py +++ b/swilena/python/image2d-misc.py @@ -22,13 +22,24 @@ from swilena import * ima = image2d_int.image2d_int(3, 3) image2d_int.fill(ima, 42) +# FIXME: Help version of SWIG older than 1.3.39. For instance, SWIG +# 1.3.36 does not generate code smart enough to detect that the output +# of `ima.domain()' should be a wrapped `box2d'. Help it. +# +# We should get rid of this when SWIG 1.3.39 (or greater) is +# widespread. +if config.have_swig(0x010339): + domain = ima.domain() +else: + domain = box2d(3, 3) + # FIXME: Eventually we'd like to be able to write this: # # for p in ima.domain(): # print "ima(" + str(p) + ") = " + ima(p) # # as it is generic and way closer to what we do in C++. -for p in ima.domain(): +for p in domain: # FIXME: Handling POD types (like int) as value types is not # transparent: ima(p) returns a pointer to int wrapped in a SWIG # object, and cannot be easily converted to a Python integer -- 1.6.2.4

1 0

[PATCH 4/7] New Swilena module: config.
by Roland Levillain 08 Jun '09

08 Jun '09

* config.i: New. * python/Makefile.am (pyexec_LTLIBRARIES): Add _config.la. (nodist__config_la_SOURCES, _config_la_LIBADD): New. (CLEANFILES): Add $(nodist__config_la_SOURCES), config.py, config.pyc and config.pyo. (nodist_python_PYTHON): Add config.py. * python/swilena.py: Import config. --- swilena/ChangeLog | 12 ++++++++++++ swilena/config.i | 31 +++++++++++++++++++++++++++++++ swilena/python/Makefile.am | 10 ++++++++++ swilena/python/swilena.py | 2 ++ 4 files changed, 55 insertions(+), 0 deletions(-) create mode 100644 swilena/config.i diff --git a/swilena/ChangeLog b/swilena/ChangeLog index c2de3c5..912b495 100644 --- a/swilena/ChangeLog +++ b/swilena/ChangeLog @@ -1,5 +1,17 @@ 2009-06-08 Roland Levillain <roland(a)lrde.epita.fr> + New Swilena module: config. + + * config.i: New. + * python/Makefile.am (pyexec_LTLIBRARIES): Add _config.la. + (nodist__config_la_SOURCES, _config_la_LIBADD): New. + (CLEANFILES): Add $(nodist__config_la_SOURCES), config.py, + config.pyc and config.pyo. + (nodist_python_PYTHON): Add config.py. + * python/swilena.py: Import config. + +2009-06-08 Roland Levillain <roland(a)lrde.epita.fr> + Fix Swilena's copyright headers. * box.ixx, diff --git a/swilena/config.i b/swilena/config.i new file mode 100644 index 0000000..a3bf3fe --- /dev/null +++ b/swilena/config.i @@ -0,0 +1,31 @@ +// -*- C++ -*- +// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library 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 library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. + +/// \file config.i +/// \brief Swilena configuration. + +%module config + +%inline %{ +/// Are we using SWIG \a version or greater? +bool +have_swig(int version) +{ + return SWIGVERSION >= version; +} +%} diff --git a/swilena/python/Makefile.am b/swilena/python/Makefile.am index ad41c3c..eb49d04 100644 --- a/swilena/python/Makefile.am +++ b/swilena/python/Makefile.am @@ -47,6 +47,16 @@ python_PYTHON += data.py nodist_python_PYTHON = pyexec_LTLIBRARIES = +## config. +pyexec_LTLIBRARIES += _config.la +nodist__config_la_SOURCES = config-wrap.cc +_config_la_LIBADD = $(AM_LIBADD) +CLEANFILES += $(nodist__config_la_SOURCES) config.py config.py[co] +## Include the dependency files. Copied from Automake's generated +## case for C++. +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/_config-wrap.Pcc@am__quote@ +nodist_python_PYTHON += config.py + ## point2d. pyexec_LTLIBRARIES += _point2d.la nodist__point2d_la_SOURCES = point2d-wrap.cc diff --git a/swilena/python/swilena.py b/swilena/python/swilena.py index 1c7f3e1..ce093b5 100644 --- a/swilena/python/swilena.py +++ b/swilena/python/swilena.py @@ -22,6 +22,8 @@ import ltihooks +import config + from box2d import * from point2d import * from dpoint2d import * -- 1.6.2.4

1 0

[PATCH 3/7] Help Swilena to compile again.
by Roland Levillain 08 Jun '09

08 Jun '09

* mln/core/alias/neighb2d.hh (mln::c6_2d): Declare it. Use fully qualified type name of mln::fun::p2b::chess to help swig. --- milena/ChangeLog | 8 ++++++++ milena/mln/core/alias/neighb2d.hh | 4 +++- 2 files changed, 11 insertions(+), 1 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 3c43dc0..ff07487 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,11 @@ +2009-06-08 Roland Levillain <roland(a)lrde.epita.fr> + + Help Swilena to compile again. + + * mln/core/alias/neighb2d.hh (mln::c6_2d): Declare it. + Use fully qualified type name of mln::fun::p2b::chess to help + swig. + 2009-06-08 Edwin Carlinet <carlinet(a)lrde.epita.fr> Add forgotten path alteration due to accu move. diff --git a/milena/mln/core/alias/neighb2d.hh b/milena/mln/core/alias/neighb2d.hh index 3fa9f30..7bb3b86 100644 --- a/milena/mln/core/alias/neighb2d.hh +++ b/milena/mln/core/alias/neighb2d.hh @@ -122,6 +122,8 @@ namespace mln const neighb2d& c2_col(); + // FIXME: Documentation + neighb< win::multiple<window2d, mln::fun::p2b::chess> > c6_2d(); @@ -203,7 +205,7 @@ namespace mln inline - neighb< win::multiple<window2d, fun::p2b::chess> > + neighb< win::multiple<window2d, mln::fun::p2b::chess> > c6_2d() { bool vert[] = { 1, 1, 0, -- 1.6.2.4

1 0

[PATCH 2/7] Require SWIG >= 1.3.36 for Swilena.
by Roland Levillain 08 Jun '09

08 Jun '09

* m4/with-swilena.m4 (_OLN_WITH_SWIG): Here. --- ChangeLog | 6 ++++++ m4/with-swilena.m4 | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index bf482e2..69be6ad 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2009-06-08 Roland Levillain <roland(a)lrde.epita.fr> + + Require SWIG >= 1.3.36 for Swilena. + + * m4/with-swilena.m4 (_OLN_WITH_SWIG): Here. + 2009-06-05 Guillaume Lazzara <lazzara(a)lrde.epita.fr> * Makefile.am: fix invalid rule name. diff --git a/m4/with-swilena.m4 b/m4/with-swilena.m4 index 602abc6..5f9b7fb 100644 --- a/m4/with-swilena.m4 +++ b/m4/with-swilena.m4 @@ -78,14 +78,14 @@ if test x$with_swig != xno; then # [You need Ruby development files to compile the Ruby interface.])]) # CPPFLAGS=$save_CPPFLAGS - AC_PROG_SWIG([1.3.31]) + AC_PROG_SWIG([1.3.36]) if (eval "$SWIG -version") >/dev/null 2>&1; then :; else oln_has_swig=no fi case $with_swig:$oln_has_swig in yes:no) - AC_MSG_ERROR([SWIG 1.3.31 is required. + AC_MSG_ERROR([SWIG 1.3.36 is required. Use `--without-swig' to disable SWIG modules.]);; esac fi -- 1.6.2.4

1 0