Fixing tab whitespace.

This commit is contained in:
mcafee%netscape.com 2002-06-20 23:41:33 +00:00
parent 1887483a18
commit 1359b1a16e

View File

@ -54,71 +54,72 @@ sub main {
#$status = checkout($mozilla_build_dir);
TinderUtils::print_log "Status from checkout: $status\n";
if ($status != 0) {
$post_status = 'busted';
$post_status = 'busted';
}
# Build chimera if we passed the checkout command.
if ($post_status ne 'busted') {
# Build embedding/config.
# Build embedding/config.
chdir $embedding_dir;
if ($status == 0) {
$status = TinderUtils::run_shell_command("make");
TinderUtils::print_log "Status from make: $status\n";
}
chdir $embedding_dir;
#
# Build chimera.
#
if ($status == 0) {
$status = TinderUtils::run_shell_command("make");
TinderUtils::print_log "Status from make: $status\n";
}
chdir $chimera_dir;
if ($status == 0) {
TinderUtils::print_log "Deleting binary...\n";
TinderUtils::DeleteBinary("$chimera_dir/build/Navigator.app/Contents/MacOS/$chimera_binary");
# Build chimera.
# Always do a clean build; gecko dependencies don't work correctly
# for Chimera.
chdir $chimera_dir;
if ($status == 0) {
# TinderUtils::print_log "Deleting binary...\n";
# TinderUtils::DeleteBinary("$chimera_dir/build/Navigator.app/Contents/MacOS/$chimera_binary");
TinderUtils::print_log "Clobbering chimera...\n";
TinderUtils::run_shell_command("pbxbuild -buildstyle \"Deployment\" clean");
# Always do a clean build; gecko dependencies don't work correctly
# for Chimera.
my $foo = Cwd::getcwd();
TinderUtils::print_log "cwd = $foo\n";
# opt = Deployment, debug = Development
$status = TinderUtils::run_shell_command("pbxbuild -buildstyle \"Deployment\" install");
TinderUtils::print_log "Status from pbxbuild: $status\n";
}
TinderUtils::print_log "Clobbering chimera...\n";
TinderUtils::run_shell_command("pbxbuild -buildstyle \"Deployment\" clean");
my $foo = Cwd::getcwd();
TinderUtils::print_log "cwd = $foo\n";
# opt = Deployment, debug = Development
$status = TinderUtils::run_shell_command("pbxbuild -buildstyle \"Deployment\" install");
TinderUtils::print_log "Status from pbxbuild: $status\n";
}
TinderUtils::print_log "Testing build status...\n";
if ($status != 0) {
TinderUtils::print_log "busted, pbxbuild status non-zero\n";
$post_status = 'busted';
} elsif (not TinderUtils::BinaryExists("$chimera_dir/build/Navigator.app/Contents/MacOS/$chimera_binary")) {
TinderUtils::print_log "Error: binary not found: $chimera_dir/build/Navigator.app/Contents/MacOS/$chimera_binary\n";
$post_status = 'busted';
} else {
$post_status = 'success';
}
TinderUtils::print_log "Testing build status...\n";
if ($status != 0) {
TinderUtils::print_log "busted, pbxbuild status non-zero\n";
$post_status = 'busted';
} elsif (not TinderUtils::BinaryExists("$chimera_dir/build/Navigator.app/Contents/MacOS/$chimera_binary")) {
TinderUtils::print_log "Error: binary not found: $chimera_dir/build/Navigator.app/Contents/MacOS/$chimera_binary\n";
$post_status = 'busted';
} else {
$post_status = 'success';
}
}
# Test chimera, about:blank
if ($chimera_alive_test and $post_status eq 'success') {
$post_status = TinderUtils::AliveTest("ChimeraAliveTest",
"$chimera_dir/build/Navigator.app/Contents/MacOS",
"Navigator",
"about:blank",
45);
"$chimera_dir/build/Navigator.app/Contents/MacOS",
"Navigator",
"about:blank",
45);
}
# Test chimera, test8
if ($chimera_test8_test and $post_status eq 'success') {
$post_status = TinderUtils::AliveTest("ChimeraTest8Test",
"$chimera_dir/build/Navigator.app/Contents/MacOS",
"Navigator",
"resource:///res/samples/test8.html",
45);
"$chimera_dir/build/Navigator.app/Contents/MacOS",
"Navigator",
"resource:///res/samples/test8.html",
45);
}
# Pass our status back to calling script.