From 48b180ea92e7d63d4e404dc2d8dfe2469b4d0ba8 Mon Sep 17 00:00:00 2001 From: Dr!fter Date: Fri, 15 Aug 2014 21:51:49 -0400 Subject: [PATCH] Update bootstrap to not set up its own envars --- buildbot/bootstrap.pl | 44 ------------------------------------------- 1 file changed, 44 deletions(-) diff --git a/buildbot/bootstrap.pl b/buildbot/bootstrap.pl index 7368dcd..c06bd44 100644 --- a/buildbot/bootstrap.pl +++ b/buildbot/bootstrap.pl @@ -21,50 +21,6 @@ rmtree('OUTPUT'); mkdir('OUTPUT') or die("Failed to create output folder: $!\n"); chdir('OUTPUT'); my ($result); -print "Attempting to reconfigure...\n"; - -#update and configure shiz -if ($^O eq "linux") { - #my @sdks = ('sourcemod-1.3', 'mmsource-1.8', 'hl2sdk', 'hl2sdk-ob', 'hl2sdk-ob-valve', 'hl2sdk-l4d', 'hl2sdk-l4d2'); - #my ($sdk); - #foreach $sdk (@sdks) { - # print "Updating checkout of ", $sdk, " on ", $^O, "\n"; - # $result = `hg pull -u /home/builds/common/$sdk`; - # print $result; - #} - - #$ENV{'SOURCEMOD14'} = '/home/builds/common/sourcemod-1.4'; - $ENV{'SMCENTRAL'} = '/home/builds/common/sourcemod-central'; - $ENV{'MMSOURCE19'} = '/home/builds/common/mmsource-1.9'; - - $ENV{'HL2SDK'} = '/home/builds/common/hl2sdk'; - $ENV{'HL2SDKOB'} = '/home/builds/common/hl2sdk-ob'; - $ENV{'HL2SDKOBVALVE'} = '/home/builds/common/hl2sdk-ob-valve'; - $ENV{'HL2SDKL4D'} = '/home/builds/common/hl2sdk-l4d'; - $ENV{'HL2SDKL4D2'} = '/home/builds/common/hl2sdk-l4d2'; - $ENV{'HL2SDKCSGO'} = '/home/builds/common/hl2sdk-csgo'; -} elsif ($^O eq "darwin") { - #my @sdks = ('sourcemod-1.3', 'mmsource-1.8', 'hl2sdk-ob-valve'); - #my ($sdk); - #foreach $sdk (@sdks) { - # print "Updating checkout of ", $sdk, " on ", $^O, "\n"; - # $result = `hg pull -u /Users/builds/slaves/common/$sdk`; - # print $result; - #} - - #$ENV{'SOURCEMOD14'} = '/Users/builds/slaves/common/sourcemod-1.4'; - $ENV{'SMCENTRAL'} = '/Users/builds/slaves/common/sourcemod-central'; - $ENV{'MMSOURCE18'} = '/Users/builds/slaves/common/mmsource-1.8'; - $ENV{'MMSOURCE19'} = '/Users/builds/slaves/common/mmsource-central'; - - $ENV{'HL2SDKOBVALVE'} = '/Users/builds/slaves/common/hl2sdk-ob-valve'; - $ENV{'HL2SDKCSS'} = '/Users/builds/slaves/common/hl2sdk-css'; -} else { - #JUST IN CASE - #$ENV{'MMSOURCE19'} = "C:\\Scripts\\common\\mmsource-1.9"; - #$ENV{'HL2SDKCSGO'} = "C:\\Scripts\\common\\hl2sdk-csgo"; -} -# Windows vars should already be set. #configure AMBuild if ($^O eq "linux") {