Merge pull request #2 from alliedmodders/git-buildbot

Switch packaging scripts to Git.
This commit is contained in:
David Anderson 2014-05-25 12:11:01 -07:00
commit c744b39c6d
3 changed files with 20 additions and 2 deletions

View File

@ -9,6 +9,24 @@ our $SVN = "/usr/bin/svn";
our $SVN_USER = 'dvander';
our $SVN_ARGS = '';
sub GitRevNum
{
my ($path) = (@_);
my ($cd, $text, $rev);
$cd = Cwd::cwd();
chdir($path);
$text = `git rev-list --count HEAD`;
chdir($cd);
chomp $text;
if ($text =~ /^(\d+)/) {
return $1;
}
return 0;
}
sub HgRevNum
{
my ($path) = (@_);

View File

@ -34,7 +34,7 @@ my ($version);
$version = Build::ProductVersion(Build::PathFormat('../../build/product.version'));
$version =~ s/-dev//g;
$version .= '-hg' . Build::HgRevNum('../../build');
$version .= '-git' . Build::GitRevNum('../../build');
# Append OS to package version
if ($^O eq "darwin")

View File

@ -16,7 +16,7 @@ open(PDBLOG, '../OUTPUT/pdblog.txt') or die "Could not open pdblog.txt: $!\n";
my ($version);
$version = Build::ProductVersion(Build::PathFormat('product.version'));
$version =~ s/-dev//g;
$version .= '-hg' . Build::HgRevNum('.');
$version .= '-git' . Build::GitRevNum('.');
my ($build_type);
$build_type = Build::GetBuildType(Build::PathFormat('tools/buildbot/build_type'));