Commit 0495fcc3 authored by Roland Levillain's avatar Roland Levillain
Browse files

Remove non-distributed headers not required by Milena nor Scribo.

	* build-aux/generate_dist_headers.sh: No longer handle the third
	argument (list of non-distributed files).
	* milena/Makefile.am,
	* scribo/Makefile.am
	(regen-am, $(srcdir)/headers.mk): Adjust.
	(EXTRA_DIST): Remove nodist-headers.
	* milena/headers.mk,
	* scribo/headers.mk:
	Regen.
	* milena/nodist-headers,
	* scribo/nodist-headers:
	Remove.
	* milena/mln/accu/math/inf.hh,
	* milena/mln/accu/math/sup.hh,
	* milena/mln/core/image/vmorph/thru_image.hh,
	* milena/mln/core/image/vmorph/thrubin_image.hh,
	* milena/mln/data/was.median.hh,
	* milena/mln/extract/all.hh,
	* milena/mln/extract/blue.hh,
	* milena/mln/extract/essential.hh,
	* milena/mln/extract/green.hh,
	* milena/mln/extract/hue.hh,
	* milena/mln/extract/lum.hh,
	* milena/mln/extract/red.hh,
	* milena/mln/extract/sat.hh,
	* milena/mln/fun/access/all.hh,
	* milena/mln/fun/access/mean.hh,
	* milena/mln/fun/accu_result.hh,
	* milena/mln/fun/binary.hh,
	* milena/mln/fun/binary_param.hh,
	* milena/mln/fun/component/blue.hh,
	* milena/mln/fun/component/comp.hh,
	* milena/mln/fun/component/comp_count.hh,
	* milena/mln/fun/component/green.hh,
	* milena/mln/fun/component/ithcomp.hh,
	* milena/mln/fun/component/red.hh,
	* milena/mln/fun/component/rgb.hh,
	* milena/mln/fun/component/scomp.hh,
	* milena/mln/fun/compose.hh,
	* milena/mln/fun/composition.hh,
	* milena/mln/fun/from_accu.hh,
	* milena/mln/fun/math/abs.hh,
	* milena/mln/fun/math/cos.hh,
	* milena/mln/fun/math/inf.hh,
	* milena/mln/fun/math/norm.hh,
	* milena/mln/fun/math/sup.hh,
	* milena/mln/fun/meta/all.hh,
	* milena/mln/fun/meta/blue.hh,
	* milena/mln/fun/meta/essential.hh,
	* milena/mln/fun/meta/first.hh,
	* milena/mln/fun/meta/green.hh,
	* milena/mln/fun/meta/hue.hh,
	* milena/mln/fun/meta/inty.hh,
	* milena/mln/fun/meta/lum.hh,
	* milena/mln/fun/meta/red.hh,
	* milena/mln/fun/meta/sat.hh,
	* milena/mln/fun/meta/second.hh,
	* milena/mln/fun/meta/to_enc.hh,
	* milena/mln/fun/param.hh,
	* milena/mln/fun/point/col.hh,
	* milena/mln/fun/point/row.hh,
	* milena/mln/fun/point/sli.hh,
	* milena/mln/fun/spe/binary.hh,
	* milena/mln/fun/spe/unary.hh,
	* milena/mln/fun/unary.hh,
	* milena/mln/fun/unary_param.hh,
	* milena/mln/fun/v2v/hsi_to_rgb.hh,
	* milena/mln/fun/v2v/rgb_to_hsi.hh,
	* milena/mln/linear/gaussian/filter.hh,
	* milena/mln/linear/gaussian/impl.hh,
	* milena/mln/linear/gaussian/internal/coefficients.hh,
	* milena/mln/registration/all.hh,
	* milena/mln/registration/essential.hh,
	* milena/mln/registration/get_rot.hh,
	* milena/mln/registration/get_rtransf.hh,
	* milena/mln/registration/icp.hh,
	* milena/mln/registration/internal/rms.hh,
	* milena/mln/registration/registration.hh,
	* milena/mln/subsampling/all.hh,
	* milena/mln/subsampling/essential.hh,
	* milena/mln/subsampling/gaussian_subsampling.hh,
	* milena/mln/subsampling/subsampling.hh,
	* milena/mln/trait/functions.hh,
	* milena/mln/trait/next/solve.hh,
	* milena/mln/trait/next/solve_binary.hh,
	* milena/mln/trait/next/solve_proxy.hh,
	* milena/mln/trait/next/solve_unary.hh,
	* milena/mln/value/hsi.hh,
	* milena/mln/value/shell.hh,
	* milena/mln/value/stack.hh,
	Remove.
	* milena/tests/unit_test/unit-tests.mk: Regen.
parent 223d19db
2012-06-11 Roland Levillain <roland@lrde.epita.fr>
Remove non-distributed headers not required by Milena nor Scribo.
* build-aux/generate_dist_headers.sh: No longer handle the third
argument (list of non-distributed files).
* milena/Makefile.am,
* scribo/Makefile.am
(regen-am, $(srcdir)/headers.mk): Adjust.
(EXTRA_DIST): Remove nodist-headers.
* milena/headers.mk,
* scribo/headers.mk:
Regen.
* milena/nodist-headers,
* scribo/nodist-headers:
Remove.
* milena/mln/accu/math/inf.hh,
* milena/mln/accu/math/sup.hh,
* milena/mln/core/image/vmorph/thru_image.hh,
* milena/mln/core/image/vmorph/thrubin_image.hh,
* milena/mln/data/was.median.hh,
* milena/mln/extract/all.hh,
* milena/mln/extract/blue.hh,
* milena/mln/extract/essential.hh,
* milena/mln/extract/green.hh,
* milena/mln/extract/hue.hh,
* milena/mln/extract/lum.hh,
* milena/mln/extract/red.hh,
* milena/mln/extract/sat.hh,
* milena/mln/fun/access/all.hh,
* milena/mln/fun/access/mean.hh,
* milena/mln/fun/accu_result.hh,
* milena/mln/fun/binary.hh,
* milena/mln/fun/binary_param.hh,
* milena/mln/fun/component/blue.hh,
* milena/mln/fun/component/comp.hh,
* milena/mln/fun/component/comp_count.hh,
* milena/mln/fun/component/green.hh,
* milena/mln/fun/component/ithcomp.hh,
* milena/mln/fun/component/red.hh,
* milena/mln/fun/component/rgb.hh,
* milena/mln/fun/component/scomp.hh,
* milena/mln/fun/compose.hh,
* milena/mln/fun/composition.hh,
* milena/mln/fun/from_accu.hh,
* milena/mln/fun/math/abs.hh,
* milena/mln/fun/math/cos.hh,
* milena/mln/fun/math/inf.hh,
* milena/mln/fun/math/norm.hh,
* milena/mln/fun/math/sup.hh,
* milena/mln/fun/meta/all.hh,
* milena/mln/fun/meta/blue.hh,
* milena/mln/fun/meta/essential.hh,
* milena/mln/fun/meta/first.hh,
* milena/mln/fun/meta/green.hh,
* milena/mln/fun/meta/hue.hh,
* milena/mln/fun/meta/inty.hh,
* milena/mln/fun/meta/lum.hh,
* milena/mln/fun/meta/red.hh,
* milena/mln/fun/meta/sat.hh,
* milena/mln/fun/meta/second.hh,
* milena/mln/fun/meta/to_enc.hh,
* milena/mln/fun/param.hh,
* milena/mln/fun/point/col.hh,
* milena/mln/fun/point/row.hh,
* milena/mln/fun/point/sli.hh,
* milena/mln/fun/spe/binary.hh,
* milena/mln/fun/spe/unary.hh,
* milena/mln/fun/unary.hh,
* milena/mln/fun/unary_param.hh,
* milena/mln/fun/v2v/hsi_to_rgb.hh,
* milena/mln/fun/v2v/rgb_to_hsi.hh,
* milena/mln/linear/gaussian/filter.hh,
* milena/mln/linear/gaussian/impl.hh,
* milena/mln/linear/gaussian/internal/coefficients.hh,
* milena/mln/registration/all.hh,
* milena/mln/registration/essential.hh,
* milena/mln/registration/get_rot.hh,
* milena/mln/registration/get_rtransf.hh,
* milena/mln/registration/icp.hh,
* milena/mln/registration/internal/rms.hh,
* milena/mln/registration/registration.hh,
* milena/mln/subsampling/all.hh,
* milena/mln/subsampling/essential.hh,
* milena/mln/subsampling/gaussian_subsampling.hh,
* milena/mln/subsampling/subsampling.hh,
* milena/mln/trait/functions.hh,
* milena/mln/trait/next/solve.hh,
* milena/mln/trait/next/solve_binary.hh,
* milena/mln/trait/next/solve_proxy.hh,
* milena/mln/trait/next/solve_unary.hh,
* milena/mln/value/hsi.hh,
* milena/mln/value/shell.hh,
* milena/mln/value/stack.hh,
Remove.
* milena/tests/unit_test/unit-tests.mk: Regen.
2012-06-11 Roland Levillain <roland@lrde.epita.fr>
Strip and remove files to match distributed files.
......
#! /bin/sh
# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE).
# Copyright (C) 2009, 2012 EPITA Research and Development Laboratory (LRDE).
#
# This file is part of Olena.
#
......@@ -25,26 +25,23 @@
# Use the C locale to have a deterministic sort.
export LC_ALL=C
if [ $# -ne 3 ] && [ $# -ne 5 ]; then
echo "$0 <scanned_dir> <output> <nodist-headers> [<module name> <inc_path>]"
if [ $# -ne 2 ] && [ $# -ne 4 ]; then
echo "Usage: $0 <scanned_dir> <output> [<module name> <inc_path>]"
exit 1
fi
me=`basename $0`
scanned_dir=$1
output=$2
nodist_headers=$3
test -f "$nodist_headers" \
|| { echo "$me: Cannot find \`$nodist_headers' in `pwd`."; exit 1; }
echo "Generating $output..." >&2
rm -f "$output"
if [ $# -eq 5 ]; then
if [ $# -eq 4 ]; then
cat <<EOF > "$output"
## Generated by \`$me', do not edit by hand.
$4dir = \$(includedir)/$5
nobase_$4_HEADERS = \\
$3dir = \$(includedir)/$4
nobase_$3_HEADERS = \\
EOF
else
cat <<EOF > "$output"
......@@ -57,7 +54,6 @@ fi
find $scanned_dir -type f -a \( -name '*.hh' -o -name '*.hxx' \) \
| sort \
| comm -23 - "$nodist_headers" \
| sed -e 's/$/ \\/g' >> $output
......@@ -65,31 +61,3 @@ last_line=`tail -n 1 $output | sed -e 's/\\\//g'` # remove '\' in last line
sed '$d' < $output > $output.tmp # remove last line
mv $output.tmp $output
echo $last_line >> $output # put the cleaned last line back.
# Add non distributed files to installed headers list.
#
# Non distributed headers will be installed if the installation
# process is launched from the repository copy.
if [ $# -eq 5 ]; then
cat <<EOF >> "$output"
#<<lrde
nobase_$4_HEADERS += \\
EOF
else
cat <<EOF >> "$output"
#<<lrde
nobase_include_HEADERS += \\
EOF
fi
cat $nodist_headers | sed -e 's/$/ \\/g' >> $output
last_line=`tail -n 1 $output | sed -e 's/\\\//g'` # remove '\' in last line
sed '$d' < $output > $output.tmp # remove last line
mv $output.tmp $output
echo $last_line >> $output # put the cleaned last line back.
echo "#>>" >> $output
\ No newline at end of file
# 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.
......@@ -63,17 +63,16 @@ REGEN_SUBDIRS += doc tests
regen-am:
cd $(srcdir) \
&& $(abs_top_srcdir)/build-aux/generate_dist_headers.sh \
mln headers.mk nodist-headers
mln headers.mk
EXTRA_DIST = nodist-headers
# FIXME: Change generate_dist_headers.sh so that the action looks like this:
#
# $< $@.tmp && mv -f $@.tmp $@ && chmod -w $@
#
$(srcdir)/headers.mk: $(top_srcdir)/build-aux/generate_dist_headers.sh nodist-headers
$(srcdir)/headers.mk: $(top_srcdir)/build-aux/generate_dist_headers.sh
cd $(srcdir) \
&& $(abs_top_srcdir)/build-aux/generate_dist_headers.sh \
mln headers.mk nodist-headers
mln headers.mk
include $(srcdir)/headers.mk
......@@ -107,7 +106,7 @@ dist_img_DATA = \
img/tiny.ppm \
img/toto.pbm
EXTRA_DIST += \
EXTRA_DIST = \
tests/img/test_rgb8.tif \
tests/img/test_bw.tif \
tests/img/test_gl.tif
......@@ -554,6 +554,7 @@ mln/fun/v2v/convert.hh \
mln/fun/v2v/dec.hh \
mln/fun/v2v/enc.hh \
mln/fun/v2v/essential.hh \
mln/fun/v2v/hsl_to_rgb.hh \
mln/fun/v2v/id.hh \
mln/fun/v2v/inc.hh \
mln/fun/v2v/linear.hh \
......@@ -561,6 +562,7 @@ mln/fun/v2v/norm.hh \
mln/fun/v2v/projection.hh \
mln/fun/v2v/qt_rgb_to_int_u.hh \
mln/fun/v2v/rgb8_to_rgbn.hh \
mln/fun/v2v/rgb_to_hsl.hh \
mln/fun/v2v/rgb_to_int_u.hh \
mln/fun/v2v/rgb_to_luma.hh \
mln/fun/v2v/saturate.hh \
......@@ -740,6 +742,9 @@ mln/linear/convolve.hh \
mln/linear/convolve_2x1d.hh \
mln/linear/convolve_directional.hh \
mln/linear/essential.hh \
mln/linear/gaussian.hh \
mln/linear/gaussian_1d.hh \
mln/linear/gaussian_directional_2d.hh \
mln/linear/lap.hh \
mln/linear/local/convolve.hh \
mln/linear/log.hh \
......@@ -1207,6 +1212,7 @@ mln/value/gl8.hh \
mln/value/glf.hh \
mln/value/graylevel.hh \
mln/value/graylevel_f.hh \
mln/value/hsl.hh \
mln/value/int_s.hh \
mln/value/int_s16.hh \
mln/value/int_s32.hh \
......@@ -1293,91 +1299,3 @@ mln/world/inter_pixel/neighb2d.hh \
mln/world/inter_pixel/separator_to_pixels.hh \
mln/world/rgb/invert.hh \
mln/world/rgb/invert.spe.hh
#<<lrde
nobase_include_HEADERS += \
mln/accu/math/inf.hh \
mln/accu/math/sup.hh \
mln/core/image/vmorph/thru_image.hh \
mln/core/image/vmorph/thrubin_image.hh \
mln/data/was.median.hh \
mln/extract/all.hh \
mln/extract/blue.hh \
mln/extract/essential.hh \
mln/extract/green.hh \
mln/extract/hue.hh \
mln/extract/lum.hh \
mln/extract/red.hh \
mln/extract/sat.hh \
mln/fun/access/all.hh \
mln/fun/access/mean.hh \
mln/fun/accu_result.hh \
mln/fun/binary.hh \
mln/fun/binary_param.hh \
mln/fun/component/blue.hh \
mln/fun/component/comp.hh \
mln/fun/component/comp_count.hh \
mln/fun/component/green.hh \
mln/fun/component/ithcomp.hh \
mln/fun/component/red.hh \
mln/fun/component/rgb.hh \
mln/fun/component/scomp.hh \
mln/fun/compose.hh \
mln/fun/composition.hh \
mln/fun/from_accu.hh \
mln/fun/math/abs.hh \
mln/fun/math/cos.hh \
mln/fun/math/inf.hh \
mln/fun/math/norm.hh \
mln/fun/math/sup.hh \
mln/fun/meta/all.hh \
mln/fun/meta/blue.hh \
mln/fun/meta/essential.hh \
mln/fun/meta/first.hh \
mln/fun/meta/green.hh \
mln/fun/meta/hue.hh \
mln/fun/meta/inty.hh \
mln/fun/meta/lum.hh \
mln/fun/meta/red.hh \
mln/fun/meta/sat.hh \
mln/fun/meta/second.hh \
mln/fun/meta/to_enc.hh \
mln/fun/param.hh \
mln/fun/point/col.hh \
mln/fun/point/row.hh \
mln/fun/point/sli.hh \
mln/fun/spe/binary.hh \
mln/fun/spe/unary.hh \
mln/fun/unary.hh \
mln/fun/unary_param.hh \
mln/fun/v2v/hsi_to_rgb.hh \
mln/fun/v2v/hsl_to_rgb.hh \
mln/fun/v2v/rgb_to_hsi.hh \
mln/fun/v2v/rgb_to_hsl.hh \
mln/linear/gaussian.hh \
mln/linear/gaussian/filter.hh \
mln/linear/gaussian/impl.hh \
mln/linear/gaussian/internal/coefficients.hh \
mln/linear/gaussian_1d.hh \
mln/linear/gaussian_directional_2d.hh \
mln/registration/all.hh \
mln/registration/essential.hh \
mln/registration/get_rot.hh \
mln/registration/get_rtransf.hh \
mln/registration/icp.hh \
mln/registration/internal/rms.hh \
mln/registration/registration.hh \
mln/subsampling/all.hh \
mln/subsampling/essential.hh \
mln/subsampling/gaussian_subsampling.hh \
mln/subsampling/subsampling.hh \
mln/trait/functions.hh \
mln/trait/next/solve.hh \
mln/trait/next/solve_binary.hh \
mln/trait/next/solve_proxy.hh \
mln/trait/next/solve_unary.hh \
mln/value/hsi.hh \
mln/value/hsl.hh \
mln/value/shell.hh \
mln/value/stack.hh
#>>
// Copyright (C) 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/>.
//
// As a special exception, you may use this file as part of a free
// software project without restriction. Specifically, if other files
// instantiate templates or use macros or inline functions from this
// file, or you compile this file and link it with other files to produce
// an executable, this file does not by itself cause the resulting
// executable to be covered by the GNU General Public License. This
// exception does not however invalidate any other reasons why the
// executable file might be covered by the GNU General Public License.
#ifndef MLN_ACCU_MATH_INF_HH
# define MLN_ACCU_MATH_INF_HH
/// \file
///
/// Define an accumulator that computes a inf.
# include <mln/accu/internal/base.hh>
# include <mln/core/concept/meta_accumulator.hh>
# include <mln/trait/value_.hh>
# include <mln/util/pix.hh>
# include <mln/fun/math/inf.hh>
namespace mln
{
namespace accu
{
namespace math
{
/// \brief Generic inf accumulator class.
///
/// The parameter \c T is the type of values.
///
/// \ingroup modaccuvalues
//
template <typename T>
struct inf : public mln::accu::internal::base< const T&, inf<T> >
{
typedef T argument;
inf();
/// Manipulators.
/// \{
void init();
void take_as_init_(const argument& t);
void take(const argument& t);
void take(const inf<T>& other);
/// \}
/// Get the value of the accumulator.
const T& to_result() const;
/// Check whether this accu is able to return a result.
/// Always true here.
bool is_valid() const;
protected:
T t_;
typename mln::fun::inf::with<T, T>::ret fun_;
};
template <typename I> struct inf< util::pix<I> >;
} // end of mln::accu::math
namespace meta
{
namespace math
{
/// Meta accumulator for inf.
struct inf : public Meta_Accumulator< inf >
{
template <typename T>
struct with
{
typedef accu::math::inf<T> ret;
};
};
} // end of namespace mln::accu::meta::math
} // end of namespace mln::accu::meta
# ifndef MLN_INCLUDE_ONLY
namespace math
{
template <typename T>
inline
inf<T>::inf()
{
init();
}
template <typename T>
inline
void
inf<T>::init()
{
t_ = mln_max(T);
}
template <typename T>
inline
void inf<T>::take_as_init_(const argument& t)
{
t_ = t;
}
template <typename T>
inline
void inf<T>::take(const argument& t)
{
this->t_ = this->fun_(t_, t);
}
template <typename T>
inline
void
inf<T>::take(const inf<T>& other)
{
this->t_ = this->fun_(t_, other.t_);
}
template <typename T>
inline
const T&
inf<T>::to_result() const
{
return t_;
}
template <typename T>
inline
bool
inf<T>::is_valid() const
{
return true;
}
} // end of namespace mln::accu::math
# endif // ! MLN_INCLUDE_ONLY
} // end of namespace mln::accu
} // end of namespace mln
#endif // ! MLN_ACCU_MATH_INF_HH
// Copyright (C) 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/>.
//
// As a special exception, you may use this file as part of a free
// software project without restriction. Specifically, if other files
// instantiate templates or use macros or inline functions from this
// file, or you compile this file and link it with other files to produce
// an executable, this file does not by itself cause the resulting
// executable to be covered by the GNU General Public License. This
// exception does not however invalidate any other reasons why the
// executable file might be covered by the GNU General Public License.
#ifndef MLN_ACCU_MATH_SUP_HH
# define MLN_ACCU_MATH_SUP_HH
/// \file
///
/// Define an accumulator that computes a sup.
# include <mln/accu/internal/base.hh>
# include <mln/core/concept/meta_accumulator.hh>
# include <mln/trait/value_.hh>
# include <mln/util/pix.hh>
# include <mln/fun/math/sup.hh>
namespace mln
{
namespace accu
{
namespace math
{
/// \brief Generic sup accumulator class.
/*!
* The parameter \c T is the type of values.
*
* \ingroup modaccuvalues
*/
template <typename T>
struct sup : public mln::accu::internal::base< const T&, sup<T> >
{
typedef T argument;
sup();
/// Manipulators.
/// \{
void init();
void take_as_init_(const argument& t);
void take(const argument& t);
void take(const sup<T>& other);
/// \}
/// Get the value of the accumulator.
const T& to_result() const;
/// Check whether this accu is able to return a result.
/// Always true here.
bool is_valid() const;
protected:
T t_;
typename mln::fun::sup::with<T, T>::ret fun_;
};
template <typename I> struct sup< util::pix<I> >;
} // end of mln::accu::math
namespace meta
{
namespace math
{
/// Meta accumulator for sup.
struct sup : public Meta_Accumulator< sup >
{
template <typename T>
struct with
{
typedef accu::math::sup<T> ret;
};
};
} // end of namespace mln::accu::meta::math
} // end of namespace mln::accu::meta
# ifndef MLN_INCLUDE_ONLY
namespace math
{