Olena-patches April 2013

olena-patches@lrde.epita.fr

7 participants
363 discussions

olena-2.0-465-g90aac13 Fix path to other documentations.

by Guillaume Lazzara

* doc/Doxyfile.in, * doc/Makefile.am: Here. --- scribo/ChangeLog | 7 +++++++ scribo/doc/Doxyfile.in | 2 +- scribo/doc/Makefile.am | 9 +++++++-- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index a31ff19..dea2689 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,10 @@ +2013-04-10 Guillaume Lazzara <z(a)lrde.epita.fr> + + Fix path to other documentations. + + * doc/Doxyfile.in, + * doc/Makefile.am: Here. + 2013-04-09 Guillaume Lazzara <z(a)lrde.epita.fr> * tests/primitive/extract/Makefile.am: Add more files in diff --git a/scribo/doc/Doxyfile.in b/scribo/doc/Doxyfile.in index bc0f2c7..b28bd55 100644 --- a/scribo/doc/Doxyfile.in +++ b/scribo/doc/Doxyfile.in @@ -334,7 +334,7 @@ SKIP_FUNCTION_MACROS = YES #--------------------------------------------------------------------------- # Configuration::additions related to external references #--------------------------------------------------------------------------- -TAGFILES = @builddir@/../../milena/doc/milena.tag=../../../milena/user-refman/html +TAGFILES = @builddir@/../../milena/doc/milena.tag=@top_srcdir@/milena/doc/user-refman/html GENERATE_TAGFILE = scribo.tag ALLEXTERNALS = NO EXTERNAL_GROUPS = NO diff --git a/scribo/doc/Makefile.am b/scribo/doc/Makefile.am index 9cbe355..38f2d1d 100644 --- a/scribo/doc/Makefile.am +++ b/scribo/doc/Makefile.am @@ -98,7 +98,8 @@ $(srcdir)/user-refman.stamp: $(srcdir)/$(DOXYFILE).in $(REFMAN_deps) test -f $(USER_REFMAN).tmp/latex/refman.tex rm -rf $(srcdir)/$(USER_REFMAN) ## Fix path to the main page of the documentation. - sed -i -e "s,\@relcommondocpath\@,$(DESTDIR)$(htmldir)/$(USER_REFMAN)/html/,g" \ + sed -i -e "s,\@relcommondocpath\@,$(top_srcdir)/,g" \ + -e "s,\@userrefman\@,$(USER_REFMAN),g" \ `find $(USER_REFMAN).tmp -name '*.html'` ## FIXME: Moving directories between file systems is not portable. mv $(USER_REFMAN).tmp $(srcdir)/$(USER_REFMAN) @@ -180,7 +181,7 @@ $(srcdir)/devel-refman.stamp: $(srcdir)/$(DOXYFILE).in $(REFMAN_deps) test -f $(DEVEL_REFMAN).tmp/latex/refman.tex rm -rf $(srcdir)/$(DEVEL_REFMAN) ## Fix path to the main page of the documentation. - sed -i -e "s,\@relcommondocpath\@,$(DESTDIR)$(htmldir)/$(DEVEL_REFMAN)/html/,g" \ + sed -i -e "s,\@relcommondocpath\@,$(top_srcdir)/doc/$(DEVEL_REFMAN)/html/,g" \ $(DEVEL_REFMAN).tmp/html/index.html ## FIXME: Moving directories between file systems is not portable. mv $(DEVEL_REFMAN).tmp $(srcdir)/$(DEVEL_REFMAN) @@ -233,6 +234,10 @@ install-data-local: rm -rf $(DESTDIR)$(htmldir)/scribo/$(USER_REFMAN)/html cp -r $(srcdir)/$(USER_REFMAN)/html \ $(DESTDIR)$(htmldir)/scribo/$(USER_REFMAN) +## Fix path to the main page of the documentation. + sed -i -e "s,$(top_srcdir)/doc/$(USER_REFMAN)/html/,$(DESTDIR)$(htmldir)/$(USER_REFMAN)/,g" \ + -e "s,$(top_srcdir)/milena/doc,$(DESTDIR)$(htmldir)/milena/$(USER_REFMAN),g" \ + `find $(DESTDIR)$(htmldir)/scribo/$(USER_REFMAN) -name '*.html'` # Other HTML directories can be processed uniformly. for d in $(DATA_html_dirs_inst); do \ rm -rf $(DESTDIR)$(htmldir)/scribo/$$d; \ -- 1.7.2.5

11 years, 8 months

olena-2.0-464-g5afba38 doc/Makefile.am: Fix path to other documentations.

by Guillaume Lazzara

--- milena/ChangeLog | 4 ++++ milena/doc/Makefile.am | 12 ++++++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 3e0e5c3..018fe9c 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,7 @@ +2013-04-10 Guillaume Lazzara <z(a)lrde.epita.fr> + + * doc/Makefile.am: Fix path to other documentations. + 2013-04-04 Guillaume Lazzara <z(a)lrde.epita.fr> Kill Doxygen warnings. diff --git a/milena/doc/Makefile.am b/milena/doc/Makefile.am index f7ad598..bdeb86d 100644 --- a/milena/doc/Makefile.am +++ b/milena/doc/Makefile.am @@ -1,5 +1,5 @@ -# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development -# Laboratory (LRDE). +# Copyright (C) 2007, 2008, 2009, 2010, 2013 EPITA Research and +# Development Laboratory (LRDE). # # This file is part of Olena. # @@ -248,7 +248,8 @@ $(srcdir)/user-refman.stamp: $(srcdir)/$(DOXYFILE).in $(REFMAN_deps) test -f $(USER_REFMAN).tmp/latex/refman.tex rm -rf $(srcdir)/$(USER_REFMAN) ## Fix path to the main page of the documentation. - sed -i -e "s,\@relcommondocpath\@,$(DESTDIR)$(htmldir)/$(USER_REFMAN)/html/,g" \ + sed -i -e "s,\@relcommondocpath\@,$(top_srcdir)/,g" \ + -e "s,\@userrefman\@,$(USER_REFMAN),g" \ `find $(USER_REFMAN).tmp -name '*.html'` ## FIXME: Moving directories between file systems is not portable. mv $(USER_REFMAN).tmp $(srcdir)/$(USER_REFMAN) @@ -330,7 +331,7 @@ $(srcdir)/devel-refman.stamp: $(srcdir)/$(DOXYFILE).in $(REFMAN_deps) test -f $(DEVEL_REFMAN).tmp/latex/refman.tex rm -rf $(srcdir)/$(DEVEL_REFMAN) ## Fix path to the main page of the documentation. - sed -i -e "s,\@relcommondocpath\@,$(DESTDIR)$(htmldir)/$(DEVEL_REFMAN)/html/,g" \ + sed -i -e "s,\@relcommondocpath\@,$(top_srcdir)/doc/$(DEVEL_REFMAN)/html/,g" \ $(DEVEL_REFMAN).tmp/html/index.html ## FIXME: Moving directories between file systems is not portable. mv $(DEVEL_REFMAN).tmp $(srcdir)/$(DEVEL_REFMAN) @@ -756,6 +757,9 @@ install-data-local: # special case. rm -rf $(DESTDIR)$(htmldir)/milena/$(USER_REFMAN)/html cp -r $(srcdir)/$(USER_REFMAN)/html $(DESTDIR)$(htmldir)/milena/$(USER_REFMAN) +## Fix path to the main page of the documentation. + sed -i -e "s,\$(top_srcdir)/doc/$(USER_REFMAN)/html,$(DESTDIR)$(htmldir)/$(USER_REFMAN),g" \ + `find $(DESTDIR)$(htmldir)/milena/$(USER_REFMAN) -name '*.html'` # Other HTML directories can be processed uniformly. for d in $(DATA_html_dirs_inst); do \ rm -rf $(DESTDIR)$(htmldir)/milena/$$d; \ -- 1.7.2.5

11 years, 8 months

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, 8 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, 8 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, 8 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, 8 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, 8 months

olena-2.0-138-g8b40c86 Aesthetic changes in Swilena.

by Roland Levillain

* swilena/box.ixx, * swilena/box2d.i, * swilena/image2d.ixx, * swilena/image2d_point2d.i, * swilena/morpho.ixx: Here. --- swilena/ChangeLog | 11 +++++++++++ swilena/box.ixx | 2 +- swilena/box2d.i | 4 ++-- swilena/image2d.ixx | 5 +++-- swilena/image2d_point2d.i | 2 +- swilena/morpho.ixx | 5 ++++- 6 files changed, 22 insertions(+), 7 deletions(-) diff --git a/swilena/ChangeLog b/swilena/ChangeLog index a9dd111..acd541a 100644 --- a/swilena/ChangeLog +++ b/swilena/ChangeLog @@ -1,5 +1,16 @@ 2012-08-28 Roland Levillain <roland(a)lrde.epita.fr> + Aesthetic changes in Swilena. + + * swilena/box.ixx, + * swilena/box2d.i, + * swilena/image2d.ixx, + * swilena/image2d_point2d.i, + * swilena/morpho.ixx: + Here. + +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. diff --git a/swilena/box.ixx b/swilena/box.ixx index 88cdec7..12f6dd4 100644 --- a/swilena/box.ixx +++ b/swilena/box.ixx @@ -41,7 +41,7 @@ /** Instantiate an mln::box<P> type. The variadic argument ``P...'' is used to allow template type - names having commas (e.g. mln::point<grid::square, def::coord) as + names having commas (e.g. mln::point<grid::square, def::coord >) as argument. */ %define instantiate_box(Name, P...) /* Swig tries to wrap everything by default; prevent it from wrapping diff --git a/swilena/box2d.i b/swilena/box2d.i index fcfd766..f13790e 100644 --- a/swilena/box2d.i +++ b/swilena/box2d.i @@ -42,8 +42,8 @@ %extend mln::box< mln::point<mln::grid::square, mln::def::coord> > { // Provide a ctor creating an `mln::box2d' from two `int's. - mln::box< mln::point< mln::grid::square, mln::def::coord> > (int nrows, - int ncols) + mln::box< mln::point<mln::grid::square, mln::def::coord> > (int nrows, + int ncols) { return new mln::box<mln::point2d>(nrows, ncols); } diff --git a/swilena/image2d.ixx b/swilena/image2d.ixx index a08864b..963fcfc 100644 --- a/swilena/image2d.ixx +++ b/swilena/image2d.ixx @@ -84,9 +84,10 @@ // Instantiate base classes of mln::image2d<T> so that Swig knows it // derives from mln::Image. - %template() mln::internal::image_primary< T, mln::box2d, mln::image2d< T > >; - %template() mln::internal::image_base< T, mln::box2d, mln::image2d< T > >; + %template() mln::Image< mln::image2d< int > >; %template() mln::internal::image_checked_< mln::image2d< T > >; + %template() mln::internal::image_base< T, mln::box2d, mln::image2d< T > >; + %template() mln::internal::image_primary< T, mln::box2d, mln::image2d< T > >; // Instantiate mln::image2d<T> %template(I) mln::image2d< T >; %enddef // !instantiate_image2d diff --git a/swilena/image2d_point2d.i b/swilena/image2d_point2d.i index 0ef3bd9..851d0e2 100644 --- a/swilena/image2d_point2d.i +++ b/swilena/image2d_point2d.i @@ -36,7 +36,7 @@ #include "mln/core/alias/point2d.hh" %} -%include concat.ixx +%include "concat.ixx" %include "image2d.ixx" instantiate_image2d(image2d_point2d, diff --git a/swilena/morpho.ixx b/swilena/morpho.ixx index 5cbf290..3e5a91d 100644 --- a/swilena/morpho.ixx +++ b/swilena/morpho.ixx @@ -49,7 +49,7 @@ %include "mln/morpho/dilation.hh" %include "mln/morpho/erosion.hh" - would require a lot of efforts. Use an explicit prototypes + would require a lot of efforts. Use explicit prototypes instead. */ namespace mln { @@ -66,6 +66,9 @@ namespace mln } +/* FIXME: We should try to factor the multiple instantiations of + `mln::trait::concrete< I >'. */ + %define instantiate_dilation(Name, I, W) // Explicit instantiation of this trait for the return type. %template() mln::trait::concrete< I >; -- 1.7.2.5

11 years, 8 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, 8 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, 8 months

← Newer
1
...
30
31
32
33
34
35
36
37
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Olena-patches April 2013