summaryrefslogtreecommitdiffstats
path: root/solenv
diff options
context:
space:
mode:
authorJesús Corrius <jesus@softcatala.org>2012-02-01 14:42:58 +0100
committerJesús Corrius <jesus@softcatala.org>2012-02-01 14:43:37 +0100
commit7be0cc289d9745e0842c4fa6c0a6ac3450f3801b (patch)
tree5b349b17cc872dfb45ef5ec73a6ba2eec27a37ef /solenv
parentconvert SdPresLayoutDlg from tools/list.hxx to boost::ptr_vector (diff)
downloadcore-7be0cc289d9745e0842c4fa6c0a6ac3450f3801b.tar.gz
core-7be0cc289d9745e0842c4fa6c0a6ac3450f3801b.zip
A few safe replacements of pathes->paths
Diffstat (limited to 'solenv')
-rw-r--r--solenv/bin/make_installer.pl4
-rw-r--r--solenv/bin/modules/installer/archivefiles.pm2
-rw-r--r--solenv/bin/modules/installer/control.pm2
-rw-r--r--solenv/bin/modules/installer/converter.pm2
-rw-r--r--solenv/bin/modules/installer/downloadsigner.pm16
-rw-r--r--solenv/bin/modules/installer/environment.pm2
-rw-r--r--solenv/bin/modules/installer/epmfile.pm2
-rw-r--r--solenv/bin/modules/installer/packagelist.pm4
-rw-r--r--solenv/bin/modules/installer/parameter.pm2
-rw-r--r--solenv/bin/modules/installer/scriptitems.pm6
-rw-r--r--solenv/bin/modules/installer/windows/admin.pm2
-rw-r--r--solenv/bin/modules/installer/windows/directory.pm2
-rw-r--r--solenv/bin/modules/installer/windows/msp.pm2
-rw-r--r--solenv/bin/modules/installer/windows/update.pm2
-rw-r--r--solenv/bin/modules/installer/ziplist.pm6
-rw-r--r--solenv/bin/modules/par2script/parameter.pm4
-rw-r--r--solenv/bin/modules/par2script/work.pm6
-rw-r--r--solenv/bin/modules/pre2par/parameter.pm2
-rwxr-xr-xsolenv/bin/packimages.pl2
-rw-r--r--solenv/inc/settings.mk2
20 files changed, 36 insertions, 36 deletions
diff --git a/solenv/bin/make_installer.pl b/solenv/bin/make_installer.pl
index 5bcee7fa4343..4f35aed4ed00 100644
--- a/solenv/bin/make_installer.pl
+++ b/solenv/bin/make_installer.pl
@@ -316,7 +316,7 @@ if ( $installer::globals::globallogging ) { installer::files::save_file($logging
##############################################
# Collecting all files from all include
-# pathes in global hashes.
+# paths in global hashes.
##############################################
installer::worker::collect_all_files_from_includepathes($includepatharrayref);
@@ -889,7 +889,7 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ )
# There are two ways for a directory to be included into the epm directory list:
# 1. Looking for all destination paths in the files array
# 2. Looking for directories with CREATE flag in the directory array
- # Advantage: Many pathes are hidden in zip files, they are not defined in the setup script.
+ # Advantage: Many paths are hidden in zip files, they are not defined in the setup script.
# It will be possible, that in the setup script only those directoies have to be defined,
# that have a CREATE flag. All other directories are created, if they contain at least one file.
diff --git a/solenv/bin/modules/installer/archivefiles.pm b/solenv/bin/modules/installer/archivefiles.pm
index af23ed21e3a6..21f8f2be49d9 100644
--- a/solenv/bin/modules/installer/archivefiles.pm
+++ b/solenv/bin/modules/installer/archivefiles.pm
@@ -377,7 +377,7 @@ sub resolving_archive_flag
if ( $set_executable_privileges )
{
- # All pathes to executables are saved in the hash %executable_files_in_extensions
+ # All paths to executables are saved in the hash %executable_files_in_extensions
my $compare_path = $newfile{'sourcepath'};
$compare_path =~ s/\\/\//g; # contains only slashes for comparison reasons
if ( exists($executable_files_in_extensions{$compare_path}) )
diff --git a/solenv/bin/modules/installer/control.pm b/solenv/bin/modules/installer/control.pm
index 0b1032080c71..54da21ac511d 100644
--- a/solenv/bin/modules/installer/control.pm
+++ b/solenv/bin/modules/installer/control.pm
@@ -252,7 +252,7 @@ sub check_makecab_version
}
######################################################################
-# Reading the environment variables for the pathes in ziplist.
+# Reading the environment variables for the paths in ziplist.
# solarpath, solarenvpath, solarcommonpath, os, osdef, pmiscpath
######################################################################
diff --git a/solenv/bin/modules/installer/converter.pm b/solenv/bin/modules/installer/converter.pm
index 2fe728b3dbac..4b8924490385 100644
--- a/solenv/bin/modules/installer/converter.pm
+++ b/solenv/bin/modules/installer/converter.pm
@@ -166,7 +166,7 @@ sub copy_item_object
}
#################################################################
-# Windows pathes must not contain the following structure:
+# Windows paths must not contain the following structure:
# c:\dirA\dirB\..\dirC
# This has to be exchanged to
# c:\dirA\dirC
diff --git a/solenv/bin/modules/installer/downloadsigner.pm b/solenv/bin/modules/installer/downloadsigner.pm
index d3af89851f40..575b42c7fc4b 100644
--- a/solenv/bin/modules/installer/downloadsigner.pm
+++ b/solenv/bin/modules/installer/downloadsigner.pm
@@ -203,7 +203,7 @@ sub set_temp_path
}
#############################################
-# Setting output pathes to temp directory
+# Setting output paths to temp directory
# This are the:
# unpackpath and the loggingdir
#############################################
@@ -217,7 +217,7 @@ sub set_output_pathes_to_temp
}
#############################################
-# Setting the minor into the pathes. This is
+# Setting the minor into the paths. This is
# required, if the original installation set
# was created without minor
# Value is always saved in
@@ -241,15 +241,15 @@ sub set_minor_into_pathes
return;
}
- # Affected pathes:
+ # Affected paths:
# $contenthash{'installlogdir'}
# $contenthash{'includepatharray'}
# $installer::globals::unpackpath
# $installer::globals::idttemplatepath
# $installer::globals::idtlanguagepath
- installer::logger::include_header_into_logfile("Changing saved pathes to add the minor");
- my $infoline = "Old pathes:\n";
+ installer::logger::include_header_into_logfile("Changing saved paths to add the minor");
+ my $infoline = "Old paths:\n";
push( @installer::globals::logfileinfo, $infoline);
$infoline = "\$followmeinfohash->{'installlogdir'}: $followmeinfohash->{'installlogdir'}\n";
push( @installer::globals::logfileinfo, $infoline);
@@ -259,7 +259,7 @@ sub set_minor_into_pathes
push( @installer::globals::logfileinfo, $infoline);
$infoline = "\$installer::globals::idtlanguagepath: $installer::globals::idtlanguagepath\n";
push( @installer::globals::logfileinfo, $infoline);
- $infoline = "Include pathes:\n";
+ $infoline = "Include paths:\n";
push( @installer::globals::logfileinfo, $infoline);
foreach my $path ( @{$followmeinfohash->{'includepatharray'}} ) { push( @installer::globals::logfileinfo, $path); }
@@ -304,7 +304,7 @@ sub set_minor_into_pathes
if ( $installer::globals::idtlanguagepath =~ /\Q$srcpath\E/ ) { $installer::globals::idtlanguagepath =~ s/\Q$srcpath\E/$newsrcpath/; }
foreach my $path ( @{$followmeinfohash->{'includepatharray'}} ) { if ( $path =~ /\Q$srcpath\E/ ) { $path =~ s/\Q$srcpath\E/$newsrcpath/; } }
- $infoline = "\nNew pathes:\n";
+ $infoline = "\nNew paths:\n";
push( @installer::globals::logfileinfo, $infoline);
$infoline = "\$followmeinfohash->{'installlogdir'}: $followmeinfohash->{'installlogdir'}\n";
push( @installer::globals::logfileinfo, $infoline);
@@ -314,7 +314,7 @@ sub set_minor_into_pathes
push( @installer::globals::logfileinfo, $infoline);
$infoline = "\$installer::globals::idtlanguagepath: $installer::globals::idtlanguagepath\n";
push( @installer::globals::logfileinfo, $infoline);
- $infoline = "Include pathes:\n";
+ $infoline = "Include paths:\n";
push( @installer::globals::logfileinfo, $infoline);
foreach my $path ( @{$followmeinfohash->{'includepatharray'}} ) { push( @installer::globals::logfileinfo, $path); }
}
diff --git a/solenv/bin/modules/installer/environment.pm b/solenv/bin/modules/installer/environment.pm
index c80d8375f3c2..54597612d46f 100644
--- a/solenv/bin/modules/installer/environment.pm
+++ b/solenv/bin/modules/installer/environment.pm
@@ -75,7 +75,7 @@ sub create_pathvariables
}
##################################################
-# Replacing tilde in pathes, because of
+# Replacing tilde in paths, because of
# problem with deep recursion (task 104830)
##################################################
diff --git a/solenv/bin/modules/installer/epmfile.pm b/solenv/bin/modules/installer/epmfile.pm
index 8d78f6226b57..b7299efa227f 100644
--- a/solenv/bin/modules/installer/epmfile.pm
+++ b/solenv/bin/modules/installer/epmfile.pm
@@ -58,7 +58,7 @@ sub read_packagemap
my $infoline = "\n\nCollected abbreviations and package names:\n";
push(@installer::globals::logfileinfo, $infoline);
- # Can be a comma separated list. All files have to be found in include pathes
+ # Can be a comma separated list. All files have to be found in include paths
my $allpackagemapnames = installer::converter::convert_stringlist_into_hash(\$packagemapname, ",");
foreach my $onepackagemapname ( keys %{$allpackagemapnames} )
{
diff --git a/solenv/bin/modules/installer/packagelist.pm b/solenv/bin/modules/installer/packagelist.pm
index 1c5d6fa00ba0..d6b2f02afa5d 100644
--- a/solenv/bin/modules/installer/packagelist.pm
+++ b/solenv/bin/modules/installer/packagelist.pm
@@ -728,7 +728,7 @@ sub log_packages_content
}
#####################################################################
-# Creating assignments from modules to destination pathes.
+# Creating assignments from modules to destination paths.
# This is required for logging in fileinfo file. Otherwise
# the complete destination file would not be known in file list.
# Saved in %installer::globals::moduledestination
@@ -754,7 +754,7 @@ sub create_module_destination_hash
}
#####################################################################
-# Adding the default pathes into the files collector for Unixes.
+# Adding the default paths into the files collector for Unixes.
# This is necessary to know the complete destination path in
# fileinfo log file.
#####################################################################
diff --git a/solenv/bin/modules/installer/parameter.pm b/solenv/bin/modules/installer/parameter.pm
index 5f9638ffd8c9..c5c783682151 100644
--- a/solenv/bin/modules/installer/parameter.pm
+++ b/solenv/bin/modules/installer/parameter.pm
@@ -207,7 +207,7 @@ sub control_fundamental_parameter
##########################################################
# The path parameters can be relative or absolute.
-# This function creates absolute pathes.
+# This function creates absolute paths.
##########################################################
sub make_path_absolute
diff --git a/solenv/bin/modules/installer/scriptitems.pm b/solenv/bin/modules/installer/scriptitems.pm
index 905b37e844db..23e94d75e0c9 100644
--- a/solenv/bin/modules/installer/scriptitems.pm
+++ b/solenv/bin/modules/installer/scriptitems.pm
@@ -1046,7 +1046,7 @@ sub get_Destination_Directory_For_Item_From_Directorylist # this is used f
}
##########################################################################
-# Searching a file in a list of pathes
+# Searching a file in a list of paths
##########################################################################
sub get_sourcepath_from_filename_and_includepath_classic
@@ -1214,7 +1214,7 @@ sub determine_directory_language_dependency
}
##############################################################
-# Getting all source pathes for all files to be packed
+# Getting all source paths for all files to be packed
# $item can be "Files" or "ScpActions"
##############################################################
@@ -2340,7 +2340,7 @@ sub resolve_links_with_flag_relative
# Before this step is:
# destination=program/libsalhelperC52.so.3, this will be the name of the link
# destinationfile=program/libsalhelperC52.so.3, this will be the linked file or name
- # If the flag RELATIVE is set, the pathes have to be analyzed. If the flag is not set
+ # If the flag RELATIVE is set, the paths have to be analyzed. If the flag is not set
# (this will not occur in the future?) destinationfile has to be an absolute path name
for ( my $i = 0; $i <= $#{$linksarrayref}; $i++ )
diff --git a/solenv/bin/modules/installer/windows/admin.pm b/solenv/bin/modules/installer/windows/admin.pm
index 6c79aaedea3c..194a65f8ad01 100644
--- a/solenv/bin/modules/installer/windows/admin.pm
+++ b/solenv/bin/modules/installer/windows/admin.pm
@@ -410,7 +410,7 @@ sub create_directory_structure
foreach $dir (@startparents) { create_directory_tree($dir, \%fullpathhash, $targetdir, $dirhash); }
- # Also adding the pathes of the startparents
+ # Also adding the paths of the startparents
foreach $dir (@startparents)
{
if ( ! exists($fullpathhash{$dir}) ) { $fullpathhash{$dir} = $targetdir; }
diff --git a/solenv/bin/modules/installer/windows/directory.pm b/solenv/bin/modules/installer/windows/directory.pm
index 7a588edeb71b..c72358da3b7b 100644
--- a/solenv/bin/modules/installer/windows/directory.pm
+++ b/solenv/bin/modules/installer/windows/directory.pm
@@ -175,7 +175,7 @@ sub create_unique_directorynames
if ( ! $allvariables->{'NOSHORTDIRECTORYNAMES'} )
{
- # This process does not work for SDK, because of its long and similar pathes
+ # This process does not work for SDK, because of its long and similar paths
$uniquename = make_short_dir_version($uniquename, $startlength, $hostname); # taking care of underlines!
}
diff --git a/solenv/bin/modules/installer/windows/msp.pm b/solenv/bin/modules/installer/windows/msp.pm
index be9ed624e0e9..0de6effff0b2 100644
--- a/solenv/bin/modules/installer/windows/msp.pm
+++ b/solenv/bin/modules/installer/windows/msp.pm
@@ -1402,7 +1402,7 @@ sub create_msp_patch
if ( $installer::globals::languagepack ) { $pcpfilename =~ s/.pcp\s*$/languagepack.pcp/; }
elsif ( $installer::globals::helppack ) { $pcpfilename =~ s/.pcp\s*$/helppack.pcp/; }
- # Searching the pcp file in the include pathes
+ # Searching the pcp file in the include paths
my $fullpcpfilenameref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$pcpfilename, $includepatharrayref, 1);
if ( $$fullpcpfilenameref eq "" ) { installer::exiter::exit_program("ERROR: pcp file not found: $pcpfilename !", "create_msp_patch"); }
my $fullpcpfilenamesource = $$fullpcpfilenameref;
diff --git a/solenv/bin/modules/installer/windows/update.pm b/solenv/bin/modules/installer/windows/update.pm
index 50d31f022024..4378ecf89a87 100644
--- a/solenv/bin/modules/installer/windows/update.pm
+++ b/solenv/bin/modules/installer/windows/update.pm
@@ -313,7 +313,7 @@ sub readdatabase
if ( ! $allvariables->{'UPDATE_DATABASE_LISTNAME'} ) { installer::exiter::exit_program("ERROR: If \"UPDATE_DATABASE\" is set, \"UPDATE_DATABASE_LISTNAME\" is required.", "Main"); }
my $listfilename = $allvariables->{'UPDATE_DATABASE_LISTNAME'};
- # Searching the list in the include pathes
+ # Searching the list in the include paths
my $listname = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$listfilename, $includepatharrayref, 1);
if ( $$listname eq "" ) { installer::exiter::exit_program("ERROR: List file not found: $listfilename !", "readdatabase"); }
my $completelistname = $$listname;
diff --git a/solenv/bin/modules/installer/ziplist.pm b/solenv/bin/modules/installer/ziplist.pm
index c078155c3f7b..3219e71284e1 100644
--- a/solenv/bin/modules/installer/ziplist.pm
+++ b/solenv/bin/modules/installer/ziplist.pm
@@ -518,7 +518,7 @@ sub replace_packagetype_in_pathes
}
####################################################
-# Removing ending separators in pathes
+# Removing ending separators in paths
####################################################
sub remove_ending_separator
@@ -546,7 +546,7 @@ sub replace_languages_in_pathes
{
my ( $patharrayref, $languagesref ) = @_;
- installer::logger::include_header_into_logfile("Replacing languages in include pathes:");
+ installer::logger::include_header_into_logfile("Replacing languages in include paths:");
my @patharray = ();
my $infoline = "";
@@ -570,7 +570,7 @@ sub replace_languages_in_pathes
installer::remover::remove_leading_and_ending_whitespaces(\$newline);
- # Is it necessary to refresh the global array, containing all files of all include pathes?
+ # Is it necessary to refresh the global array, containing all files of all include paths?
if ( -d $newdir )
{
# Checking if $newdir is empty
diff --git a/solenv/bin/modules/par2script/parameter.pm b/solenv/bin/modules/par2script/parameter.pm
index 9c8abec78a0c..38a2d39dcb78 100644
--- a/solenv/bin/modules/par2script/parameter.pm
+++ b/solenv/bin/modules/par2script/parameter.pm
@@ -51,7 +51,7 @@ sub usage
--------------------------------------------------------------
$par2script::globals::prog
The following parameter are needed:
--i: include pathes, comma separated list
+-i: include paths, comma separated list
-o: setup script file name
-v: writing logfile.txt (optional)
\@\@list: list of all par files
@@ -105,7 +105,7 @@ sub control_parameter
if ($par2script::globals::includepathlist eq "")
{
print "\n************************************************\n";
- print "Error: Include pathes not set not set (-i)!";
+ print "Error: Include paths not set not set (-i)!";
print "\n************************************************\n";
usage();
exit(-1);
diff --git a/solenv/bin/modules/par2script/work.pm b/solenv/bin/modules/par2script/work.pm
index c9b0bb150bce..10dd1ea7ecdb 100644
--- a/solenv/bin/modules/par2script/work.pm
+++ b/solenv/bin/modules/par2script/work.pm
@@ -66,14 +66,14 @@ sub analyze_comma_separated_list
}
############################################
-# setting list of include pathes
+# setting list of include paths
############################################
sub setincludes
{
my ($list) = @_;
- # input is the comma separated list of include pathes
+ # input is the comma separated list of include paths
my $includes = analyze_comma_separated_list($list);
@@ -131,7 +131,7 @@ sub make_complete_pathes_for_parfiles
if ( ! $foundparfile )
{
- die "ERROR: Could not find parfile ${$parfiles}[$i] in includes pathes: $par2script::globals::includepathlist !\n";
+ die "ERROR: Could not find parfile ${$parfiles}[$i] in includes paths: $par2script::globals::includepathlist !\n";
}
}
}
diff --git a/solenv/bin/modules/pre2par/parameter.pm b/solenv/bin/modules/pre2par/parameter.pm
index 763f1963051c..a39dbd0623b0 100644
--- a/solenv/bin/modules/pre2par/parameter.pm
+++ b/solenv/bin/modules/pre2par/parameter.pm
@@ -132,7 +132,7 @@ sub control_parameter
##########################################################
# The path parameters can be relative or absolute.
-# This function creates absolute pathes.
+# This function creates absolute paths.
##########################################################
sub make_path_absolute
diff --git a/solenv/bin/packimages.pl b/solenv/bin/packimages.pl
index 70823c5a8b41..12eb3ea1b9ad 100755
--- a/solenv/bin/packimages.pl
+++ b/solenv/bin/packimages.pl
@@ -49,7 +49,7 @@ my $global_path; # path to global images directory
my $module_path; # path to module images directory
my $sort_file; # path to file containing sorting data
my @custom_path; # path to custom images directory
-my @imagelist_path; # pathes to directories containing the image lists
+my @imagelist_path; # paths to directories containing the image lists
my $verbose; # be verbose
my $extra_verbose; # be extra verbose
my $do_rebuild = 0; # is rebuilding zipfile required?
diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk
index a8bd275ebbd7..c3eddcd4ed2b 100644
--- a/solenv/inc/settings.mk
+++ b/solenv/inc/settings.mk
@@ -1012,7 +1012,7 @@ JAVA*:=$(JAVAINTERPRETER)
.EXPORT : JAVA JAVAI
# Define SCPCOMP without wrapper because pre2par.pl chokes on DOS style
-# pathes. (See iz57443)
+# paths. (See iz57443)
SCPCOMP=$(PERL) $(SOLARENV)/bin/pre2par.pl
SCPLINK=$(PERL) $(SOLARENV)/bin/par2script.pl
LZIP*=lzip