Builds now occur above source folder.
This commit is contained in:
parent
54a7aa1116
commit
e94234ae73
@ -10,8 +10,8 @@ chdir($path);
|
|||||||
|
|
||||||
require 'helpers.pm';
|
require 'helpers.pm';
|
||||||
|
|
||||||
#Go back to main source dir.
|
#Go back above build dir
|
||||||
chdir(Build::PathFormat('../..'));
|
chdir(Build::PathFormat('../../..'));
|
||||||
|
|
||||||
#Get the source path.
|
#Get the source path.
|
||||||
our ($root) = getcwd();
|
our ($root) = getcwd();
|
||||||
@ -26,7 +26,7 @@ if (!(-d 'OUTPUT')) {
|
|||||||
if (-d 'OUTPUT/sentinel') {
|
if (-d 'OUTPUT/sentinel') {
|
||||||
my @s = stat('OUTPUT/sentinel');
|
my @s = stat('OUTPUT/sentinel');
|
||||||
my $mtime = $s[9];
|
my $mtime = $s[9];
|
||||||
my @files = ('pushbuild.txt', 'AMBuildScript', 'product.version');
|
my @files = ('build/pushbuild.txt', 'build/AMBuildScript', 'build/product.version');
|
||||||
my ($i);
|
my ($i);
|
||||||
for ($i = 0; $i <= $#files; $i++) {
|
for ($i = 0; $i <= $#files; $i++) {
|
||||||
if (IsNewer($files[$i], $mtime)) {
|
if (IsNewer($files[$i], $mtime)) {
|
||||||
@ -44,9 +44,9 @@ if ($reconf) {
|
|||||||
my ($result);
|
my ($result);
|
||||||
print "Attempting to reconfigure...\n";
|
print "Attempting to reconfigure...\n";
|
||||||
if ($^O eq "linux") {
|
if ($^O eq "linux") {
|
||||||
$result = `python3.1 ../configure.py --enable-optimize`;
|
$result = `python3.1 build/configure.py --enable-optimize`;
|
||||||
} else {
|
} else {
|
||||||
$result = `C:\\Python31\\Python.exe ..\\configure.py --enable-optimize`;
|
$result = `C:\\Python31\\Python.exe build\\configure.py --enable-optimize`;
|
||||||
}
|
}
|
||||||
print "$result\n";
|
print "$result\n";
|
||||||
if ($? == -1) {
|
if ($? == -1) {
|
||||||
@ -55,6 +55,7 @@ if ($reconf) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
open(FILE, '>OUTPUT/sentinel');
|
open(FILE, '>OUTPUT/sentinel');
|
||||||
|
print FILE "this is nothing.\n";
|
||||||
close(FILE);
|
close(FILE);
|
||||||
|
|
||||||
sub IsNewer
|
sub IsNewer
|
||||||
|
@ -8,7 +8,7 @@ chdir($path);
|
|||||||
|
|
||||||
require 'helpers.pm';
|
require 'helpers.pm';
|
||||||
|
|
||||||
chdir('../../OUTPUT');
|
chdir('../../../OUTPUT');
|
||||||
|
|
||||||
if ($^O eq "linux") {
|
if ($^O eq "linux") {
|
||||||
system("python3.1 build.py");
|
system("python3.1 build.py");
|
||||||
|
Loading…
Reference in New Issue
Block a user