diff --git a/.gitignore b/.gitignore index 5f205a35c..13eaa52dc 100644 --- a/.gitignore +++ b/.gitignore @@ -56,6 +56,5 @@ libmetrics/**/.libs libmetrics/**/*.la libmetrics/**/*.lo libmetrics/**/*.o -libmetrics/ChangeLog libmetrics/INSTALL libtool diff --git a/Makefile.am b/Makefile.am index da018f22b..3ec290b30 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,3 @@ -# $Id$ # include $(top_srcdir)/ganglia.inc @@ -36,16 +35,9 @@ ganglia.html: ganglia.sub README: ganglia.sub pod2text ganglia.sub README -CHANGE_LOG_GEN_BIN = scripts/svn2cl.sh -CHANGE_LOG_GEN_FLAGS = -i --alternate-strip-prefix="/trunk/monitor-core/" --break-before-msg=1 --reparagraph --revision HEAD:1 - -ChangeLog: - touch ChangeLog - $(CHANGE_LOG_GEN_BIN) $(CHANGE_LOG_GEN_FLAGS) - CLEANFILES = ganglia.sub pod2htm* -dist-local: README ganglia.html ChangeLog +dist-local: README ganglia.html # We go through and make sure all the files have diff --git a/README.SVN b/README.GIT similarity index 77% rename from README.SVN rename to README.GIT index 17cf04c19..9fe8bce84 100644 --- a/README.SVN +++ b/README.GIT @@ -1,6 +1,6 @@ Welcome to the Bleeding Edge of Ganglia Development -The SVN source represents the latest snapshot of Ganglia +The git source represents the latest snapshot of Ganglia development. For best results, make sure you have in your development environment @@ -17,15 +17,7 @@ Additionally, you might need the following CheckOut the source files of Ganglia: - svn co http://ganglia.svn.sourceforge.net/svnroot/ganglia/trunk/monitor-core ganglia - -If you are interested in getting a snapshot for distribution -you have to edit the configure.in file to set the variable GANGLIA_SNAPSHOT -to "yes" and update the value of the GANGLIA_NANO_VERSION variable with the -version number that your snapshot represents and that usually corresponds -to the numeric value returned by: - - ./svnversion . + git clone git://github.com/ganglia/monitor-core.git ganglia To prepare the distribution for compilation, run the bootstrapping script: diff --git a/bootstrap b/bootstrap index da17b13c2..abfc7e813 100755 --- a/bootstrap +++ b/bootstrap @@ -1,19 +1,8 @@ #!/bin/sh -# $Id$ echo "Bootstrapping libmetrics" cd libmetrics && ./bootstrap || exit 1 cd .. -MINOR=`grep 'GANGLIA_MINOR_VERSION=' configure.in | cut -d "=" -f 2` -if [ $MINOR -eq 1 ]; then - #XXX: only for 3.1 - SVNVERSION=`svnversion . | cut -d ":" -f 1 | sed -e "s/[A-Z]//g"` - if [ "$SVNVERSION" = "exported" ]; then - SVNVERSION=0 - fi - perl -pi -e "s/GANGLIA_NANO_VERSION=\d+/GANGLIA_NANO_VERSION=$SVNVERSION/g" configure.in -fi - echo "Create distribution timestamp" touch Makefile.am echo "Running aclocal" && @@ -23,9 +12,9 @@ autoheader && echo "Creating build" && mkdir -p build && echo "Running automake" && -automake --add-missing --copy 2>/dev/null +automake --add-missing --copy --foreign 2>/dev/null echo "Running libtoolize" && -libtoolize --automake --copy && automake --add-missing --copy && +libtoolize --automake --copy && automake --add-missing --copy --foreign && echo "Running autoconf" && autoconf -f || exit 1 diff --git a/configure.in b/configure.in index f1ae3866a..7aa0ab567 100644 --- a/configure.in +++ b/configure.in @@ -1,5 +1,4 @@ dnl -dnl $Id$ dnl dnl "Copyright (c) 2001 by Matt Massie and The Regents of the University dnl of California. All rights reserved." @@ -54,10 +53,6 @@ GANGLIA_MICRO_VERSION=1 # appears to be consistent with the way Blastwave does things REL=1 -# If we are releasing a snapshot (beta), set GANGLIA_SNAPSHOT to "yes" -# If we are creating an official release, set it to "no" -GANGLIA_SNAPSHOT="yes" - # If there are any changes to libganglia in this release, you need to... # LIBGANGLIA_MICRO_VERSION += 1; # LIBGANGLIA_INTERFACE_AGE += 1; @@ -70,14 +65,7 @@ LIBGANGLIA_INTERFACE_AGE=0 LIBGANGLIA_BINARY_AGE=0 ### END RELEASE VARIABLES ############################# -if test x"$GANGLIA_SNAPSHOT" != xyes; -then GANGLIA_VERSION=$GANGLIA_MAJOR_VERSION.$GANGLIA_MINOR_VERSION.$GANGLIA_MICRO_VERSION -else -GANGLIA_NANO_VERSION=0 -AC_DEFINE_UNQUOTED(GANGLIA_NANO_VERSION, $GANGLIA_NANO_VERSION, GANGLIA_NANO_VERSION) -GANGLIA_VERSION=$GANGLIA_MAJOR_VERSION.$GANGLIA_MINOR_VERSION.$GANGLIA_MICRO_VERSION.$GANGLIA_NANO_VERSION -fi AM_INIT_AUTOMAKE(ganglia, $GANGLIA_VERSION) diff --git a/debian/gmetad.conf b/debian/gmetad.conf index 5165c0aed..1adf2080b 100644 --- a/debian/gmetad.conf +++ b/debian/gmetad.conf @@ -1,7 +1,6 @@ # This is an example of a Ganglia Meta Daemon configuration file # http://ganglia.sourceforge.net/ # -# $Id$ # # Setting the debug_level above zero will make gmetad output # debugging information and stay in the foreground diff --git a/ganglia.spec.in b/ganglia.spec.in index a2c465533..db6ce2436 100644 --- a/ganglia.spec.in +++ b/ganglia.spec.in @@ -1,5 +1,4 @@ # -# $Id$ # # @configure_input@ # diff --git a/gmetad/cleanup.c b/gmetad/cleanup.c index d93ded03b..22411720f 100644 --- a/gmetad/cleanup.c +++ b/gmetad/cleanup.c @@ -1,4 +1,3 @@ -/* $Id$ */ /* * cleanup.c - Enforces metric/host delete time. Helps keep * memory usage trim and fit by deleting expired metrics from hash. diff --git a/gmetad/daemon_init.c b/gmetad/daemon_init.c index b514a56bb..21edd8b6f 100644 --- a/gmetad/daemon_init.c +++ b/gmetad/daemon_init.c @@ -1,7 +1,6 @@ /** * @file daemon_init.c Functions for standalone daemons */ -/* $Id$ */ #include #include #include diff --git a/gmetad/data_thread.c b/gmetad/data_thread.c index 336c62191..95cbb3dc7 100644 --- a/gmetad/data_thread.c +++ b/gmetad/data_thread.c @@ -1,4 +1,3 @@ -/* $Id$ */ #include #include #include diff --git a/gmetad/gmetad.c b/gmetad/gmetad.c index 1dd8163f5..8bc8ee074 100644 --- a/gmetad/gmetad.c +++ b/gmetad/gmetad.c @@ -1,4 +1,3 @@ -/* $Id$ */ #include #include #include diff --git a/gmetad/gmetad.conf.in b/gmetad/gmetad.conf.in index 5da2c3a19..ed670d7fa 100644 --- a/gmetad/gmetad.conf.in +++ b/gmetad/gmetad.conf.in @@ -1,7 +1,6 @@ # This is an example of a Ganglia Meta Daemon configuration file # http://ganglia.sourceforge.net/ # -# $Id$ # #------------------------------------------------------------------------------- # Setting the debug_level to 1 will keep daemon in the forground and diff --git a/gmetad/gmetad.init b/gmetad/gmetad.init index 5b20b79ec..ce2ae42dc 100755 --- a/gmetad/gmetad.init +++ b/gmetad/gmetad.init @@ -1,5 +1,4 @@ #!/bin/sh -# $Id$ # # chkconfig: 2345 20 80 # description: gmetad startup script diff --git a/gmetad/metric_hash.c b/gmetad/metric_hash.c index 1a3fb58b4..ea61561f4 100644 --- a/gmetad/metric_hash.c +++ b/gmetad/metric_hash.c @@ -1,6 +1,5 @@ /* C code produced by gperf version 2.7.2 */ /* Command-line: gperf -G -l -H metric_hash -t -F ', 0' -N in_metric_list -k '1,6,$' -W metrics ./metric_hash.gperf */ -/* $Id$ */ /* Included for the metric_tyep definition */ #include diff --git a/gmetad/type_hash.c b/gmetad/type_hash.c index c452ca4ff..8aecc891d 100644 --- a/gmetad/type_hash.c +++ b/gmetad/type_hash.c @@ -30,7 +30,6 @@ error "gperf generated tables don't work with this execution character set. Plea #line 1 "type_hash.gperf" -/* $Id$ */ /* Recognizes metric types. * Build with: gperf -G -l -H type_hash -t -F ', 0' -N in_type_list -k 1,$ \ * -W types ./type_hash.gperf > type_hash.c diff --git a/gmetad/type_hash.gperf b/gmetad/type_hash.gperf index dbf3470fc..04524101c 100644 --- a/gmetad/type_hash.gperf +++ b/gmetad/type_hash.gperf @@ -1,5 +1,4 @@ %{ -/* $Id$ */ /* Recognizes metric types. * Build with: gperf -G -l -H type_hash -t -F ', 0' -N in_type_list -k 1,$ \ * -W types ./type_hash.gperf > type_hash.c diff --git a/gmetad/xml_hash.c b/gmetad/xml_hash.c index ea88280da..fd11689f8 100644 --- a/gmetad/xml_hash.c +++ b/gmetad/xml_hash.c @@ -30,7 +30,6 @@ error "gperf generated tables don't work with this execution character set. Plea #line 1 "xml_hash.gperf" -/* $Id$ */ #include #line 5 "xml_hash.gperf" struct xml_tag; diff --git a/gmetad/xml_hash.gperf b/gmetad/xml_hash.gperf index 12fc2cd79..9b68486d2 100644 --- a/gmetad/xml_hash.gperf +++ b/gmetad/xml_hash.gperf @@ -1,5 +1,4 @@ %{ -/* $Id$ */ #include %} struct xml_tag; diff --git a/gmond/g25_config.c b/gmond/g25_config.c index 8e36d106d..9b1bc0b70 100644 --- a/gmond/g25_config.c +++ b/gmond/g25_config.c @@ -1,4 +1,3 @@ -/* $Id$ */ #include #include #include "ganglia_priv.h" diff --git a/gmond/gmond.init b/gmond/gmond.init index eadca000a..e3de43f74 100755 --- a/gmond/gmond.init +++ b/gmond/gmond.init @@ -1,5 +1,4 @@ #!/bin/sh -# $Id$ # # chkconfig: 2345 70 40 # description: gmond startup script diff --git a/gstat/gstat.c b/gstat/gstat.c index 639078040..5d72e16e4 100644 --- a/gstat/gstat.c +++ b/gstat/gstat.c @@ -1,4 +1,3 @@ -/* $Id$ */ #if HAVE_CONFIG_H #include #endif /* HAVE_CONFIG_H */ diff --git a/lib/become_a_nobody.c b/lib/become_a_nobody.c index 9d65dcbb5..dd9910f26 100644 --- a/lib/become_a_nobody.c +++ b/lib/become_a_nobody.c @@ -1,4 +1,3 @@ -/* $Id$ */ #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/lib/daemon_inetd.c b/lib/daemon_inetd.c index 4425e2579..def583280 100644 --- a/lib/daemon_inetd.c +++ b/lib/daemon_inetd.c @@ -1,7 +1,6 @@ /** * @file daemon_inetd.c Functions for inetd daemons */ -/* $Id$ */ #include #include diff --git a/lib/debug_msg.c b/lib/debug_msg.c index eb364ba07..a620be3ca 100644 --- a/lib/debug_msg.c +++ b/lib/debug_msg.c @@ -1,7 +1,6 @@ /** * @file debug_msg.c Debug Message function */ -/* $Id$ */ #include #include diff --git a/lib/error_msg.c b/lib/error_msg.c index 0ba421576..5143c658b 100644 --- a/lib/error_msg.c +++ b/lib/error_msg.c @@ -1,7 +1,6 @@ /** * @file error_msg.c Error Handling Functions */ -/* $Id$ */ #ifdef HAVE_CONFIG_H #include "config.h" diff --git a/lib/file.c b/lib/file.c index c4715c457..ec423b9f4 100644 --- a/lib/file.c +++ b/lib/file.c @@ -1,7 +1,6 @@ /** * @file file.c Some file functions */ -/* $Id$ */ #include #include #include diff --git a/lib/ganglia.c b/lib/ganglia.c index b1e528065..48481bcfa 100644 --- a/lib/ganglia.c +++ b/lib/ganglia.c @@ -1,7 +1,6 @@ /** * @file gexec_funcs.c Functions to support gexec, gstat et al */ -/* $Id$ */ #include #include #include diff --git a/lib/hash.c b/lib/hash.c index 0b452d854..c85e938f1 100644 --- a/lib/hash.c +++ b/lib/hash.c @@ -1,4 +1,3 @@ -/* $Id$ */ #include #include #include diff --git a/lib/inetaddr.c b/lib/inetaddr.c index 994769894..9baaeb006 100644 --- a/lib/inetaddr.c +++ b/lib/inetaddr.c @@ -1,5 +1,4 @@ /* - * $Id$ * This code was originally written by the authors below but * I rewrote it and took out all the glib dependencies. * diff --git a/lib/llist.c b/lib/llist.c index 3ee816938..78e411fc3 100644 --- a/lib/llist.c +++ b/lib/llist.c @@ -1,5 +1,4 @@ /* - * $Id$ * "Copyright (c) 1999 by Brent N. Chun and The Regents of the University * of California. All rights reserved." * diff --git a/lib/my_inet_ntop.c b/lib/my_inet_ntop.c index 4491dee55..75fb0f0c2 100644 --- a/lib/my_inet_ntop.c +++ b/lib/my_inet_ntop.c @@ -1,4 +1,3 @@ -/* $Id$ */ #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/lib/net.h b/lib/net.h index eb942d1ee..4c9b27165 100644 --- a/lib/net.h +++ b/lib/net.h @@ -1,6 +1,5 @@ #ifndef NET_H #define NET_H 1 -/* $Id$ */ #ifdef HAVE_CONFIG_H #include diff --git a/lib/tcp.c b/lib/tcp.c index 449159049..667c4b9a3 100644 --- a/lib/tcp.c +++ b/lib/tcp.c @@ -1,5 +1,4 @@ /* - * $Id$ * This code was originally written by the authors below but * I rewrote it and took out all the glib dependencies. * diff --git a/libmetrics/bootstrap b/libmetrics/bootstrap index 96065abaf..bcaca1089 100755 --- a/libmetrics/bootstrap +++ b/libmetrics/bootstrap @@ -1,5 +1,4 @@ #!/bin/sh -# $Id$ #echo "Running make distclean" #make distclean echo "Running aclocal" && @@ -7,11 +6,11 @@ aclocal && echo "Running autoheader" && autoheader && echo "Preparing tree" && -mkdir -p build && touch ChangeLog && ../scripts/svn2cl.sh -i --alternate-strip-prefix="/trunk/monitor-core/libmetrics/" --break-before-msg=1 --reparagraph +mkdir -p build && echo "Running automake" && -automake --add-missing --copy 2>/dev/null +automake --add-missing --copy --foreign 2>/dev/null echo "Running libtoolize" && -libtoolize --automake --copy && automake --add-missing --copy && +libtoolize --automake --copy && automake --add-missing --copy --foreign && echo "Running autoconf" && autoconf -f || exit 1 echo diff --git a/scripts/README.svn2cl b/scripts/README.svn2cl deleted file mode 100644 index cf5b86558..000000000 --- a/scripts/README.svn2cl +++ /dev/null @@ -1,102 +0,0 @@ - svn2cl - create a ChangeLog from a subversion log - - Copyright (C) 2004, 2005, 2006, 2007, 2008 Arthur de Jong - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions - are met: - 1. Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - 2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in - the documentation and/or other materials provided with the - distribution. - 3. The name of the author may not be used to endorse or promote - products derived from this software without specific prior - written permission. - - THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY - DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE - GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER - IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR - OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN - IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - -INTRODUCTION -============ - -svn2cl is a simple xsl transformation and shell script wrapper for generating -a classic GNU-style ChangeLog from a subversion repository log. It is made -from several changelog-like scripts using common xslt constructs found in -different places. - -I made it because it was the only thing that I missed from cvs after I -converted a repository to subversion. I used cvs2cl before. - -INSTALLING SVN2CL -================= - -Just unpack the tarball in some directory (e.g. /opt/svn2cl-0.10) -and symlink the svn2cl.sh script in your path somewhere (e.g. -ln -s /opt/svn2cl-0.10/svn2cl.sh /usr/local/bin/svn2cl). - -Note: Be sure to keep the svn2cl.xsl file in the same directory as the -svn2cl.sh script as the script looks for it there (symlinking is ok). - -USING SVN2CL IN AN ANT TARGET -============================= - -It is possible to use svn2cl in an ant target with a snippet like: - - - - - - - - - - - - - - - -Although it seems that currently the xslt processor that is used by ant -inserts newlines in places it shouldn't. This can be worked around by -replacing &newl; throughout the xsl files by . - -WINDOWS PORT -============ - -A VBScript port of the wrapper shell script has been made by Iwasa Kazmi, -which allows running svn2cl on Microsoft Windows without a POSIX compatibility -layer and xsltproc. More information is available here: -http://www.cosmo-system.jp/iwasa/svn2clwin.html - -NOTES -===== - -The log is performed on the current directory '.' unless you specify URL -and/or PATH parameters. Before generating the ChangeLog you may want to make -your working copy up to date with 'svn update' (non-recursive update will do) -or pass --revision HEAD:1 as a parameter to svn2cl.sh. - -There will not be very frequent new releases but if there are they can be -found at: http://ch.tudelft.nl/~arthur/svn2cl/ - -FEEDBACK AND BUG REPORTS -======================== - -If you have any questions about svn2cl or would like to report a bug please -send an email to Arthur de Jong . diff --git a/scripts/fixconfig.in b/scripts/fixconfig.in index 9208c2250..2098359ee 100644 --- a/scripts/fixconfig.in +++ b/scripts/fixconfig.in @@ -1,6 +1,5 @@ #! /bin/sh -## $Id$ ## ## Make variable substitutions in configuration files. ## diff --git a/scripts/package-ganglia-release b/scripts/package-ganglia-release index 9be05ce18..d381b3a9b 100755 --- a/scripts/package-ganglia-release +++ b/scripts/package-ganglia-release @@ -1,6 +1,5 @@ #!/bin/bash # -# $Id$ # $Author$ # diff --git a/scripts/svn2cl.sh b/scripts/svn2cl.sh deleted file mode 100755 index d05a75b42..000000000 --- a/scripts/svn2cl.sh +++ /dev/null @@ -1,345 +0,0 @@ -#!/bin/sh - -# svn2cl.sh - front end shell script for svn2cl.xsl, calls xsltproc -# with the correct parameters -# -# Copyright (C) 2005, 2006, 2007, 2008 Arthur de Jong. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# 1. Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# 2. Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in -# the documentation and/or other materials provided with the -# distribution. -# 3. The name of the author may not be used to endorse or promote -# products derived from this software without specific prior -# written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR -# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY -# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE -# GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER -# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN -# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -# exit on any failures -set -e -# report unset variables -set -u - -# svn2cl version -VERSION="0.11" - -# set default parameters -PWD=`pwd` -STRIPPREFIX="AUTOMATICALLY-DETERMINED" -ALTERNATESTRIPPREFIX="no" -LINELEN=75 -GROUPBYDAY="no" -INCLUDEREV="no" -BREAKBEFOREMSG="no" -REPARAGRAPH="no" -SEPARATEDAYLOGS="no" -ACTIONS="no" -CHANGELOG="" -OUTSTYLE="cl" -SVNLOGCMD="svn --verbose --xml log" -SVNINFOCMD="svn info" -AUTHORSFILE="" -IGNORE_MESSAGE_STARTING="" -TITLE="ChangeLog" -REVISION_LINK="#r" -TMPFILES="" -AWK="awk" - -# do command line checking -prog=`basename $0` -while [ $# -gt 0 ] -do - case "$1" in - --strip-prefix) - STRIPPREFIX="$2" - shift 2 || { echo "$prog: option requires an argument -- $1";exit 1; } - ;; - --strip-prefix=*) - STRIPPREFIX=`echo "$1" | sed 's/^--[a-z-]*=//'` - shift - ;; - --alternate-strip-prefix=*) - ALTERNATESTRIPPREFIX=`echo "$1" | sed 's/^--[a-z-]*=//'` - shift - ;; - --linelen) - LINELEN="$2"; - shift 2 || { echo "$prog: option requires an argument -- $1";exit 1; } - ;; - --linelen=*) - LINELEN=`echo "$1" | sed 's/^--[a-z-]*=//'` - shift - ;; - --group-by-day) - GROUPBYDAY="yes"; - shift - ;; - --separate-daylogs) - SEPARATEDAYLOGS="yes" - shift - ;; - -i|--include-rev) - INCLUDEREV="yes"; - shift - ;; - -a|--include-actions) - ACTIONS="yes" - shift - ;; - --break-before-msg|--breaks-before-msg) - # FIXME: if next argument is numeric use that as a parameter - BREAKBEFOREMSG="yes" - shift - ;; - --break-before-msg=*|--breaks-before-msg=*) - BREAKBEFOREMSG=`echo "$1" | sed 's/^--[a-z-]*=//'` - shift - ;; - --reparagraph) - REPARAGRAPH="yes" - shift - ;; - --title) - TITLE="$2" - shift 2 || { echo "$prog: option requires an argument -- $1";exit 1; } - ;; - --title=*) - TITLE=`echo "$1" | sed 's/^--[a-z-]*=//'` - shift - ;; - --revision-link) - REVISION_LINK="$2" - shift 2 || { echo "$prog: option requires an argument -- $1";exit 1; } - ;; - --revision-link=*) - REVISION_LINK=`echo "$1" | sed 's/^--[a-z-]*=//'` - shift - ;; - --ignore-message-starting) - IGNORE_MESSAGE_STARTING="$2" - shift 2 || { echo "$prog: option requires an argument -- $1";exit 1; } - ;; - --ignore-message-starting=*) - IGNORE_MESSAGE_STARTING=`echo "$1" | sed 's/^--[a-z-]*=//'` - shift - ;; - -f|--file|-o|--output) - CHANGELOG="$2" - shift 2 || { echo "$prog: option requires an argument -- $1";exit 1; } - ;; - --file=*|--output=*) - CHANGELOG=`echo "$1" | sed 's/^--[a-z-]*=//'` - shift - ;; - --stdout) - CHANGELOG="-" - shift - ;; - --authors) - AUTHORSFILE="$2" - shift 2 || { echo "$prog: option requires an argument -- $1";exit 1; } - ;; - --authors=*) - AUTHORSFILE=`echo "$1" | sed 's/^--[a-z-]*=//'` - shift - ;; - --html) - OUTSTYLE="html" - shift - ;; - -r|--revision|--targets|--limit) - # add these as extra options to the command (with argument) - arg=`echo "$2" | sed "s/'/'\"'\"'/g"` - SVNLOGCMD="$SVNLOGCMD $1 '$arg'" - shift 2 || { echo "$prog: option requires an argument -- $1";exit 1; } - ;; - --username|--password|--config-dir) - # add these as extra options to the command (with argument) - arg=`echo "$2" | sed "s/'/'\"'\"'/g"` - SVNLOGCMD="$SVNLOGCMD $1 '$arg'" - # also add to svn info command - SVNINFOCMD="$SVNINFOCMD $1 '$arg'" - shift 2 || { echo "$prog: option requires an argument -- $1";exit 1; } - ;; - --revision=*|--targets=*|--limit=*) - # these are single argument versions of the above - arg=`echo "$1" | sed "s/'/'\"'\"'/g"` - SVNLOGCMD="$SVNLOGCMD '$arg'" - shift - ;; - --username=*|--password=*|--config-dir=*) - # these are single argument versions of the above - arg=`echo "$1" | sed "s/'/'\"'\"'/g"` - SVNLOGCMD="$SVNLOGCMD '$arg'" - # also add to svn info command - SVNINFOCMD="$SVNINFOCMD '$arg'" - shift - ;; - --stop-on-copy) - # add these as simple options - SVNLOGCMD="$SVNLOGCMD $1" - shift - ;; - --no-auth-cache|--non-interactive) - # add these as simple options - SVNLOGCMD="$SVNLOGCMD $1" - # also add to svn info command - SVNINFOCMD="$SVNINFOCMD $1" - shift - ;; - -V|--version) - echo "$prog $VERSION"; - echo "Written by Arthur de Jong." - echo "" - echo "Copyright (C) 2005, 2006, 2007 Arthur de Jong." - echo "This is free software; see the source for copying conditions. There is NO" - echo "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." - exit 0 - ;; - -h|--help) - echo "Usage: $prog [OPTION]... [PATH]..." - echo "Generate a ChangeLog from a subversion repository." - echo "" - echo " --strip-prefix=NAME prefix to strip from all entries, defaults" - echo " path inside the repository" - echo " --alternate-strip-prefix=NAME alternate prefix to strip from all" - echo " entries; useful to avoid filtering" - echo " entries that don't match the strip" - echo " prefix because they were in a" - echo " different branch originally" - echo " --linelen=NUM maximum length of an output line" - echo " --group-by-day group changelog entries by day" - echo " --separate-daylogs put a blank line between grouped by day entries" - echo " -i, --include-rev include revision numbers" - echo " -a, --include-actions add [ADD], [DEL] and [CPY] tags to files" - echo " --break-before-msg[=NUM] add a line break (or multiple breaks)" - echo " between the paths and the log message" - echo " --reparagraph rewrap lines inside a paragraph" - echo " --title=NAME title used in html file" - echo " --revision-link=NAME link revision numbers in html output" - echo " --ignore-message-starting=STRING" - echo " ignore messages starting with the string" - echo " -o, --output=FILE output to FILE instead of ChangeLog" - echo " -f, --file=FILE alias for -o, --output" - echo " --stdout output to stdout instead of ChangeLog" - echo " --authors=FILE file to read for authors" - echo " --html output as html instead of plain text" - echo " -h, --help display this help and exit" - echo " -V, --version output version information and exit" - echo "" - echo "PATH arguments and the following options are passed to the svn log" - echo "command: -r, --revision, --targets --stop-on-copy, --username," - echo "--password, --no-auth-cache, --non-interactive, --config-dir and" - echo "--limit (see 'svn help log' for more information)." - exit 0 - ;; - -*) - echo "$prog: invalid option -- $1" - echo "Try '$prog --help' for more information." - exit 1 - ;; - *) - arg=`echo "$1" | sed "s/'/'\"'\"'/g"` - SVNLOGCMD="$SVNLOGCMD '$arg'" - SVNINFOCMD="$SVNINFOCMD '$arg'" - shift - ;; - esac -done - -# find the directory that this script resides in -prog="$0" -while [ -h "$prog" ] -do - dir=`dirname "$prog"` - prog=`ls -ld "$prog" | sed "s/^.*-> \(.*\)/\1/;/^[^/]/s,^,$dir/,"` -done -dir=`dirname "$prog"` -dir=`cd "$dir" && pwd` -XSL="$dir/svn2${OUTSTYLE}.xsl" - -# check if the authors file is formatted as a legacy -# colon separated file -if [ -n "$AUTHORSFILE" ] && \ - egrep '^(#.*|[a-zA-Z0-9].*:)' "$AUTHORSFILE" > /dev/null 2>/dev/null -then - # create a temporary file - tmpfile=`mktemp -t svn2cl.XXXXXX 2> /dev/null || tempfile -s .svn2cl 2> /dev/null || echo "$AUTHORSFILE.$$.xml"` - arg=`echo "$tmpfile" | sed "s/'/'\"'\"'/g"` - TMPFILES="$TMPFILES '$arg'" - # generate an authors.xml file on the fly - echo '' > "$tmpfile" - sed -n 's/&/\&/g;s//\>/g;s|^\([a-zA-Z0-9][^:]*\):\(.*\)$| \2|p' \ - < "$AUTHORSFILE" >> "$tmpfile" - echo '' >> "$tmpfile" - AUTHORSFILE="$tmpfile" -fi - -# find the absolute path of the authors file -# (otherwise xsltproc will find the file relative to svn2cl.xsl) -pwd=`pwd` -AUTHORSFILE=`echo "$AUTHORSFILE" | sed "/^[^/]/s|^|$pwd/|"` - -# if no filename was specified, make one up -if [ -z "$CHANGELOG" ] -then - CHANGELOG="ChangeLog" - if [ "$OUTSTYLE" != "cl" ] - then - CHANGELOG="$CHANGELOG.$OUTSTYLE" - fi -fi - -# try to determin a prefix to strip from all paths -if [ "$STRIPPREFIX" = "AUTOMATICALLY-DETERMINED" ] -then - STRIPPREFIX=`LANG=C eval "$SVNINFOCMD" 2> /dev/null | $AWK '/^URL:/{url=$2} /^Repository Root:/{root=$3} END{if(root){print substr(url,length(root)+2)}else{if(n=index(url,"trunk")){print substr(url,n)}else{if(n=index(url,"branches")){print substr(url,n)}else{n=split(url,u,"/");print u[n]}}}}'` - STRIPPREFIX=`echo "$STRIPPREFIX" | sed 's/%20/ /g'` -fi - -# redirect stdout to the changelog file if needed -if [ "x$CHANGELOG" != "x-" ] -then - exec > "$CHANGELOG" -fi - -# actually run the command we need -eval "$SVNLOGCMD" | \ - xsltproc --stringparam strip-prefix "$STRIPPREFIX" \ - --stringparam alternate-strip-prefix "$ALTERNATESTRIPPREFIX" \ - --stringparam linelen "$LINELEN" \ - --stringparam groupbyday "$GROUPBYDAY" \ - --stringparam separate-daylogs "$SEPARATEDAYLOGS" \ - --stringparam include-rev "$INCLUDEREV" \ - --stringparam include-actions "$ACTIONS" \ - --stringparam breakbeforemsg "$BREAKBEFOREMSG" \ - --stringparam reparagraph "$REPARAGRAPH" \ - --stringparam authorsfile "$AUTHORSFILE" \ - --stringparam title "$TITLE" \ - --stringparam revision-link "$REVISION_LINK" \ - --stringparam ignore-message-starting "$IGNORE_MESSAGE_STARTING" \ - --nowrite \ - --nomkdir \ - --nonet \ - "$XSL" - - -# clean up temporary files -[ -n "$TMPFILES" ] && eval "rm -f $TMPFILES" - -# we're done (the previous command could return false) -exit 0 diff --git a/scripts/svn2cl.xsl b/scripts/svn2cl.xsl deleted file mode 100644 index a529ed2eb..000000000 --- a/scripts/svn2cl.xsl +++ /dev/null @@ -1,509 +0,0 @@ - - - - - - - -]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - &newl; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - &newl; - - - - - &space;&space; - - - - &newl; - &newl; - - - - - - - &newl; - - - - - &space;&space; - - - - &newl;&newl; - - - - - - - - - - [r - - ]&space; - - - - - - - - &newl; - - - - - - - - - - - - - &newl; - - &tab;*&space; - - - - - - - - - - - - - - - - - - - - - - &space; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ,&space; - - - - - - - - - - - - - - - - - - - - - - - - - - - ,&space; - - - - - - - - - - - - - - - - [DEL] - - - [CPY] - - - [ADD] - - - - - - - - - - - - - - - - - - - - - - - . - - - - - - - - - - - - - - - - - - - &tab;&space;&space; - - - - - - - - - - &newl; - - - - - - - - - - - - - - - - - - - - - - &newl;&tab;&space;&space; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - &newl;&newl; - - - - - - - - - - - - - - - - - - - - &newl; - - - - - - - - diff --git a/scripts/tag-ganglia-release b/scripts/tag-ganglia-release index e5f40c5b6..956330636 100755 --- a/scripts/tag-ganglia-release +++ b/scripts/tag-ganglia-release @@ -1,6 +1,5 @@ #!/bin/bash # -# $Id$ # $Author$ # diff --git a/web/cluster_view.php b/web/cluster_view.php index cf6c37d55..5351e950e 100644 --- a/web/cluster_view.php +++ b/web/cluster_view.php @@ -1,5 +1,4 @@ assign("extra", template("cluster_extra.tpl")); diff --git a/web/conf.php.in b/web/conf.php.in index 481f88fc1..b0fc58be5 100644 --- a/web/conf.php.in +++ b/web/conf.php.in @@ -1,5 +1,4 @@ assign("webfrontend_version",$version["webfrontend"]); diff --git a/web/ganglia.php b/web/ganglia.php index 7751ff1b2..e2c683522 100644 --- a/web/ganglia.php +++ b/web/ganglia.php @@ -1,5 +1,4 @@