Olena-patches

olena-patches@lrde.epita.fr

9625 discussions

Start a nNew thread

branch distribute-olena created: last-svn-commit-507-ga796f1e

by lazzara＠lrde.epita.fr

14 years, 5 months

last-svn-commit-507-ga796f1e Makefile.am: Add new rules to build rpm and deb packages.

by Guillaume Lazzara

--- ChangeLog | 4 ++++ Makefile.am | 20 ++++++++++++++++++++ 2 files changed, 24 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 95aa943..4083555 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2010-08-27 Guillaume Lazzara <z(a)lrde.epita.fr> + * Makefile.am: Add new rules to build rpm and deb packages. + +2010-08-27 Guillaume Lazzara <z(a)lrde.epita.fr> + Add package configuration files. * configure.ac: Ask for the generation of some package diff --git a/Makefile.am b/Makefile.am index f89da9f..063a088 100644 --- a/Makefile.am +++ b/Makefile.am @@ -136,3 +136,23 @@ snapshot: && $(MAKE) $(AM_MAKEFLAGS) dist \ && mv -f $(srcdir)/configure.ac.old $(srcdir)/configure.ac #>> + + +regen-inst: + cd milena && $(MAKE) regen-inst \ + && cd scribo && $(MAKE) regen-inst + +deb: + cd milena && $(MAKE) deb \ + && cd scribo && $(MAKE) deb + +rpm: + cd milena && $(MAKE) rpm \ + && cd scribo && $(MAKE) rpm + +pkg: + cd $(abs_top_builddir)/milena \ + && $(MAKE) pkg \ + && cd $(abs_top_builddir)/scribo \ + && $(MAKE) pkg \ + && cd $(abs_top_builddir) \ No newline at end of file -- 1.5.6.5

14 years, 5 months

last-svn-commit-506-gc800936 Makefile.am: Add new rules to build rpm and deb packages for Scribo.

by Guillaume Lazzara

--- scribo/ChangeLog | 5 ++++ scribo/Makefile.am | 53 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 58 insertions(+), 0 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 3f281f4..df2f390 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,10 @@ 2010-08-27 Guillaume Lazzara <z(a)lrde.epita.fr> + * Makefile.am: Add new rules to build rpm and deb packages for + Scribo. + +2010-08-27 Guillaume Lazzara <z(a)lrde.epita.fr> + * src/Makefile.am (CLEANFILES): Fix invalid variable name. 2010-08-26 Guillaume Lazzara <z(a)lrde.epita.fr> diff --git a/scribo/Makefile.am b/scribo/Makefile.am index 741cca4..2857d57 100644 --- a/scribo/Makefile.am +++ b/scribo/Makefile.am @@ -41,3 +41,56 @@ $(srcdir)/headers.mk: $(top_srcdir)/build-aux/generate_dist_headers.sh scribo headers.mk nodist-headers include $(srcdir)/headers.mk + + + + +# Packaging +#---------- + +tmp_inst_dir = scribo_inst.tmp +tmp_inst_path = $(abs_builddir)/$(tmp_inst_dir) + +regen-inst: + rm -rf $(tmp_inst_path) \ + && mkdir $(tmp_inst_path) \ + && $(MAKE) DESTDIR=$(tmp_inst_path) install \ + && mkepmlist --prefix $(bindir) -g sys -u root \ + $(builddir)/$(tmp_inst_dir)/$(bindir) \ + > $(top_srcdir)/pkg-aux/scribo_bin_list.inc \ + && mkepmlist --prefix $(libexecdir) -g sys -u root \ + $(builddir)/$(tmp_inst_dir)/$(libexecdir) \ + >> $(top_srcdir)/pkg-aux/scribo_bin_list.inc \ + && mkepmlist --prefix $(includedir) -g sys -u root \ + $(builddir)/$(tmp_inst_dir)/$(includedir) \ + > $(top_srcdir)/pkg-aux/scribo_include_list.inc \ + && rm -rf $(tmp_inst_path) + + +deb: + rm -rf $(tmp_inst_path) \ + && mkdir $(tmp_inst_path) \ + && $(MAKE) DESTDIR=$(tmp_inst_path) install \ + && epm -v -v -f deb -n --output-dir $(top_builddir) scribo \ + $(top_builddir)/pkg-aux/scribo.list \ + && rm -rf $(tmp_inst_path) + + +rpm: + rm -rf $(tmp_inst_path) \ + && mkdir $(tmp_inst_path) \ + && $(MAKE) DESTDIR=$(tmp_inst_path) install \ + && epm -v -v -f rpm -n --output-dir $(top_builddir) scribo \ + $(top_builddir)/pkg-aux/scribo.list \ + && rm -rf $(tmp_inst_path) + +pkg: + rm -rf $(tmp_inst_path) \ + && mkdir $(tmp_inst_path) \ + && $(MAKE) DESTDIR=$(tmp_inst_path) install \ + && epm -v -v -f rpm -n --output-dir $(top_builddir) scribo \ + $(top_builddir)/pkg-aux/scribo.list \ + && epm -v -v -f deb -n --output-dir $(top_builddir) scribo \ + $(top_builddir)/pkg-aux/scribo.list \ + && rm -rf $(tmp_inst_path) + -- 1.5.6.5

14 years, 5 months

last-svn-commit-505-g472e7e3 Makefile.am: Add new rules to build rpm and deb packages for Milena.

by Guillaume Lazzara

--- milena/ChangeLog | 5 +++++ milena/Makefile.am | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 56 insertions(+), 0 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index f858b7e..f16ccdc 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,8 @@ +2010-08-27 Guillaume Lazzara <z(a)lrde.epita.fr> + + * Makefile.am: Add new rules to build rpm and deb packages for + Milena. + 2010-08-26 Guillaume Lazzara <z(a)lrde.epita.fr> * mln/labeling/compute.hh: Add a missing overload in dispatch. diff --git a/milena/Makefile.am b/milena/Makefile.am index bac240d..a12aedc 100644 --- a/milena/Makefile.am +++ b/milena/Makefile.am @@ -110,3 +110,54 @@ EXTRA_DIST += \ tests/img/test_rgb8.tif \ tests/img/test_bw.tif \ tests/img/test_gl.tif + + + +# Packaging +#---------- + +tmp_inst_dir = milena_inst.tmp +tmp_inst_path = $(abs_builddir)/$(tmp_inst_dir) + +regen-inst: + rm -rf $(tmp_inst_path) \ + && $(MAKE) DESTDIR=$(tmp_inst_path) install \ + && mkepmlist --prefix $(bindir) -g sys -u root \ + $(builddir)/$(tmp_inst_dir)/$(bindir) \ + > $(top_srcdir)/pkg-aux/milena_bin_list.inc \ + && mkepmlist --prefix $(datarootdir)/olena -g sys -u root \ + $(builddir)/$(tmp_inst_dir)/$(datarootdir)/olena \ + >> $(top_srcdir)/pkg-aux/milena_bin_list.inc \ + && mkepmlist --prefix $(datarootdir)/doc -g sys -u root \ + $(builddir)/$(tmp_inst_dir)/$(datarootdir)/doc \ + > $(top_srcdir)/pkg-aux/milena_doc_list.inc \ + && mkepmlist --prefix $(includedir) -g sys -u root \ + $(builddir)/$(tmp_inst_dir)/$(includedir) \ + > $(top_srcdir)/pkg-aux/milena_include_list.inc \ + && rm -rf $(tmp_inst_path) + + +deb: + rm -rf $(tmp_inst_path) \ + && $(MAKE) DESTDIR=$(tmp_inst_path) install \ + && epm -v -v -f deb -n --output-dir $(top_builddir) milena \ + $(top_builddir)/pkg-aux/milena.list \ + && rm -rf $(tmp_inst_path) + + +rpm: + rm -rf $(tmp_inst_path) \ + && $(MAKE) DESTDIR=$(tmp_inst_path) install \ + && epm -v -v -f rpm -n --output-dir $(top_builddir) milena \ + $(top_builddir)/pkg-aux/milena.list \ + && rm -rf $(tmp_inst_path) + +pkg: + rm -rf $(tmp_inst_path) \ + && $(MAKE) DESTDIR=$(tmp_inst_path) install \ + && epm -v -v -f rpm -n --output-dir $(top_builddir) milena \ + $(top_builddir)/pkg-aux/milena.list \ + && epm -v -v -f deb -n --output-dir $(top_builddir) milena \ + $(top_builddir)/pkg-aux/milena.list \ + && rm -rf $(tmp_inst_path) + -- 1.5.6.5

14 years, 5 months

branch distribute-scribo updated: last-svn-commit-503-ga73e820

by lazzara＠lrde.epita.fr

14 years, 5 months

last-svn-commit-503-ga73e820 src/Makefile.am (CLEANFILES): Fix invalid variable name.

by Guillaume Lazzara

--- scribo/ChangeLog | 4 ++++ scribo/src/Makefile.am | 2 +- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 95e0a35..3f281f4 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,7 @@ +2010-08-27 Guillaume Lazzara <z(a)lrde.epita.fr> + + * src/Makefile.am (CLEANFILES): Fix invalid variable name. + 2010-08-26 Guillaume Lazzara <z(a)lrde.epita.fr> Add scribo-cli script. diff --git a/scribo/src/Makefile.am b/scribo/src/Makefile.am index ed458cd..49f772d 100644 --- a/scribo/src/Makefile.am +++ b/scribo/src/Makefile.am @@ -100,6 +100,6 @@ scribo-cli: $(srcdir)/scribo-cli.in Makefile chmod a-w $@.tmp mv $@.tmp $@ -CLEANFILES = $(bin_SCRIPTS) +CLEANFILES = $(dist_bin_SCRIPTS) EXTRA_DIST = scribo-cli.in -- 1.5.6.5

14 years, 5 months

last-svn-commit-495-gdce59ec Distribute Scribo.

by Roland Levillain

* configure.ac: Remove tags `<<lrde' and `dnl>>' around Scribo-related bits. * Makefile.am: Likewise. (LRDE_NODIST_FILES): Remove $(distdir)/scribo. --- ChangeLog | 9 +++++++++ Makefile.am | 7 ++----- configure.ac | 4 ---- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index d0cac72..55ddb57 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2010-05-11 Roland Levillain <roland(a)lrde.epita.fr> + + Distribute Scribo. + + * configure.ac: Remove tags `<<lrde' and `dnl>>' around + Scribo-related bits. + * Makefile.am: Likewise. + (LRDE_NODIST_FILES): Remove $(distdir)/scribo. + 2010-08-24 Guillaume Lazzara <z(a)lrde.epita.fr> * m4/oln-with-lib.m4: Force headers lookup in specified path. diff --git a/Makefile.am b/Makefile.am index 87987f1..f89da9f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2006, 2007, 2008, 2009 EPITA Research and Development +# Copyright (C) 2006, 2007, 2008, 2009, 2010 EPITA Research and Development # Laboratory (LRDE). # # This file is part of Olena. @@ -23,11 +23,9 @@ if ENABLE_SWILENA SUBDIRS += swilena endif ENABLE_SWILENA -#<<lrde if ENABLE_SCRIBO SUBDIRS += scribo endif ENABLE_SCRIBO -#>> # Target shortcuts delegating the actual action to milena/Makefile. LOCAL_RECURSIVE_TARGETS = pretty-check tests @@ -87,8 +85,7 @@ LRDE_NODIST_FILES = \ $(distdir)/milena/tests/linear/gaussian.cc \ $(distdir)/milena/tests/linear/gaussian/filter.cc \ $(distdir)/milena/tests/registration/registration.cc \ - $(distdir)/milena/tests/value/stack.cc \ - $(distdir)/scribo + $(distdir)/milena/tests/value/stack.cc ## FIXME: Running `build-aux/build_unit_test.sh' just to update ## `milena/tests/unit_test/unit-tests.mk' is overkill: diff --git a/configure.ac b/configure.ac index 5ea0ac8..09a78d4 100644 --- a/configure.ac +++ b/configure.ac @@ -166,9 +166,7 @@ AC_ARG_ENABLE([all], [ enable_trimesh=yes enable_swilena=yes -dnl<<lrde enable_scribo=yes -dnl>> enable_apps=yes enable_tools=yes ]) @@ -447,7 +445,6 @@ AC_CONFIG_FILES(m4_do([swilena/python/sps-local], [:swilena/python/sps-local.in]), [chmod +x swilena/python/sps-local]) -dnl<<lrde ## -------- ## ## Scribo. ## ## -------- ## @@ -502,7 +499,6 @@ if test "$GXX" = yes || test "$ICPC" = yes; then # FIXME: We might want to use -ggdb when g++ is used. test -z "$SCRIBO_TESTS_CXXFLAGS" && SCRIBO_TESTS_CXXFLAGS="-g -O0" fi -dnl>> ## --------------- ## ## Configuration. ## -- 1.5.6.5

14 years, 5 months

branch exp/scribo-z updated: last-svn-commit-494-g4a2bb95

by lazzara＠lrde.epita.fr

14 years, 5 months

branch distribute-scribo updated: last-svn-commit-502-g9d6e03f

by lazzara＠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 distribute-scribo has been updated discards dca41a34768ed67ea7a32c51742d3ae502bd12f2 (commit) discards f75a6a28e9daa1d86f7988449ab8409eb4d2de3a (commit) discards 947f6e451ca08a9c55e780da8795ae2b50987af1 (commit) discards 8464d5567563b91c8c58a8a2214f3a8c5a8ab64f (commit) via 9d6e03f2dc8fc61320aae6d0eca1766b10b3611b (commit) via 330d20be0d0be1488add27f82a546263b2d191e3 (commit) via e23121549516d2c6ec01f47c834d93900c332866 (commit) via 01b0be04ac4abb7739b9ebc415cc95c997a36937 (commit) via 8d50316b6cef7a40f53cbeee1534f2bc0151a7e5 (commit) via 86afde11be03ca0f23630b97d9b9797228b6dabd (commit) via eeb2374b8ab58b8e8ad3edcf745573b96c96dcc6 (commit) via dce59ecf2488784f4c403f9704f213f2ee25af06 (commit) via 4a2bb958c2a6159916a7e943a655f3b65184d3d3 (commit) via 41318782a928e2ff9d3b0fbf46e432658e289d6e (commit) via 5e6b26dcba53c84a5ccdc8deb719a21647d91e8c (commit) via 59dededb8e58c6baf67bf1f43a039ffc32840c08 (commit) via de89d9cc0d3bd2b1bb375e5a9b4bcc439d5cc6ca (commit) This update added new revisions after undoing existing revisions. That is to say, the old revision is not a strict subset of the new revision. This situation occurs when you --force push a change and generate a repository containing something like this: * -- * -- B -- O -- O -- O (dca41a34768ed67ea7a32c51742d3ae502bd12f2) \ N -- N -- N (9d6e03f2dc8fc61320aae6d0eca1766b10b3611b) When this happens we assume that you've already had alert emails for all of the O revisions, and so we here report only the revisions in the N branch from the common base, B. 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 ----------------------------------------------------------------- 9d6e03f Add scribo-cli script. 330d20b Setup what to install with Scribo. e231215 Make use of autotroll in demo/review. 01b0be0 Install Scribo headers in include/scribo. 8d50316 tests/Makefile.am (EXTRA_DIST): Fix path to files. 86afde1 tests/Makefile.am (EXTRA_DIST): Add new files. eeb2374 Re-enable 'table' directory in SUBDIRS. dce59ec Distribute Scribo. 4a2bb95 mln/labeling/compute.hh: Add a missing overload in dispatch. 4131878 Rename examples. 5e6b26d headers.mk: Regen. 59deded Add a preprocessing toolchain. de89d9c Fix namespace ambiguities. ----------------------------------------------------------------------- Summary of changes: milena/ChangeLog | 4 + milena/mln/labeling/compute.hh | 14 ++ scribo/ChangeLog | 83 +++++++++++ scribo/Makefile.am | 4 +- scribo/demo/review/Makefile.am | 44 +++++- scribo/demo/review/review.pro | 16 -- scribo/demo/review/src/mainwindow.cc | 7 +- scribo/demo/review/src/mainwindow.hh | 2 +- scribo/demo/viewer/Makefile.am | 72 +++++----- scribo/headers.mk | 7 +- scribo/scribo.mk | 2 + scribo/scribo/binarization/sauvola_ms.hh | 28 ++-- .../scribo/binarization/sauvola_threshold_image.hh | 9 +- scribo/scribo/preprocessing/deskew.hh | 7 +- scribo/scribo/subsampling/integral_single_image.hh | 7 +- scribo/scribo/toolchain/text_in_doc_preprocess.hh | 152 ++++++++++++++++++++ scribo/src/Makefile.am | 29 +++- scribo/src/binarization/Makefile.am | 66 +++++---- .../{ppm_fg_sauvola_ms.cc => ppm_sauvola_ms_fg.cc} | 0 .../{fg_sauvola_ms.cc => sauvola_ms_fg.cc} | 0 scribo/src/contest/hdibco-2010/Makefile.am | 2 +- scribo/src/debug/Makefile.am | 6 +- scribo/src/filter/Makefile.am | 5 +- scribo/src/misc/Makefile.am | 5 +- scribo/src/postprocessing/Makefile.am | 2 +- scribo/src/preprocessing/Makefile.am | 61 ++++----- scribo/src/primitive/extract/Makefile.am | 5 +- scribo/src/primitive/find/Makefile.am | 5 +- scribo/src/primitive/group/Makefile.am | 2 +- scribo/src/scribo-cli.in | 135 +++++++++++++++++ scribo/src/table/Makefile.am | 7 +- scribo/src/text/Makefile.am | 9 +- scribo/src/text_in_doc_preprocess.cc | 41 ++---- 33 files changed, 625 insertions(+), 213 deletions(-) delete mode 100644 scribo/demo/review/review.pro create mode 100644 scribo/scribo/toolchain/text_in_doc_preprocess.hh rename scribo/src/binarization/{ppm_fg_sauvola_ms.cc => ppm_sauvola_ms_fg.cc} (100%) rename scribo/src/binarization/{fg_sauvola_ms.cc => sauvola_ms_fg.cc} (100%) create mode 100755 scribo/src/scribo-cli.in hooks/post-receive -- Olena, a generic and efficient image processing platform

14 years, 5 months

last-svn-commit-494-g4a2bb95 mln/labeling/compute.hh: Add a missing overload in dispatch.

by Guillaume Lazzara

--- milena/ChangeLog | 4 ++++ milena/mln/labeling/compute.hh | 14 ++++++++++++++ 2 files changed, 18 insertions(+), 0 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index fde9d16..f858b7e 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,7 @@ +2010-08-26 Guillaume Lazzara <z(a)lrde.epita.fr> + + * mln/labeling/compute.hh: Add a missing overload in dispatch. + 2010-08-24 Guillaume Lazzara <z(a)lrde.epita.fr> * mln/value/int_s.hh: Fix warnings. diff --git a/milena/mln/labeling/compute.hh b/milena/mln/labeling/compute.hh index 56cb92a..518a09b 100644 --- a/milena/mln/labeling/compute.hh +++ b/milena/mln/labeling/compute.hh @@ -529,6 +529,20 @@ namespace mln template <typename A, typename I, typename L> inline util::array<mln_result(A)> + compute_dispatch(mln::trait::image::value_storage::any, + mln::trait::image::value_storage::any, + const Accumulator<A>& a, + const Image<I>& input, + const Image<L>& label, + const mln_value(L)& nlabels) + { + return impl::generic::compute(a, input, label, nlabels); + } + + + template <typename A, typename I, typename L> + inline + util::array<mln_result(A)> compute_dispatch(mln::trait::image::value_storage::one_block, mln::trait::image::value_storage::one_block, const Accumulator<A>& a, -- 1.5.6.5

14 years, 5 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