summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobi Oetiker <tobi@oetiker.ch>2008-06-10 15:08:07 +0200
committerTobi Oetiker <tobi@oetiker.ch>2008-06-10 15:08:07 +0200
commit424e08410b2cdbf963c07cca0834ba66a541b703 (patch)
tree79b84c65ff0b4b24eaa46b98d998be43b6ad469a
parent8d5f45365467584b313528c60c6f3a902e02c1a4 (diff)
downloadsmokeping-424e08410b2cdbf963c07cca0834ba66a541b703.tar.gz
smokeping-424e08410b2cdbf963c07cca0834ba66a541b703.tar.xz
prepare for the release of smokeping-2.4.0
-rw-r--r--CHANGES2
-rw-r--r--Makefile10
-rwxr-xr-xbin/smokeping.dist2
-rwxr-xr-xbin/tSmoke.dist2
-rwxr-xr-xhtdocs/smokeping.cgi.dist2
-rw-r--r--lib/Smokeping.pm2
6 files changed, 14 insertions, 6 deletions
diff --git a/CHANGES b/CHANGES
index 4dfb362..3c1d65a 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+2008/6/10 -- released version 2.4.0
+
* building a --static version of the smokeping page is broken. Make
it a little less broken by providing a dummyCGI->script_name method.
--tobi
diff --git a/Makefile b/Makefile
index 0bbc548..82cc865 100644
--- a/Makefile
+++ b/Makefile
@@ -1,12 +1,12 @@
SHELL = /bin/sh
-VERSION := 2.3.6
+VERSION := 2.4.0
SVNREPO = svn://svn.oetiker.ch/smokeping
############ A is for features
############ B is for bugfixes
############ V.AAABBB
############ 2.000001
############ 2.000002
-NUMVERSION = 2.003006
+NUMVERSION = 2.004000
IGNORE = ~|CVS|var/|smokeping-$(VERSION)/smokeping-$(VERSION)|cvsignore|rej|orig|DEAD|pod2htm[di]\.tmp|\.svn|tar\.gz|DEADJOE|svn-commit\.tmp
GROFF = groff
PERL = perl-5.8.8
@@ -163,6 +163,12 @@ smokeping-$(VERSION).tar.gz:
svn export $(SVNREPO)/trunk/software smokeping-$(VERSION)
rm -rf smokeping-$(VERSION)/qooxdoo
(cd smokeping-$(VERSION) && $(MAKE) doc)
+ (cd smokeping-$(VERSION)/qooxdoo && $(MAKE) build; \
+ cp build/tr.cgi ../htdocs/tr.cgi.dist; \
+ cp build/index.html ../htdocs/tr.html; \
+ cp -rp build/script ../htdocs; \
+ cp -rp build/resource ../htdocs;\
+ cp -rp build/perl/* ../lib/)
tar czvf smokeping-$(VERSION).tar.gz --exclude '*.tmp' smokeping-$(VERSION)
rm -rf smokeping-$(VERSION)
diff --git a/bin/smokeping.dist b/bin/smokeping.dist
index 14dcdb2..148a880 100755
--- a/bin/smokeping.dist
+++ b/bin/smokeping.dist
@@ -4,7 +4,7 @@
use lib qw(/usr/pack/rrdtool-1.2.23-mo/lib/perl);
use lib qw(lib);
-use Smokeping 2.003006;
+use Smokeping 2.004000;
Smokeping::main("etc/config.dist");
diff --git a/bin/tSmoke.dist b/bin/tSmoke.dist
index e87bb93..cf876f8 100755
--- a/bin/tSmoke.dist
+++ b/bin/tSmoke.dist
@@ -53,7 +53,7 @@ use strict;
use lib qw(lib);
use lib "/usr/local/rrdtool-1.0.39/lib/perl";
-use Smokeping 2.003006;
+use Smokeping 2.004000;
use Net::SMTP;
use Getopt::Long;
use Pod::Usage;
diff --git a/htdocs/smokeping.cgi.dist b/htdocs/smokeping.cgi.dist
index 2714ce1..6e462d8 100755
--- a/htdocs/smokeping.cgi.dist
+++ b/htdocs/smokeping.cgi.dist
@@ -5,7 +5,7 @@ use lib qw(/usr/pack/rrdtool-1.0.33-to/lib/perl);
use lib qw(/home/oetiker/data/projects/AADJ-smokeping/dist/lib);
use CGI::Carp qw(fatalsToBrowser);
-use Smokeping 2.003006;
+use Smokeping 2.004000;
Smokeping::cgi("/home/oetiker/data/projects/AADJ-smokeping/dist/etc/config");
diff --git a/lib/Smokeping.pm b/lib/Smokeping.pm
index af5906c..5f47efc 100644
--- a/lib/Smokeping.pm
+++ b/lib/Smokeping.pm
@@ -38,7 +38,7 @@ use Smokeping::RRDtools;
# globale persistent variables for speedy
use vars qw($cfg $probes $VERSION $havegetaddrinfo $cgimode);
-$VERSION="2.003006";
+$VERSION="2.004000";
# we want opts everywhere
my %opt;