[Olena-patches] olena-0.10 10.284: Fix the distribution of Swilena.

2007-02-13 Roland Levillain &lt;roland(a)lrde.epita.fr&gt; Fix the distribution of Swilena. * src/Makefile.am (EXTRA_DIST): Append copyright.template, instead of simply assigning it. * swilena/generate_arith_instantiations.py, * swilena/generate_morpho_instantiations.py: Update comment w.r.t. an old SWIG bug. --- 10.283/tools/swilena/src/Makefile.am Sat, 10 Feb 2007 16:31:23 +0100 levill_r (oln/v/25_Makefile.a 1.5 644) +++ 10.284/tools/swilena/src/Makefile.am Tue, 13 Feb 2007 19:00:25 +0100 levill_r (oln/v/25_Makefile.a 1.6 644) @@ -31,8 +31,8 @@ ## Public License. -EXTRA_DIST = copyright.template - DISTCLEANFILES = $(srcdir)/*.i makefile.swig include makefile.swig + +EXTRA_DIST += copyright.template --- 10.283/tools/swilena/generate_arith_instantiations.py Sat, 10 Feb 2007 16:31:23 +0100 levill_r (oln/v/51_generate_a 1.1.1.3 744) +++ 10.284/tools/swilena/generate_arith_instantiations.py Tue, 13 Feb 2007 19:00:25 +0100 levill_r (oln/v/51_generate_a 1.1.1.4 744) @@ -93,12 +93,13 @@ "ntg_int_u8", "ntg_int_u32", "ntg_int_s8", "ntg_int_s32", "ntg_float" ]: - # FIXME: SWIG 1.3.29 Bug. We used to refer to `oln::image' from - # the global (top-level) namespace, i.e. `::oln::image', - # but it makes swig 1.3.29 generate invalid C++ code when - # used ad a template argument: the space between `<' and - # `::' is eaten by swig, and `<:' is understood as a - # trigraph (for `[') by the C++ compiler. + # Work around a bug in SWIG 1.3.29 (fixed since). We used + # to refer to `oln::image' from the global (top-level) + # namespace, i.e. `::oln::image', but it makes swig 1.3.29 + # generate invalid C++ code when used ad a template + # argument: the space between `<' and `::' is eaten by + # swig, and `<:' is understood as a trigraph (for `[') by + # the C++ compiler. img_type = "oln::image%(dim)sd< %(type)s >" % vars() bigger_type = get_bigger_type(type) return_img_type = "oln::image%(dim)sd< %(bigger_type)s >" % vars() --- 10.283/tools/swilena/generate_morpho_instantiations.py Sat, 10 Feb 2007 16:31:23 +0100 levill_r (oln/v/24_generate_m 1.8.1.3 744) +++ 10.284/tools/swilena/generate_morpho_instantiations.py Tue, 13 Feb 2007 19:00:25 +0100 levill_r (oln/v/24_generate_m 1.8.1.4 744) @@ -91,12 +91,13 @@ "ntg_int_u8", "ntg_int_u32", "ntg_int_s8", "ntg_int_s32", "ntg_float" ]: - # FIXME: SWIG 1.3.29 Bug. We used to refer to `oln::image' from - # the global (top-level) namespace, i.e. `::oln::image', - # but it makes swig 1.3.29 generate invalid C++ code when - # used ad a template argument: the space between `<' and - # `::' is eaten by swig, and `<:' is understood as a - # trigraph (for `[') by the C++ compiler. + # Work around a bug in SWIG 1.3.29 (fixed since). We used + # to refer to `oln::image' from the global (top-level) + # namespace, i.e. `::oln::image', but it makes swig 1.3.29 + # generate invalid C++ code when used ad a template + # argument: the space between `<' and `::' is eaten by + # swig, and `<:' is understood as a trigraph (for `[') by + # the C++ compiler. img_type = "oln::image%(dim)sd< %(type)s >" % vars() win_type = "::oln::window%(dim)sd" % vars() neighb_type = "::oln::neighborhood%(dim)sd" % vars() @@ -175,11 +176,11 @@ instantiate(idx, "top_hat_contrast_op", img_type, img_type, win_type) instantiate(idx, "fast_top_hat_contrast_op", img_type, img_type, win_type) # Watershed - # FIXME: SWIG 1.3.29 Bug (same as above). + # Same workaround as above. img_ret_type = "oln::image%(dim)sd< ntg_int_u32 >" % vars() instantiate(idx, "watershed_seg", img_ret_type, img_type, neighb_type) instantiate(idx, "watershed_con", img_ret_type, img_type, neighb_type) - # FIXME: SWIG 1.3.29 Bug (same as above). + # Same workaround as above. bin_img_type = "oln::image%(dim)sd< ntg_bin >" % vars() instantiate(idx, "sure_minima_imposition", img_type, img_type, bin_img_type, neighb_type) instantiate(idx, "sequential_minima_imposition", img_type, img_type, bin_img_type, neighb_type) --- 10.283/oln.prj +++ 10.284/oln.prj @@ -1,17 +1,20 @@ ;; -*- Prcs -*- (Created-By-Prcs-Version 1 3 3) (Project-Description "Olena") -(Project-Version oln 10 283) -(Parent-Version oln 10 282) -(Version-Log "2007-02-12 Roland Levillain &lt;roland(a)lrde.epita.fr&gt; - - Fix sanity tests. - - * oln/lrde/efigi/misc.hh (oln::efigi::crop): Fix erroneous - argument name. +(Project-Version oln 10 284) +(Parent-Version oln 10 283) +(Version-Log "2007-02-13 Roland Levillain &lt;roland(a)lrde.epita.fr&gt; + + Fix the distribution of Swilena. + + * src/Makefile.am (EXTRA_DIST): Append copyright.template, instead + of simply assigning it. + * swilena/generate_arith_instantiations.py, + * swilena/generate_morpho_instantiations.py: Update comment + w.r.t. an old SWIG bug. ") (New-Version-Log "") -(Checkin-Time "Mon, 12 Feb 2007 10:41:22 +0100") +(Checkin-Time "Tue, 13 Feb 2007 19:00:25 +0100") (Checkin-Login levill_r) ;; diff-ignore tests/data/.*pbm$ ;; diff-ignore .*\.pbm$ @@ -130,7 +133,7 @@ (metalic/ChangeLog (oln/q/30_ChangeLog 1.3.1.47 644)) (olena/ChangeLog (oln/o/30_ChangeLog 1.27.1.36.1.3.1.11.1.5.1.64.1.47.1.93.1.27.2.18.1.14 644)) (tools/ChangeLog (oln/o/32_ChangeLog 1.10.1.20 644)) - (tools/swilena/ChangeLog (oln/n/37_ChangeLog 1.7.1.54 644)) + (tools/swilena/ChangeLog (oln/n/37_ChangeLog 1.7.1.55 644)) (olena/ChangeLog.0 (oln/6_ChangeLog 1.50.1.98.1.5 644)) (doc/ChangeLog.0 (oln/e/1_ChangeLog 1.31 644)) @@ -1071,7 +1074,7 @@ ;; Files added by populate at Sat, 27 Sep 2003 18:32:26 +0200, ;; to version 10.24(w), by burrus_n: - (tools/swilena/generate_morpho_instantiations.py (oln/v/24_generate_m 1.8.1.3 744)) + (tools/swilena/generate_morpho_instantiations.py (oln/v/24_generate_m 1.8.1.4 744)) ;; Files deleted by populate at Sat, 27 Sep 2003 18:33:27 +0200, ;; from version 10.24(w), by nes: @@ -1083,7 +1086,7 @@ ;; Files added by populate at Mon, 29 Sep 2003 19:17:53 +0200, ;; to version 10.26(w), by nes: - (tools/swilena/src/Makefile.am (oln/v/25_Makefile.a 1.5 644)) + (tools/swilena/src/Makefile.am (oln/v/25_Makefile.a 1.6 644)) ;; Files added by populate at Wed, 08 Oct 2003 11:13:23 +0200, ;; to version 10.27(w), by burrus_n: @@ -1123,7 +1126,7 @@ (tools/swilena/meta/swilena_arith.i (oln/v/48_swilena_ar 1.3 644)) (tools/swilena/meta/swilena_conversions.i (oln/v/49_swilena_co 1.3 644)) (tools/swilena/generate_conversions_instantiations.py (oln/v/50_generate_c 1.1.1.2 744)) - (tools/swilena/generate_arith_instantiations.py (oln/v/51_generate_a 1.1.1.3 744)) + (tools/swilena/generate_arith_instantiations.py (oln/v/51_generate_a 1.1.1.4 744)) ;; Files added by populate at Mon, 10 Nov 2003 14:06:22 +0100, ;; to version 10.39(w), by burrus_n: