From 5df6b9b9d0005d7590bb0033418076aa87331ca9 Mon Sep 17 00:00:00 2001 From: David Anderson Date: Sat, 12 Mar 2011 20:18:10 -0800 Subject: [PATCH] Updated symstore logic. --- support/buildbot/symstore.pl | 24 +++++------------------- 1 file changed, 5 insertions(+), 19 deletions(-) diff --git a/support/buildbot/symstore.pl b/support/buildbot/symstore.pl index 6f75049..aabc890 100755 --- a/support/buildbot/symstore.pl +++ b/support/buildbot/symstore.pl @@ -10,13 +10,8 @@ require 'helpers.pm'; chdir('..'); chdir('..'); -our $SSH = 'ssh -i ../../mmspvkey'; - open(PDBLOG, '../OUTPUT/pdblog.txt') or die "Could not open pdblog.txt: $!\n"; -#Sync us up with the main symbol store -rsync('sourcemm@alliedmods.net:~/public_html/symbols/', '..\\..\\symstore'); - #Get version info my ($version); $version = Build::ProductVersion(Build::PathFormat('product.version')); @@ -41,14 +36,14 @@ while () $line = $_; $line =~ s/\.pdb/\*/; chomp $line; - Build::Command("symstore add /r /f \"..\\OUTPUT\\$line\" /s ..\\..\\symstore /t \"Metamod:Source\" /v \"$version\" /c \"$build_type\""); + Build::Command("symstore add /r /f \"..\\OUTPUT\\$line\" /s \"S:\\mmsource\" /t \"Metamod:Source\" /v \"$version\" /c \"$build_type\""); } close(PDBLOG); #Lowercase DLLs. Sigh. my (@files); -opendir(DIR, "..\\..\\symstore"); +opendir(DIR, "S:\\mmsource"); @files = readdir(DIR); closedir(DIR); @@ -57,23 +52,14 @@ for ($i = 0; $i <= $#files; $i++) { $file = $files[$i]; next unless ($file =~ /\.dll$/); - next unless (-d "..\\..\\symstore\\$file"); - opendir(DIR, "..\\..\\symstore\\$file"); + next unless (-d "S:\\mmsource\\$file"); + opendir(DIR, "S:\\mmsource\\$file"); @subdirs = readdir(DIR); closedir(DIR); for ($j = 0; $j <= $#subdirs; $j++) { next unless ($subdirs[$j] =~ /[A-Z]/); - Build::Command("rename ..\\..\\symstore\\$file\\" . $subdirs[$j] . " " . lc($subdirs[$j])); + Build::Command("rename S:\\mmsource\\$file\\" . $subdirs[$j] . " " . lc($subdirs[$j])); } } -#Now that we're done, rsync back. -rsync('../../symstore/', 'sourcemm@alliedmods.net:~/public_html/symbols'); - -sub rsync -{ - my ($from, $to) = (@_); - - Build::Command('rsync -av --delete -e="' . $SSH . '" ' . $from . ' ' . $to); -}