From 8238d7d66f1a51f734770d09242824b12d8f3b25 Mon Sep 17 00:00:00 2001 From: "zodiac@gmail.com" Date: Wed, 2 Dec 2009 02:45:48 +0000 Subject: [PATCH] Added some basic sanity checks to the commit script that now makes sure we at least attempt to keep copyright dates updated whenever we make changes. git-svn-id: https://shellinabox.googlecode.com/svn/trunk@193 0da03de8-d603-11dd-86c2-0f8696b7b6f9 --- ChangeLog | 6 ++++++ commit | 28 +++++++++++++++++++++++++++- config.h | 2 +- configure | 2 +- configure.ac | 2 +- demo/vt100.js | 2 +- shellinabox/shell_in_a_box.js | 2 +- shellinabox/vt100.js | 2 +- 8 files changed, 39 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 93e4522..6d804f3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2009-12-01 Markus Gutschke + + * Added some basic sanity checks to the commit script that now makes + sure we at least attempt to keep copyright dates updated whenever we + make changes. + 2009-11-29 Markus Gutschke * Preparations for packaging ShellInABox in a way that makes it diff --git a/commit b/commit index 022fb54..0ea8684 100755 --- a/commit +++ b/commit @@ -125,9 +125,35 @@ svn update # Update "configure.ac" with the next Subversion revision number. This # information will trickle down into various source files where it becomes # part of the user-visible version information. -sed -ie 's/^\(VCS_REVISION=\).*/\1'"${rev}"'/' configure.ac +sed -i -e 's/^\(VCS_REVISION=\).*/\1'"${rev}"'/' configure.ac touch shellinabox/vt100.jspp shellinabox/shell_in_a_box.jspp +# If the manual page has been changed, make sure that the time stamp will be +# changed, too. +if [ -n "$(svn st shellinabox/shellinaboxd.man.in 2>/dev/null | + grep '^M')" ]; then + sed -i -e 's/^\([.]TH .*\)"[^"]*"/\1"'"$(date +'%b %d, %Y')"'"/ + s/2008-2[01][0-9][0-9]/2008-'"$(date +'%Y')"'/g' \ + shellinabox/shellinaboxd.man.in +fi + +# Always update the year in the user visible copyright statement(s) +for i in shellinabox/shell_in_a_box.jspp \ + shellinabox/vt100.jspp \ + COPYING \ + debian/copyright; do + sed -i -e 's/\(2[01][0-9][0-9]-\)2[01][0-9][0-9]/\1'"$(date +'%Y')"'/g' "$i" +done + +# If a source file has changed, make sure to update the year in the copyright +# statement for that particular file. +svn st | egrep '^[MA]' | awk '{ print $2 }' | + egrep '^(shellinabox|libhttp|demo)/' | + egrep '[.](html|h|c|css|jspp)$' | + while read -r f; do + sed -i -e 's/\(2[01][0-9][0-9]-\)2[01][0-9][0-9]/\1'"$(date +'%Y')"'/g' "$f" + done + # For now, Ubuntu/Hardy is still quite popular. We want to make it easy for # our users to build Debian packages from source. So, make sure we lock the # compatibility level at 6. Once we no longer care about maintaining strict diff --git a/config.h b/config.h index ee99d85..e627a2d 100644 --- a/config.h +++ b/config.h @@ -138,7 +138,7 @@ #define STDC_HEADERS 1 /* Most recent revision number in the version control system */ -#define VCS_REVISION "192" +#define VCS_REVISION "193" /* Version number of package */ #define VERSION "2.10" diff --git a/configure b/configure index 97c9da8..ebf45ad 100755 --- a/configure +++ b/configure @@ -2319,7 +2319,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu -VCS_REVISION=192 +VCS_REVISION=193 cat >>confdefs.h <<_ACEOF diff --git a/configure.ac b/configure.ac index f469a1e..fe8cba1 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ AC_PREREQ(2.57) dnl This is the one location where the authoritative version number is stored AC_INIT(shellinabox, 2.10, markus@shellinabox.com) -VCS_REVISION=192 +VCS_REVISION=193 AC_SUBST(VCS_REVISION) AC_DEFINE_UNQUOTED(VCS_REVISION, "${VCS_REVISION}", [Most recent revision number in the version control system]) diff --git a/demo/vt100.js b/demo/vt100.js index 2763b22..485ccef 100644 --- a/demo/vt100.js +++ b/demo/vt100.js @@ -1955,7 +1955,7 @@ VT100.prototype.toggleBell = function() { }; VT100.prototype.about = function() { - alert("VT100 Terminal Emulator " + "2.10 (revision 192)" + + alert("VT100 Terminal Emulator " + "2.10 (revision 193)" + "\nCopyright 2008-2009 by Markus Gutschke\n" + "For more information check http://shellinabox.com"); }; diff --git a/shellinabox/shell_in_a_box.js b/shellinabox/shell_in_a_box.js index d2fb11e..034aef9 100644 --- a/shellinabox/shell_in_a_box.js +++ b/shellinabox/shell_in_a_box.js @@ -358,7 +358,7 @@ ShellInABox.prototype.extendContextMenu = function(entries, actions) { }; ShellInABox.prototype.about = function() { - alert("Shell In A Box version " + "2.10 (revision 192)" + + alert("Shell In A Box version " + "2.10 (revision 193)" + "\nCopyright 2008-2009 by Markus Gutschke\n" + "For more information check http://shellinabox.com" + (typeof serverSupportsSSL != 'undefined' && serverSupportsSSL ? diff --git a/shellinabox/vt100.js b/shellinabox/vt100.js index 2763b22..485ccef 100644 --- a/shellinabox/vt100.js +++ b/shellinabox/vt100.js @@ -1955,7 +1955,7 @@ VT100.prototype.toggleBell = function() { }; VT100.prototype.about = function() { - alert("VT100 Terminal Emulator " + "2.10 (revision 192)" + + alert("VT100 Terminal Emulator " + "2.10 (revision 193)" + "\nCopyright 2008-2009 by Markus Gutschke\n" + "For more information check http://shellinabox.com"); };