diff options
Diffstat (limited to 'solenv/bin/build.pl')
| -rwxr-xr-x | solenv/bin/build.pl | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/solenv/bin/build.pl b/solenv/bin/build.pl index 0ca5f4ea0b20..4f8199c532f2 100755 --- a/solenv/bin/build.pl +++ b/solenv/bin/build.pl @@ -235,7 +235,7 @@ if (open (CMD_FILE, ">>$cmd_file")) { select CMD_FILE; $echo = 'echo '; - if ($ENV{GUI_FOR_BUILD} ne 'UNX') { + if ($ENV{OS_FOR_BUILD} eq 'WNT') { $new_line = "echo.\n"; print "\@$echo off\npushd\n"; } else { @@ -275,7 +275,7 @@ print $new_line; do_exit(1) if ($checkparents); }; - if (($ENV{GUI_FOR_BUILD} ne 'UNX') && $cmd_file) { + if (($ENV{OS_FOR_BUILD} eq 'WNT') && $cmd_file) { print "popd\n"; }; $ENV{mk_tmp} = ''; @@ -772,7 +772,7 @@ sub dmake_dir { #if dmake fails, have a go at regenerating the dependencies #and try again. dmakes normal failure is 255, while death on signal is 254 my $real_exit_code = $error_code >> 8; - if (($ENV{GUI_FOR_BUILD} eq 'WNT') && ($real_exit_code == 255) && ($ENV{nodep} eq '') && ($ENV{depend} eq '')) { + if (($ENV{OS_FOR_BUILD} eq 'WNT') && ($real_exit_code == 255) && ($ENV{nodep} eq '') && ($ENV{depend} eq '')) { print "Retrying $job_name\n"; $error_code = run_job($dmake, $job_name); } @@ -877,12 +877,12 @@ sub get_prj_platform { sub get_deps_from_object { my ($module, $build_list_object, $dependencies_hash) = @_; - foreach my $dir ($build_list_object->getJobDirectories("make", $ENV{GUI})) { + foreach my $dir ($build_list_object->getJobDirectories("make", $ENV{OS})) { $path_hash{$dir} = $module_paths{$module}; $path_hash{$dir} .= $dir if ($dir ne '/'); my %deps_hash = (); - foreach my $dep ($build_list_object->getJobDependencies($dir, "make", $ENV{GUI})) { + foreach my $dep ($build_list_object->getJobDependencies($dir, "make", $ENV{OS})) { $deps_hash{$dep}++; }; $$dependencies_hash{$dir} = \%deps_hash; @@ -1085,7 +1085,7 @@ sub get_commands { check_dmake(); if ($cmd_file) { - if ($ENV{GUI_FOR_BUILD} eq 'UNX') { + if ($ENV{OS_FOR_BUILD} ne 'WNT') { $check_error_string = "if \"\$?\" != \"0\" exit\n"; } else { $check_error_string = "if \"\%?\" != \"0\" quit\n"; @@ -1104,7 +1104,7 @@ sub get_commands { # Procedure retrieves list of projects to be built from build.lst # sub get_workspace_path { - if (!defined $ENV{GUI}) { + if (!defined $ENV{OS}) { $ENV{mk_tmp} = ''; die "No environment set\n"; }; @@ -1142,8 +1142,8 @@ sub pick_prj_to_build { sub check_platform { my $platform = shift; return 1 if ($platform eq 'all'); - return 1 if (($ENV{GUI} eq 'UNX') && ($platform eq 'u')); - return 1 if (($ENV{GUI} eq 'WNT') && + return 1 if (($ENV{OS} ne 'WNT') && ($platform eq 'u')); + return 1 if (($ENV{OS} eq 'WNT') && (($platform eq 'w') || ($platform eq 'n'))); return 0; }; @@ -1604,7 +1604,7 @@ sub store_error { my $child_nick = $processes_hash{$pid}; - if ($ENV{GUI_FOR_BUILD} eq 'WNT') { + if ($ENV{OS_FOR_BUILD} eq 'WNT') { if (!defined $had_error{$child_nick}) { $had_error{$child_nick}++; return 1; @@ -1927,7 +1927,7 @@ sub do_custom_job { $error_code = run_job($job, $module_paths{$module}, $module_job); if ($error_code) { # give windows one more chance - if ($ENV{GUI_FOR_BUILD} eq 'WNT') { + if ($ENV{OS_FOR_BUILD} eq 'WNT') { $error_code = run_job($job, $module_paths{$module}, $module_job); }; }; @@ -2877,7 +2877,7 @@ sub start_server_on_port { my $port = shift; my $socket_obj = shift; $client_timeout = 1 if (!$parent_process); - if ($ENV{GUI_FOR_BUILD} eq 'WNT') { + if ($ENV{OS_FOR_BUILD} eq 'WNT') { $$socket_obj = new IO::Socket::INET (#LocalAddr => hostname(), LocalPort => $port, Proto => 'tcp', |