[Box Backup-commit] COMMIT r1739 - box/chris/general/infrastructure

[boxbackup-dev@fluffy.co.uk]

Author: chris
Date: 2007-07-26 22:34:55 +0100 (Thu, 26 Jul 2007)
New Revision: 1739

Modified:
   box/chris/general/infrastructure/BoxPlatform.pm.in
Log:
Handle USE_SVN_VERSION in the middle of a version string. (refs #3,
merges [1705])


Modified: box/chris/general/infrastructure/BoxPlatform.pm.in
===================================================================
--- box/chris/general/infrastructure/BoxPlatform.pm.in	2007-07-26 21:34:27 UTC (rev 1738)
+++ box/chris/general/infrastructure/BoxPlatform.pm.in	2007-07-26 21:34:55 UTC (rev 1739)
@@ -51,7 +51,7 @@
 	$product_name = <VERSION>;
 	chomp $product_name;
 	close VERSION;
-	if($product_version eq 'USE_SVN_VERSION')
+	if($product_version =~ /USE_SVN_VERSION/)
 	{
 		# for developers, use SVN version
 		my $svnversion = `svnversion .`;
@@ -70,7 +70,7 @@
 		$svnurl =~ m!box/(.+)$!;
 		my $svndir = $1;
 		$svndir =~ tr/0-9A-Za-z/_/c;
-		$product_version = $svndir.'_'.$svnversion;
+		$product_version =~ s/USE_SVN_VERSION/$svndir.'_'.$svnversion/e;
 	}
 
 	# where to put the files