diff options
Diffstat (limited to 'solenv/bin')
39 files changed, 131 insertions, 121 deletions
diff --git a/solenv/bin/build.pl b/solenv/bin/build.pl index 57853d9d7619..c82b57c3912e 100755 --- a/solenv/bin/build.pl +++ b/solenv/bin/build.pl @@ -1049,7 +1049,7 @@ sub add_prerequisite_job { }; # -# procedure adds a job wich is dependent from all already registered jobs +# procedure adds a job which is dependent from all already registered jobs # sub add_dependent_job { # $post_job is dependent from all jobs @@ -1777,7 +1777,7 @@ sub handle_dead_children { sub give_second_chance { my $pid = shift; - # A malicious hack for misterious windows problems - try 2 times + # A malicious hack for mysterious windows problems - try 2 times # to run dmake in the same directory if errors occurs my $child_nick = $processes_hash{$pid}; $running_children{$folders_hashes{$child_nick}}--; @@ -3386,7 +3386,7 @@ sub run_server { }; } else { if ($client_hash{result} eq "0") { -# print "$clients_jobs{$pid} succedded on $pid\n"; +# print "$clients_jobs{$pid} succeeded on $pid\n"; } else { print "Error $client_hash{result}\n"; if (store_error($pid, $client_hash{result})) { diff --git a/solenv/bin/build_release.pl b/solenv/bin/build_release.pl index d5f9b06fe764..83ea6f404f46 100755 --- a/solenv/bin/build_release.pl +++ b/solenv/bin/build_release.pl @@ -1342,7 +1342,7 @@ sub ResolveTemplate ($$$$$) my $name = $template; - # Resolve %? template paramters. + # Resolve %? template parameters. $name =~ s/%V/$release_descriptor->{'version'}/g; $name =~ s/%W/$old_to_new_version_dash/g; $name =~ s/%w/$old_to_new_version_dots/g; diff --git a/solenv/bin/cws.pl b/solenv/bin/cws.pl index 7583a4b6cb70..59e530b96fc0 100644 --- a/solenv/bin/cws.pl +++ b/solenv/bin/cws.pl @@ -126,7 +126,7 @@ sub parse_command_line my $command = shift @ARGV; if (!exists $valid_commands_hash{$command}) { - print_error("Unkown command: '$command'\n"); + print_error("Unknown command: '$command'\n"); usage(); exit(1); } @@ -144,7 +144,7 @@ sub parse_command_line $command = 'task'; } - # An unkown option might be accompanied with a valid command. + # An unknown option might be accompanied with a valid command. # Show the command specific help if ( !$success ) { do_help([$command]) @@ -607,7 +607,7 @@ sub query_integratedinto if ( is_valid_cws($cws) ) { my $milestone = $cws->get_milestone_integrated(); print_message("Integrated into:"); - print defined($milestone) ? "$milestone\n" : "unkown\n"; + print defined($milestone) ? "$milestone\n" : "unknown\n"; } return; } @@ -1405,7 +1405,7 @@ sub do_help elsif ($arg eq 'create') { print STDERR "create: Create a new child workspace\n"; print STDERR "usage: create [-m milestone] <master workspace> <child workspace>\n"; - print STDERR "\t-m milestone: Milestone to base the child workspace on. If ommitted the\n"; + print STDERR "\t-m milestone: Milestone to base the child workspace on. If omitted the\n"; print STDERR "\t last published milestone will be used.\n"; print STDERR "\t--milestone milestone: Same as -m milestone.\n"; } @@ -2012,7 +2012,7 @@ sub hg_clone print STDERR "CWS-DEBUG: ... hg clone: '$source -> $dest', options: '$options'\n"; } - # The to be cloned revision might not yet be avaliable. In this case clone + # The to be cloned revision might not yet be available. In this case clone # the available tip. my @result = execute_hg_command(0, 'clone', $options, $source, $dest); if ( defined($result[0]) && $result[0] =~ /abort: unknown revision/ ) { diff --git a/solenv/bin/download_external_dependencies.pl b/solenv/bin/download_external_dependencies.pl index 855f430958ef..d1b4121247ec 100755 --- a/solenv/bin/download_external_dependencies.pl +++ b/solenv/bin/download_external_dependencies.pl @@ -587,7 +587,7 @@ sub DownloadFile ($$$) close $out; } - # When download was successfull then check the checksum and rename the .part file + # When download was successful then check the checksum and rename the .part file # into the actual extension name. if ($success) { diff --git a/solenv/bin/make_download.pl b/solenv/bin/make_download.pl index 6b36ed32bcc5..eb7fc29fc0ef 100644 --- a/solenv/bin/make_download.pl +++ b/solenv/bin/make_download.pl @@ -64,7 +64,7 @@ foreach my $infofilename ( @{$infofilelist} ) installer::logger::print_message( "... WARNING: Signing only for Windows platforms active ...\n" ); } - # installer::logger::include_header_into_logfile("Reading include pathes"); + # installer::logger::include_header_into_logfile("Reading include paths"); # installer::worker::collect_all_files_from_includepathes($followmeinfohash->{'includepatharray'}); if (( $installer::globals::iswindowsbuild ) && ( $installer::globals::dosign )) diff --git a/solenv/bin/make_installer.pl b/solenv/bin/make_installer.pl index 05c566dce23b..cce6c29f9a9e 100644 --- a/solenv/bin/make_installer.pl +++ b/solenv/bin/make_installer.pl @@ -1470,7 +1470,7 @@ installer::ziplist::remove_ending_separator($includepatharrayref); ############################################## # Collecting all files from all include -# pathes in global hashes. +# paths in global hashes. ############################################## installer::worker::collect_all_files_from_includepathes($includepatharrayref); @@ -1954,7 +1954,7 @@ for (;1;last) # 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/Cws.pm b/solenv/bin/modules/Cws.pm index 5134006d5170..03e47800f54b 100644 --- a/solenv/bin/modules/Cws.pm +++ b/solenv/bin/modules/Cws.pm @@ -1406,7 +1406,7 @@ sub set_integration_milestone_in_eis if ( !defined($milestone) ) { $milestone = Eis::to_string(''); } - # $buildid must be transfered as string + # $buildid must be transferred as string if ( !defined($buildid) ) { $buildid = Eis::to_string(''); } diff --git a/solenv/bin/modules/ExtensionsLst.pm b/solenv/bin/modules/ExtensionsLst.pm index 55c280c7dcf7..39bb6d06af82 100644 --- a/solenv/bin/modules/ExtensionsLst.pm +++ b/solenv/bin/modules/ExtensionsLst.pm @@ -169,7 +169,7 @@ sub EvaluateTerm ($$) my $left_value = $ENV{$left}; $left_value = "" if ! defined $left_value; - # We can check whether the condition is fullfilled right now. + # We can check whether the condition is fulfilled right now. $result = EvaluateOperator($left_value, $operator, $right); } elsif ($left eq "language") @@ -506,7 +506,7 @@ sub Download (@) my $response = $agent->get($URL); close $out; - # When download was successfull then check the md5 checksum and rename the .part file + # When download was successful then check the md5 checksum and rename the .part file # into the actual extension name. if ($response->is_success()) { diff --git a/solenv/bin/modules/installer/archivefiles.pm b/solenv/bin/modules/installer/archivefiles.pm index 421c418c4afa..0d4cd54f5794 100644 --- a/solenv/bin/modules/installer/archivefiles.pm +++ b/solenv/bin/modules/installer/archivefiles.pm @@ -362,7 +362,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 8db26b264537..38b8fa20e126 100644 --- a/solenv/bin/modules/installer/control.pm +++ b/solenv/bin/modules/installer/control.pm @@ -269,7 +269,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 ###################################################################### @@ -378,7 +378,7 @@ sub check_logfile () } else { - push(@output, "ERROR: The following errors occured in packaging process:\n"); + push(@output, "ERROR: The following errors occurred in packaging process:\n"); } push(@output, "\n"); @@ -557,7 +557,7 @@ sub check_updatepack $installer::logger::Global->printf("Failed to create directory \n", $directory); if ( defined $ENV{'BSCLIENT'} && ( uc $ENV{'BSCLIENT'} eq 'TRUE' ) ) { - installer::exiter::exit_program("ERROR: No write access to SHIPDRIVE allthough BSCLIENT is set.", "check_updatepack"); + installer::exiter::exit_program("ERROR: No write access to SHIPDRIVE although BSCLIENT is set.", "check_updatepack"); } } } diff --git a/solenv/bin/modules/installer/converter.pm b/solenv/bin/modules/installer/converter.pm index c6d2b794314a..d3c45b3fa8ea 100644 --- a/solenv/bin/modules/installer/converter.pm +++ b/solenv/bin/modules/installer/converter.pm @@ -273,7 +273,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 0bdf49edb16b..616543777c7a 100644 --- a/solenv/bin/modules/installer/downloadsigner.pm +++ b/solenv/bin/modules/installer/downloadsigner.pm @@ -200,7 +200,7 @@ sub set_temp_path } ############################################# -# Setting output pathes to temp directory +# Setting output paths to temp directory # This are the: # unpackpath and the loggingdir ############################################# @@ -214,7 +214,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 @@ -240,20 +240,20 @@ 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"); - $installer::logger::Lang->print("Old pathes:\n"); + installer::logger::include_header_into_logfile("Changing saved paths to add the minor"); + $installer::logger::Lang->print("Old paths:\n"); $installer::logger::Lang->printf("\$followmeinfohash->{'installlogdir'}: %s\n", $followmeinfohash->{'installlogdir'}); $installer::logger::Lang->printf("\$installer::globals::unpackpath: %s\n", $installer::globals::unpackpath); $installer::logger::Lang->printf("\$installer::globals::idttemplatepath: %s\n", $installer::globals::idttemplatepath); $installer::logger::Lang->printf("\$installer::globals::idtlanguagepath: %s\n", $installer::globals::idtlanguagepath); - $installer::logger::Lang->printf("Include pathes:\n"); + $installer::logger::Lang->printf("Include paths:\n"); foreach my $path ( @{$followmeinfohash->{'includepatharray'}} ) { $installer::logger::Lang->print($path); @@ -301,12 +301,12 @@ sub set_minor_into_pathes foreach my $path ( @{$followmeinfohash->{'includepatharray'}} ) { if ( $path =~ /\Q$srcpath\E/ ) { $path =~ s/\Q$srcpath\E/$newsrcpath/; } } $installer::logger::Lang->print("\n"); - $installer::logger::Lang->print("New pathes:\n"); + $installer::logger::Lang->print("New paths:\n"); $installer::logger::Lang->printf("\$followmeinfohash->{'installlogdir'}: %s\n", $followmeinfohash->{'installlogdir'}); $installer::logger::Lang->printf("\$installer::globals::unpackpath: %s\n", $installer::globals::unpackpath); $installer::logger::Lang->printf("\$installer::globals::idttemplatepath: %s\n", $installer::globals::idttemplatepath); $installer::logger::Lang->printf("\$installer::globals::idtlanguagepath: %s\n", $installer::globals::idtlanguagepath); - $installer::logger::Lang->printf("Include pathes:\n"); + $installer::logger::Lang->printf("Include paths:\n"); foreach my $path ( @{$followmeinfohash->{'includepatharray'}} ) { $installer::logger::Lang->print($path); diff --git a/solenv/bin/modules/installer/environment.pm b/solenv/bin/modules/installer/environment.pm index b6d6b96297c5..e7f9eca78bc2 100644 --- a/solenv/bin/modules/installer/environment.pm +++ b/solenv/bin/modules/installer/environment.pm @@ -72,7 +72,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 38cff5d3569c..21b35981f072 100644 --- a/solenv/bin/modules/installer/epmfile.pm +++ b/solenv/bin/modules/installer/epmfile.pm @@ -55,7 +55,7 @@ sub read_packagemap $installer::logger::Lang->printf("\n"); $installer::logger::Lang->printf("nCollected abbreviations and package names:\n"); - # 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/javainstaller.pm b/solenv/bin/modules/installer/javainstaller.pm index 31f3709fc1ab..40bae72caa34 100644 --- a/solenv/bin/modules/installer/javainstaller.pm +++ b/solenv/bin/modules/installer/javainstaller.pm @@ -371,7 +371,7 @@ sub convert_licenstring ####################################################### # Adding the license file into the java file # In the template java file there are two -# occurences of INSTALLSDK_GUI_LICENSE +# occurrences of INSTALLSDK_GUI_LICENSE # and INSTALLSDK_CONSOLE_LICENSE ####################################################### diff --git a/solenv/bin/modules/installer/packagelist.pm b/solenv/bin/modules/installer/packagelist.pm index 51706274beff..fcdabd9feecd 100644 --- a/solenv/bin/modules/installer/packagelist.pm +++ b/solenv/bin/modules/installer/packagelist.pm @@ -735,7 +735,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 @@ -761,7 +761,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/packagepool.pm b/solenv/bin/modules/installer/packagepool.pm index 69d9a09339b9..f8ce641df1f9 100644 --- a/solenv/bin/modules/installer/packagepool.pm +++ b/solenv/bin/modules/installer/packagepool.pm @@ -90,7 +90,7 @@ sub compare_epm_content for ( my $i = 0; $i <= $#{$newcontent}; $i++ ) { if ( ${$newcontent}[$i] =~ /^\s*$/ ) { next; } # Removing empty lines from $newcontent. Empty lines are also not included into pcf file, from where $oldcontent was read. - if ( ${$newcontent}[$i] =~ /^\s*f\s+/ ) { next; } # Ignoring files, they can contain temporary pathes + if ( ${$newcontent}[$i] =~ /^\s*f\s+/ ) { next; } # Ignoring files, they can contain temporary paths if (( ${$newcontent}[$i] =~ /^\s*%readme\s+/ ) || ( ${$newcontent}[$i] =~ /^\s*%license\s+/ )) { next; } # ignoring license and readme (language specific!) my $oneline = ${$newcontent}[$i]; $oneline =~ s/\s*$//; # Removing line ends. Also not included in old epm file, that is read from pcf file. @@ -308,7 +308,7 @@ sub create_pcfcontent_file for ( my $i = 0; $i <= $#{$epmfilecontent}; $i++ ) { if ( ${$epmfilecontent}[$i] =~ /^\s*$/ ) { next; } # avoiding empty lines - if ( ${$epmfilecontent}[$i] =~ /^\s*f\s+/ ) { next; } # ignoring files, because they can contain temporary pathes + if ( ${$epmfilecontent}[$i] =~ /^\s*f\s+/ ) { next; } # ignoring files, because they can contain temporary paths if (( ${$epmfilecontent}[$i] =~ /^\s*%readme\s+/ ) || ( ${$epmfilecontent}[$i] =~ /^\s*%license\s+/ )) { next; } # ignoring license and readme (language specific!) $oneline = "EPM:\t${$epmfilecontent}[$i]"; push(@content, $oneline); @@ -775,7 +775,7 @@ sub package_is_up_to_date log_pool_info(0); # removing new package from installation set - if ( $newpackagepath ne "" ) { remove_package_from_installset($newpackagepath); } # A file was copied and a problem occured with pooling + if ( $newpackagepath ne "" ) { remove_package_from_installset($newpackagepath); } # A file was copied and a problem occurred with pooling $package_is_up_to_date = 4; # repeat this package return $package_is_up_to_date; @@ -788,7 +788,7 @@ sub package_is_up_to_date log_pool_info(1); # removing new package from installation set - if ( $newpackagepath ne "" ) { remove_package_from_installset($newpackagepath); } # A file was copied and a problem occured with pooling + if ( $newpackagepath ne "" ) { remove_package_from_installset($newpackagepath); } # A file was copied and a problem occurred with pooling $package_is_up_to_date = 4; # repeat this package return $package_is_up_to_date; @@ -946,7 +946,7 @@ sub put_content_into_pool } # Before the new package is renamed in the pool, it has to be checked, if this process still has the lock for this package. - # Check, if lock file still exists and if this process is the owner. Otherwise a pool error occured. + # Check, if lock file still exists and if this process is the owner. Otherwise a pool error occurred. if ( ! -f $installer::globals::poollockfilename ) { unlink $uniquedestination; # removing file from pool @@ -968,7 +968,7 @@ sub put_content_into_pool $installer::logger::Lang->print($infoline); # Before the lock file in the pool can be removed, it has to be checked, if this process is still the owner of this lock file. - # Check, if lock file still exists and if this process is the owner. Otherwise a pool error occured. + # Check, if lock file still exists and if this process is the owner. Otherwise a pool error occurred. if ( ! -f $installer::globals::poollockfilename ) { log_pool_info(0); @@ -1015,7 +1015,7 @@ sub copy_package_from_pool $destinationfile =~ s/.tar\s*$//; } - # Keeping the content of @installer::globals::installsetcontent up to date (with full pathes): + # Keeping the content of @installer::globals::installsetcontent up to date (with full paths): push(@installer::globals::installsetcontent, $destinationfile); return $destinationfile; diff --git a/solenv/bin/modules/installer/parameter.pm b/solenv/bin/modules/installer/parameter.pm index 62e0bee70c80..122abf58934a 100644 --- a/solenv/bin/modules/installer/parameter.pm +++ b/solenv/bin/modules/installer/parameter.pm @@ -202,7 +202,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/patch/InstallationSet.pm b/solenv/bin/modules/installer/patch/InstallationSet.pm index 8ea4f1579863..fecb94cacbc0 100644 --- a/solenv/bin/modules/installer/patch/InstallationSet.pm +++ b/solenv/bin/modules/installer/patch/InstallationSet.pm @@ -475,7 +475,7 @@ sub Download ($$$) if ( ! defined $digest || $digest->hexdigest() eq $checksum_value) { - $installer::logger::Info->print("download was successfull\n"); + $installer::logger::Info->print("download was successful\n"); if ( ! rename($temporary_filename, $filename)) { installer::logger::PrintError("can not rename '%s' to '%s'\n", $temporary_filename, $filename); diff --git a/solenv/bin/modules/installer/scriptitems.pm b/solenv/bin/modules/installer/scriptitems.pm index a874daac04c0..d11e9cfb36fd 100644 --- a/solenv/bin/modules/installer/scriptitems.pm +++ b/solenv/bin/modules/installer/scriptitems.pm @@ -1229,7 +1229,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 @@ -1394,7 +1394,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" ############################################################## @@ -2201,7 +2201,7 @@ sub quoting_illegal_filenames } ############################################################################ -# Removing multiple occurences of same module. +# Removing multiple occurrences of same module. ############################################################################ sub optimize_list @@ -2581,7 +2581,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 0bb4e2819033..e7f31a784570 100644 --- a/solenv/bin/modules/installer/windows/admin.pm +++ b/solenv/bin/modules/installer/windows/admin.pm @@ -415,7 +415,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 18d036adc789..dc37ae2cdd90 100644 --- a/solenv/bin/modules/installer/windows/directory.pm +++ b/solenv/bin/modules/installer/windows/directory.pm @@ -126,7 +126,7 @@ sub make_short_dir_version ($) $shortstring =~ s/^\s*\_//; # Setting unique ID to each directory - # No counter allowed, process must be absolute reproducable due to patch creation process. + # No counter allowed, process must be absolute reproducible due to patch creation process. my $subid = installer::windows::msiglobal::calculate_id($longstring_save, 9); # taking only the first 9 digits $shortstring = substr($shortstring, 0, $cutlength) . "_" . $subid; diff --git a/solenv/bin/modules/installer/windows/feature.pm b/solenv/bin/modules/installer/windows/feature.pm index d7979dd01ee5..d4650a664708 100644 --- a/solenv/bin/modules/installer/windows/feature.pm +++ b/solenv/bin/modules/installer/windows/feature.pm @@ -435,7 +435,7 @@ sub add_missing_features ($) return $features if ! $installer::globals::is_release; - # Aquire the feature list of the source release. + # Acquire the feature list of the source release. my $source_feature_table = $installer::globals::source_msi->GetTable("Feature"); my $feature_column_index = $source_feature_table->GetColumnIndex("Feature"); diff --git a/solenv/bin/modules/installer/windows/idtglobal.pm b/solenv/bin/modules/installer/windows/idtglobal.pm index 8caffaf48e98..4b3d59aff50b 100644 --- a/solenv/bin/modules/installer/windows/idtglobal.pm +++ b/solenv/bin/modules/installer/windows/idtglobal.pm @@ -2130,7 +2130,7 @@ sub get_customaction_position ########################################################################## # Setting the position of CustomActions in sequence tables. -# Replacing all occurences of "POSITIONTEMPLATE_" +# Replacing all occurrences of "POSITIONTEMPLATE_" ########################################################################## sub set_positions_in_table @@ -2140,7 +2140,7 @@ sub set_positions_in_table $installer::logger::Lang->print("\n"); $installer::logger::Lang->printf("Setting positions in table \"%s\".\n", $tablename); - # Step 1: Resolving all occurences of "POSITIONTEMPLATE_end" + # Step 1: Resolving all occurrences of "POSITIONTEMPLATE_end" my $lastposition = get_last_position_in_sequencetable($sequencetable); @@ -2156,9 +2156,9 @@ sub set_positions_in_table } } - # Step 2: Resolving all occurences of "POSITIONTEMPLATE_abc" or "POSITIONTEMPLATE_behind_abc" + # Step 2: Resolving all occurrences of "POSITIONTEMPLATE_abc" or "POSITIONTEMPLATE_behind_abc" # where abc is the name of the reference Custom Action. - # This has to be done, until there is no more occurence of POSITIONTEMPLATE (success) + # This has to be done, until there is no more occurrence of POSITIONTEMPLATE (success) # or there is no replacement in one circle (failure). my $template_exists = 0; @@ -2213,7 +2213,7 @@ sub set_positions_in_table } } while (( $template_exists ) && ( $template_replaced )); - # An error occured, because templates still exist, but could not be replaced. + # An error occurred, because templates still exist, but could not be replaced. # Reason: # 1. Wrong name of CustomAction in scp2 (typo?) # 2. Circular dependencies of CustomActions (A after B and B after A) diff --git a/solenv/bin/modules/installer/windows/msiglobal.pm b/solenv/bin/modules/installer/windows/msiglobal.pm index db0791468d76..4314319c6105 100644 --- a/solenv/bin/modules/installer/windows/msiglobal.pm +++ b/solenv/bin/modules/installer/windows/msiglobal.pm @@ -109,7 +109,7 @@ sub check_ddf_file ########################################################################## # Lines in ddf files must not be longer than 256 characters. -# Therefore it can be useful to use relative pathes. Then it is +# Therefore it can be useful to use relative paths. Then it is # necessary to change into temp directory before calling # makecab.exe. ########################################################################## @@ -183,7 +183,7 @@ sub generate_cab_file_list ($$$$) $sourcepath = $onefile->{'cyg_sourcepath'}; } - # to avoid lines with more than 256 characters, it can be useful to use relative pathes + # to avoid lines with more than 256 characters, it can be useful to use relative paths if ($allvariables->{'RELATIVE_PATHES_IN_DDF'}) { $sourcepath = make_relative_ddf_path($sourcepath); @@ -581,9 +581,9 @@ sub create_transforms my $infoline = "Systemcall: $systemcall\n"; $installer::logger::Lang->print($infoline); - # Problem: msitran.exe in version 4.0 always returns "1", even if no failure occured. + # Problem: msitran.exe in version 4.0 always returns "1", even if no failure occurred. # Therefore it has to be checked, if this is version 4.0. If yes, if the mst file - # exists and if it is larger than 0 bytes. If this is true, then no error occured. + # exists and if it is larger than 0 bytes. If this is true, then no error occurred. # File Version of msitran.exe: 4.0.6000.16384 has checksum: "b66190a70145a57773ec769e16777b29". # Same for msitran.exe from wntmsci12: "aa25d3445b94ffde8ef0c1efb77a56b8" @@ -628,13 +628,13 @@ sub create_transforms } else { - $infoline = "Filesize indicates that an error occured.\n"; + $infoline = "Filesize indicates that an error occurred.\n"; $installer::logger::Lang->print($infoline); } } else { - $infoline = "File $transformfile does not exist -> An error occured.\n"; + $infoline = "File $transformfile does not exist -> An error occurred.\n"; $installer::logger::Lang->print($infoline); } } @@ -1289,7 +1289,7 @@ sub prepare_64bit_database } } - # 2. Replacing all occurences of "VersionNT" by "VersionNT64" + # 2. Replacing all occurrences of "VersionNT" by "VersionNT64" my @versionnt_files = ("Componen.idt", "InstallE.idt", "InstallU.idt", "LaunchCo.idt"); @@ -1413,7 +1413,7 @@ sub execute_packaging $infoline = "chdir: $to \n"; $installer::logger::Lang->print($infoline); - # if the ddf file contains relative pathes, it is necessary to change into the temp directory + # if the ddf file contains relative paths, it is necessary to change into the temp directory if ( $allvariables->{'RELATIVE_PATHES_IN_DDF'} ) { $to = $installer::globals::temppath; @@ -1567,10 +1567,12 @@ sub get_source_codes ($) Determine values for the product code and upgrade code of the target version. - As perparation for building a Windows patch, certain conditions have to be fullfilled. - - The upgrade code changes from old to new version + As preparation for building a Windows patch, certain conditions have to be fulfilled. + - The upgrade code remains the same - The product code remains the same - In order to inforce that we have to access information about the source version. + [this is still to be determined. For patches to work we need the same product codes but + the install sets install only when the product codes differ.] + In order to enforce that we have to access information about the source version. The resulting values are stored as global variables $installer::globals::productcode @@ -1631,6 +1633,28 @@ sub set_global_code_variables ($$) $installer::logger::Lang->printf("there is no source version => created new guids\n"); } + # Keep the upgrade code constant between versions. Read it from the codes.txt file. + # Note that this handles regular installation sets and language packs. + my $onelanguage = ${$languagesref}[0]; + $installer::logger::Lang->printf("reading upgrade code for language %s from %s\n", + $onelanguage, + $installer::globals::codefilename); + if (defined $installer::globals::codefilename) + { + my $code_filename = $installer::globals::codefilename; + installer::files::check_file($code_filename); + my $codefile = installer::files::read_file($code_filename); + my $searchstring = "UPGRADECODE"; + my $codeblock = installer::windows::idtglobal::get_language_block_from_language_file( + $searchstring, + $codefile); + $target_upgrade_code = installer::windows::idtglobal::get_language_string_from_language_block( + $codeblock, + $onelanguage, + ""); + } + # else use the previously generated upgrade code. + $installer::globals::productcode = $target_product_code; $installer::globals::upgradecode = $target_upgrade_code; $allvariableshashref->{'PRODUCTCODE'} = $target_product_code; diff --git a/solenv/bin/modules/installer/windows/sign.pm b/solenv/bin/modules/installer/windows/sign.pm index 8ce4cc6e054c..38dd2fde5896 100644 --- a/solenv/bin/modules/installer/windows/sign.pm +++ b/solenv/bin/modules/installer/windows/sign.pm @@ -631,9 +631,9 @@ sub cabinet_cosistency_check } else { - $infoline = "ERROR: Problem occured calling diff.exe (File: $lastfile)\n"; + $infoline = "ERROR: Problem occurred calling diff.exe (File: $lastfile)\n"; $installer::logger::Lang->print($infoline); - installer::exiter::exit_program("ERROR: Problem occured calling diff.exe (File: $lastfile) !", "cabinet_cosistency_check"); + installer::exiter::exit_program("ERROR: Problem occurred calling diff.exe (File: $lastfile) !", "cabinet_cosistency_check"); } } } diff --git a/solenv/bin/modules/installer/worker.pm b/solenv/bin/modules/installer/worker.pm index b7db09969d31..3364db4fe9d6 100644 --- a/solenv/bin/modules/installer/worker.pm +++ b/solenv/bin/modules/installer/worker.pm @@ -492,7 +492,7 @@ sub analyze_and_save_logfile if ( $installer::globals::creating_windows_installer_patch ) { $installer::globals::creating_windows_installer_patch = 0; } - # Exiting the packaging process, if an error occured. + # Exiting the packaging process, if an error occurred. # This is important, to get an error code "-1", if an error was found in the log file, # that did not break the packaging process @@ -607,7 +607,7 @@ sub copy_hash_from_references ########################################################### # Setting one language in the language independent -# array of include pathes with $(LANG) +# array of include paths with $(LANG) ########################################################### sub get_language_specific_include_pathes @@ -2354,7 +2354,7 @@ sub add_variables_from_inc_to_hashref } ############################################## -# Collecting all files from include pathes +# Collecting all files from include paths ############################################## sub collect_all_files_from_includepathes @@ -2362,7 +2362,7 @@ sub collect_all_files_from_includepathes my ($patharrayref) = @_; installer::logger::globallog("Reading all directories: Start"); - $installer::logger::Info->print( "... reading include pathes ...\n" ); + $installer::logger::Info->print( "... reading include paths ...\n" ); # empty the global @installer::globals::allincludepathes =(); @@ -2668,7 +2668,7 @@ sub set_time_stamp } ############################################################ -# Generating pathes for cygwin (first version) +# Generating paths for cygwin (first version) # This function has problems with cygwin, if $tmpfilename # contains many thousand files (OpenOffice SDK). ############################################################ @@ -2695,7 +2695,7 @@ sub generate_cygwin_pathes_old } ################################################# -# Generating pathes for cygwin (second version) +# Generating paths for cygwin (second version) # This function generates smaller files for ################################################# @@ -2703,12 +2703,12 @@ sub generate_cygwin_pathes { my ($filesref) = @_; - $installer::logger::Lang->add_timestamp("Starting generating cygwin pathes"); + $installer::logger::Lang->add_timestamp("Starting generating cygwin paths"); - my $infoline = "Generating cygwin pathes (generate_cygwin_pathes)\n"; + my $infoline = "Generating cygwin paths (generate_cygwin_pathes)\n"; $installer::logger::Lang->print($infoline); - my $max = 5000; # number of pathes in one file + my $max = 5000; # number of paths in one file my @pathcollector = (); my $startnumber = 0; @@ -2726,7 +2726,7 @@ sub generate_cygwin_pathes my $temppath = $installer::globals::temppath; $temppath =~ s/\Q$installer::globals::separator\E\s*$//; $tmpfilename = $temppath . $installer::globals::separator . $tmpfilename; - $infoline = "Creating temporary file for cygwin conversion: $tmpfilename (contains $counter pathes)\n"; + $infoline = "Creating temporary file for cygwin conversion: $tmpfilename (contains $counter paths)\n"; $installer::logger::Lang->print($infoline); if ( -f $tmpfilename ) { unlink $tmpfilename; } @@ -2751,9 +2751,9 @@ sub generate_cygwin_pathes } else { - $installer::logger::Lang->print("ERROR: Failed to convert to cygwin pathes!\n"); + $installer::logger::Lang->print("ERROR: Failed to convert to cygwin paths!\n"); installer::exiter::exit_program( - "ERROR: Failed to convert to cygwin pathes!", + "ERROR: Failed to convert to cygwin paths!", "generate_cygwin_pathes"); } @@ -2782,7 +2782,7 @@ sub generate_cygwin_pathes } } - $installer::logger::Lang->add_timestamp("Ending generating cygwin pathes"); + $installer::logger::Lang->add_timestamp("Ending generating cygwin paths"); } ############################################## diff --git a/solenv/bin/modules/installer/xpdinstaller.pm b/solenv/bin/modules/installer/xpdinstaller.pm index 301878b8ab88..941f9285cbe1 100644 --- a/solenv/bin/modules/installer/xpdinstaller.pm +++ b/solenv/bin/modules/installer/xpdinstaller.pm @@ -441,8 +441,8 @@ sub get_forceintoupdate_value } ################################################### -# Substituting all occurences of "<" by "<" -# and all occurences of ">" by ">" +# Substituting all occurrences of "<" by "<" +# and all occurrences of ">" by ">" ################################################### sub replace_brackets_in_string @@ -456,7 +456,7 @@ sub replace_brackets_in_string } ################################################### -# Substituting all occurences of "\uUXYZ" by +# Substituting all occurrences of "\uUXYZ" by # "&#xUXYZ;", because the use xml saxparser does # not know anything about this encoding. Therfore # the xml file can keep standard encoding "UTF-8" diff --git a/solenv/bin/modules/installer/ziplist.pm b/solenv/bin/modules/installer/ziplist.pm index 7c66cdd6851c..c30bbb431ce1 100644 --- a/solenv/bin/modules/installer/ziplist.pm +++ b/solenv/bin/modules/installer/ziplist.pm @@ -639,7 +639,7 @@ sub replace_packagetype_in_pathes } #################################################### -# Removing ending separators in pathes +# Removing ending separators in paths #################################################### sub remove_ending_separator @@ -667,7 +667,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 = ""; @@ -691,7 +691,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 @@ -731,7 +731,7 @@ sub list_all_files_from_include_path { my ( $patharrayref) = @_; - installer::logger::include_header_into_logfile("Include pathes:"); + installer::logger::include_header_into_logfile("Include paths:"); for ( my $i = 0; $i <= $#{$patharrayref}; $i++ ) { @@ -790,7 +790,7 @@ sub set_default_productversion_if_required } #################################################### -# Removing .. in pathes +# Removing .. in paths #################################################### sub simplify_path @@ -813,7 +813,7 @@ sub simplify_path } #################################################### -# Removing ending separators in pathes +# Removing ending separators in paths #################################################### sub resolve_relative_pathes diff --git a/solenv/bin/modules/osarch.pm b/solenv/bin/modules/osarch.pm index a6b35336035a..1a7fe62944c7 100644 --- a/solenv/bin/modules/osarch.pm +++ b/solenv/bin/modules/osarch.pm @@ -23,7 +23,7 @@ # *********************************************************************** # Description: # Filename: osarch.pm -# Autor: EG +# Author: EG # Date: 28.10.96 # $Header: /zpool/svn/migration/cvs_rep_09_09_08/code/solenv/bin/modules/osarch.pm,v 1.3 2008-08-18 13:11:04 vg Exp $ # Copyright: STAR DIVISION diff --git a/solenv/bin/modules/packager/work.pm b/solenv/bin/modules/packager/work.pm index 0fd4c299da0c..69eeb222cd27 100644 --- a/solenv/bin/modules/packager/work.pm +++ b/solenv/bin/modules/packager/work.pm @@ -289,7 +289,7 @@ sub do_broadcast print "cmd_bcst -s 18 \@$tmpfile_name\n"; unlink "$tmpfile_name"; - if ( $returnvalue ) # an error occured + if ( $returnvalue ) # an error occurred { if (!($packager::globals::ignoreerrors)) { packager::exiter::exit_program("ERROR: Packing not successful!", "do_broadcast"); } } diff --git a/solenv/bin/modules/par2script/parameter.pm b/solenv/bin/modules/par2script/parameter.pm index 3bc9fc4b08e2..06fac65a1fc4 100644 --- a/solenv/bin/modules/par2script/parameter.pm +++ b/solenv/bin/modules/par2script/parameter.pm @@ -47,7 +47,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 @@ -101,7 +101,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 01c299829b81..0bdfb85dde78 100644 --- a/solenv/bin/modules/par2script/work.pm +++ b/solenv/bin/modules/par2script/work.pm @@ -62,14 +62,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); @@ -127,7 +127,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 288dde17eba0..92fe9840faa8 100644 --- a/solenv/bin/modules/pre2par/parameter.pm +++ b/solenv/bin/modules/pre2par/parameter.pm @@ -128,7 +128,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 54ae0bd12805..1de1ea4e74ea 100755 --- a/solenv/bin/packimages.pl +++ b/solenv/bin/packimages.pl @@ -45,7 +45,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/bin/packregistry.xslt b/solenv/bin/packregistry.xslt index f418e6dda89e..ecab36da9dcf 100644 --- a/solenv/bin/packregistry.xslt +++ b/solenv/bin/packregistry.xslt @@ -39,7 +39,7 @@ instead of the below for-each would only issue warnings, not errors, for non-existing or otherwise bad input files; it is important that the input filename list is already sorted in an order suitable for the configmgr - (e.g., xcs files preceeding xcu files). + (e.g., xcs files preceding xcu files). --> <xsl:for-each select="list/filename"> <xsl:variable name="doc" select="document(concat($prefix, .))"/> diff --git a/solenv/bin/patch_tool.pl b/solenv/bin/patch_tool.pl index 7f2d4de5b4fd..36b635117cfc 100644 --- a/solenv/bin/patch_tool.pl +++ b/solenv/bin/patch_tool.pl @@ -1281,7 +1281,7 @@ sub Check ($$$$) { my ($source_msi, $target_msi, $variables, $product_name) = @_; - $installer::logger::Info->printf("checking if source and target releases are compatable\n"); + $installer::logger::Info->printf("checking if source and target releases are compatible\n"); $installer::logger::Info->increase_indentation(); my $result = 1; diff --git a/solenv/bin/srcrelease.xml b/solenv/bin/srcrelease.xml index 0049952fbee6..5a05488e83e2 100644 --- a/solenv/bin/srcrelease.xml +++ b/solenv/bin/srcrelease.xml @@ -27,7 +27,7 @@ <property name="out.dir" value="."/> <property name="aoo.name" value="apache-openoffice"/> <property name="aoo.short.name" value="aoo"/> - <property name="aoo.ver" value="4.1.0"/> + <property name="aoo.ver" value="4.2.0"/> <property name="excludes.list" value="configure, moz/zipped/*.zip, **/.svn **/.gitignore, **/.git, warn, set_soenv, solver/**, makefile.mk, config.log, config.parms, config.status, bootstrap, autom4te.cache/**, MacOSXX86Env.*, external/unowinreg/unowinreg.dll" /> <property name="excludes.executables" value="solenv/bin/macosx-create-bundle, solenv/bin/linkoo, solenv/bin/localize, solenv/bin/createpdbrelocators, solenv/bin/langwrap, solenv/bin/makedepn, solenv/bin/packmodule, solenv/bin/rpm-wrapper, solenv/bin/relocate, solenv/bin/receditor, solenv/bin/subsequenttests, **/*.sh, **/*.bat, **/*.exe, configure.cmd, oowintool, config.sub, config.guess, **/*.pl"/> @@ -46,8 +46,6 @@ <property name="release.name" value="${aoo.name}-${aoo.ver}"/> <property name="release.file.name" value="${release.name}-r${scm.revision}-src"/> <property name="release.zip" value="${out.dir}/${release.file.name}.zip"/> - <property name="release.tar" value="${out.dir}/${release.file.name}.tar"/> - <property name="release.tar.gz" value="${out.dir}/${release.file.name}.tar.gz"/> <property name="release.tar.bz2" value="${out.dir}/${release.file.name}.tar.bz2"/> </target> @@ -79,9 +77,9 @@ <echo level="verbose" message=" ... DONE"/> </target> - <target name="source.tar" depends="declarenames"> - <echo level="verbose" message="### creating intermediate ${release.tar} ..."/> - <tar destfile="${release.tar}" longfile="gnu"> + <target name="source.tar.bz2" depends="declarenames"> + <echo level="verbose" message="### creating ${release.tar.bz2} ..."/> + <tar destfile="${release.tar.bz2}" compression="bzip2" longfile="gnu"> <tarfileset file="main/NOTICE" fullpath="${release.dir.name}/NOTICE"/> <tarfileset file="main/LICENSE" fullpath="${release.dir.name}/LICENSE"/> <tarfileset file="main/README" fullpath="${release.dir.name}/README"/> @@ -95,19 +93,7 @@ <echo level="verbose" message=" ... DONE"/> </target> - <target name="source.tar.gz" depends="source.tar"> - <echo level="verbose" message="### creating ${release.tar.gz} ..."/> - <gzip destfile="${release.tar.gz}" src="${release.tar}"/> - <echo level="verbose" message=" ... DONE"/> - </target> - - <target name="source.tar.bz2" depends="source.tar"> - <echo level="verbose" message="### creating ${release.tar.bz2} ..."/> - <bzip2 destfile="${release.tar.bz2}" src="${release.tar}"/> - <echo level="verbose" message=" ... DONE"/> - </target> - - <target name="pack" depends="clean,source.zip,source.tar.gz,source.tar.bz2"> + <target name="pack" depends="clean,source.zip,source.tar.bz2"> <echo level="info" message="### Create source release files for Apache OpenOffice ${aoo.ver} ..."/> </target> diff --git a/solenv/bin/transform_description.pl b/solenv/bin/transform_description.pl index c3343f294124..297efc74cd37 100644 --- a/solenv/bin/transform_description.pl +++ b/solenv/bin/transform_description.pl @@ -126,7 +126,7 @@ sub explain print STDOUT "\n"; print STDOUT " The following transformations are done at the moment:\n"; print STDOUT " - duplicate all lines containing #LANG#, for ever token of \$WITH_LANG\n"; - print STDOUT " replacing every occurance of \$LANG with a token\n"; + print STDOUT " replacing every occurrence of \$LANG with a token\n"; print STDOUT "\n"; print STDOUT " And yes, the functionality of this script should be\n"; print STDOUT " - moved to solenv/inc/tg_ext.mk\n"; |