2006-09-13 Roland Levillain <roland@lrde.epita.fr> Prevent recursive traversals accross directories. * oln/lrde/ufmt/bin/inc: Remove this symbolic link. * oln/lrde/ufmt/bin/gpp, oln/lrde/ufmt/bin/gppo: Adjust. --- 10.256/olena/oln/lrde/ufmt/bin/gppo Thu, 03 Aug 2006 16:06:43 +0200 theo (oln/x/2_gppo 1.1 755) +++ 10.257/olena/oln/lrde/ufmt/bin/gppo Wed, 13 Sep 2006 13:11:27 +0200 levill_r (oln/x/2_gppo 1.1.1.1 755) @@ -1 +1,5 @@ -g++-4.0 -Wall -Werror -ansi -pedantic -Iinc/metalic -Iinc/integre -Iinc/olena -DNDEBUG -O3 $1 +#! /bin/sh + +inc="../../../../.." + +g++-4.0 -Wall -Werror -ansi -pedantic -I$inc/metalic -I$inc/integre -I$inc/olena -DNDEBUG -O3 $1 --- 10.256/olena/oln/lrde/ufmt/bin/gpp Thu, 03 Aug 2006 16:06:43 +0200 theo (oln/x/3_gpp 1.1 755) +++ 10.257/olena/oln/lrde/ufmt/bin/gpp Wed, 13 Sep 2006 13:11:27 +0200 levill_r (oln/x/3_gpp 1.1.1.1 755) @@ -1 +1,5 @@ -g++-4.0 -Wall -Werror -ansi -pedantic -Iinc/metalic -Iinc/integre -Iinc/olena $1 +#! /bin/sh + +inc="../../../../.." + +g++-4.0 -Wall -Werror -ansi -pedantic -I$inc/metalic -I$inc/integre -I$inc/olena $1 --- 10.256/oln.prj +++ 10.257/oln.prj @@ -1,26 +1,18 @@ ;; -*- Prcs -*- (Created-By-Prcs-Version 1 3 3) (Project-Description "Olena") -(Project-Version oln 10 256) -(Parent-Version oln 10 251) -(Version-Log "2006-08-29 Roland Levillain <roland@lrde.epita.fr> - - Add a third version of the computation of a the max-tree based on - Fiorio's and Gustedt's labelling algorithm. - - * oln/lrde/ufmt/fiorio-3.hh: New file. - * oln/lrde/ufmt/bin/fiorio.cc: Handle fiorio-3.hh. - Add copyright notice. - * oln/lrde/ufmt/bin/Makefile.am (AM_CXXFLAGS): Add -DNDEBUG. - (check_PROGRAMS): Add fiorio-3. - (fiorio_3_SOURCES, fiorio_3_CPPFLAGS): New. - * oln/lrde/ufmt/Makefile.am (noinst_HEADERS): Add fiorio-3.hh. - * oln/lrde/ufmt/fiorio-1.hh, oln/lrde/ufmt/fiorio-2.hh: Typo in - comment. - * oln/lrde/ufmt/README: Update. +(Project-Version oln 10 257) +(Parent-Version oln 10 256) +(Version-Log "2006-09-13 Roland Levillain <roland@lrde.epita.fr> + + Prevent recursive traversals accross directories. + + * oln/lrde/ufmt/bin/inc: Remove this symbolic link. + * oln/lrde/ufmt/bin/gpp, oln/lrde/ufmt/bin/gppo: Adjust. + ") (New-Version-Log "") -(Checkin-Time "Tue, 29 Aug 2006 14:48:46 +0200") +(Checkin-Time "Wed, 13 Sep 2006 13:11:27 +0200") (Checkin-Login levill_r) ;; diff-ignore tests/data/.*pbm$ ;; diff-ignore .*\.pbm$ @@ -137,7 +129,7 @@ (doc/ChangeLog (oln/o/31_ChangeLog 1.38.1.7.1.5.1.14.1.17 600)) (integre/ChangeLog (oln/q/35_ChangeLog 1.12.1.2.1.51 600)) (metalic/ChangeLog (oln/q/30_ChangeLog 1.3.1.44 600)) - (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 600)) + (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.1 600)) (tools/ChangeLog (oln/o/32_ChangeLog 1.10.1.17 600)) (tools/swilena/ChangeLog (oln/n/37_ChangeLog 1.7.1.48 600)) @@ -1542,9 +1534,9 @@ (olena/oln/lrde/ufmt/basic_salembier.hh (oln/w/51_basic_sale 1.1 644)) (olena/oln/lrde/ufmt/bin/basic_maxtree.cc (oln/x/0_basic_maxt 1.2 644)) (olena/oln/lrde/ufmt/bin/basic_salembier.cc (oln/x/1_basic_sale 1.2 644)) - (olena/oln/lrde/ufmt/bin/gppo (oln/x/2_gppo 1.1 755)) - (olena/oln/lrde/ufmt/bin/gpp (oln/x/3_gpp 1.1 755)) - (olena/oln/lrde/ufmt/bin/inc (../../../../../) :symlink) + (olena/oln/lrde/ufmt/bin/gppo (oln/x/2_gppo 1.1.1.1 755)) + (olena/oln/lrde/ufmt/bin/gpp (oln/x/3_gpp 1.1.1.1 755)) + (olena/oln/lrde/ufmt/basic_maxtree.hh (oln/x/4_basic_maxt 1.2 644)) (olena/oln/lrde/ufmt/log.hh (oln/x/5_log.hh 1.2 644)) (olena/oln/lrde/ufmt/img/lena64.pgm (oln/x/6_lena64.pgm 1.1 644)) @@ -1627,18 +1619,11 @@ ;; to version 10.251(w), by levill_r: (olena/oln/lrde/ufmt/fiorio-3.hh (oln/x/44_fiorio-3.h 1.1 644)) + +;; Files deleted by depopulate at Wed, 13 Sep 2006 13:10:40 +0200, +;; from version 10.256(w), by levill_r: + + ; (olena/oln/lrde/ufmt/bin/inc () :symlink) ) -(Merge-Parents - (10.255 complete - (olena/ChangeLog olena/ChangeLog olena/ChangeLog r) (olena/oln/lrde/ufmt/utils.hh olena/oln/lrde/ufmt/utils.hh olena/oln/lrde/ufmt/utils.hh r) - (olena/oln/lrde/ufmt/rpc_maxtree.hh olena/oln/lrde/ufmt/rpc_maxtree.hh olena/oln/lrde/ufmt/rpc_maxtree.hh r) (olena/oln/lrde/ufmt/hpc_maxtree.hh olena/oln/lrde/ufmt/hpc_maxtree.hh olena/oln/lrde/ufmt/hpc_maxtree.hh r) - (olena/oln/lrde/ufmt/README olena/oln/lrde/ufmt/README olena/oln/lrde/ufmt/README m) (olena/oln/lrde/ufmt/Makefile.am olena/oln/lrde/ufmt/Makefile.am olena/oln/lrde/ufmt/Makefile.am m) - (olena/oln/lrde/ufmt/bin/Makefile.am olena/oln/lrde/ufmt/bin/Makefile.am olena/oln/lrde/ufmt/bin/Makefile.am m) (() () olena/oln/lrde/ufmt/hpx_maxtree.hh a) - (() () olena/oln/lrde/ufmt/attributes.hh a) (() () olena/oln/lrde/ufmt/hdx_maxtree.hh a) - (() () olena/oln/lrde/ufmt/attributes_bis.hh a) (() () olena/oln/lrde/ufmt/bin/hdx_maxtree.cc a) - (() () olena/oln/lrde/ufmt/bin/gen_worst_salembier.cc a) (() () olena/oln/lrde/ufmt/bin/hpx_maxtree.cc a) - (() () olena/oln/lrde/ufmt/bin/sp_maxtree.cc a) (() () olena/oln/lrde/ufmt/bin/spx_maxtree.cc a) - (() () olena/oln/lrde/ufmt/spx_maxtree.hh a) (() () olena/oln/lrde/ufmt/sp_maxtree.hh a) - (() () olena/oln/lrde/ufmt/basic_najman.hh a) (() () olena/oln/lrde/ufmt/bin/basic_najman.cc a)) -) +(Merge-Parents) (New-Merge-Parents)