[vhffs-dev] [424] Version string now shows *real* svn revision.

[subversion@xxxxxxxxx]

Revision: 424
Author:   beuss
Date:     2007-01-30 18:13:29 +0000 (Tue, 30 Jan 2007)

Log Message:
-----------
Version string now shows *real* svn revision.
Misric, please open a bug for the revision thing so I can close it :)

Modified Paths:
--------------
    branches/vhffs_4.1/Makefile


Modified: branches/vhffs_4.1/Makefile
===================================================================
--- branches/vhffs_4.1/Makefile	2007-01-22 22:15:28 UTC (rev 423)
+++ branches/vhffs_4.1/Makefile	2007-01-30 18:13:29 UTC (rev 424)
@@ -20,9 +20,9 @@
 
 all: help
 
-install: install-api install-panel install-listengine install-tools install-intl install-conf install-backend install-doc install-bots install-shell install-jabber link-api
+install: update-version install-api install-panel install-listengine install-tools install-intl install-conf install-backend install-doc install-bots install-shell install-jabber link-api
 
-install-debian: debian-deps install-api install-panel install-listengine install-tools install-intl install-conf install-backend install-doc install-bots install-shell install-jabber
+install-debian: update-version debian-deps install-api install-panel install-listengine install-tools install-intl install-conf install-backend install-doc install-bots install-shell install-jabber
 	if [ ! -L "/usr/lib/perl5/Vhffs" ]; then ln -s "$(DESTDIR)/usr/share/vhffs/api" "/usr/lib/perl5/Vhffs" ; fi
 
 check: test-deps
@@ -38,6 +38,18 @@
 debian-deps:
 	/usr/bin/apt-get install $(DEBIAN_PACKAGES)
 
+
+update-version:
+	@svnversion | perl -e " \
+		\$$_ = <STDIN>; \
+		/^(?:.*?:)?(\d+)\w*\$$/; \
+		my \$$version = \$$1; \
+		\$$^I = \"\"; \
+		while(<>) { \
+			s/(VHFFS_VERSION.*\d+\.\d+.*?)(?:\d+)(.*)/\$$1\$$version\$$2/; \
+			print; \
+		}" vhffs-api/src/Vhffs/Constants.pm
+
 test-deps:
 	@perl -e " \
 		foreach ( qw( $(PERL_MODULES) ) ) { \
@@ -283,7 +295,13 @@
 	install -d -m 755 $(PANELDIR)/themes/vhffs/images
 	install -m 644 vhffs-panel/themes/vhffs/*.css        $(PANELDIR)/themes/vhffs/
 	install -m 644 vhffs-panel/themes/vhffs/images/*.png $(PANELDIR)/themes/vhffs/images/
+	#next gen theme
+	install -d -m 755 $(PANELDIR)/themes/vhffs-ng
+	install -d -m 755 $(PANELDIR)/themes/vhffs-ng/images
+	install -m 644 vhffs-panel/themes/vhffs-ng/*.css        $(PANELDIR)/themes/vhffs-ng/
+	install -m 644 vhffs-panel/themes/vhffs-ng/images/*.png $(PANELDIR)/themes/vhffs-ng/images/
 
+
 test: test-object test-group test-user test-stats
 test-object:
 	@perl -I vhffs-tests/src/ -I vhffs-api/src/ -e 'use Test::Harness; Test::Harness::runtests("vhffs-tests/src/Object.pl");'