[Box Backup-commit] COMMIT r1705 - box/chris/merge/infrastructure

boxbackup-dev at fluffy.co.uk boxbackup-dev at fluffy.co.uk
Wed Jun 27 20:54:54 BST 2007


Author: chris
Date: 2007-06-27 20:54:54 +0100 (Wed, 27 Jun 2007)
New Revision: 1705

Modified:
   box/chris/merge/infrastructure/BoxPlatform.pm.in
Log:
Handle USE_SVN_VERSION in the middle of a version string.


Modified: box/chris/merge/infrastructure/BoxPlatform.pm.in
===================================================================
--- box/chris/merge/infrastructure/BoxPlatform.pm.in	2007-06-27 19:17:57 UTC (rev 1704)
+++ box/chris/merge/infrastructure/BoxPlatform.pm.in	2007-06-27 19:54:54 UTC (rev 1705)
@@ -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




More information about the Boxbackup-commit mailing list