Bugfixes to buildbot scripts, added symstore script.
Removed soon-to-be-outdated fetchdlls program. --HG-- extra : convert_revision : svn%3A39bc706e-5318-0410-9160-8a85361fbb7c/trunk%402512
This commit is contained in:
@@ -45,6 +45,7 @@ if ($^O eq "linux")
|
||||
else
|
||||
{
|
||||
print CONF "BuilderPath = " . $ENV{'MSVC8'} . "\n";
|
||||
print CONF "PDBLog = $root\\OUTPUT\\pdblog.txt\n";
|
||||
}
|
||||
close(CONF);
|
||||
|
||||
|
||||
@@ -8,14 +8,12 @@ package Build;
|
||||
our $SVN = "/usr/bin/svn";
|
||||
our $SVN_USER = 'dvander';
|
||||
our $SVN_ARGS = '';
|
||||
our $SVN_VERSION = "/usr/bin/svnversion";
|
||||
|
||||
sub Revision
|
||||
{
|
||||
my ($str)=(@_);
|
||||
my $dir = $SVN_VERSION;
|
||||
|
||||
my $data = Command($dir . ' -c ' . $str);
|
||||
|
||||
my $data = Command('svnversion -c ' . $str);
|
||||
if ($data =~ /(\d+):(\d+)/)
|
||||
{
|
||||
return $2;
|
||||
@@ -26,6 +24,17 @@ sub Revision
|
||||
}
|
||||
}
|
||||
|
||||
sub ProductVersion
|
||||
{
|
||||
my ($file) = (@_);
|
||||
my ($version);
|
||||
open(FILE, $file) or die "Could not open $file: $!\n";
|
||||
$version = <FILE>;
|
||||
close(FILE);
|
||||
chomp $version;
|
||||
return $version;
|
||||
}
|
||||
|
||||
sub Delete
|
||||
{
|
||||
my ($str)=(@_);
|
||||
@@ -114,3 +123,4 @@ sub SVN_Add
|
||||
chdir($dir);
|
||||
}
|
||||
|
||||
return 1;
|
||||
@@ -31,8 +31,7 @@ chdir(Build::PathFormat('../../OUTPUT/base'));
|
||||
|
||||
my ($version);
|
||||
|
||||
$version = `cat ../../product.version`;
|
||||
chomp $version;
|
||||
$version = Build::ProductVersion(Build::PathFormat('../../product.version'));
|
||||
$version .= '.' . Build::Revision('../..');
|
||||
|
||||
my ($filename);
|
||||
|
||||
Executable
+44
@@ -0,0 +1,44 @@
|
||||
#!/usr/bin/perl
|
||||
|
||||
use File::Basename;
|
||||
|
||||
my ($myself, $path) = fileparse($0);
|
||||
chdir($path);
|
||||
|
||||
require 'helpers.pm';
|
||||
|
||||
chdir('..');
|
||||
chdir('..');
|
||||
|
||||
our $SSH = 'ssh -i ../../smpvkey';
|
||||
|
||||
open(PDBLOG, 'OUTPUT/pdblog.txt') or die "Could not open pdblog.txt: $!\n";
|
||||
|
||||
#Sync us up with the main symbol store
|
||||
rsync('[email protected]:~/public_html/symbols/', '..\\..\\symstore');
|
||||
|
||||
#Get version info
|
||||
my ($version);
|
||||
$version = Build::ProductVersion(Build::PathFormat('product.version'));
|
||||
$version .= '.' . Build::Revision('.');
|
||||
|
||||
my ($line);
|
||||
while (<PDBLOG>)
|
||||
{
|
||||
$line = $_;
|
||||
$line =~ s/\.pdb/\*/;
|
||||
chomp $line;
|
||||
Build::Command("symstore add /r /f \"$line\" /s ..\\..\\symstore /t \"SourceMod\" /v \"$version\" /c \"buildbot\"");
|
||||
}
|
||||
|
||||
close(PDBLOG);
|
||||
|
||||
#Now that we're done, rsync back.
|
||||
rsync('..\\..\\symstore\\', '[email protected]:~/public_html/symbols');
|
||||
|
||||
sub rsync
|
||||
{
|
||||
my ($from, $to) = (@_);
|
||||
|
||||
Build::Command('rsync -av --delete -e="' . $SSH . '" ' . $from . ' ' . $to);
|
||||
}
|
||||
Reference in New Issue
Block a user