summaryrefslogtreecommitdiff
path: root/solenv/bin/modules
diff options
context:
space:
mode:
Diffstat (limited to 'solenv/bin/modules')
-rw-r--r--solenv/bin/modules/installer/control.pm3
-rw-r--r--solenv/bin/modules/installer/download.pm2
-rw-r--r--solenv/bin/modules/installer/environment.pm5
-rw-r--r--solenv/bin/modules/installer/parameter.pm2
-rw-r--r--solenv/bin/modules/installer/simplepackage.pm4
-rw-r--r--solenv/bin/modules/installer/worker.pm2
6 files changed, 7 insertions, 11 deletions
diff --git a/solenv/bin/modules/installer/control.pm b/solenv/bin/modules/installer/control.pm
index deea124b817e..bd80505bb5f7 100644
--- a/solenv/bin/modules/installer/control.pm
+++ b/solenv/bin/modules/installer/control.pm
@@ -256,7 +256,7 @@ sub check_makecab_version
######################################################################
# Reading the environment variables for the paths in ziplist.
-# solarpath, solarenvpath, os, pmiscpath
+# solarenvpath, os, pmiscpath
######################################################################
sub check_system_environment
@@ -265,7 +265,6 @@ sub check_system_environment
my $error = 0;
my @environmentvariables = qw(
- SOLARVERSION
WORK_STAMP
OUTPATH
LOCAL_OUT
diff --git a/solenv/bin/modules/installer/download.pm b/solenv/bin/modules/installer/download.pm
index 4d3bd6745ac2..1db93452b3f1 100644
--- a/solenv/bin/modules/installer/download.pm
+++ b/solenv/bin/modules/installer/download.pm
@@ -187,7 +187,7 @@ sub call_sum
}
#########################################################
-# Searching for the getuid.so in the solver
+# Searching for the getuid.so
#########################################################
sub get_path_for_library
diff --git a/solenv/bin/modules/installer/environment.pm b/solenv/bin/modules/installer/environment.pm
index 2bcd7ccdf847..a3c2c0bafb2a 100644
--- a/solenv/bin/modules/installer/environment.pm
+++ b/solenv/bin/modules/installer/environment.pm
@@ -31,10 +31,7 @@ sub create_pathvariables
my %variables = ();
# The following variables are needed in the path file list
- # solarpath, solarenvpath, os, pmiscpath
-
- my $solarpath = $environment->{'SOLARVERSION'} . $installer::globals::separator . $installer::globals::compiler . $installer::globals::productextension;
- $variables{'solarpath'} = $solarpath;
+ # solarenvpath, os, pmiscpath
my $shlxthdlpath = $ENV{'INSTDIR'} . $installer::globals::separator . "program" . $installer::globals::separator . "shlxthdl";
$variables{'shlxthdlpath'} = $shlxthdlpath;
diff --git a/solenv/bin/modules/installer/parameter.pm b/solenv/bin/modules/installer/parameter.pm
index 0cc6e9e0c753..9d1c200e89b1 100644
--- a/solenv/bin/modules/installer/parameter.pm
+++ b/solenv/bin/modules/installer/parameter.pm
@@ -514,7 +514,7 @@ sub outputparameter
}
else
{
- push(@output, "Taking setup script from solver\n");
+ push(@output, "Taking setup script from workdir\n");
}
push(@output, "Unpackpath: $installer::globals::unpackpath\n");
push(@output, "Compiler: $installer::globals::compiler\n");
diff --git a/solenv/bin/modules/installer/simplepackage.pm b/solenv/bin/modules/installer/simplepackage.pm
index 554e0d847a94..8ed693fe4414 100644
--- a/solenv/bin/modules/installer/simplepackage.pm
+++ b/solenv/bin/modules/installer/simplepackage.pm
@@ -347,7 +347,7 @@ sub create_package
my $scripthelperrealfilename = $volume_name_classic_app;
my $translationfilename = $installer::globals::macinstallfilename;
- # Finding both files in solver
+ # Finding both files in source tree
my $scriptref = $ENV{'SRCDIR'} . "/setup_native/scripts/" . $scriptfilename;
if (! -f $scriptref) { installer::exiter::exit_program("ERROR: Could not find Apple script $scriptfilename ($scriptref)!", "create_package"); }
@@ -374,7 +374,7 @@ sub create_package
chmod 0775, $scripthelperrealfilename;
# Copy also Info.plist and icon file
- # Finding both files in solver
+ # Finding both files in source tree
my $iconfile = "ooo3_installer.icns";
my $iconfileref = $ENV{'SRCDIR'} . "/setup_native/source/mac/" . $iconfile;
if (! -f $iconfileref) { installer::exiter::exit_program("ERROR: Could not find Apple script icon file $iconfile ($iconfileref)!", "create_package"); }
diff --git a/solenv/bin/modules/installer/worker.pm b/solenv/bin/modules/installer/worker.pm
index 261bd19d6d86..917066f4f784 100644
--- a/solenv/bin/modules/installer/worker.pm
+++ b/solenv/bin/modules/installer/worker.pm
@@ -526,7 +526,7 @@ sub collect_scpactions
###########################################################
# Adding additional variables into the variableshashref,
-# that are defined in include files in the solver. The
+# that are defined in include files in the source tree. The
# names of the include files are stored in
# ADD_INCLUDE_FILES (comma separated list).
###########################################################