rewrite the +CVS thingy to better support snapshots

Makefile

@@ -3,7 +3,14 @@
 all: release
 
 # Ugly hack to get the version number from Pisg.pm
-VERSION := $(shell grep "version =>" modules/Pisg.pm | sed 's/[^"]*"\([^"]*\)".*/\1/')
+VER = $(shell grep "version =>" modules/Pisg.pm | sed 's/[^"]*"\([^"]*\)+CVS".*/\1/')
+
+# append +CVS.. if SNAPSHOT is defined
+ifeq ($(SNAPSHOT),)
+	VERSION = $(VER)
+else
+	VERSION = $(VER)+CVS_$(shell date +%Y%m%d)
+endif
 
 DIRNAME = pisg-$(VERSION)
 
@@ -140,6 +147,8 @@ release: docs
 	cp $(PARSER_MODULES) $(DIRNAME)/$(MODULESDIR)/Pisg/Parser
 	cp $(FORMAT_MODULES) $(DIRNAME)/$(MODULESDIR)/Pisg/Parser/Format
 
+	perl -i -pe 's/^(.*version => ")[^"]*(".*)/$${1}$(VERSION)$${2}/' $(DIRNAME)/$(MODULESDIR)/Pisg.pm
+
 	tar zcfv newrelease/$(TARFILE) $(DIRNAME)
 	zip -r pisg $(DIRNAME)
 	mv pisg.zip newrelease/$(ZIPFILE)

docs/Changelog

@@ -36,7 +36,8 @@ pisg (0.69) - ??
      + Fix Makefile to support the +CVS string and include it in releasename
      + Fix charts to not include "NULL" tracks. 
    * Features:
-     + Add "+CVS" to versionstring if ./CVS is found
+     + Add "+CVS" to versionstring and remove it in Makefile when running
+       'make release'. This makes snapshot easier.
    * Parsers:
      + Add support for both the 1.0.5(stable) and the 1.1.0(devel) log format 
        of dircproxy.

docs/Makefile

@@ -1,6 +1,6 @@
 all: pisg-doc.txt pisg-doc.html pisg.1
 
-VERSION := $(shell grep "version =>" ../modules/Pisg.pm | sed 's/[^"]*"\([^"]*\)".*/\1/')
+VERSION := $(shell grep "version =>" ../modules/Pisg.pm | sed 's/[^"]*"\([^"]*\)+CVS".*/\1/')
 
 pisg-doc.xml: .version
 .version: ../modules/Pisg.pm

modules/Pisg.pm

@@ -219,7 +219,7 @@ sub get_default_config_settings
         modules_dir => '',         # set in get_cmdline_options
         cchannels => '',           # set in get_cmdline_options
 
-        version => "0.68" . (-d "$self->{search_path}/CVS" ? '+CVS' : ''),
+        version => "0.68+CVS",
     };
 
     # This enables us to use the search_path in other modules