- Olena-patches

last-svn-commit-176-g29c2a51 Fix the generation of the sps scripts.
by Roland Levillain 31 May '10

31 May '10

* python/Makefile.am (sps, sps-local): Remove a stray slash. Fix permissions. --- swilena/ChangeLog | 7 +++++++ swilena/python/Makefile.am | 3 ++- 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/swilena/ChangeLog b/swilena/ChangeLog index c6fd900..539284d 100644 --- a/swilena/ChangeLog +++ b/swilena/ChangeLog @@ -1,3 +1,10 @@ +2010-01-06 Roland Levillain <roland(a)lrde.epita.fr> + + Fix the generation of the sps scripts. + + * python/Makefile.am (sps, sps-local): Remove a stray slash. + Fix permissions. + 2010-05-28 Roland Levillain <roland(a)lrde.epita.fr> Generate python/data.py. diff --git a/swilena/python/Makefile.am b/swilena/python/Makefile.am index cd02746..a3b883c 100644 --- a/swilena/python/Makefile.am +++ b/swilena/python/Makefile.am @@ -329,7 +329,8 @@ sps sps-local: Makefile $(srcdir)/sps-common.in rm -f $@ $@.tmp srcdir=''; \ test -f ./$@.in || srcdir=$(srcdir)/; \ - cp $${srcdir}/sps-common.in $@.tmp; \ + cp $${srcdir}sps-common.in $@.tmp; \ + chmod u+w $@.tmp; \ $(edit) $${srcdir}$@.in >>$@.tmp chmod +x $@.tmp chmod a-w $@.tmp -- 1.5.6.5

1 0

branch swilena updated: last-svn-commit-176-g19fd7f5
by git＠lrde.epita.fr 31 May '10

31 May '10

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Olena, a generic and efficient image processing platform". The branch swilena has been updated via 19fd7f5144d94a4a8c5afb11ff3094400023783e (commit) from 0581226dd9b4f0e35235ca763e7f7940cfba9945 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- 19fd7f5 Fix the generation of the sps scripts. ----------------------------------------------------------------------- Summary of changes: swilena/ChangeLog | 6 ++++++ swilena/python/Makefile.am | 2 +- 2 files changed, 7 insertions(+), 1 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

last-svn-commit-161-g2b5bd16 Remove improper copyright headers in Trimesh.
by Roland Levillain 28 May '10

28 May '10

* Makefile.am, * gluit/Makefile.am, * include/Makefile.am, * libsrc/Makefile.am, * utilsrc/Makefile.am: Here. --- external/trimesh/ChangeLog | 11 +++++++++++ external/trimesh/Makefile.am | 19 ------------------- external/trimesh/gluit/Makefile.am | 19 ------------------- external/trimesh/include/Makefile.am | 19 ------------------- external/trimesh/libsrc/Makefile.am | 19 ------------------- external/trimesh/utilsrc/Makefile.am | 19 ------------------- 6 files changed, 11 insertions(+), 95 deletions(-) diff --git a/external/trimesh/ChangeLog b/external/trimesh/ChangeLog index 62ddb64..8e79d5d 100644 --- a/external/trimesh/ChangeLog +++ b/external/trimesh/ChangeLog @@ -1,3 +1,14 @@ +2010-05-12 Roland Levillain <roland(a)lrde.epita.fr> + + Remove improper copyright headers in Trimesh. + + * Makefile.am, + * gluit/Makefile.am, + * include/Makefile.am, + * libsrc/Makefile.am, + * utilsrc/Makefile.am: + Here. + 2010-03-15 Roland Levillain <roland(a)lrde.epita.fr> * gluit/gluit.mk: Help Emacs find out the nature of this file. diff --git a/external/trimesh/Makefile.am b/external/trimesh/Makefile.am index 119efba..2c0e8b1 100644 --- a/external/trimesh/Makefile.am +++ b/external/trimesh/Makefile.am @@ -1,22 +1,3 @@ -# Copyright (C) 2008, 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/>. -# - -## Process this file through Automake to produce Makefile.in. - SUBDIRS = include libsrc gluit utilsrc # FIXME: These files are not used with the new (Autotool'd) build diff --git a/external/trimesh/gluit/Makefile.am b/external/trimesh/gluit/Makefile.am index bc336c2..4b4f351 100644 --- a/external/trimesh/gluit/Makefile.am +++ b/external/trimesh/gluit/Makefile.am @@ -1,22 +1,3 @@ -# Copyright (C) 2008, 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/>. -# - -## Process this file through Automake to produce Makefile.in. - # Find config.h. AM_CPPFLAGS = -I$(top_builddir) AM_CPPFLAGS += -I$(top_srcdir)/include -I$(top_srcdir)/include/GL diff --git a/external/trimesh/include/Makefile.am b/external/trimesh/include/Makefile.am index 96c6ecd..969647e 100644 --- a/external/trimesh/include/Makefile.am +++ b/external/trimesh/include/Makefile.am @@ -1,22 +1,3 @@ -# Copyright (C) 2008, 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/>. -# - -## Process this file through Automake to produce Makefile.in. - trimeshdir = $(includedir)/trimesh nobase_trimesh_HEADERS = \ GL/freeglut.h \ diff --git a/external/trimesh/libsrc/Makefile.am b/external/trimesh/libsrc/Makefile.am index 36e72b4..54f30f9 100644 --- a/external/trimesh/libsrc/Makefile.am +++ b/external/trimesh/libsrc/Makefile.am @@ -1,22 +1,3 @@ -# Copyright (C) 2008, 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/>. -# - -## Process this file through Automake to produce Makefile.in. - AM_CPPFLAGS = -I$(top_srcdir)/include AM_LDFLAGS = -lGL -lGLU diff --git a/external/trimesh/utilsrc/Makefile.am b/external/trimesh/utilsrc/Makefile.am index 3d942d9..eacac17 100644 --- a/external/trimesh/utilsrc/Makefile.am +++ b/external/trimesh/utilsrc/Makefile.am @@ -1,22 +1,3 @@ -# Copyright (C) 2008, 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/>. -# - -## Process this file through Automake to produce Makefile.in. - # Linking with gluit and GLUT/OpenGL. gluit_builddir = $(top_builddir)/gluit include $(top_srcdir)/gluit/gluit.mk -- 1.5.6.5

1 0

last-svn-commit-162-g69ce9fa AUTHORS: Update.
by Roland Levillain 28 May '10

28 May '10

--- AUTHORS | 3 +++ ChangeLog | 4 ++++ 2 files changed, 7 insertions(+), 0 deletions(-) diff --git a/AUTHORS b/AUTHORS index f6478dc..4c943aa 100644 --- a/AUTHORS +++ b/AUTHORS @@ -243,6 +243,9 @@ Students from Class 2002. Students from Class 2001. ========================= +* Alexis Angelidis + - Olena logo. + * Vincent Berruchon * Renaud François diff --git a/ChangeLog b/ChangeLog index 1e20d08..1e17844 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2010-05-03 Roland Levillain <roland(a)lrde.epita.fr> + + * AUTHORS: Update. + 2010-05-12 Roland Levillain <roland(a)lrde.epita.fr> Add missing copyright headers. -- 1.5.6.5

1 0

last-svn-commit-159-g916df42 Add missing copyright headers in Milena.
by Roland Levillain 28 May '10

28 May '10

* apps/constrained-connectivity/test-constrained-connectivity.in, * apps/mesh-segm-skel/test-mesh-complex-max-curv-segm.in, * apps/mesh-segm-skel/test-mesh-complex-max-curv.in, * apps/mesh-segm-skel/test-mesh-complex-segm.in, * apps/mesh-segm-skel/test-mesh-complex-skel.in, * apps/mesh-segm-skel/test-mesh-max-curv.in, * apps/mesh-segm-skel/test-mesh-segm.in, * doc/graphicx.hva, * doc/tools/clearbanner.sh, * doc/tools/split_sample.sh: Here. --- milena/ChangeLog | 16 ++++++++++++++++ .../test-constrained-connectivity.in | 16 ++++++++++++++++ .../test-mesh-complex-max-curv-segm.in | 16 ++++++++++++++++ .../mesh-segm-skel/test-mesh-complex-max-curv.in | 16 ++++++++++++++++ .../apps/mesh-segm-skel/test-mesh-complex-segm.in | 16 ++++++++++++++++ .../apps/mesh-segm-skel/test-mesh-complex-skel.in | 16 ++++++++++++++++ milena/apps/mesh-segm-skel/test-mesh-max-curv.in | 16 ++++++++++++++++ milena/apps/mesh-segm-skel/test-mesh-segm.in | 16 ++++++++++++++++ milena/doc/graphicx.hva | 16 ++++++++++++++++ milena/doc/tools/clearbanner.sh | 16 ++++++++++++++++ milena/doc/tools/split_sample.sh | 17 +++++++++++++++++ 11 files changed, 177 insertions(+), 0 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 900ebd8..3355da2 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,19 @@ +2010-05-12 Roland Levillain <roland(a)lrde.epita.fr> + + Add missing copyright headers in Milena. + + * apps/constrained-connectivity/test-constrained-connectivity.in, + * apps/mesh-segm-skel/test-mesh-complex-max-curv-segm.in, + * apps/mesh-segm-skel/test-mesh-complex-max-curv.in, + * apps/mesh-segm-skel/test-mesh-complex-segm.in, + * apps/mesh-segm-skel/test-mesh-complex-skel.in, + * apps/mesh-segm-skel/test-mesh-max-curv.in, + * apps/mesh-segm-skel/test-mesh-segm.in, + * doc/graphicx.hva, + * doc/tools/clearbanner.sh, + * doc/tools/split_sample.sh: + Here. + 2010-05-11 Roland Levillain <roland(a)lrde.epita.fr> Miscellaneous changes in graphs and graph-based images. diff --git a/milena/apps/constrained-connectivity/test-constrained-connectivity.in b/milena/apps/constrained-connectivity/test-constrained-connectivity.in index 5d8d89c..a0d6a88 100644 --- a/milena/apps/constrained-connectivity/test-constrained-connectivity.in +++ b/milena/apps/constrained-connectivity/test-constrained-connectivity.in @@ -1,5 +1,21 @@ #! /bin/sh +# Copyright (C) 2009, 2010 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/>. + set -ex srcdir="@top_srcdir@/milena/apps/constrained-connectivity" diff --git a/milena/apps/mesh-segm-skel/test-mesh-complex-max-curv-segm.in b/milena/apps/mesh-segm-skel/test-mesh-complex-max-curv-segm.in index 7200ba7..ac5a1e7 100644 --- a/milena/apps/mesh-segm-skel/test-mesh-complex-max-curv-segm.in +++ b/milena/apps/mesh-segm-skel/test-mesh-complex-max-curv-segm.in @@ -1,5 +1,21 @@ #! /bin/sh +# Copyright (C) 2008, 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/>. + set -ex mesh_dir=@top_srcdir@/milena/mesh diff --git a/milena/apps/mesh-segm-skel/test-mesh-complex-max-curv.in b/milena/apps/mesh-segm-skel/test-mesh-complex-max-curv.in index e138a12..a60eede 100644 --- a/milena/apps/mesh-segm-skel/test-mesh-complex-max-curv.in +++ b/milena/apps/mesh-segm-skel/test-mesh-complex-max-curv.in @@ -1,5 +1,21 @@ #! /bin/sh +# Copyright (C) 2008, 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/>. + set -ex mesh_dir=@top_srcdir@/milena/mesh diff --git a/milena/apps/mesh-segm-skel/test-mesh-complex-segm.in b/milena/apps/mesh-segm-skel/test-mesh-complex-segm.in index dd0ccc4..58cd47e 100644 --- a/milena/apps/mesh-segm-skel/test-mesh-complex-segm.in +++ b/milena/apps/mesh-segm-skel/test-mesh-complex-segm.in @@ -1,5 +1,21 @@ #! /bin/sh +# Copyright (C) 2008, 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/>. + set -ex mesh_dir=@top_srcdir@/milena/mesh diff --git a/milena/apps/mesh-segm-skel/test-mesh-complex-skel.in b/milena/apps/mesh-segm-skel/test-mesh-complex-skel.in index 7f0714d..f6b787b 100644 --- a/milena/apps/mesh-segm-skel/test-mesh-complex-skel.in +++ b/milena/apps/mesh-segm-skel/test-mesh-complex-skel.in @@ -1,5 +1,21 @@ #! /bin/sh +# 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/>. + set -ex mesh_dir=@top_srcdir@/milena/mesh diff --git a/milena/apps/mesh-segm-skel/test-mesh-max-curv.in b/milena/apps/mesh-segm-skel/test-mesh-max-curv.in index 9e9b2ce..e5eaf96 100644 --- a/milena/apps/mesh-segm-skel/test-mesh-max-curv.in +++ b/milena/apps/mesh-segm-skel/test-mesh-max-curv.in @@ -1,5 +1,21 @@ #! /bin/sh +# Copyright (C) 2008, 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/>. + set -ex mesh_dir=@top_srcdir@/milena/mesh diff --git a/milena/apps/mesh-segm-skel/test-mesh-segm.in b/milena/apps/mesh-segm-skel/test-mesh-segm.in index e50d270..e70e63a 100755 --- a/milena/apps/mesh-segm-skel/test-mesh-segm.in +++ b/milena/apps/mesh-segm-skel/test-mesh-segm.in @@ -1,5 +1,21 @@ #! /bin/sh +# Copyright (C) 2008, 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/>. + set -ex mesh_dir=@top_srcdir@/milena/mesh diff --git a/milena/doc/graphicx.hva b/milena/doc/graphicx.hva index ff95ca7..ce81120 100644 --- a/milena/doc/graphicx.hva +++ b/milena/doc/graphicx.hva @@ -1,3 +1,19 @@ % -*- LaTeX -*- +% Copyright (C) 2010 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/>. + \newcommand{\includegraphics}[2][]{\imgsrc{#2.png}} diff --git a/milena/doc/tools/clearbanner.sh b/milena/doc/tools/clearbanner.sh index 3095457..d5f6b8c 100755 --- a/milena/doc/tools/clearbanner.sh +++ b/milena/doc/tools/clearbanner.sh @@ -1,5 +1,21 @@ #!/bin/sh +# Copyright (C) 2009, 2010 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/>. + sed -i -e 's,<HR SIZE=2><BLOCKQUOTE CLASS="quote">This document was translated from LATEX by,,g' $1 sed -i -e 's,<A HREF="http://hevea.inria.fr/index.html">HEVEA</A>.</BLOCKQUOTE></BODY>,,g' $1 diff --git a/milena/doc/tools/split_sample.sh b/milena/doc/tools/split_sample.sh index 04b313e..b9027bd 100755 --- a/milena/doc/tools/split_sample.sh +++ b/milena/doc/tools/split_sample.sh @@ -1,5 +1,22 @@ # /bin/sh +# Copyright (C) 2008, 2009, 2010 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/>. + if ! [ $# -eq 4 ]; then echo "Usage: $0 <file1> <file extension> <suffix> <dst dir>" exit 1; -- 1.5.6.5

1 0

last-svn-commit-160-g94486e4 Add missing copyright headers in Scribo.
by Roland Levillain 28 May '10

28 May '10

* scribo/Doxyfile, * scribo/Doxyfile_tex, * scribo/demo/Makefile.am: Here. --- scribo/ChangeLog | 9 +++++++++ scribo/Doxyfile | 16 ++++++++++++++++ scribo/Doxyfile_tex | 16 ++++++++++++++++ scribo/demo/Makefile.am | 16 ++++++++++++++++ 4 files changed, 57 insertions(+), 0 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index ef877c8..0627bc3 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,12 @@ +2010-05-12 Roland Levillain <roland(a)lrde.epita.fr> + + Add missing copyright headers in Scribo. + + * scribo/Doxyfile, + * scribo/Doxyfile_tex, + * scribo/demo/Makefile.am: + Here. + 2010-04-27 Roland Levillain <roland(a)lrde.epita.fr> Help g++ 3.3 compile Scribo code. diff --git a/scribo/Doxyfile b/scribo/Doxyfile index 1f2f484..e3ec433 100644 --- a/scribo/Doxyfile +++ b/scribo/Doxyfile @@ -1,3 +1,19 @@ +# 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/>. + # Doxyfile 1.5.6 #--------------------------------------------------------------------------- diff --git a/scribo/Doxyfile_tex b/scribo/Doxyfile_tex index d2f4b19..69aecec 100644 --- a/scribo/Doxyfile_tex +++ b/scribo/Doxyfile_tex @@ -1,3 +1,19 @@ +# 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/>. + # Doxyfile 1.5.6 #--------------------------------------------------------------------------- diff --git a/scribo/demo/Makefile.am b/scribo/demo/Makefile.am index b51084e..bab9f0f 100644 --- a/scribo/demo/Makefile.am +++ b/scribo/demo/Makefile.am @@ -1,3 +1,19 @@ +# Copyright (C) 2009, 2010 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/>. + ## Process this file through Automake to create Makefile.in. include $(top_srcdir)/scribo/scribo.mk -- 1.5.6.5

1 0

last-svn-commit-158-g664b361 Add missing copyright headers.
by Roland Levillain 28 May '10

28 May '10

* build-aux/devtools.sh, * build-aux/devtools_utils.sh, * build-aux/generate_dist_headers.sh, * build-aux/make_report_utils.sh, * configure.ac, * lrde-upload.sh: Here. --- ChangeLog | 12 ++++++++++++ build-aux/devtools.sh | 16 ++++++++++++++++ build-aux/devtools_utils.sh | 16 ++++++++++++++++ build-aux/generate_dist_headers.sh | 17 +++++++++++++++++ build-aux/make_report_utils.sh | 18 +++++++++++++++++- configure.ac | 18 ++++++++++++++++-- 6 files changed, 94 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index bd092e5..1e20d08 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2010-05-12 Roland Levillain <roland(a)lrde.epita.fr> + + Add missing copyright headers. + + * build-aux/devtools.sh, + * build-aux/devtools_utils.sh, + * build-aux/generate_dist_headers.sh, + * build-aux/make_report_utils.sh, + * configure.ac, + * lrde-upload.sh: + Here. + 2010-05-28 Roland Levillain <roland(a)lrde.epita.fr> Add `swilena' to the branches to be uploaded. diff --git a/build-aux/devtools.sh b/build-aux/devtools.sh index 0a35ac6..b944808 100644 --- a/build-aux/devtools.sh +++ b/build-aux/devtools.sh @@ -1,3 +1,19 @@ +# 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/>. + dname="`dirname $0`" if [ "$dname" = "." ]; then export PATH="$PWD:$PATH" diff --git a/build-aux/devtools_utils.sh b/build-aux/devtools_utils.sh index 2156a50..0c3d6b0 100644 --- a/build-aux/devtools_utils.sh +++ b/build-aux/devtools_utils.sh @@ -1,5 +1,21 @@ #!/bin/sh +# 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/>. + # $1: a file. # diff --git a/build-aux/generate_dist_headers.sh b/build-aux/generate_dist_headers.sh index 2cace34..de78882 100755 --- a/build-aux/generate_dist_headers.sh +++ b/build-aux/generate_dist_headers.sh @@ -1,5 +1,22 @@ #! /bin/sh +# 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/>. + + # Generate a list of distributed files w.r.t. a list of file which must # be excluded. # -------------------- diff --git a/build-aux/make_report_utils.sh b/build-aux/make_report_utils.sh index 4660f2b..d633779 100644 --- a/build-aux/make_report_utils.sh +++ b/build-aux/make_report_utils.sh @@ -1,7 +1,23 @@ #!/bin/sh -# Set of useful functions to generate HTML reports. +# 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/>. + +# Set of useful functions to generate HTML reports. # $1: report file. diff --git a/configure.ac b/configure.ac index 62ceb8c..aa216f6 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,19 @@ -# -*- Autoconf -*- -# Process this file with autoconf to produce a configure script. +# Copyright (C) 2006, 2007, 2008, 2009, 2010 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/>. m4_pattern_forbid([^OLN_]) -- 1.5.6.5

1 0

branch next updated: last-svn-commit-162-g69ce9fa
by git＠lrde.epita.fr 28 May '10

28 May '10

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Olena, a generic and efficient image processing platform". The branch next has been updated via 69ce9faae9f4efb9de5b7f0bb413e467d6b10882 (commit) via 2b5bd163c6290a5e6125b338212ac97bc5963dce (commit) via 94486e40acf3355b24eece538313f3ec9edd5f20 (commit) via 916df4279f248a6fb5c85a129229f57e71f036eb (commit) via 664b361a5b75efba6b472d1028abad8d267c3628 (commit) from 9ced0495ec829f942f3abffe7077d472efff96f6 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- 69ce9fa AUTHORS: Update. 2b5bd16 Remove improper copyright headers in Trimesh. 94486e4 Add missing copyright headers in Scribo. 916df42 Add missing copyright headers in Milena. 664b361 Add missing copyright headers. ----------------------------------------------------------------------- Summary of changes: AUTHORS | 3 +++ ChangeLog | 16 ++++++++++++++++ build-aux/devtools.sh | 16 ++++++++++++++++ build-aux/devtools_utils.sh | 16 ++++++++++++++++ build-aux/generate_dist_headers.sh | 17 +++++++++++++++++ build-aux/make_report_utils.sh | 18 +++++++++++++++++- configure.ac | 18 ++++++++++++++++-- external/trimesh/ChangeLog | 11 +++++++++++ external/trimesh/Makefile.am | 19 ------------------- external/trimesh/gluit/Makefile.am | 19 ------------------- external/trimesh/include/Makefile.am | 19 ------------------- external/trimesh/libsrc/Makefile.am | 19 ------------------- external/trimesh/utilsrc/Makefile.am | 19 ------------------- milena/ChangeLog | 16 ++++++++++++++++ .../test-constrained-connectivity.in | 16 ++++++++++++++++ .../test-mesh-complex-max-curv-segm.in | 16 ++++++++++++++++ .../mesh-segm-skel/test-mesh-complex-max-curv.in | 16 ++++++++++++++++ .../apps/mesh-segm-skel/test-mesh-complex-segm.in | 16 ++++++++++++++++ .../apps/mesh-segm-skel/test-mesh-complex-skel.in | 16 ++++++++++++++++ milena/apps/mesh-segm-skel/test-mesh-max-curv.in | 16 ++++++++++++++++ milena/apps/mesh-segm-skel/test-mesh-segm.in | 16 ++++++++++++++++ milena/doc/graphicx.hva | 16 ++++++++++++++++ milena/doc/tools/clearbanner.sh | 16 ++++++++++++++++ milena/doc/tools/split_sample.sh | 17 +++++++++++++++++ scribo/ChangeLog | 9 +++++++++ scribo/Doxyfile | 16 ++++++++++++++++ scribo/Doxyfile_tex | 16 ++++++++++++++++ scribo/demo/Makefile.am | 16 ++++++++++++++++ 28 files changed, 346 insertions(+), 98 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

last-svn-commit-167-gb527c96 Have Make generate the Swilena Python Shell (sps).
by Roland Levillain 28 May '10

28 May '10

* python/Makefile.am (EXTRA_DIST): Add sps-common.in, sps.in and sps-local.in. (edit): New. (sps, sps-local): New rules. --- swilena/ChangeLog | 9 +++++++++ swilena/python/Makefile.am | 27 ++++++++++++++++++++++++++- 2 files changed, 35 insertions(+), 1 deletions(-) diff --git a/swilena/ChangeLog b/swilena/ChangeLog index fb854f5..89da33d 100644 --- a/swilena/ChangeLog +++ b/swilena/ChangeLog @@ -1,3 +1,12 @@ +2010-04-01 Roland Levillain <roland(a)lrde.epita.fr> + + Have Make generate the Swilena Python Shell (sps). + + * python/Makefile.am (EXTRA_DIST): Add sps-common.in, sps.in and + sps-local.in. + (edit): New. + (sps, sps-local): New rules. + 2010-02-08 Roland Levillain <roland(a)lrde.epita.fr> Add a Swilena wrapper for mln::image2d<mln::value::rgb8>. diff --git a/swilena/python/Makefile.am b/swilena/python/Makefile.am index 44b9210..9693c2e 100644 --- a/swilena/python/Makefile.am +++ b/swilena/python/Makefile.am @@ -260,7 +260,6 @@ image2d_rgb8-wrap.cc: $(top_srcdir)/swilena/println.ixx ## Swilena Python Shell (sps). ## ## ---------------------------- ## -# FIXME: We might want to rename this shell as something else. python_PYTHON += sps.py # The script to be used in installed distributions. @@ -268,6 +267,32 @@ bin_SCRIPTS = sps # The script to be used in non-installed build trees. noinst_SCRIPTS = sps-local +EXTRA_DIST += sps-common.in sps.in sps-local.in + +# Use Make to generate shell scripts (`sps' and `sps-local') instead +# of `configure', as advised by Autoconf's manual (see section +# ``Installation Directory Variables''). +edit = sed \ + -e 's|@abs_srcdir[@]|$(abs_srcdir)|g' \ + -e 's|@abs_builddir[@]|$(abs_builddir)|g' \ + -e 's|@abs_top_builddir[@]|$(abs_top_builddir)|g' \ + -e 's|@libdir[@]|$(libdir)|g' \ + -e 's|@pythondir[@]|$(pythondir)|g' \ + -e 's|@PYTHON[@]|$(PYTHON)|g' + +sps sps-local: Makefile $(srcdir)/sps-common.in + rm -f $@ $@.tmp + srcdir=''; \ + test -f ./$@.in || srcdir=$(srcdir)/; \ + cp $${srcdir}/sps-common.in $@.tmp; \ + $(edit) $${srcdir}$@.in >>$@.tmp + chmod +x $@.tmp + chmod a-w $@.tmp + mv $@.tmp $@ + +sps: $(srcdir)/sps.in +sps-local: $(srcdir)/sps-local.in + CLEANFILES += $(bin_SCRIPTS) $(noinst_SCRIPTS) -- 1.5.6.5

1 0

last-svn-commit-168-g102284f Add a Swilena wrapper for mln::image2d<mln::point2d>.
by Roland Levillain 28 May '10

28 May '10

* image2d_point2d.i: New. * Makefile.am (wrappers): Add image2d_point2d.i. * python/Makefile.am (pyexec_LTLIBRARIES): Add _image2d_point2d.la. (nodist__image2d_point2d_la_SOURCES, _image2d_point2d_la_LIBADD): New. (CLEANFILES): Add $(nodist__image2d_point2d_la_SOURCES) image2d_point2d.py image2d_point2d.py[co]. (nodist_python_PYTHON): Add image2d_point2d.py. (image2d_point2d-wrap.cc): Add dependencies. * python/swilena.py: Import image2d_point2d. --- swilena/ChangeLog | 16 ++++++++++ swilena/Makefile.am | 1 + swilena/{image2d_int.i => image2d_point2d.i} | 42 +++++++++++++------------ swilena/python/Makefile.am | 14 ++++++++ swilena/python/swilena.py | 2 + 5 files changed, 55 insertions(+), 20 deletions(-) copy swilena/{image2d_int.i => image2d_point2d.i} (67%) diff --git a/swilena/ChangeLog b/swilena/ChangeLog index 89da33d..b0145d8 100644 --- a/swilena/ChangeLog +++ b/swilena/ChangeLog @@ -1,5 +1,21 @@ 2010-04-01 Roland Levillain <roland(a)lrde.epita.fr> + Add a Swilena wrapper for mln::image2d<mln::point2d>. + + * image2d_point2d.i: New. + * Makefile.am (wrappers): Add image2d_point2d.i. + * python/Makefile.am (pyexec_LTLIBRARIES): + Add _image2d_point2d.la. + (nodist__image2d_point2d_la_SOURCES, _image2d_point2d_la_LIBADD): + New. + (CLEANFILES): Add $(nodist__image2d_point2d_la_SOURCES) + image2d_point2d.py image2d_point2d.py[co]. + (nodist_python_PYTHON): Add image2d_point2d.py. + (image2d_point2d-wrap.cc): Add dependencies. + * python/swilena.py: Import image2d_point2d. + +2010-04-01 Roland Levillain <roland(a)lrde.epita.fr> + Have Make generate the Swilena Python Shell (sps). * python/Makefile.am (EXTRA_DIST): Add sps-common.in, sps.in and diff --git a/swilena/Makefile.am b/swilena/Makefile.am index f484707..98eb4f6 100644 --- a/swilena/Makefile.am +++ b/swilena/Makefile.am @@ -45,6 +45,7 @@ wrappers = \ dpoint2d.i \ image2d_int.i \ image2d_int_u8.i \ + image2d_point2d.i \ image2d_rgb8.i \ int_u32.i \ int_u8.i \ diff --git a/swilena/image2d_int.i b/swilena/image2d_point2d.i similarity index 67% copy from swilena/image2d_int.i copy to swilena/image2d_point2d.i index ac82fe6..0ef3bd9 100644 --- a/swilena/image2d_int.i +++ b/swilena/image2d_point2d.i @@ -1,5 +1,5 @@ -// -*- C++ -*- -// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// -*- C++ -*- +// Copyright (C) 2010 EPITA Research and Development Laboratory (LRDE) // // This file is part of Olena. // @@ -24,28 +24,30 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. -/// \file image2d.i -/// \brief A simple wrapping of mln::image2d<int> along with some -/// algorithms. +/// \file image2d_point2d.i +/// \brief A simple wrapping of mln::image2d<mln::point2d> along +/// with some algorithms. -%module image2d_int +%module image2d_point2d + +%import "point2d.i" +// FIXME: The import directive does not include the `%{ ... %}' clauses. +%{ +#include "mln/core/alias/point2d.hh" +%} + +%include concat.ixx -%include "intp.ixx" %include "image2d.ixx" -instantiate_image2d(image2d_int, int) +instantiate_image2d(image2d_point2d, + concat2(mln::point< mln::grid::square, mln::def::coord >)) %include "fill.ixx" -%template(fill) mln::data::fill< mln::image2d<int> >; +%template(fill) +mln::data::fill< mln::image2d< mln::point< mln::grid::square, + mln::def::coord> > >; %include "println.ixx" -%template(println) mln::debug::println< mln::image2d<int> >; - -%import "window2d.i" -// FIXME: The import directive does not include the `%{ ... %}' clauses. -%{ -#include "mln/core/alias/window2d.hh" -%} - -%include "morpho.ixx" -instantiate_erosion(erosion, mln::image2d<int>, mln::window2d) -instantiate_dilation(dilation, mln::image2d<int>, mln::window2d) +%template(println) +mln::debug::println< mln::image2d< mln::point< mln::grid::square, + mln::def::coord> > >; diff --git a/swilena/python/Makefile.am b/swilena/python/Makefile.am index 9693c2e..71ca9e7 100644 --- a/swilena/python/Makefile.am +++ b/swilena/python/Makefile.am @@ -194,6 +194,16 @@ CLEANFILES += $(nodist__image2d_rgb8_la_SOURCES) image2d_rgb8.py image2d_rgb8.py @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/_image2d_rgb8-wrap.Pcc@am__quote@ nodist_python_PYTHON += image2d_rgb8.py +## image2d_point2d. +pyexec_LTLIBRARIES += _image2d_point2d.la +nodist__image2d_point2d_la_SOURCES = image2d_point2d-wrap.cc +_image2d_point2d_la_LIBADD = $(AM_LIBADD) +CLEANFILES += $(nodist__image2d_point2d_la_SOURCES) image2d_point2d.py image2d_point2d.py[co] +## Include the dependency files. Copied from Automake's generated +## case for C++. +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/_image2d_point2d-wrap.Pcc@am__quote@ +nodist_python_PYTHON += image2d_point2d.py + ## dynamic_image2d. pyexec_LTLIBRARIES += _dynamic_image2d.la # Swig also generates a header for this module, since it makes use of @@ -255,6 +265,10 @@ image2d_rgb8-wrap.cc: $(top_srcdir)/swilena/ppm.ixx image2d_rgb8-wrap.cc: $(top_srcdir)/swilena/fill.ixx image2d_rgb8-wrap.cc: $(top_srcdir)/swilena/println.ixx +image2d_point2d-wrap.cc: $(top_srcdir)/swilena/image2d.ixx +image2d_point2d-wrap.cc: $(top_srcdir)/swilena/fill.ixx +image2d_point2d-wrap.cc: $(top_srcdir)/swilena/println.ixx + ## ---------------------------- ## ## Swilena Python Shell (sps). ## diff --git a/swilena/python/swilena.py b/swilena/python/swilena.py index 14b9838..6c4dc89 100644 --- a/swilena/python/swilena.py +++ b/swilena/python/swilena.py @@ -37,3 +37,5 @@ from rgb8 import * import image2d_int import image2d_int_u8 import image2d_rgb8 + +import image2d_point2d -- 1.5.6.5

1 0