summaryrefslogtreecommitdiff
path: root/solenv/bin
diff options
context:
space:
mode:
Diffstat (limited to 'solenv/bin')
-rwxr-xr-xsolenv/bin/build.pl24
-rwxr-xr-xsolenv/bin/deliver.pl8
-rw-r--r--solenv/bin/modules/installer/control.pm2
-rw-r--r--solenv/bin/modules/installer/environment.pm5
-rwxr-xr-xsolenv/bin/ooinstall2
5 files changed, 18 insertions, 23 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',
diff --git a/solenv/bin/deliver.pl b/solenv/bin/deliver.pl
index 2d9f5658accc..096e5bd3faeb 100755
--- a/solenv/bin/deliver.pl
+++ b/solenv/bin/deliver.pl
@@ -114,7 +114,6 @@ if ($^O ne 'cygwin') { # iz59477 - cygwin needes a dot "." at the e
}
}
-($gui = lc($ENV{GUI})) || die "Can't determine 'GUI'. Please set environment.\n";
$tempcounter = 0;
# zip is default for RE master builds
@@ -384,7 +383,7 @@ sub parse_options
$arg =~ /^-delete$/ and $opt_delete = 1 and next;
$arg =~ /^-dontdeletecommon$/ and $dontdeletecommon = 1 and next;
$arg =~ /^-help$/ and $opt_help = 1 and $arg = '';
- $arg =~ /^-link$/ and $ENV{GUI} ne 'WNT' and $opt_link = 1 and next;
+ $arg =~ /^-link$/ and $ENV{OS} ne 'WNT' and $opt_link = 1 and next;
$arg =~ /^-deloutput$/ and $opt_deloutput = 1 and next;
$arg =~ /^-debug$/ and $is_debug = 1 and next;
$arg =~ /^-checkdlst$/ and $opt_checkdlst = 1 and next;
@@ -458,11 +457,10 @@ sub init_globals
[ '%_DEST%', $dest ],
[ '%COMMON_OUTDIR%', $common_outdir ],
[ '%COMMON_DEST%', $common_dest ],
- [ '%GUI%', $gui ]
);
# find out if the *HOST* system supports symlinks. They all do except Windows
- $has_symlinks = $ENV{GUI} ne 'WNT';
+ $has_symlinks = $ENV{OS} ne 'WNT';
}
sub get_base
@@ -1321,7 +1319,7 @@ sub usage
print STDERR " -dontdeletecommon do not delete common files (for -delete option)\n";
print STDERR " -force copy even if not newer\n";
print STDERR " -help print this message\n";
- if ( !defined($ENV{GUI}) || $ENV{GUI} ne 'WNT' ) {
+ if ( !defined($ENV{OS}) || $ENV{OS} ne 'WNT' ) {
print STDERR " -link hard link files into the solver to save disk space\n";
}
print STDERR " -quiet be quiet, only report errors\n";
diff --git a/solenv/bin/modules/installer/control.pm b/solenv/bin/modules/installer/control.pm
index 99705f876edc..3f88c472ec22 100644
--- a/solenv/bin/modules/installer/control.pm
+++ b/solenv/bin/modules/installer/control.pm
@@ -265,7 +265,7 @@ sub check_makecab_version
######################################################################
# Reading the environment variables for the paths in ziplist.
-# solarpath, solarenvpath, solarcommonpath, os, osdef, pmiscpath
+# solarpath, solarenvpath, solarcommonpath, os, pmiscpath
######################################################################
sub check_system_environment
diff --git a/solenv/bin/modules/installer/environment.pm b/solenv/bin/modules/installer/environment.pm
index a0cf5f3e4e2b..646bf1649e00 100644
--- a/solenv/bin/modules/installer/environment.pm
+++ b/solenv/bin/modules/installer/environment.pm
@@ -40,7 +40,7 @@ sub create_pathvariables
my %variables = ();
# The following variables are needed in the path file list
- # solarpath, solarenvpath, solarcommonpath, os, osdef, pmiscpath
+ # solarpath, solarenvpath, solarcommonpath, os, pmiscpath
my $solarpath = $environment->{'SOLARVERSION'} . $installer::globals::separator . $installer::globals::compiler . $installer::globals::productextension;
$variables{'solarpath'} = $solarpath;
@@ -48,9 +48,6 @@ sub create_pathvariables
my $solarcommonpath = $environment->{'SOLARVERSION'} . $installer::globals::separator . "common" . $installer::globals::productextension;
$variables{'solarcommonpath'} = $solarcommonpath;
- my $osdef = lc($environment->{'GUI'});
- $variables{'osdef'} = $osdef;
-
$variables{'os'} = $installer::globals::compiler;
my $solarenvpath = "";
diff --git a/solenv/bin/ooinstall b/solenv/bin/ooinstall
index 3b086c633348..9e806cad413f 100755
--- a/solenv/bin/ooinstall
+++ b/solenv/bin/ooinstall
@@ -27,7 +27,7 @@ my $tmp_dir;
# FIXME: really we should hunt and parse / source the config_host.mk magic I guess.
die "You need your environment setup right, eg. run make cmd cmd='ooinstall /path/to/install'" if (!defined $ENV{SRC_ROOT});
-if ($ENV{GUI} eq 'WNT') {
+if ($ENV{OS} eq 'WNT') {
$is_windows = 1;
}
generated by cgit (git 2.34.1) at 2024-07-09 23:36:27 +0000