UNLOZE/sourcemod
10
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Really fixed version.rc file problem by removing and recreating build OUTPUT directory when required (bug 4042, r=dvander).

Browse Source
This commit is contained in:
Scott Ehlert 2009-10-06 01:46:06 -05:00
parent 3277cc3675
commit 705ea18b2a
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
AMBuildScript
View File

@ -153,6 +153,7 @@ class SM:
self.targetMap = AMBuild.cache['targetMap'] self.targetMap = AMBuild.cache['targetMap']
if AMBuild.target['platform'] == 'windows': if AMBuild.target['platform'] == 'windows':
self.compiler.AddToListVar('RCINCLUDES', os.path.join(AMBuild.sourceFolder, 'public'))
self.compiler.AddToListVar('RCINCLUDES', self.compiler.AddToListVar('RCINCLUDES',
os.path.join(AMBuild.outputFolder, 'includes')) os.path.join(AMBuild.outputFolder, 'includes'))
self.mmsPath = AMBuild.cache['MMSOURCE17'] self.mmsPath = AMBuild.cache['MMSOURCE17']

4
tools/buildbot/bootstrap.pl
View File

@ -4,6 +4,7 @@
use strict; use strict;
use Cwd; use Cwd;
use File::Basename; use File::Basename;
use File::Path;
my ($myself, $path) = fileparse($0); my ($myself, $path) = fileparse($0);
chdir($path); chdir($path);
@ -20,7 +21,6 @@ my $reconf = 0;
#Create output folder if it doesn't exist. #Create output folder if it doesn't exist.
if (!(-d 'OUTPUT')) { if (!(-d 'OUTPUT')) {
mkdir('OUTPUT') or die("Failed to create output folder: $!\n");
$reconf = 1; $reconf = 1;
} else { } else {
if (-f 'OUTPUT/sentinel') { if (-f 'OUTPUT/sentinel') {
@ -40,6 +40,8 @@ if (!(-d 'OUTPUT')) {
} }
if ($reconf) { if ($reconf) {
rmtree('OUTPUT');
mkdir('OUTPUT') or die("Failed to create output folder: $!\n");
chdir('OUTPUT'); chdir('OUTPUT');
my ($result); my ($result);
print "Attempting to reconfigure...\n"; print "Attempting to reconfigure...\n";