Commit 223d19db authored by Roland Levillain's avatar Roland Levillain
Browse files

Strip and remove files to match distributed files.

	* configure.ac,
	* milena/mln/accu/math/all.hh,
	* milena/mln/all.hh,
	* milena/mln/core/image/vmorph/all.hh,
	* milena/mln/core/image/vmorph/fun_image.hh,
	* milena/mln/data/all.hh,
	* milena/mln/essential/routine.hh,
	* milena/mln/fun/all.hh,
	* milena/mln/fun/essential.hh,
	* milena/mln/fun/v2v/all.hh,
	* milena/mln/fun/v2v/essential.hh,
	* milena/mln/linear/all.hh,
	* milena/mln/trait/all.hh,
	* milena/mln/trait/ch_value.hh,
	* milena/mln/value/all.hh,
	* milena/mln/value/essential.hh,
	* milena/tests/Makefile.am,
	* milena/tests/convert/Makefile.am,
	* milena/tests/extract/Makefile.am,
	* milena/tests/fun/v2v/Makefile.am,
	* milena/tests/linear/Makefile.am,
	* milena/tests/linear/gaussian/Makefile.am,
	* milena/tests/registration/Makefile.am,
	* milena/tests/trait/ch_value.cc,
	* milena/tests/value/Makefile.am:
	Strip (some) parts between tags `<<lrde' and `>>'.
	* Makefile.am: Likewise.
	(LRDE_STRIPPED_DIST_FILES, LRDE_NODIST_FILES, dist-hook): Remove.
	* milena/tests/convert/to_hsl.cc,
	* milena/tests/extract/blue.cc,
	* milena/tests/extract/green.cc,
	* milena/tests/extract/hue.cc,
	* milena/tests/extract/lum.cc,
	* milena/tests/extract/red.cc,
	* milena/tests/extract/sat.cc,
	* milena/tests/fun/v2v/component.cc,
	* milena/tests/linear/gaussian/filter.cc,
	* milena/tests/registration/registration.cc,
	* milena/tests/value/stack.cc:
	Remove.
	* build-aux/strip-lrde: Remove.
parent 4cc8793a
2012-06-11 Roland Levillain <roland@lrde.epita.fr>
Strip and remove files to match distributed files.
* configure.ac,
* milena/mln/accu/math/all.hh,
* milena/mln/all.hh,
* milena/mln/core/image/vmorph/all.hh,
* milena/mln/core/image/vmorph/fun_image.hh,
* milena/mln/data/all.hh,
* milena/mln/essential/routine.hh,
* milena/mln/fun/all.hh,
* milena/mln/fun/essential.hh,
* milena/mln/fun/v2v/all.hh,
* milena/mln/fun/v2v/essential.hh,
* milena/mln/linear/all.hh,
* milena/mln/trait/all.hh,
* milena/mln/trait/ch_value.hh,
* milena/mln/value/all.hh,
* milena/mln/value/essential.hh,
* milena/tests/Makefile.am,
* milena/tests/convert/Makefile.am,
* milena/tests/extract/Makefile.am,
* milena/tests/fun/v2v/Makefile.am,
* milena/tests/linear/Makefile.am,
* milena/tests/linear/gaussian/Makefile.am,
* milena/tests/registration/Makefile.am,
* milena/tests/trait/ch_value.cc,
* milena/tests/value/Makefile.am:
Strip (some) parts between tags `<<lrde' and `>>'.
* Makefile.am: Likewise.
(LRDE_STRIPPED_DIST_FILES, LRDE_NODIST_FILES, dist-hook): Remove.
* milena/tests/convert/to_hsl.cc,
* milena/tests/extract/blue.cc,
* milena/tests/extract/green.cc,
* milena/tests/extract/hue.cc,
* milena/tests/extract/lum.cc,
* milena/tests/extract/red.cc,
* milena/tests/extract/sat.cc,
* milena/tests/fun/v2v/component.cc,
* milena/tests/linear/gaussian/filter.cc,
* milena/tests/registration/registration.cc,
* milena/tests/value/stack.cc:
Remove.
* build-aux/strip-lrde: Remove.
2011-11-16 Guillaume Lazzara <z@lrde.epita.fr>
* m4/oln-with-lib.m4: Lookup for multiple AND single libraries
......
# Copyright (C) 2006, 2007, 2008, 2009, 2010 EPITA Research and Development
# Laboratory (LRDE).
# Copyright (C) 2006, 2007, 2008, 2009, 2010, 2012 EPITA Research and
# Development Laboratory (LRDE).
#
# This file is part of Olena.
#
......@@ -38,55 +38,6 @@ include $(top_srcdir)/build-aux/regen-recursive.mk
REGEN_SUBDIRS += milena scribo
#<<lrde
## FIXME: All of this it too much ad hoc. Use Git branches to
## distinguish distributed files from non distributed ones after the
## conversion of the repository.
LRDE_STRIPPED_DIST_FILES = \
$(distdir)/Makefile.am \
$(distdir)/configure.ac \
$(distdir)/milena/mln/accu/math/all.hh \
$(distdir)/milena/mln/all.hh \
$(distdir)/milena/mln/core/image/vmorph/all.hh \
$(distdir)/milena/mln/core/image/vmorph/fun_image.hh \
$(distdir)/milena/mln/data/all.hh \
$(distdir)/milena/mln/essential/routine.hh \
$(distdir)/milena/mln/fun/all.hh \
$(distdir)/milena/mln/fun/essential.hh \
$(distdir)/milena/mln/fun/v2v/all.hh \
$(distdir)/milena/mln/fun/v2v/essential.hh \
$(distdir)/milena/mln/linear/all.hh \
$(distdir)/milena/mln/trait/all.hh \
$(distdir)/milena/mln/trait/ch_value.hh \
$(distdir)/milena/mln/value/all.hh \
$(distdir)/milena/mln/value/essential.hh \
$(distdir)/milena/tests/Makefile.am \
$(distdir)/milena/tests/convert/Makefile.am \
$(distdir)/milena/tests/extract/Makefile.am \
$(distdir)/milena/tests/fun/v2v/Makefile.am \
$(distdir)/milena/tests/linear/Makefile.am \
$(distdir)/milena/tests/linear/gaussian/Makefile.am \
$(distdir)/milena/tests/registration/Makefile.am \
$(distdir)/milena/tests/trait/ch_value.cc \
$(distdir)/milena/tests/value/Makefile.am
LRDE_NODIST_FILES = \
$(distdir)/milena/tests/convert/to_hsl.cc \
$(distdir)/milena/tests/extract/blue.cc \
$(distdir)/milena/tests/extract/green.cc \
$(distdir)/milena/tests/extract/hue.cc \
$(distdir)/milena/tests/extract/lum.cc \
$(distdir)/milena/tests/extract/red.cc \
$(distdir)/milena/tests/extract/sat.cc \
$(distdir)/milena/tests/fun/v2v/component.cc \
$(distdir)/milena/tests/fun/v2v/hsl_to_rgb.cc \
$(distdir)/milena/tests/fun/v2v/rgb_to_hsl.cc \
$(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
PORTFILE=distrib/macports/Portfile
TARBALL_GZ=$(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar.gz
......@@ -115,41 +66,6 @@ CLEANFILES = $(PORTFILE)
port: $(PORTFILE)
## FIXME: Running `build-aux/build_unit_test.sh' just to update
## `milena/tests/unit_test/unit-tests.mk' is overkill:
##
## 1. It recreates *all* the sources (more than 1200 `.cc' files!).
## => We should just regen `unit-tests.mk', not the `.cc' files.
##
## 2. It visits (almost) all the directories and files under
## milena/mln/ (which admittedly a smaller issue compared to the
## previous one)
## => Prune `unit-tests.mk' instead of regenerating it. The
## simplest solution is probably to equip `unit-tests.mk' in the
## first place with `<<lrde'/`>>' tags, then prune it with
## dist-strip.
##
# Do not distribute parts tagged `lrde' (see build-aux/strip-lrde).
dist-hook:
for f in $(LRDE_STRIPPED_DIST_FILES); do \
$(top_srcdir)/build-aux/strip-lrde $$f; \
done; \
rm -rf $(LRDE_NODIST_FILES) && \
$(top_srcdir)/build-aux/build_unit_test.sh \
$(distdir)/milena/mln \
$(distdir)/milena/tests/unit_test \
$(top_srcdir)/milena/tests/unit_test/disabled_tests \
mln \
&& \
( \
cd $(distdir); \
set -evx; \
autoreconf -f -v -i; \
find . -name autom4te.cache | xargs rm -rf \
)
# Set the package version to olena-x.x-snapshot-dd-mm-yy.
#
# Do not check NEWS file (this is not a release so there is no
......@@ -163,4 +79,3 @@ snapshot:
&& cp -f $(srcdir)/configure.ac.tmp $(srcdir)/configure.ac \
&& $(MAKE) $(AM_MAKEFLAGS) dist \
&& mv -f $(srcdir)/configure.ac.old $(srcdir)/configure.ac
#>>
#! /bin/sh
# Copyright (C) 2007, 2009 EPITA Research and Development Laboratory (LRDE)
#
# This file is part of Olena.
#
# Olena 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, version 2 of the License.
#
# Olena 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 Olena. If not, see <http://www.gnu.org/licenses/>.
# Remove everything between `<<lrde' and `>>' (these tags being at the
# beginning of comment line starting with `#', `//' or `dnl').
exec perl -0777 -pi -e \
's,\n\s*(#|//|dnl)\s*<<lrde(.|\n)+?\n\s*(#|//|dnl)\s*>>\s*\n,\n\n,g' \
"$@"
......@@ -537,16 +537,6 @@ AC_CONFIG_FILES([
milena/tests/world/inter_pixel/dim2/Makefile
])
dnl<<lrde
AC_CONFIG_FILES([
milena/tests/extract/Makefile
milena/tests/linear/gaussian/Makefile
milena/tests/registration/Makefile
milena/tests/subsampling/Makefile
])
dnl>>
## -------------- ##
## Applications. ##
## -------------- ##
......
......@@ -55,9 +55,4 @@ namespace mln
# include <mln/accu/math/sum.hh>
# include <mln/accu/math/count.hh>
//<<lrde
# include <mln/accu/math/inf.hh>
# include <mln/accu/math/sup.hh>
//>>
#endif // ! MLN_ACCU_MATH_ALL_HH
......@@ -45,9 +45,7 @@
#include <mln/draw/all.hh>
#include <mln/estim/all.hh>
#include <mln/extension/all.hh>
//<<lrde
#include <mln/extract/all.hh>
//>>
#include <mln/fun/all.hh>
#include <mln/geom/all.hh>
#include <mln/graph/all.hh>
......@@ -64,13 +62,9 @@
#include <mln/norm/all.hh>
#include <mln/opt/all.hh>
#include <mln/pw/all.hh>
//<<lrde
#include <mln/registration/all.hh>
//>>
#include <mln/set/all.hh>
//<<lrde
#include <mln/subsampling/all.hh>
//>>
#include <mln/tag/all.hh>
#include <mln/test/all.hh>
#include <mln/trace/all.hh>
......
......@@ -33,10 +33,7 @@
# include <mln/core/image/vmorph/cast_image.hh>
# include <mln/core/image/vmorph/fun_image.hh>
//<<lrde
# include <mln/core/image/vmorph/thrubin_image.hh>
# include <mln/core/image/vmorph/thru_image.hh>
//>>
# include <mln/core/image/vmorph/violent_cast_image.hh>
......
......@@ -35,9 +35,7 @@
# include <mln/core/internal/image_value_morpher.hh>
# include <mln/trait/images.hh>
# include <mln/value/set.hh>
//<<lrde
# include <mln/value/shell.hh>
//>>
# include <mln/metal/if.hh>
# include <mln/metal/equal.hh>
......
......@@ -69,9 +69,7 @@ namespace mln
# include <mln/data/to_enc.hh>
# include <mln/data/transform.hh>
# include <mln/data/update.hh>
//<<lrde
# include <mln/data/was.median.hh>
//>>
# include <mln/data/wrap.hh>
......
......@@ -40,9 +40,7 @@
# include <mln/draw/essential.hh>
# include <mln/estim/essential.hh>
# include <mln/extension/essential.hh>
//<<lrde
# include <mln/extract/essential.hh>
//>>
# include <mln/fun/essential.hh>
# include <mln/geom/essential.hh>
# include <mln/graph/essential.hh>
......@@ -60,13 +58,9 @@
# include <mln/norm/essential.hh>
# include <mln/opt/essential.hh>
# include <mln/pw/essential.hh>
//<<lrde
# include <mln/registration/essential.hh>
//>>
# include <mln/set/essential.hh>
//<<lrde
# include <mln/subsampling/essential.hh>
//>>
# include <mln/tag/essential.hh>
# include <mln/test/essential.hh>
# include <mln/trace/essential.hh>
......
......@@ -60,14 +60,10 @@ namespace mln
# include <mln/fun/n2v/all.hh>
# include <mln/fun/i2v/all.hh>
//<<lrde
# include <mln/fun/meta/all.hh>
//>>
# include <mln/fun/p2b/all.hh>
# include <mln/fun/p2v/all.hh>
//<<lrde
// # include <mln/fun/spe/all.hh>
//>>
# include <mln/fun/stat/all.hh>
# include <mln/fun/v2b/all.hh>
# include <mln/fun/v2i/all.hh>
......
......@@ -34,9 +34,7 @@
# include <mln/fun/c.hh>
# include <mln/fun/ops.hh>
# include <mln/fun/i2v/essential.hh>
//<<lrde
# include <mln/fun/meta/essential.hh>
//>>
# include <mln/fun/p2b/essential.hh>
# include <mln/fun/p2v/essential.hh>
# include <mln/fun/v2b/essential.hh>
......
......@@ -52,19 +52,13 @@ namespace mln
# include <mln/fun/v2v/convert.hh>
# include <mln/fun/v2v/dec.hh>
# include <mln/fun/v2v/enc.hh>
//<<lrde
# include <mln/fun/v2v/hsi_to_rgb.hh>
# include <mln/fun/v2v/hsl_to_rgb.hh>
//>>
# include <mln/fun/v2v/id.hh>
# include <mln/fun/v2v/linear.hh>
# include <mln/fun/v2v/norm.hh>
# include <mln/fun/v2v/projection.hh>
# include <mln/fun/v2v/rgb_to_int_u.hh>
//<<lrde
# include <mln/fun/v2v/rgb_to_hsi.hh>
# include <mln/fun/v2v/rgb_to_hsl.hh>
//>>
# include <mln/fun/v2v/saturate.hh>
# include <mln/fun/v2v/wrap.hh>
......
......@@ -34,9 +34,7 @@
# include <mln/fun/v2v/abs.hh>
# include <mln/fun/v2v/cast.hh>
# include <mln/fun/v2v/convert.hh>
//<<lrde
# include <mln/fun/v2v/rgb_to_hsi.hh>
//>>
# include <mln/fun/v2v/saturate.hh>
......
......@@ -60,19 +60,7 @@ namespace mln
# include <mln/linear/convolve_2x1d.hh>
# include <mln/linear/convolve_directional.hh>
//<<lrde
# include <mln/linear/gaussian.hh>
# include <mln/linear/gaussian_directional_2d.hh>
# include <mln/linear/gaussian_1d.hh>
//>>
# include <mln/linear/lap.hh>
# include <mln/linear/log.hh>
//<<lrde
# include <mln/linear/sobel_2d.hh>
# include <mln/linear/local/convolve.hh>
//>>
#endif // ! MLN_LINEAR_ALL_HH
......@@ -57,10 +57,4 @@ namespace mln
# include <mln/trait/promote.hh>
# include <mln/trait/op/all.hh>
//<<lrde
// # include <mln/trait/next/all.hh>
# include <mln/trait/functions.hh>
//>>
#endif // ! MLN_TRAIT_ALL_HH
......@@ -116,25 +116,6 @@ namespace mln
typedef M< mln_ch_value(I, V), E > ret;
};
//<<lrde
// For mln::value::stack_image<n,I>.
template < template <unsigned, class> class M, unsigned n, typename I,
typename V >
struct ch_value_< M< n, tag::image_<I> >, V >
{
/* FIXME: The code used to read
typedef algebra::vec<n, V> value;
typedef mln_ch_value(I, value) ret;
here. But this is wrong IMHO (Roland). Changing the value
type of a stack image (in fact, a vectorial image) shall
alter the *value type* of the image, not the type of the
*components* of the vector. Hence the current definition. */
typedef mln_ch_value(I, V) ret;
};
//>>
// For mln::complex_image<D, G, T>.
template < template <unsigned, class, class> class M,
unsigned D, typename G, typename T, typename V >
......
......@@ -57,12 +57,4 @@ namespace mln
// FIXME: that includes concept/image.hh!
//<<lrde
# include <mln/value/cast.hh>
# include <mln/value/shell.hh>
# include <mln/value/stack.hh>
//>>
#endif // ! MLN_VALUE_ALL_HH
......@@ -37,11 +37,6 @@
# include <mln/value/float01_8.hh>
# include <mln/value/float01_16.hh>
//<<lrde
# include <mln/value/gl8.hh>
# include <mln/value/gl16.hh>
//>>
# include <mln/value/int_s8.hh>
# include <mln/value/int_s16.hh>
# include <mln/value/int_s32.hh>
......
# Copyright (C) 2007, 2008, 2009 EPITA Research and Development
# Copyright (C) 2007, 2008, 2009, 2012 EPITA Research and Development
# Laboratory (LRDE).
#
# This file is part of Olena.
......@@ -62,13 +62,6 @@ SUBDIRS = \
win \
world
#<<lrde
SUBDIRS += \
extract \
registration \
subsampling
#>>
check_PROGRAMS = \
all_headers \
essential_headers \
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment