[Box Backup-commit] COMMIT r3571 - box/trunk/infrastructure

[subversion at boxbackup.org]

Author: chris
Date: 2015-05-16 11:54:21 +0000 (Sat, 16 May 2015)
New Revision: 3571

Modified:
   box/trunk/infrastructure/BoxPlatform.pm.in
Log:
Include full platform name in parcels, to distinguish 64-bit builds.

Modified: box/trunk/infrastructure/BoxPlatform.pm.in
===================================================================
--- box/trunk/infrastructure/BoxPlatform.pm.in	2015-05-16 11:54:16 UTC (rev 3570)
+++ box/trunk/infrastructure/BoxPlatform.pm.in	2015-05-16 11:54:21 UTC (rev 3571)
@@ -82,19 +82,30 @@
 	if($product_version =~ /USE_SVN_VERSION/)
 	{
 		# for developers, use SVN version
-		my $svnversion = `svnversion .`;
-		chomp $svnversion;
-		$svnversion =~ tr/0-9A-Za-z/_/c;
-		open INFO,'svn info . |';
-		my $svnurl;
-		while(<INFO>)
+		my $svnversion = 'unknown';
+		my $svnurl = 'unknown';
+
+		if(-d '.svn')
 		{
-			if(m/^URL: (.+?)[\n\r]+/)
+			my $svnversion = `svnversion .`;
+			chomp $svnversion;
+			$svnversion =~ tr/0-9A-Za-z/_/c;
+			open INFO,'svn info . |';
+			while(<INFO>)
 			{
-				$svnurl = $1
+				if(m/^URL: (.+?)[\n\r]+/)
+				{
+					$svnurl = $1
+				}
 			}
+			close INFO;
 		}
-		close INFO;
+		elsif(-d '.git')
+		{
+			$svnversion = `git svn info | grep '^Revision:' | cut -d' ' -f2`;
+			chomp $svnversion;
+			$svnurl = `git svn info --url`;
+		}
 
 		my $svndir;
 		if ($svnurl =~ m!/box/(.+)$!)
@@ -158,7 +169,7 @@
 
 sub parcel_root
 {
-	my $tos = $_[1] || $ac_target_os;
+	my $tos = $_[1] || $ac_target;
 	return $product_name.'-'.$product_version.'-'.$_[0].'-'.$tos;
 }