Really fixed version.rc file problem by removing and recreating build OUTPUT directory when required (bug 4042, r=dvander).
This commit is contained in:
parent
3277cc3675
commit
705ea18b2a
@ -153,6 +153,7 @@ class SM:
|
||||
self.targetMap = AMBuild.cache['targetMap']
|
||||
|
||||
if AMBuild.target['platform'] == 'windows':
|
||||
self.compiler.AddToListVar('RCINCLUDES', os.path.join(AMBuild.sourceFolder, 'public'))
|
||||
self.compiler.AddToListVar('RCINCLUDES',
|
||||
os.path.join(AMBuild.outputFolder, 'includes'))
|
||||
self.mmsPath = AMBuild.cache['MMSOURCE17']
|
||||
|
@ -4,6 +4,7 @@
|
||||
use strict;
|
||||
use Cwd;
|
||||
use File::Basename;
|
||||
use File::Path;
|
||||
|
||||
my ($myself, $path) = fileparse($0);
|
||||
chdir($path);
|
||||
@ -20,7 +21,6 @@ my $reconf = 0;
|
||||
|
||||
#Create output folder if it doesn't exist.
|
||||
if (!(-d 'OUTPUT')) {
|
||||
mkdir('OUTPUT') or die("Failed to create output folder: $!\n");
|
||||
$reconf = 1;
|
||||
} else {
|
||||
if (-f 'OUTPUT/sentinel') {
|
||||
@ -40,6 +40,8 @@ if (!(-d 'OUTPUT')) {
|
||||
}
|
||||
|
||||
if ($reconf) {
|
||||
rmtree('OUTPUT');
|
||||
mkdir('OUTPUT') or die("Failed to create output folder: $!\n");
|
||||
chdir('OUTPUT');
|
||||
my ($result);
|
||||
print "Attempting to reconfigure...\n";
|
||||
|
Loading…
Reference in New Issue
Block a user