2007-02-16 Roland Levillain <roland@lrde.epita.fr> Fix the distribution mechanism. * Makefile.am (EXTRA_DIST): Remove config/strip-lrde. (dist-hook): Prune bootstrap.sh *after* using it. --- 10.295/Makefile.am Tue, 13 Feb 2007 19:04:39 +0100 levill_r (oln/n/32_Makefile.a 1.17.1.2.1.12 644) +++ 10.296/Makefile.am Fri, 16 Feb 2007 19:44:00 +0100 levill_r (oln/n/32_Makefile.a 1.17.1.2.1.13 644) @@ -48,8 +48,10 @@ ### Development files. ### -EXTRA_DIST = bootstrap.sh config/oln-local.m4 contrib/runtests \ - config/strip-lrde +#<<lrde +# config/strip-lrde is not distributed. +#>> +EXTRA_DIST = bootstrap.sh config/oln-local.m4 contrib/runtests ### ### Basic doc files generation. @@ -99,8 +101,10 @@ ## FIXME: Improve integration. # Remove any trace of olena/oln/lrde from the distribution and reset # the GNU Build system for the distdir layout. +# +# bootstrap.sh is processed last by config/strip-lrde, because we need +# it to reset the build system after the pruning. dist-hook: - $(top_srcdir)/config/strip-lrde $(distdir)/bootstrap.sh && \ $(top_srcdir)/config/strip-lrde $(distdir)/configure.ac && \ $(top_srcdir)/config/strip-lrde $(distdir)/Makefile.am && \ $(top_srcdir)/config/strip-lrde $(distdir)/olena/oln/Makefile.am && \ @@ -110,5 +114,6 @@ set -evx; \ ./bootstrap.sh; \ find . -name autom4te.cache | xargs rm -rf \ - ) + ) && \ + $(top_srcdir)/config/strip-lrde $(distdir)/bootstrap.sh #>> --- 10.295/oln.prj +++ 10.296/oln.prj @@ -1,18 +1,17 @@ ;; -*- Prcs -*- (Created-By-Prcs-Version 1 3 3) (Project-Description "Olena") -(Project-Version oln 10 295) -(Parent-Version oln 10 294) +(Project-Version oln 10 296) +(Parent-Version oln 10 295) (Version-Log "2007-02-16 Roland Levillain <roland@lrde.epita.fr> - Fix test `stat' in tests/utils. + Fix the distribution mechanism. - * tests/utils/tests/stat: Be more tolerant on comparisons of - floating point values for the variance. - Revert to the previous comparison for the mean. + * Makefile.am (EXTRA_DIST): Remove config/strip-lrde. + (dist-hook): Prune bootstrap.sh *after* using it. ") (New-Version-Log "") -(Checkin-Time "Fri, 16 Feb 2007 10:54:17 +0100") +(Checkin-Time "Fri, 16 Feb 2007 19:44:00 +0100") (Checkin-Login levill_r) ;; diff-ignore tests/data/.*pbm$ ;; diff-ignore .*\.pbm$ @@ -125,7 +124,7 @@ (Project-Keywords) (Files - (ChangeLog (oln/o/33_ChangeLog 1.37.1.16.1.17.1.19.1.38 644)) + (ChangeLog (oln/o/33_ChangeLog 1.37.1.16.1.17.1.19.1.39 644)) (doc/ChangeLog (oln/o/31_ChangeLog 1.38.1.7.1.5.1.14.1.24 644)) (integre/ChangeLog (oln/q/35_ChangeLog 1.12.1.2.1.56 755)) (metalic/ChangeLog (oln/q/30_ChangeLog 1.3.1.48 644)) @@ -157,7 +156,7 @@ (doc/Makefile.am (oln/e/0_Makefile.a 1.15 644)) (doc/ref/processing.tpl (oln/d/48_processing 1.16 644)) - (Makefile.am (oln/n/32_Makefile.a 1.17.1.2.1.12 644)) + (Makefile.am (oln/n/32_Makefile.a 1.17.1.2.1.13 644)) (NEWS (oln/0_NEWS 1.25 644)) (olena/img/face_se.pbm (oln/n/17_face_se.pb 1.1 644) :no-keywords)