Olena-patches

Download

olena-patches@lrde.epita.fr

March 2014

2 participants
2 discussions

olena: branch next updated: olena-2.0-848-gc75b4cf
by git＠lrde.epita.fr 31 Mar '14

31 Mar '14

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 c75b4cfe1b9b94b2adbdd948964e37c341d9be65 (commit) from 7b885b8910789acd2491bf66f267c27e525b500d (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 ----------------------------------------------------------------- c75b4cf Scribo: Improve scribo-cli's `--version' option. ----------------------------------------------------------------------- Summary of changes: scribo/ChangeLog | 10 ++++++++++ scribo/src/Makefile.am | 3 ++- scribo/src/scribo-cli.in | 11 ++++++----- 3 files changed, 18 insertions(+), 6 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

olena: olena-2.0-848-gc75b4cf Scribo: Improve scribo-cli's `--version' option.
by Roland Levillain 31 Mar '14

31 Mar '14

* src/scribo-cli.in: Move the shebang to the first line. (version): Do not hard-code the version number in scribo-cli. Rephrase the copyright owner for uniformity reasons. * src/Makefile.am (do_subst): Also substitute PACKAGE_VERSION. --- scribo/ChangeLog | 10 ++++++++++ scribo/src/Makefile.am | 3 ++- scribo/src/scribo-cli.in | 11 ++++++----- 3 files changed, 18 insertions(+), 6 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 2fa24c1..419cc9a 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,13 @@ +2014-03-31 Roland Levillain <roland(a)lrde.epita.fr> + + Scribo: Improve scribo-cli's `--version' option. + + * src/scribo-cli.in: Move the shebang to the first line. + (version): Do not hard-code the version number + in scribo-cli. + Rephrase the copyright owner for uniformity reasons. + * src/Makefile.am (do_subst): Also substitute PACKAGE_VERSION. + 2013-09-13 Roland Levillain <roland(a)lrde.epita.fr> Scribo: Define flags in proper Makefile helpers. diff --git a/scribo/src/Makefile.am b/scribo/src/Makefile.am index 827771c..47d9960 100644 --- a/scribo/src/Makefile.am +++ b/scribo/src/Makefile.am @@ -155,7 +155,8 @@ endif HAVE_MAGICKXX # Generated by configure from scribo-cli.in. dist_bin_SCRIPTS = scribo-cli -do_subst = sed -e 's|@utilexecdir[@]|$(utilexecdir)|g' +do_subst = sed -e 's|@utilexecdir[@]|$(utilexecdir)|g' \ + -e 's|@PACKAGE_VERSION[@]|$(PACKAGE_VERSION)|g' scribo-cli: $(srcdir)/scribo-cli.in Makefile rm -f $@ $@.tmp diff --git a/scribo/src/scribo-cli.in b/scribo/src/scribo-cli.in index 7cc4864..6cfc9d0 100755 --- a/scribo/src/scribo-cli.in +++ b/scribo/src/scribo-cli.in @@ -1,4 +1,6 @@ -# Copyright (C) 2010 EPITA Research and Development Laboratory (LRDE). +#! /bin/sh + +# Copyright (C) 2010, 2014 EPITA Research and Development Laboratory (LRDE). # # This file is part of Olena. # @@ -13,17 +15,16 @@ # # You should have received a copy of the GNU General Public License # along with Olena. If not, see <http://www.gnu.org/licenses/>. -# -#!/bin/sh bdir="@utilexecdir@" bin=`basename $0` +version="@PACKAGE_VERSION@" version() { cat <<EOF -SCRIBO Command LIne tool, version 1.0 -Copyright (C) 2010 LRDE/EPITA +Olena Scribo Module Command-Line Interface (CLI) tool, version $version +Copyright (C) 2010, 2014 EPITA Research and Development Laboratory (LRDE) This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. EOF -- 1.7.10.4

1 0