Merge.
authorNicholas Hastings <skamonkey@gmail.com>
Thu Apr 14 23:25:03 2011 -0400 (2011-04-14)
changeset 744fe25ed65588e
parent 743 57beb5d67f8b
parent 742 f38fc2289fa5
child 745 3a451f11f1f4
Merge.
     1.1 --- a/support/buildbot/symstore.pl	Thu Apr 14 23:24:17 2011 -0400
     1.2 +++ b/support/buildbot/symstore.pl	Thu Apr 14 23:25:03 2011 -0400
     1.3 @@ -10,13 +10,8 @@
     1.4  chdir('..');
     1.5  chdir('..');
     1.6  
     1.7 -our $SSH = 'ssh -i ../../mmspvkey';
     1.8 -
     1.9  open(PDBLOG, '../OUTPUT/pdblog.txt') or die "Could not open pdblog.txt: $!\n";
    1.10  
    1.11 -#Sync us up with the main symbol store
    1.12 -rsync('[email protected]:~/public_html/symbols/', '..\\..\\symstore');
    1.13 -
    1.14  #Get version info
    1.15  my ($version);
    1.16  $version = Build::ProductVersion(Build::PathFormat('product.version'));
    1.17 @@ -41,14 +36,14 @@
    1.18  	$line = $_;
    1.19  	$line =~ s/\.pdb/\*/;
    1.20  	chomp $line;
    1.21 -	Build::Command("symstore add /r /f \"..\\OUTPUT\\$line\" /s ..\\..\\symstore /t \"Metamod:Source\" /v \"$version\" /c \"$build_type\"");
    1.22 +	Build::Command("symstore add /r /f \"..\\OUTPUT\\$line\" /s \"S:\\mmsource\" /t \"Metamod:Source\" /v \"$version\" /c \"$build_type\"");
    1.23  }
    1.24  
    1.25  close(PDBLOG);
    1.26  
    1.27  #Lowercase DLLs.  Sigh.
    1.28  my (@files);
    1.29 -opendir(DIR, "..\\..\\symstore");
    1.30 +opendir(DIR, "S:\\mmsource");
    1.31  @files = readdir(DIR);
    1.32  closedir(DIR);
    1.33  
    1.34 @@ -57,23 +52,14 @@
    1.35  {
    1.36  	$file = $files[$i];
    1.37  	next unless ($file =~ /\.dll$/);
    1.38 -	next unless (-d "..\\..\\symstore\\$file");
    1.39 -	opendir(DIR, "..\\..\\symstore\\$file");
    1.40 +	next unless (-d "S:\\mmsource\\$file");
    1.41 +	opendir(DIR, "S:\\mmsource\\$file");
    1.42  	@subdirs = readdir(DIR);
    1.43  	closedir(DIR);
    1.44  	for ($j = 0; $j <= $#subdirs; $j++)
    1.45  	{
    1.46  		next unless ($subdirs[$j] =~ /[A-Z]/);
    1.47 -		Build::Command("rename ..\\..\\symstore\\$file\\" . $subdirs[$j] . " " . lc($subdirs[$j]));
    1.48 +		Build::Command("rename S:\\mmsource\\$file\\" . $subdirs[$j] . " " . lc($subdirs[$j]));
    1.49  	}	
    1.50  }
    1.51  
    1.52 -#Now that we're done, rsync back.
    1.53 -rsync('../../symstore/', '[email protected]:~/public_html/symbols');
    1.54 -
    1.55 -sub rsync
    1.56 -{
    1.57 -	my ($from, $to) = (@_);
    1.58 -	
    1.59 -	Build::Command('rsync -av --delete -e="' . $SSH . '" ' . $from . ' ' . $to);
    1.60 -}