diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2011-01-28 22:39:47 -0600 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2011-01-28 22:39:47 -0600 |
| commit | 6f277c207c70811e044cdfab3469de2d56be5742 (patch) | |
| tree | af67e41e19d0b52b0e4d9d4979d93f8926957332 | |
| parent | 6a2d11f784c046a192ee50fa1c9fbd41980c2eed (diff) | |
pre-merge m98 to resolve the trivial conflict/differences
136 files changed, 403 insertions, 1050 deletions
diff --git a/bootstrap.1 b/bootstrap.1 index 156f56255..09dd13f82 100644 --- a/bootstrap.1 +++ b/bootstrap.1 @@ -14,9 +14,7 @@ export EXEEXT # Build dmake if test "$BUILD_DMAKE" != "NO"; then - - if test ! -x "$SOLARENV/$OUTPATH/bin/dmake$EXEEXT"; then - + if test ! -x "$SRC_ROOT/dmake/dmake$EXEEXT"; then cd "$SRC_ROOT/dmake" || exit # Special case! The w32/tcsh build needs CC pointing to the MSVC++ compiler @@ -42,14 +40,9 @@ if test "$BUILD_DMAKE" != "NO"; then echo "dmake has been successfully built" cd .. - else - - echo "" - echo "dmake present in $SOLARENV/$OUTPATH/bin/dmake$EXEEXT" - + echo "dmake/dmake already built" fi - fi mkdir -p "$SOLARENV/$OUTPATH/bin" diff --git a/dmake/dbug/dbug/dbug.c b/dmake/dbug/dbug/dbug.c index bbd283aeb..c866cf7a3 100644 --- a/dmake/dbug/dbug/dbug.c +++ b/dmake/dbug/dbug/dbug.c @@ -164,45 +164,6 @@ EXPORT BOOLEAN _db_pon_ = FALSE; /* TRUE if debugging currently on */ * Externally supplied functions. */ -/* Disable the manual definitions, if something is missing use #include's! */ -#if 0 - -#ifdef unix /* Only needed for unix */ -IMPORT VOID perror (); /* Print system/library error */ -IMPORT int chown (); /* Change owner of a file */ -IMPORT int getgid (); /* Get real group id */ -IMPORT int getuid (); /* Get real user id */ -IMPORT int access (); /* Test file for access */ -#else -#if !(AMIGA || LATTICE || __TURBOC__) -LOCAL VOID perror (); /* Fake system/library error print routine */ -#endif -#endif - -# if BSD4_3 || sun -IMPORT int getrusage (); -#endif - -IMPORT int atoi (); /* Convert ascii to integer */ -IMPORT VOID exit (); /* Terminate execution */ -IMPORT int fclose (); /* Close a stream */ -IMPORT FILE *fopen (); /* Open a stream */ -#if !defined(__BORLANDC__) -IMPORT int fprintf (); /* Formatted print on file */ -#endif -IMPORT VOID free (); -IMPORT char *malloc (); /* Allocate memory */ -IMPORT int strcmp (); /* Compare strings */ -IMPORT char *strcpy (); /* Copy strings around */ -IMPORT int strlen (); /* Find length of string */ - -#ifndef fflush /* This is sometimes a macro */ -IMPORT int fflush (); /* Flush output for stream */ -#endif - -#endif - - /* * The user may specify a list of functions to trace or * debug. These lists are kept in a linear linked list, @@ -274,7 +235,7 @@ LOCAL BOOLEAN DoProfile (); /* Check if profiling is enabled */ /* Supplied in Sys V runtime environ */ LOCAL char *strtok (); /* Break string into tokens */ -LOCAL char *strrchr (); /* Find last occurance of char */ +LOCAL char *strrchr (); /* Find last occurrence of char */ /* * The following local variables are used to hold the state information diff --git a/dmake/dbug/malloc/testmem.c b/dmake/dbug/malloc/testmem.c index 33c5b362e..de5492412 100644 --- a/dmake/dbug/malloc/testmem.c +++ b/dmake/dbug/malloc/testmem.c @@ -354,34 +354,6 @@ second() check(strpbrk(one, "bc") == NULL, 10); /* Empty string. */ check(strpbrk(one, "") == NULL, 11); /* Both strings empty. */ -#if 0 - /* - * strstr - somewhat like strchr - */ - it = "strstr"; - check(strstr("abcd", "z") == NULL, 1); /* Not found. */ - check(strstr("abcd", "abx") == NULL, 2); /* Dead end. */ - (void) strcpy(one, "abcd"); - check(strstr(one, "c") == one+2, 3); /* Basic test. */ - check(strstr(one, "bc") == one+1, 4); /* Multichar. */ - check(strstr(one, "d") == one+3, 5); /* End of string. */ - check(strstr(one, "cd") == one+2, 6); /* Tail of string. */ - check(strstr(one, "abc") == one, 7); /* Beginning. */ - check(strstr(one, "abcd") == one, 8); /* Exact match. */ - check(strstr(one, "abcde") == NULL, 9); /* Too long. */ - check(strstr(one, "de") == NULL, 10); /* Past end. */ - check(strstr(one, "") == one+4, 11); /* Finding empty. */ - (void) strcpy(one, "ababa"); - check(strstr(one, "ba") == one+1, 12); /* Finding first. */ - (void) strcpy(one, ""); - check(strstr(one, "b") == NULL, 13); /* Empty string. */ - check(strstr(one, "") == one, 14); /* Empty in empty string. */ - (void) strcpy(one, "bcbca"); - check(strstr(one, "bca") == one+2, 15); /* False start. */ - (void) strcpy(one, "bbbcabbca"); - check(strstr(one, "bbca") == one+1, 16); /* With overlap. */ -#endif - /* * strspn */ diff --git a/dmake/dmake.c b/dmake/dmake.c index cae60beb7..aee84cdaa 100644 --- a/dmake/dmake.c +++ b/dmake/dmake.c @@ -292,7 +292,7 @@ char **argv; HASHPTR hp; /* This cleans the .SILENT setting */ hp = Def_macro(".SILENT", "", M_EXPANDED); - /* This overrides the bitmask for further occurences of + /* This overrides the bitmask for further occurrences of * .SILENT to "no bits allowed", see bit variables in the * set_macro_value() definition in dag.c. * The bitmask is already set by Create_macro_vars() in @@ -791,11 +791,7 @@ va_list args; ** Print error message and abort */ PUBLIC void -#ifndef __MWERKS__ Fatal(ARG(char *,fmt), ARG(va_alist_type,va_alist)) -#else -Fatal(char * fmt, ...) -#endif DARG(char *,fmt) DARG(va_alist_type,va_alist) { @@ -811,11 +807,7 @@ DARG(va_alist_type,va_alist) ** error message and exit (unless -k) */ PUBLIC void -#ifndef __MWERKS__ Error(ARG(char *,fmt), ARG(va_alist_type,va_alist)) -#else -Error(char * fmt, ...) -#endif DARG(char *,fmt) DARG(va_alist_type,va_alist) { @@ -831,11 +823,7 @@ DARG(va_alist_type,va_alist) ** non-fatal message */ PUBLIC void -#ifndef __MWERKS__ Warning(ARG(char *,fmt), ARG(va_alist_type,va_alist)) -#else -Warning(char * fmt , ...) -#endif DARG(char *,fmt) DARG(va_alist_type,va_alist) { diff --git a/dmake/dmstring.c b/dmake/dmstring.c index 207e75c2a..c64f503d6 100644 --- a/dmake/dmstring.c +++ b/dmake/dmstring.c @@ -200,7 +200,7 @@ char *str; PUBLIC char * DmStrPbrk( s1, s2 )/* ==================== - find first occurence of char in s2 in string s1. + find first occurrence of char in s2 in string s1. Returns a pointer to the first occurrence. NOTE '\0' is considered part of s2 and a pointer to it is returned if no other chars match. */ diff --git a/dmake/make.c b/dmake/make.c index 93878c401..a948c75c0 100644 --- a/dmake/make.c +++ b/dmake/make.c @@ -1254,7 +1254,7 @@ Exec_commands( cp )/* The function returns 0, if the command is executed and has successfully returned, and it returns 1 if the command is executing but has not yet - returned or -1 if an error occured (Return value from Do_cmnd()). + returned or -1 if an error occurred (Return value from Do_cmnd()). Macros that are found in recipe lines are expanded in this function, in parallel builds this can mean they are expanded before the previous recipe diff --git a/dmake/path.c b/dmake/path.c index 9520686d6..39c66e33d 100644 --- a/dmake/path.c +++ b/dmake/path.c @@ -181,7 +181,7 @@ char *path; #ifdef HAVE_DRIVE_LETTERS - /* Change all occurences from DirBrkStr to *DirSepStr. This assumes + /* Change all occurrences from DirBrkStr to *DirSepStr. This assumes * that when HAVE_DRIVE_LETTERS is set the directory separator is * either '\' or '/'. */ if (*DirSepStr == '/') diff --git a/dmake/rulparse.c b/dmake/rulparse.c index c02860745..fe1a62ef8 100644 --- a/dmake/rulparse.c +++ b/dmake/rulparse.c @@ -451,12 +451,6 @@ int flag; DB_PRINT( "par", ("Binding to %s, %04x", tg->CE_NAME, tg->ce_flag) ); magic = tg->ce_flag & F_PERCENT; -#if 0 - /* Check to see if we had a rule of the form '%.o : a.h b.h ; xxx' - * In which case we must build a NULL prq node to hold the recipe */ - if( _sv_globprq_only && (_sv_rules != NIL(STRING)) ) - _build_graph( _sv_op, tg, NIL(CELL) ); -#endif /* NOTE: For targets that are magic or special we ignore any * previously defined rules, ie. We throw away the old definition @@ -1200,7 +1194,7 @@ CELLPTR prereq; * definitions for the %-target members are stored in the prerequisites * list of the master target. */ /* This relies on target->ce_prq being NULL if this is the first - * occurence of this %-target and therefore not yet having a %-target + * occurrence of this %-target and therefore not yet having a %-target * master. */ match = FALSE; for(edl=target->ce_prq; !match && edl != NIL(LINK); edl=edl->cl_next) { diff --git a/dmake/sysintf.c b/dmake/sysintf.c index 528178a49..dd95b4006 100644 --- a/dmake/sysintf.c +++ b/dmake/sysintf.c @@ -278,7 +278,7 @@ int last; /* Last recipe line in target. */ DB_RETURN( 0 ); } - /* Stop making the rest of the recipies for this target if an error occured + /* Stop making the rest of the recipies for this target if an error occurred * but the Continue (-k) flag is set to build as much as possible. */ if ( target->ce_attr & A_ERROR ) { if ( last ) { diff --git a/dmake/unix/runargv.c b/dmake/unix/runargv.c index d74c0d625..03d9a45cc 100644 --- a/dmake/unix/runargv.c +++ b/dmake/unix/runargv.c @@ -438,7 +438,7 @@ private_strerror (errnum) int errnum; { #ifndef __APPLE__ -# if defined(arm32) || defined(linux) || defined(__FreeBSD__) || defined(__OpenBSD__) +# if defined(arm32) || defined(linux) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) extern const char * const sys_errlist[]; # else extern char *sys_errlist[]; diff --git a/dmake/win95/dchdir.c b/dmake/win95/dchdir.c index 53432ce63..7398b0f4c 100644 --- a/dmake/win95/dchdir.c +++ b/dmake/win95/dchdir.c @@ -23,9 +23,6 @@ -- Use cvs log to obtain detailed change logs. */ -#if 0 -#include <dir.h> -#endif #include <direct.h> #include "extern.h" diff --git a/guw/guw.cc b/guw/guw.cc index ea7c84d5c..a3a2f86fe 100644 --- a/guw/guw.cc +++ b/guw/guw.cc @@ -290,7 +290,7 @@ void init_ignorepara(string fullcommand) { bool is_ignorepara(const string ¶) { for( vector<string>::iterator it = ignorepara_vec.begin(); - it != ignorepara_vec.end(); it++ ) { + it != ignorepara_vec.end(); ++it ) { if ( para.find(*it) != string::npos ) { if ( debug ) cerr << "Found execption para: " << para << endl; @@ -641,7 +641,7 @@ void rep_subn_cyg(string &argument) regfree(&re); } -// Replace all occurences of subexpression number "subexp" with "repl" +// Replace all occurrences of subexpression number "subexp" with "repl" void rep_subn( string &argument, const char *pattern, int subexp, const char repl) { int status, pos=0; diff --git a/instsetoo_native/inc_broffice/windows/msi_templates/Binary/Banner.bmp b/instsetoo_native/inc_broffice/windows/msi_templates/Binary/Banner.bmp Binary files differindex 9b367631b..84840f36a 100644 --- a/instsetoo_native/inc_broffice/windows/msi_templates/Binary/Banner.bmp +++ b/instsetoo_native/inc_broffice/windows/msi_templates/Binary/Banner.bmp diff --git a/instsetoo_native/inc_broffice/windows/msi_templates/Binary/Image.bmp b/instsetoo_native/inc_broffice/windows/msi_templates/Binary/Image.bmp Binary files differindex 8b160e68e..75dc163eb 100644 --- a/instsetoo_native/inc_broffice/windows/msi_templates/Binary/Image.bmp +++ b/instsetoo_native/inc_broffice/windows/msi_templates/Binary/Image.bmp diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/Banner.bmp b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/Banner.bmp Binary files differindex d7f7f6359..a453f1fcd 100644 --- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/Banner.bmp +++ b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/Banner.bmp diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/Image.bmp b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/Image.bmp Binary files differindex 515f8faec..25b5b11be 100644 --- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/Image.bmp +++ b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/Image.bmp diff --git a/instsetoo_native/util/pack.lst b/instsetoo_native/util/pack.lst index c19039118..973f564ae 100644 --- a/instsetoo_native/util/pack.lst +++ b/instsetoo_native/util/pack.lst @@ -2,7 +2,7 @@ # Pack.lst: Contains the packaging information for the update packaging process. # Syntax: Product, list of platforms, list of languages, target (Separator: spaces) # Syntax for list of languages: One multilingual installation set uses separator "," -# (Example: "en-US,de" creates english-german multilingual installation set) +# (Example: "en-US,de" creates english-german multilingual installation set) # Different installation sets use the "|" as separator # Product List_of_platforms List_of_languages Target diff --git a/scp2/source/base/module_base.scp b/scp2/source/base/module_base.scp index dc4d76fcf..269b8cd3c 100644 --- a/scp2/source/base/module_base.scp +++ b/scp2/source/base/module_base.scp @@ -54,15 +54,6 @@ Module gid_Module_Prg_Base_Bin ); End -// Module gid_Module_Prg_Base_Help -// MOD_NAME_DESC ( MODULE_PRG_BASE_HELP ); -// ParentID = gid_Module_Prg_Base; -// Sortkey = "200"; -// Minimal = NO; -// Default = YES; -// Files = (gid_File_Help_Sdatabase_Zip); -// End - Module gid_Module_Brand_Prg_Base PackageInfo = "packinfo_brand.txt"; Name = "gid_Module_Brand_Prg_Base"; diff --git a/scp2/source/calc/module_calc.scp b/scp2/source/calc/module_calc.scp index 0c26c3a7a..ac9e2dd90 100644 --- a/scp2/source/calc/module_calc.scp +++ b/scp2/source/calc/module_calc.scp @@ -47,14 +47,6 @@ Module gid_Module_Prg_Calc_Bin gid_File_Tmp_Userinstall_Calc_Inf); End -// Module gid_Module_Prg_Calc_Help -// MOD_NAME_DESC ( MODULE_PRG_CALC_HELP ); -// ParentID = gid_Module_Prg_Calc; -// Sortkey = "200"; -// Default = YES; -// Files = (gid_File_Help_Scalc_Zip); -// End - Module gid_Module_Prg_Calc_Addins MOD_NAME_DESC ( MODULE_OPTIONAL_ADDINS ); Styles = (HIDDEN_ROOT); diff --git a/scp2/source/draw/module_draw.scp b/scp2/source/draw/module_draw.scp index 3226e08ea..3db67d105 100644 --- a/scp2/source/draw/module_draw.scp +++ b/scp2/source/draw/module_draw.scp @@ -47,14 +47,6 @@ Module gid_Module_Prg_Draw_Bin gid_File_Tmp_Userinstall_Draw_Inf); End -// Module gid_Module_Prg_Draw_Help -// MOD_NAME_DESC ( MODULE_PRG_DRAW_HELP ); -// ParentID = gid_Module_Prg_Draw; -// Sortkey = "200"; -// Default = YES; -// Files = (gid_File_Help_Sdraw_Zip); -// End - Module gid_Module_Brand_Prg_Draw PackageInfo = "packinfo_brand.txt"; Name = "gid_Module_Brand_Prg_Draw"; diff --git a/scp2/source/impress/module_impress.scp b/scp2/source/impress/module_impress.scp index 1682b88d0..bc1ae3570 100644 --- a/scp2/source/impress/module_impress.scp +++ b/scp2/source/impress/module_impress.scp @@ -48,14 +48,6 @@ Module gid_Module_Prg_Impress_Bin gid_File_Tmp_Userinstall_Impress_Inf); End -// Module gid_Module_Prg_Impress_Help -// MOD_NAME_DESC ( MODULE_PRG_IMPRESS_HELP ); -// ParentID = gid_Module_Prg_Impress; -// Sortkey = "200"; -// Default = YES; -// Files = (gid_File_Help_Simpress_Zip); -// End - Module gid_Module_Brand_Prg_Impress PackageInfo = "packinfo_brand.txt"; Name = "gid_Module_Brand_Prg_Impress"; diff --git a/scp2/source/math/module_math.scp b/scp2/source/math/module_math.scp index e9c084ba9..60b398191 100644 --- a/scp2/source/math/module_math.scp +++ b/scp2/source/math/module_math.scp @@ -47,14 +47,6 @@ Module gid_Module_Prg_Math_Bin gid_File_Tmp_Userinstall_Math_Inf); End -// Module gid_Module_Prg_Math_Help -// MOD_NAME_DESC ( MODULE_PRG_MATH_HELP ); -// ParentID = gid_Module_Prg_Math; -// Sortkey = "200"; -// Default = YES; -// Files = (gid_File_Help_Smath_Zip); -// End - Module gid_Module_Brand_Prg_Math PackageInfo = "packinfo_brand.txt"; Name = "gid_Module_Brand_Prg_Math"; diff --git a/scp2/source/writer/module_writer.scp b/scp2/source/writer/module_writer.scp index 0d959dd3f..a3c77e8ec 100644 --- a/scp2/source/writer/module_writer.scp +++ b/scp2/source/writer/module_writer.scp @@ -61,15 +61,6 @@ Module gid_Module_Prg_Wrt_Bin gid_File_Tmp_Userinstall_Wrt_Inf); End -// Module gid_Module_Prg_Wrt_Help -// MOD_NAME_DESC ( MODULE_PRG_WRT_HELP ); -// ParentID = gid_Module_Prg_Wrt; -// Sortkey = "200"; -// Default = YES; -// Minimal = YES; -// Files = (gid_File_Help_Swriter_Zip); -// End - Module gid_Module_Brand_Prg_Wrt PackageInfo = "packinfo_brand.txt"; Name = "gid_Module_Brand_Prg_Wrt"; diff --git a/solenv/bin/build.pl b/solenv/bin/build.pl index 1e0645340..464e60591 100644 --- a/solenv/bin/build.pl +++ b/solenv/bin/build.pl @@ -54,10 +54,6 @@ unshift(@INC, "$ENV{COMMON_ENV_TOOLS}/modules"); $in_so_env++; }; - if (defined $ENV{CWS_WORK_STAMP}) { - require GenInfoParser; import GenInfoParser; - require IO::Handle; import IO::Handle; - }; my $verbose_mode = 0; if (defined $ENV{verbose} || defined $ENV{VERBOSE}) { $verbose_mode = ($ENV{verbose} =~ /^t\S*$/i); @@ -83,7 +79,7 @@ ######################### # # -# Globale Variablen # +# Global Variables # # # ######################### @@ -195,7 +191,7 @@ my %add_to_config = (); my %remove_from_config = (); my $clear_config = 0; - my $finisched_children = 0; + my $finished_children = 0; my $debug = 0; my %module_deps_hash_pids = (); my @argv = @ARGV; @@ -271,14 +267,12 @@ } else { print_error ("Cannot open file $cmd_file"); }; -# } elsif ($show) { -# select STDOUT; }; print $new_line; get_server_ports(); start_interactive() if ($interactive); - + if ($checkparents) { get_parent_deps( $initial_module, \%global_deps_hash ); } else { @@ -340,7 +334,7 @@ sub print_warnings { sub rename_file { my ($old_file_name, $new_file_name, $throw_error) = @_; - + if(-e $old_file_name) { rename($old_file_name, $new_file_name) or system("mv", $old_file_name, $new_file_name); if (-e $old_file_name) { @@ -403,7 +397,7 @@ sub start_html_listener { sub start_html_message_trigger { my $child_id=fork(); ### VG: for windows there is a "simulation of the "fork"", no new procs... One can use Win32::Process::Create - + if ($child_id) { # parent # print "started listener trigger\n"; @@ -423,7 +417,6 @@ sub start_html_message_trigger { if (connect(SOCKET, $paddr)) { $full_buffer .= "\n"; syswrite SOCKET, $full_buffer, length $full_buffer; -# close SOCKET or die "Child close socket: $!"; } else { die "Child connect: $!"; }; @@ -440,10 +433,9 @@ sub get_html_orders { my $full_buffer = ''; my %modules_to_rebuild = (); my %modules_to_delete = (); - while ($rv = sysread(HTML_PIPE, $buffer, $buffer_size)) { - $full_buffer .= $buffer; - }; -# }; + while ($rv = sysread(HTML_PIPE, $buffer, $buffer_size)) { + $full_buffer .= $buffer; + }; my @html_messages = split(/\n/, $full_buffer); foreach (@html_messages) { if (/^html_port:(\d+)/) { @@ -530,8 +522,7 @@ sub schedule_rebuild { }; }; }; - - + # # procedure retrieves build list path # (all possibilities are taken into account) @@ -558,7 +549,7 @@ sub get_build_list_path { $build_list_paths{$module} = correct_path(retrieve_build_list($module)) if (!defined $build_list_paths{$module}); return $build_list_paths{$module}; }; - + # # Get dependencies hash of the current and all parent projects # @@ -745,12 +736,12 @@ sub initialize_html_info { return if (defined $dead_parents{$module}); $html_info{$module} = { 'DIRS' => [], 'ERRORFUL' => [], - 'SUCCESSFUL' => [], + 'SUCCESSFUL' => [], 'BUILD_TIME' => 0}; } # -# Do job +# Do job # sub dmake_dir { my ($new_job_name, $error_code); @@ -843,7 +834,7 @@ sub get_parents_array { my $module = shift; store_build_list_content($module); my $build_list_ref = $build_lists_hash{$module}; - + if (ref($build_list_ref) eq 'XMLBuildListParser') { return $build_list_ref->getModuleDependencies(\@modes_array); }; @@ -896,7 +887,7 @@ sub get_deps_from_object { $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})) { $deps_hash{$dep}++; }; @@ -944,7 +935,6 @@ sub get_deps_hash { }; my $build_list_ref = $build_lists_hash{$module_to_build}; -# delete $build_lists_hash{$module_to_build}; if (ref($build_list_ref) eq 'XMLBuildListParser') { get_deps_from_object($module_to_build, $build_list_ref, $dependencies_hash); } else { @@ -1088,14 +1078,9 @@ sub correct_path { sub check_dmake { -#print "Checking dmake..."; if (open(DMAKEVERSION, "dmake -V |")) { -# if (open(DMAKEVERSION, "dmake -V |")) { my @dmake_version = <DMAKEVERSION>; close DMAKEVERSION; -# if ($dmake_version[0] =~ /^dmake\s\-\sCopyright\s\(c\)/) { -# print " Using version $1\n" if ($dmake_version[0] =~ /Version\s(\d+\.*\d*)/); -# }; return; }; my $error_message = 'dmake: Command not found.'; @@ -1119,9 +1104,9 @@ sub get_commands { $check_error_string = "if \"\%?\" != \"0\" quit\n"; }; }; - + $dmake_args = join(' ', 'dmake', @dmake_args); - + while ($arg = pop(@dmake_args)) { $dmake .= ' '.$arg; }; @@ -1560,7 +1545,7 @@ sub get_options { $cmd_file = ''; }; print_error('Switches --job and --deliver collision') if ($custom_job && $deliver); - $custom_job = 'deliver' if $deliver; + $custom_job = 'deliver' if $deliver; $post_job = 'deliver' if (!$custom_job); $incompatible = scalar keys %incompatibles; if ($prepare) { @@ -1633,7 +1618,7 @@ sub get_module_and_buildlist_paths { sub get_dmake_args { my $arg; - my @job_args = (); + my @job_args = (); while ($arg = shift @ARGV) { next if ($arg =~ /^--$/); push (@job_args, $arg); @@ -1724,7 +1709,7 @@ sub store_error { $broken_build{$child_nick} = $error_code; if ($stop_build_on_error) { clear_from_child($pid); - # Let all children finish their work + # Let all children finish their work while (children_number()) { handle_dead_children(1); }; @@ -1763,7 +1748,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}}--; @@ -1905,8 +1890,7 @@ sub build_multiprocessing { }; if (!$got_module) { cancel_build() if ((!scalar keys %module_build_queue) && !children_number()); - if (!$finisched_children) { -# print "#### 1979: Starting waiting for dead child\n"; + if (!$finished_children) { handle_dead_children(1); }; }; @@ -1915,10 +1899,9 @@ sub build_multiprocessing { # Let the last module be built till the end while (scalar keys %module_build_queue) { build_actual_queue(\%module_build_queue); -# print "#### 1988: Starting waiting for dead child\n"; handle_dead_children(1); }; - # Let all children finish their work + # Let all children finish their work while (children_number()) { handle_dead_children(1); }; @@ -1933,6 +1916,8 @@ sub mp_success_exit { # }; print "\nMultiprocessing build is finished\n"; print "Maximal number of processes run: $maximal_processes\n"; + zenity_message("LibreOffice Build Success!"); + zenity_close(); do_exit(0); }; @@ -1941,7 +1926,7 @@ sub mp_success_exit { # sub build_actual_queue { my $build_queue = shift; - my $finished_projects = 0; + my $finished_projects = 0; do { my @sorted_queue = sort {(scalar keys %{$projects_deps_hash{$a}}) <=> (scalar keys %{$projects_deps_hash{$b}})} keys %$build_queue; my $started_children = 0; @@ -2027,7 +2012,7 @@ sub do_custom_job { } else { $error_code = run_job($job, $module_paths{$module}, $module_job); if ($error_code) { - # give windows one more chance + # give windows one more chance if ($ENV{GUI} eq 'WNT') { $error_code = run_job($job, $module_paths{$module}, $module_job); }; @@ -2161,7 +2146,7 @@ sub ensure_clear_module { if ($modules_types{$module} eq 'lnk' && (File::Basename::basename($module_paths{$module}) ne $module)) { if(rename($module_paths{$module}, File::Basename::dirname($module_paths{$module}) ."/$module")) { $module_paths{$module} = File::Basename::dirname($module_paths{$module}) ."/$module"; - clear_module($module); + clear_module($module); } else { print_error("Cannot rename link to $module. Please rename it manually"); }; @@ -2182,13 +2167,11 @@ sub clear_module { next if (/^\.+$/); my $dir = correct_path($module_paths{$module}.'/'.$_); if ((!-d $dir.'/.svn') && is_output_tree($dir)) { - #print "I would delete $dir\n"; rmtree("$dir", 0, 1); if (-d $dir) { system("$remove_command $dir"); if (-d $dir) { push(@warnings, "Cannot delete $dir"); -#print_error("Cannot delete $dir"); } else { print STDERR (">>> Removed $dir by force\n"); }; @@ -2235,7 +2218,7 @@ sub get_tmp_dir { sub retrieve_build_list { my $module = shift; my $old_fh = select(STDOUT); - + # Try to get global depencies from solver's build.lst if such exists my $solver_inc_dir = "$ENV{SOLARVER}/common"; $solver_inc_dir .= $ENV{PROEXT} if (defined $ENV{PROEXT}); @@ -2492,7 +2475,7 @@ sub get_platforms { if (!scalar keys %platforms) { # An Auses wish - fallback to INPATH for new platforms - if (defined $ENV{INPATH}) { + if (defined $ENV{INPATH}) { $$platforms_ref{$ENV{INPATH}}++; } else { print_error("There is no platform found!!") ; @@ -2514,7 +2497,7 @@ sub clear_delivered { $only_common = ''; }; print "$message\n"; - + foreach my $platform (keys %platforms) { print "\nRemoving files delivered for $platform\n"; my %solar_vars = (); @@ -2528,7 +2511,6 @@ sub clear_delivered { }; }; my $undeliver = "$deliver_command $deliver_delete_switches $nul"; -# my $current_dir = getcwd(); foreach my $module (sort @modules_built) { if (chdir($module_paths{$module})) { print "Removing delivered from module $module\n"; @@ -2541,8 +2523,6 @@ sub clear_delivered { push(@warnings, "Could not remove delivered files from the module $module. Your build can become inconsistent.\n"); }; }; -# chdir $current_dir; -# getcwd(); }; $ENV{$_} = $backup_vars{$_} foreach (keys %backup_vars); }; @@ -2566,7 +2546,7 @@ sub read_ssolar_vars { $pro = "-pro"; $platform = $`; }; - + my ($verswitch, $source_root, $cwsname); $verswitch = "-ver $ENV{UPDMINOR}" if (defined $ENV{UPDMINOR}); $source_root = '-sourceroot' if (defined $ENV{SOURCE_ROOT_USED}); @@ -2587,7 +2567,7 @@ sub read_ssolar_vars { sub get_solar_vars { my ($solar_vars, $file) = @_; my ($var, $value); - open SOLARTABLE, "<$file" or die "can´t open solarfile $file"; + open SOLARTABLE, "<$file" or die "can't open solarfile $file"; while(<SOLARTABLE>) { s/\r\n//o; next if(!/^\w+\s+(\w+)/o); @@ -2675,7 +2655,6 @@ sub pick_for_build_type { }; sub do_exit { -# close_server_socket(); my $exit_code = shift; $build_finished++; generate_html_file(1); @@ -2791,7 +2770,7 @@ sub generate_html_file { next if ($modules_types{$_} eq 'lnk'); next if (!defined $active_modules{$_}); my ($errors_info_line, $dirs_info_line, $errors_number, $successes_percent, $errors_percent, $time) = get_html_info($_); -#<one module> +#<one module> print HTML 'document.write(" <tr>");' . "\n"; print HTML 'document.write(" <td width=*>");' . "\n"; @@ -2807,9 +2786,6 @@ sub generate_html_file { print HTML $errors_number; print HTML ' error(s)\">', $_, '</a>");' . "\n"; } else { -# print HTML 'document.write("<em style=color:gray>' . $_ . '</em>");'; -#### print HTML 'document.write("<em style=color:gray>' . $_ ."href=\'http://$local_host_ip:$html_port/delete=\'$_". '</em>");'; - print HTML 'document.write(" <a target=\'infoframe\' id='; print HTML $_; print HTML ' href=\"javascript:void(0)\"; title=\"Remove module\">' . $_ . '</a>");' . "\n"; @@ -2821,7 +2797,7 @@ sub generate_html_file { print HTML 'document.write(" <table width=100% valign=top cellpadding=0 hspace=0 vspace=0 cellspacing=0 border=0>");' . "\n"; print HTML 'document.write(" <tr>");' . "\n"; print HTML 'document.write(" <td height=15* width='; - + print HTML $successes_percent + $errors_percent; if ($errors_number) { print HTML '% bgcolor=red valign=top></td>");' . "\n"; @@ -2829,7 +2805,7 @@ sub generate_html_file { print HTML '% bgcolor=#25A528 valign=top></td>");' . "\n"; }; print HTML 'document.write(" <td width='; - + print HTML 100 - ($successes_percent + $errors_percent); print HTML '% bgcolor=lightgrey valign=top></td>");' . "\n"; print HTML 'document.write(" </tr>");' . "\n"; @@ -2838,7 +2814,7 @@ sub generate_html_file { print HTML 'document.write(" <td align=\"center\">', $time, '</td>");' . "\n"; print HTML 'document.write(" </tr>");' . "\n"; # </one module> - } + } print HTML 'document.write(" </table>");' . "\n"; print HTML 'document.write(" </body>");' . "\n"; print HTML 'document.write("</html>");' . "\n"; @@ -2929,7 +2905,7 @@ sub generate_html_file { print HTML ' document.write("Click on the project of interest");' . "\n"; print HTML ' document.close();' . "\n"; print HTML '} function getStatusInnerHTML(Status) { var StatusInnerHtml;' . "\n"; - print HTML ' if (Status == "success") {' . "\n"; + print HTML ' if (Status == "success") {' . "\n"; print HTML ' StatusInnerHtml = "<em style=color:green>";' . "\n"; print HTML ' } else if (Status == "building") {' . "\n"; print HTML ' StatusInnerHtml = "<em style=color:blue>";' . "\n"; @@ -2947,7 +2923,7 @@ sub generate_html_file { if (defined $html_path) { print HTML 'file://'; } - print HTML '+ LogFilePath + " width=100%></iframe>");' . "\n"; + print HTML '+ LogFilePath + " width=100%></iframe>");' . "\n"; print HTML ' top.innerFrame.frames[2].document.close();' . "\n"; print HTML '};' . "\n"; print HTML 'function FillFrame_1(Module, Message1, Message2) {' . "\n"; @@ -3039,7 +3015,7 @@ sub generate_html_file { print HTML ' top.innerFrame.frames[0].document.location.reload();' . "\n"; print HTML ' refreshInfoFrames();' . "\n"; print HTML '};' . "\n\n"; - + print HTML 'function setRefreshRate() {' . "\n"; print HTML ' RefreshRate = document.Formular.rate.value;' . "\n"; print HTML ' if (!isNaN(RefreshRate * 1)) {' . "\n"; @@ -3168,7 +3144,6 @@ sub get_html_info { } } else { return(undef, undef, 0, 0, 0, '-'); -# $dirs_info_line .= 'No information available yet'; }; $dirs_info_line =~ s/(<br>)*$//o; $dirs_info_line .= '\''; @@ -3183,13 +3158,9 @@ sub get_html_info { $errors_info_line .= 'No errors'; }; $errors_info_line .= '\''; -# if (defined $full_info) { my $time_line = get_time_line($$module_info_hash{BUILD_TIME}); - my ($successes_percent, $errors_percent) = get_progress_percentage($dirs_number - 1, $successful_number - 1, $errorful_number); - return($errors_info_line, $dirs_info_line, $errorful_number, $successes_percent, $errors_percent, $time_line); -# } else { -# return($errors_info_line, $dirs_info_line, $errorful_number); -# }; + my ($successes_percent, $errors_percent) = get_progress_percentage($dirs_number - 1, $successful_number - 1, $errorful_number); + return($errors_info_line, $dirs_info_line, $errorful_number, $successes_percent, $errors_percent, $time_line); }; sub get_time_line { @@ -3303,8 +3274,6 @@ sub check_client_jobs { delete $processes_hash{$_}; delete $clients_jobs{$_}; delete $clients_times{$_}; -# } else { -# print time - $clients_times{$_} . "\n"; }; }; }; @@ -3329,10 +3298,6 @@ sub run_server { if ($error) { print STDERR "port $_: $error\n"; } else { -# $SIG{KILL} = \&stop_server; -# $SIG{INT} = \&stop_server; -# $SIG{TERM} = \&stop_server; -# $SIG{QUIT} = \&stop_server; last; }; }; @@ -3368,7 +3333,6 @@ sub run_server { }; } else { if ($client_hash{result} eq "0") { -# print "$clients_jobs{$pid} succedded on $pid\n"; } else { print "Error $client_hash{result}\n"; if (store_error($pid, $client_hash{result})) { @@ -3382,7 +3346,7 @@ sub run_server { clear_from_child($pid); delete $clients_jobs{$pid}; $verbose_mode && print 'Running processes: ', children_number(), "\n"; - # Actually, next 3 strings are only for even distribution + # Actually, next 3 strings are only for even distribution # of clients if there are more than one build server running print $new_socket_obj 'No job'; close($new_socket_obj); @@ -3394,7 +3358,6 @@ sub run_server { $job_string = $lost_jobs[0]; delete $lost_client_jobs{$lost_jobs[0]}; } else { -# $job_string = get_job_string(\@build_queue, $pid); $job_string = get_job_string(\@build_queue); }; if ($job_string) { @@ -3456,10 +3419,8 @@ sub get_job_string { $jobs_hash{$job_dir}->{START_TIME} = time(); $jobs_hash{$job_dir}->{STATUS} = 'building'; if ($job_dir =~ /(\s)$pre_job/o) { -# if ($' eq $pre_job) { - do_custom_job($job_dir, $dependencies_hash); - $job_dir = ''; -# } + do_custom_job($job_dir, $dependencies_hash); + $job_dir = ''; }; } while (!$job_dir); }; diff --git a/solenv/bin/modules/installer/archivefiles.pm b/solenv/bin/modules/installer/archivefiles.pm index b7636ca61..351f58a25 100644 --- a/solenv/bin/modules/installer/archivefiles.pm +++ b/solenv/bin/modules/installer/archivefiles.pm @@ -241,9 +241,6 @@ sub resolving_archive_flag my $unzipdir; - # if ($iscommonfile) { $unzipdir = $commonunzipdirbase . $installer::globals::separator . $onelanguage . $installer::globals::separator; } - # else { $unzipdir = $platformunzipdirbase . $installer::globals::separator . $onelanguage . $installer::globals::separator; } - $unzipdir = $platformunzipdirbase . $installer::globals::separator . $onelanguage . $installer::globals::separator; installer::systemactions::create_directory($unzipdir); # creating language specific subdirectories @@ -411,13 +408,9 @@ sub resolving_archive_flag $newfile{'Styles'} =~ s/\,\s*\,/\,/; $newfile{'Styles'} =~ s/\(\s*\,/\(/; $newfile{'Styles'} =~ s/\,\s*\)/\)/; - # $infoline = "Removing PATCH flag from: $zipname\n"; - # push( @installer::globals::logfileinfo, $infoline); } else { - # $infoline = "Keeping PATCH flag at: $zipname\n"; - # push( @installer::globals::logfileinfo, $infoline); push( @keptpatchflags, $zipname); # collecting all PATCH flags } } diff --git a/solenv/bin/modules/installer/configuration.pm b/solenv/bin/modules/installer/configuration.pm index b7d054bab..1dff4a6ee 100644 --- a/solenv/bin/modules/installer/configuration.pm +++ b/solenv/bin/modules/installer/configuration.pm @@ -482,7 +482,6 @@ sub insert_into_config_file elsif ( $styles =~ /CFG_NUMERIC/ ) { $valuetype = "int"; } elsif ( $styles =~ /CFG_BOOLEAN/ ) { $valuetype = "boolean"; } elsif ( $styles =~ /CFG_STRINGLIST/ ) { $valuetype = "string-list"; } -# elsif ( $styles =~ /CFG_STRINGLIST/ ) { $valuetype = "string-list oor:separator=\"\|\""; } else { installer::exiter::exit_program("ERROR: Unknown configuration value type: $styles", "insert_into_config_file"); @@ -552,8 +551,6 @@ sub insert_into_config_file # ToDo: Substituting the setup replace variables - # replace_setting_variables(); - $value =~ s/^\s*\<//; $value =~ s/\>\s*$//; @@ -577,14 +574,12 @@ sub insert_into_config_file if (!($oneconfig->{'isisocode'} )) # this is the simpe case { - # my $valueline = '<value SEPARATORPART>VALUECONTENT</value>' . "\n"; $newvalueline = $valueline; $newvalueline =~ s/VALUECONTENT/$value/g; $newvalueline =~ s/SEPARATORPART/$separatorpart/; } else { - # my $langvalueline = '<value xml:lang="SAVEDLANGUAGE">VALUECONTENT</value>' . "\n"; $newvalueline = $langvalueline; $newvalueline =~ s/VALUECONTENT/$value/; my $savedlanguage = $oneconfig->{'Key'}; diff --git a/solenv/bin/modules/installer/control.pm b/solenv/bin/modules/installer/control.pm index d7c5658e3..f2e427b7f 100644 --- a/solenv/bin/modules/installer/control.pm +++ b/solenv/bin/modules/installer/control.pm @@ -341,11 +341,11 @@ sub check_logfile # Errors are all errors, but not the Windows installer table "Error.idt" my $compareline = $line; - $compareline =~ s/Error\.idt//g; # removing all occurences of "Error.idt" - $compareline =~ s/Error\.mlf//g; # removing all occurences of "Error.mlf" - $compareline =~ s/Error\.ulf//g; # removing all occurences of "Error.ulf" - $compareline =~ s/Error\.idl//g; # removing all occurences of "Error.idl" - $compareline =~ s/Error\.html//g; # removing all occurences of "Error.html" + $compareline =~ s/Error\.idt//g; # removing all occurrences of "Error.idt" + $compareline =~ s/Error\.mlf//g; # removing all occurrences of "Error.mlf" + $compareline =~ s/Error\.ulf//g; # removing all occurrences of "Error.ulf" + $compareline =~ s/Error\.idl//g; # removing all occurrences of "Error.idl" + $compareline =~ s/Error\.html//g; # removing all occurrences of "Error.html" if ( $compareline =~ /\bError\b/i ) { @@ -364,7 +364,7 @@ sub check_logfile { my $line = "\n*********************************************************************\n"; push(@output, $line); - $line = "ERROR: The following errors occured in packaging process:\n\n"; + $line = "ERROR: The following errors occurred in packaging process:\n\n"; push(@output, $line); for ( my $i = 0; $i <= $#errors; $i++ ) @@ -375,7 +375,6 @@ sub check_logfile $line = "*********************************************************************\n"; push(@output, $line); -# exit(-1); } else { @@ -654,11 +653,6 @@ sub read_encodinglist $installer::globals::msiencoding = \%msiencoding; $installer::globals::msilanguage = \%msilanguage; - - # my $key; - # foreach $key (keys %{$installer::globals::msiencoding}) { print "A Key: $key : Value: $installer::globals::msiencoding->{$key}\n"; } - # foreach $key (keys %{$installer::globals::msilanguage}) { print "B Key: $key : Value: $installer::globals::msilanguage->{$key}\n"; } - } ############################################################# diff --git a/solenv/bin/modules/installer/download.pm b/solenv/bin/modules/installer/download.pm index 2d83d8c69..588f14d11 100644 --- a/solenv/bin/modules/installer/download.pm +++ b/solenv/bin/modules/installer/download.pm @@ -753,7 +753,6 @@ sub get_current_version my $infoline = ""; my $versionstring = ""; my $filename = "version.info"; - # $filename = $installer::globals::ooouploaddir . $installer::globals::separator . $filename; if ( -f $filename ) { @@ -1531,8 +1530,6 @@ sub convert_utf16_to_utf8 my $savfilename = $filename . "_before.utf16"; installer::systemactions::copy_one_file($filename, $savfilename); -# open( IN, "<:utf16", $filename ) || installer::exiter::exit_program("ERROR: Cannot open file $filename for reading", "convert_utf16_to_utf8"); -# open( IN, "<:para:crlf:uni", $filename ) || installer::exiter::exit_program("ERROR: Cannot open file $filename for reading", "convert_utf16_to_utf8"); open( IN, "<:encoding(UTF16-LE)", $filename ) || installer::exiter::exit_program("ERROR: Cannot open file $filename for reading", "convert_utf16_to_utf8"); while ( $line = <IN> ) { push @localfile, $line; @@ -1757,12 +1754,6 @@ sub get_path_to_nsis_sdk $nsispath = $ENV{'NSISSDK_SOURCE'}; # overriding the NSIS SDK with NSISSDK_SOURCE } -# if( ($^O =~ /cygwin/i) and $nsispath =~ /\\/ ) { -# # We need a POSIX path for W32-4nt-cygwin-perl -# $nsispath =~ s/\\/\\\\/g; -# chomp( $nsispath = qx{cygpath -u "$nsispath"} ); -# } - if ( $nsispath eq "" ) { installer::logger::print_message( "... no Environment variable \"SOLARROOT\", \"NSIS_PATH\" or \"NSISSDK_SOURCE\" found and NSIS not found in path!", "get_path_to_nsis_sdk"); @@ -2157,9 +2148,6 @@ sub create_download_link_tree push( @installer::globals::logfileinfo, $infoline); create_link_tree($sourcedownloadfile, $destdownloadfilename, $versionstring); - # my $md5sumoutput = call_md5sum($downloadfile); - # my $md5sum = get_md5sum($md5sumoutput); - } } else diff --git a/solenv/bin/modules/installer/downloadsigner.pm b/solenv/bin/modules/installer/downloadsigner.pm index 746e171bb..6e6780f4f 100644 --- a/solenv/bin/modules/installer/downloadsigner.pm +++ b/solenv/bin/modules/installer/downloadsigner.pm @@ -91,8 +91,6 @@ Ende sub getparameter { - # installer::logger::print_message("Checking parameter"); - while ( $#ARGV >= 0 ) { my $param = shift(@ARGV); @@ -347,7 +345,6 @@ sub check_cws_build my $iscws = 1; if ( $filename =~ /follow_me_\d+_/ ) { $iscws = 0; } - # if ( $filename =~ /log_\d+_/ ) { $iscws = 0; } return $iscws; } diff --git a/solenv/bin/modules/installer/environment.pm b/solenv/bin/modules/installer/environment.pm index f316be9bb..e163687cc 100644 --- a/solenv/bin/modules/installer/environment.pm +++ b/solenv/bin/modules/installer/environment.pm @@ -47,7 +47,6 @@ sub create_pathvariables $variables{'solarpath'} = $solarpath; my $solarcommonpath = $environment->{'SOLARVERSION'} . $installer::globals::separator . "common" . $installer::globals::productextension; - # my $solarcommonpath = $environment->{'SOLARVERSION'} . $installer::globals::separator . $environment->{'COMMON_OUTDIR'} . $installer::globals::productextension; $variables{'solarcommonpath'} = $solarcommonpath; my $osdef = lc($environment->{'GUI'}); @@ -110,7 +109,6 @@ sub set_global_environment_variables my ( $environment ) = @_; $installer::globals::build = $environment->{'WORK_STAMP'}; - # $installer::globals::minor = $environment->{'UPDMINOR'}; $installer::globals::compiler = $environment->{'OUTPATH'}; if ( $ENV{'UPDMINOR'} ) { $installer::globals::minor = $ENV{'UPDMINOR'}; } diff --git a/solenv/bin/modules/installer/epmfile.pm b/solenv/bin/modules/installer/epmfile.pm index ab6d3572e..67842dbe3 100644 --- a/solenv/bin/modules/installer/epmfile.pm +++ b/solenv/bin/modules/installer/epmfile.pm @@ -228,14 +228,10 @@ sub put_directories_into_epmfile if ( $onedir->{'Dir'} ) { $dir = $onedir->{'Dir'}; } - # if (!($dir =~ /\bPREDEFINED_/ )) if ((!($dir =~ /\bPREDEFINED_/ )) || ( $dir =~ /\bPREDEFINED_PROGDIR\b/ )) { my $hostname = $onedir->{'HostName'}; - # not including simple directory "/opt" - # if (( $allvariables->{'SETSTATICPATH'} ) && ( $hostname eq $packagerootpath )) { next; } - my $line = "d 755 root $group $hostname -\n"; push(@{$epmfileref}, $line) @@ -598,15 +594,9 @@ sub create_epm_header $requires = "requires"; # the name in the packagelist } - # if ( $installer::globals::patch ) - # { - # $onepackage->{$provides} = ""; my $isdict = 0; if ( $onepackage->{'packagename'} =~ /-dict-/ ) { $isdict = 1; } - # $onepackage->{$requires} = ""; - # } - if ( $onepackage->{$provides} ) { my $providesstring = $onepackage->{$provides}; @@ -649,19 +639,6 @@ sub create_epm_header $onerequires =~ s/\s*$//; installer::packagelist::resolve_packagevariables2(\$onerequires, $variableshashref, 0, $isdict); - # Special handling for Solaris. In depend files, the names of the packages are required, not - # only the abbreviation. Therefore there is a special syntax for names in packagelist: - # solarisrequires = "SUNWcar (Name="Package name of SUNWcar"),SUNWkvm (Name="Package name of SUNWcar"), ... - # if ( $installer::globals::issolarispkgbuild ) - # { - # if ( $onerequires =~ /^\s*(.*?)\s+\(\s*Name\s*=\s*\"(.*?)\"\s*\)\s*$/ ) - # { - # $onerequires = $1; - # $packagename = $2; - # $installer::globals::dependfilenames{$onerequires} = $packagename; - # } - # } - $line = "%requires" . " " . $onerequires . "\n"; push(@epmheader, $line); } @@ -683,19 +660,6 @@ sub create_epm_header $onerequires =~ s/\s*$//; installer::packagelist::resolve_packagevariables(\$onerequires, $variableshashref, 0); - # Special handling for Solaris. In depend files, the names of the packages are required, not - # only the abbreviation. Therefore there is a special syntax for names in packagelist: - # solarisrequires = "SUNWcar (Name="Package name of SUNWcar"),SUNWkvm (Name="Package name of SUNWcar"), ... - # if ( $installer::globals::issolarispkgbuild ) - # { - # if ( $onerequires =~ /^\s*(.*?)\s+\(\s*Name\s*=\s*\"(.*?)\"\s*\)\s*$/ ) - # { - # $onerequires = $1; - # $packagename = $2; - # $installer::globals::dependfilenames{$onerequires} = $packagename; - # } - # } - $line = "%requires" . " " . $onerequires . "\n"; push(@epmheader, $line); } @@ -1318,7 +1282,6 @@ sub set_topdir_in_specfile { my ($changefile, $filename, $newepmdir) = @_; - # $newepmdir =~ s/^\s*\.//; # removing leading "." $newepmdir = cwd() . $installer::globals::separator . $newepmdir; # only absolute path allowed # removing "%define _topdir", if existing @@ -1919,11 +1882,6 @@ sub include_patchinfos_into_pkginfo } $newline = "SUNW_PATCH_PROPERTIES=\n"; add_one_line_into_file($changefile, $newline, $filename); - # $newline = "SUNW_PKGTYPE=usr\n"; - # add_one_line_into_file($changefile, $newline, $filename); - - # $newline = "SUNW_PKGVERS=1.0\n"; - # add_one_line_into_file($changefile, $newline, $filename); } ############################################################ @@ -2103,7 +2061,6 @@ sub prepare_packages if ( $installer::globals::islinuxrpmbuild ) { - # if ( $localrelocatablepath =~ /^\s*$/ ) { $localrelocatablepath = "/"; }; # at least the "/" $filename = $packagename . ".spec"; $newline = "Prefix\:\ " . $localrelocatablepath . "\n"; } @@ -2118,9 +2075,6 @@ sub prepare_packages installer::files::save_file($completefilename, $changefile); } - # my $newepmdir = $completefilename; - # installer::pathanalyzer::get_path_from_fullqualifiedname(\$newepmdir); - # adding new "topdir" and removing old "topdir" in specfile if ( $installer::globals::islinuxrpmbuild ) @@ -2131,7 +2085,6 @@ sub prepare_packages if ( is_extension_package($changefile) ) { set_prereq_in_specfile($changefile); } set_license_in_specfile($changefile, $variableshashref); set_tab_into_datafile($changefile, $filesref); - # check_requirements_in_specfile($changefile); installer::files::save_file($completefilename, $changefile); if ( $installer::globals::patch ) { collect_patch_files($changefile, $packagename, $localrelocatablepath); } } @@ -2245,7 +2198,6 @@ sub determine_rpm_version my $rpmout = ""; my $systemcall = ""; - # my $systemcall = "rpm --version |"; # "rpm --version" has problems since LD_LIBRARY_PATH was removed. Therefore the content of $RPM has to be called. # "rpm --version" and "rpmbuild --version" have the same output. Therefore $RPM can be used. Its value # is saved in $installer::globals::rpm @@ -2354,7 +2306,6 @@ sub create_packages_without_epm installer::pathanalyzer::get_path_from_fullqualifiedname(\$destinationdir); $destinationdir =~ s/\/\s*$//; # removing ending slashes - # my $systemcall = "pkgmk -o -f $prototypefile -d $destinationdir \> /dev/null 2\>\&1"; my $systemcall = "pkgmk -l 1073741824 -o -f $prototypefile -d $destinationdir 2\>\&1 |"; installer::logger::print_message( "... $systemcall ...\n" ); @@ -2559,12 +2510,9 @@ sub create_packages_without_epm my $specfilename = $epmdir . $packagename . ".spec"; if (! -f $specfilename) { installer::exiter::exit_program("ERROR: Did not find file: $specfilename", "create_packages_without_epm"); } - # my $rpmcommand = "rpm"; my $rpmcommand = $installer::globals::rpm; my $rpmversion = determine_rpm_version(); - # if ( $rpmversion >= 4 ) { $rpmcommand = "rpmbuild"; } - # saving globally for later usage $installer::globals::rpmcommand = $rpmcommand; $installer::globals::rpmquerycommand = "rpm"; @@ -2613,7 +2561,6 @@ sub create_packages_without_epm for ( my $j = 0; $j <= $#rpmoutput; $j++ ) { - # if ( $i < $maxrpmcalls ) { $rpmoutput[$j] =~ s/\bERROR\b/PROBLEM/ig; } $rpmoutput[$j] =~ s/\bERROR\b/PROBLEM/ig; push( @installer::globals::logfileinfo, "$rpmoutput[$j]"); } @@ -2716,30 +2663,6 @@ sub remove_temporary_epm_files $infoline = "Systemcall: $systemcall\n"; push( @installer::globals::logfileinfo, $infoline); } - - # removing the package - -# my $removedir = $epmdir . $packagename; -# -# my $systemcall = "rm -rf $removedir"; -# -# print "... $systemcall ...\n"; -# -# my $returnvalue = system($systemcall); -# -# my $infoline = "Systemcall: $systemcall\n"; -# push( @installer::globals::logfileinfo, $infoline); -# -# if ($returnvalue) -# { -# $infoline = "ERROR: Could not execute \"$systemcall\"!\n"; -# push( @installer::globals::logfileinfo, $infoline); -# } -# else -# { -# $infoline = "Success: Executed \"$systemcall\" successfully!\n"; -# push( @installer::globals::logfileinfo, $infoline); -# } } if ( $installer::globals::islinuxrpmbuild ) @@ -2747,8 +2670,6 @@ sub remove_temporary_epm_files my $removefile = $epmdir . $packagename . ".spec"; my $destfile = $loggingdir . $packagename . ".spec.log"; - # if (! -f $removefile) { next; } - my $systemcall = "mv -f $removefile $destfile"; system($systemcall); # ignoring the return value $infoline = "Systemcall: $systemcall\n"; @@ -3187,40 +3108,6 @@ sub analyze_rootpath $rootpath =~ s/\/\s*$//; # removing ending slash ############################################################## - # Version 1: "/opt" is variable and "openofficeorg20" fixed - ############################################################## - - # my $staticpath = $rootpath; - # installer::pathanalyzer::make_absolute_filename_to_relative_filename(\$staticpath); - # $$staticpathref = $staticpath; # will be "openofficeorg20" - - # my $relocatablepath = $rootpath; - # installer::pathanalyzer::get_path_from_fullqualifiedname(\$relocatablepath); - # $$relocatablepathref = $relocatablepath; # will be "/opt/" - - ############################################################## - # Version 2: "/opt/openofficeorg20" is variable and "" fixed - ############################################################## - - # if ( $$relocatablepathref eq "" ) # relocatablepath is not defined in package list - # { - # $$staticpathref = ""; # will be "" - # $$relocatablepathref = $rootpath . "\/"; # relocatable path must end with "/", will be "/opt/openofficeorg20/" - # # setting the static path to the hostname of the directory with style OFFICEDIRECTORY - # if ( $allvariables->{'SETSTATICPATH'} ) { $$staticpathref = $installer::globals::officedirhostname; } - # - # } - # else # relocatablepath is defined in package list - # { - # $$relocatablepathref =~ s/\/\s*$//; # removing ending slash - # $$relocatablepathref = $$relocatablepathref . "\/"; # relocatable path must end with "/" - # my $staticpath = $rootpath; - # $staticpath =~ s/\Q$$relocatablepathref\E//; - # $staticpath =~ s/\/\s*$//; - # $$staticpathref = $staticpath; - # } - - ############################################################## # Version 3: "/" is variable and "/opt/openofficeorg20" fixed ############################################################## @@ -3391,20 +3278,6 @@ sub finalize_linux_patch if ( ! ( $#{$rpmfiles} > -1 )) { installer::exiter::exit_program("ERROR: Could not find rpm in directory $newepmdir!", "finalize_linux_patch"); } for ( my $i = 0; $i <= $#{$rpmfiles}; $i++ ) { installer::pathanalyzer::make_absolute_filename_to_relative_filename(\${$rpmfiles}[$i]); } -# my $installline = ""; -# -# for ( my $i = 0; $i <= $#{$rpmfiles}; $i++ ) -# { -# $installline = $installline . " rpm --prefix \$PRODUCTINSTALLLOCATION -U $newepmdir/${$rpmfiles}[$i]\n"; -# } -# -# $installline =~ s/\s*$//; -# -# for ( my $j = 0; $j <= $#{$scriptfile}; $j++ ) -# { -# ${$scriptfile}[$j] =~ s/INSTALLLINES/$installline/; -# } - # Searching packagename containing -core01 my $found_package = 0; my $searchpackagename = ""; @@ -3431,7 +3304,6 @@ sub finalize_linux_patch my $productname = $allvariables->{'PRODUCTNAME'}; $productname = lc($productname); $productname =~ s/ /_/g; # abc office -> abc_office -# $productname =~ s/\.//g; # openoffice.org -> openofficeorg $infoline = "Adding productname $productname into Linux patch script\n"; push( @installer::globals::logfileinfo, $infoline); diff --git a/solenv/bin/modules/installer/javainstaller.pm b/solenv/bin/modules/installer/javainstaller.pm index c873aabb0..97d656fc4 100644 --- a/solenv/bin/modules/installer/javainstaller.pm +++ b/solenv/bin/modules/installer/javainstaller.pm @@ -260,7 +260,6 @@ sub translate_javafile $newstring =~ s/\"/\\\"/g; # masquerading the " $newstring =~ s/\\\\\"/\\\"/g; # unmasquerading if \" was converted to \\" (because " was already masked) - # if (!( $newstring eq "" )) { ${$idtfile}[$i] =~ s/$oldstring/$newstring/; } ${$templatefile}[$i] =~ s/$oldstring/$newstring/; # always substitute, even if $newstring eq "" } } @@ -375,7 +374,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 ####################################################### @@ -861,15 +860,7 @@ sub prepare_language_pack_in_xmlfile { my ($xmlfile, $languagesarrayref) = @_; - # if ( ! $installer::globals::is_unix_multi ) - # { - # remove_languagepack_from_xmlfile($xmlfile); - # } - # else - # { duplicate_languagepack_in_xmlfile($xmlfile, $languagesarrayref); - # } - } ####################################################### @@ -1672,7 +1663,6 @@ sub create_java_installer # creating the directory my $javadir = installer::systemactions::create_directories("javainstaller", $languagestringref); $javadir =~ s/\/\s*$//; -# push(@installer::globals::removedirs, $javadir); # copying the content from directory install_sdk into the java directory @@ -1694,7 +1684,6 @@ sub create_java_installer # determining the ulf language file - # my $ulffilename = "installsdk.ulf"; my $ulffilename = "installsdk.jlf"; $ulffilename = $installer::globals::javalanguagepath . $installer::globals::separator . $ulffilename; my $ulffile = installer::files::read_file($ulffilename); @@ -1728,7 +1717,6 @@ sub create_java_installer # setting the class name in the java file ( "MyResources_TEMPLATE" -> "MyResources_en" ) - # if ( $onelanguage =~ /^\s*(\w+)\-(\w+)\s*$/ ) { $onelanguage = $1; } $onelanguage =~ s/en-US/en/; # java file name and class name contain only "_en" $onelanguage =~ s/\-/\_/; # "pt-BR" -> "pt_BR" my $classfilename = "MyResources_" . $onelanguage; @@ -1750,8 +1738,6 @@ sub create_java_installer my $baselanguage = installer::languages::get_default_language($languagesarrayref); $baselanguage =~ s/\-/\_/; # "pt-BR" -> "pt_BR" $baselanguage =~ s/en_US/en/; # java file name and class name contain only "_en" - # if ( $baselanguage =~ /^\s*(\w+)\-(\w+)\s*$/ ) { $baselanguage = $1; } # java file name and class name contain only "_en" - # $baselanguage =~ s/en-US/en/; # java file name and class name contain only "_en" my $baselanguagefilename = $javadir . $installer::globals::separator . "locale/resources/MyResources_" . $baselanguage . "\.java"; my $basedestfilename = $javadir . $installer::globals::separator . "locale/resources/MyResources.java"; installer::systemactions::copy_one_file($baselanguagefilename, $basedestfilename); diff --git a/solenv/bin/modules/installer/languagepack.pm b/solenv/bin/modules/installer/languagepack.pm index 2100467d9..c5c67399b 100644 --- a/solenv/bin/modules/installer/languagepack.pm +++ b/solenv/bin/modules/installer/languagepack.pm @@ -82,33 +82,6 @@ sub select_language_items if ( $specificlanguage eq $onelanguage ) { - # $oneitem->{'modules'} = $installer::globals::rootmodulegid; # all files in a language pack are root files - # Using $installer::globals::languagemodulesbase (?) - -# # no more automatic change of module assignments -# $oneitem->{'modules'} = $installer::globals::rootmodulegid . "_$locallang"; # all files in a language pack are root files -# -# if (( $installer::globals::islinuxbuild ) || ( $installer::globals::issolarispkgbuild )) -# { -# if ( $oneitem->{'Dir'} ) -# { -# if ( $oneitem->{'Dir'} eq "gid_Dir_Fonts_Truetype" ) { $oneitem->{'modules'} = "gid_Module_Langpack_Fonts_$locallang"; } -# if ( $oneitem->{'Dir'} eq "gid_Dir_Resource" ) { $oneitem->{'modules'} = "gid_Module_Langpack_Resource_$locallang"; } -# if ( $oneitem->{'Dir'} eq "gid_Dir_Help_Isolanguage" ) { $oneitem->{'modules'} = "gid_Module_Langpack_Help_$locallang"; } -# } -# } - - # preparing different modules for Windows Installer language packs - # my $underlinelanguage = $specificlanguage; - # $underlinelanguage =~ s/-/_/; - # if ( $installer::globals::iswindowsbuild ) { $oneitem->{'modules'} = $installer::globals::languagemodulesbase . $underlinelanguage; } - -# # no more collecting of language pack feature -# if (! installer::existence::exists_in_array($oneitem->{'modules'}, \@installer::globals::languagepackfeature)) -# { -# push(@installer::globals::languagepackfeature, $oneitem->{'modules'}); # Collecting all language pack feature -# } - push(@itemsarray, $oneitem); } } @@ -195,20 +168,6 @@ sub get_packagename_from_packagelist { my ( $alldirs, $allvariables, $languagestringref ) = @_; - # my $packagename = ""; - - # for ( my $i = 0; $i <= $#{$alldirs}; $i++ ) - # { - # if ( ${$alldirs}[$i] =~ /-fonts/ ) { next; } - # if ( ${$alldirs}[$i] =~ /-help/ ) { next; } - # if ( ${$alldirs}[$i] =~ /-res/ ) { next; } - # - # $packagename = ${$alldirs}[$i]; - # last; - # } - - # if ( $packagename eq "" ) { installer::exiter::exit_program("ERROR: Could not find base package in directory $installdir!", "get_packagename_from_packagelist"); } - my $localproductname = $allvariables->{'PRODUCTNAME'}; $localproductname = lc($localproductname); $localproductname =~ s/ //g; @@ -411,9 +370,6 @@ sub determine_scriptfile_name my $scriptfilename = $packagename; -# if ( $installer::globals::islinuxrpmbuild ) { $scriptfilename =~ s/\.rpm\s*$/\.sh/; } -# if ( $installer::globals::issolarisbuild ) { $scriptfilename =~ s/\.tar\.gz\s*$/\.sh/; } - $scriptfilename =~ s/\.tar\.gz\s*$/\.sh/; my $infoline = "Setting language pack script file name to $scriptfilename\n"; diff --git a/solenv/bin/modules/installer/languages.pm b/solenv/bin/modules/installer/languages.pm index 84828bfea..591b6b28d 100644 --- a/solenv/bin/modules/installer/languages.pm +++ b/solenv/bin/modules/installer/languages.pm @@ -331,45 +331,6 @@ sub get_java_language { my ( $language ) = @_; - # my $javalanguage = ""; - - # if ( $language eq "en-US" ) { $javalanguage = "en_US"; } - # elsif ( $language eq "ar" ) { $javalanguage = "ar_AR"; } - # elsif ( $language eq "bg" ) { $javalanguage = "bg_BG"; } - # elsif ( $language eq "ca" ) { $javalanguage = "ca_CA"; } - # elsif ( $language eq "cs" ) { $javalanguage = "cs_CS"; } - # elsif ( $language eq "da" ) { $javalanguage = "da_DA"; } - # elsif ( $language eq "de" ) { $javalanguage = "de"; } - # elsif ( $language eq "de" ) { $javalanguage = "de_DE"; } - # elsif ( $language eq "et" ) { $javalanguage = "et_ET"; } - # elsif ( $language eq "el" ) { $javalanguage = "el_EL"; } - # elsif ( $language eq "fi" ) { $javalanguage = "fi_FI"; } - # elsif ( $language eq "fr" ) { $javalanguage = "fr_FR"; } - # elsif ( $language eq "hu" ) { $javalanguage = "hu_HU"; } - # elsif ( $language eq "he" ) { $javalanguage = "he_HE"; } - # elsif ( $language eq "it" ) { $javalanguage = "it_IT"; } - # elsif ( $language eq "nl" ) { $javalanguage = "nl_NL"; } - # elsif ( $language eq "es" ) { $javalanguage = "es_ES"; } - # elsif ( $language eq "sv" ) { $javalanguage = "sv_SV"; } - # elsif ( $language eq "sk" ) { $javalanguage = "sk_SK"; } - # elsif ( $language eq "pl" ) { $javalanguage = "pl_PL"; } - # elsif ( $language eq "pt-BR" ) { $javalanguage = "pt_BR"; } - # elsif ( $language eq "ru" ) { $javalanguage = "ru_RU"; } - # elsif ( $language eq "tr" ) { $javalanguage = "tr_TR"; } - # elsif ( $language eq "ja" ) { $javalanguage = "ja"; } - # elsif ( $language eq "ja" ) { $javalanguage = "ja_JP"; } - # elsif ( $language eq "ko" ) { $javalanguage = "ko_KR"; } - # elsif ( $language eq "th" ) { $javalanguage = "th_TH"; } - # elsif ( $language eq "zh-CN" ) { $javalanguage = "zh_CN"; } - # elsif ( $language eq "zh-TW" ) { $javalanguage = "zh_TW"; } - - # languages not defined yet - # if ( $javalanguage eq "" ) - # { - # $javalanguage = $language; - # $javalanguage =~ s/\-/\_/; - # } - $javalanguage = $language; $javalanguage =~ s/\-/\_/; diff --git a/solenv/bin/modules/installer/packagelist.pm b/solenv/bin/modules/installer/packagelist.pm index 64d890ada..0079b6f10 100644 --- a/solenv/bin/modules/installer/packagelist.pm +++ b/solenv/bin/modules/installer/packagelist.pm @@ -85,7 +85,6 @@ sub analyze_list push(@allmodules, $onegid); - # get_children($moduleslist, $onegid, \@allmodules); get_children_with_hash($moduleshash, $onegid, \@allmodules); $onepackage->{'allmodules'} = \@allmodules; @@ -180,8 +179,6 @@ sub remove_multiple_modules_packages my $onepackage = ${$allpackagemodules}[$i]; my $allmodules = $onepackage->{'allmodules'}; - # print "Modules below $onepackage->{'module'}: $#{$allmodules}\n"; - # Comparing each package, with all following packages. If a # gid for the module is part of more than one package, it is # removed if the number of modules in the package is greater @@ -240,14 +237,6 @@ sub remove_multiple_modules_packages $onepackage->{'allmodules'} = \@optimizedpackage; } - - # for ( my $i = 0; $i <= $#{$allpackagemodules}; $i++ ) - # { - # my $onepackage = ${$allpackagemodules}[$i]; - # my $allmodules = $onepackage->{'allmodules'}; - # print "New: Modules below $onepackage->{'module'}: $#{$allmodules}\n"; - # } - } ##################################################################### @@ -652,11 +641,6 @@ sub collectpackages { my $modulegid = $onemodule->{'gid'}; - # Only collecting modules with correct language for language packs -# if ( $installer::globals::languagepack ) { if ( ! ( $modulegid =~ /_$onelanguage\s*$/ )) { next; } } - # Resetting language, if this is no language pack -# if ( ! $installer::globals::languagepack ) { $onelanguage = ""; } - my $styles = ""; if ( $onemodule->{'Styles'} ) { $styles = $onemodule->{'Styles'}; } diff --git a/solenv/bin/modules/installer/packagepool.pm b/solenv/bin/modules/installer/packagepool.pm index d603dd54a..6c1874328 100644 --- a/solenv/bin/modules/installer/packagepool.pm +++ b/solenv/bin/modules/installer/packagepool.pm @@ -743,7 +743,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; @@ -756,7 +756,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; @@ -914,7 +914,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 @@ -936,7 +936,7 @@ sub put_content_into_pool push( @installer::globals::logfileinfo, $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); diff --git a/solenv/bin/modules/installer/scppatchsoname.pm b/solenv/bin/modules/installer/scppatchsoname.pm index f542de97f..888cfeb59 100644 --- a/solenv/bin/modules/installer/scppatchsoname.pm +++ b/solenv/bin/modules/installer/scppatchsoname.pm @@ -175,9 +175,6 @@ sub resolving_patchsoname_flag my $destinationpath = $replacedir . $onefilename; my $movepath = $destinationpath . ".orig"; - # if (!(-f $destinationpath)) # do nothing if the file already exists - # { - my $copysuccess = installer::systemactions::copy_one_file($sourcepath, $movepath); if ( $copysuccess ) @@ -197,8 +194,6 @@ sub resolving_patchsoname_flag } } - # } - # Saving the original source, where the file was found $onefile->{'originalsourcepath'} = $onefile->{'sourcepath'}; diff --git a/solenv/bin/modules/installer/scpzipfiles.pm b/solenv/bin/modules/installer/scpzipfiles.pm index ee59b0708..8854b3d7e 100644 --- a/solenv/bin/modules/installer/scpzipfiles.pm +++ b/solenv/bin/modules/installer/scpzipfiles.pm @@ -45,7 +45,7 @@ sub replace_all_ziplistvariables_in_file { my $line = ${$fileref}[$i]; - if ( $line =~ /^.*\$\{\w+\}.*$/ ) # only occurence of ${abc} + if ( $line =~ /^.*\$\{\w+\}.*$/ ) # only occurrence of ${abc} { my $key; @@ -69,13 +69,11 @@ sub replace_all_ziplistvariables_in_rtffile { my ( $fileref, $variablesref, $onelanguage, $loggingdir ) = @_; - # installer::files::save_file($loggingdir . "license_" . $onelanguage . "_before.rtf", $fileref); - for ( my $i = 0; $i <= $#{$fileref}; $i++ ) { my $line = ${$fileref}[$i]; - if ( $line =~ /^.*\$\\\{\w+\\\}.*$/ ) # only occurence of $\{abc\} + if ( $line =~ /^.*\$\\\{\w+\\\}.*$/ ) # only occurrence of $\{abc\} { for ( my $j = 0; $j <= $#{$variablesref}; $j++ ) { @@ -96,8 +94,6 @@ sub replace_all_ziplistvariables_in_rtffile } } } - - # installer::files::save_file($loggingdir . "license_" . $onelanguage . "_after.rtf", $fileref); } ######################################################### diff --git a/solenv/bin/modules/installer/scriptitems.pm b/solenv/bin/modules/installer/scriptitems.pm index f5035d55c..8b6b7b823 100644 --- a/solenv/bin/modules/installer/scriptitems.pm +++ b/solenv/bin/modules/installer/scriptitems.pm @@ -809,7 +809,6 @@ sub replace_setup_variables if ( $localminor =~ /^\s*\w(\d+)\w*\s*$/ ) { $localminor = $1; } - # $updateid my $updateid = $productname . "_" . $userdirproductversion . "_" . $$languagestringref; $updateid =~ s/ /_/g; @@ -1243,7 +1242,6 @@ sub get_Source_Directory_For_Files_From_Includepathlist my $oldname = $onefile->{'Name'}; my $oldlanguage = $onefile->{'specificlanguage'}; my $newlanguage = "en-US"; - # $onefile->{'Name'} =~ s/$oldlanguage\./$newlanguage\./; # Example: tplwizfax_it.zip -> tplwizfax_en-US.zip $onefilename = $onefile->{'Name'}; $onefilename =~ s/$oldlanguage\./$newlanguage\./; # Example: tplwizfax_it.zip -> tplwizfax_en-US.zip $onefilename =~ s/^\s*\Q$installer::globals::separator\E//; # filename begins with a slash, for instance /registry/schema/org/openoffice/VCL.xcs @@ -1255,7 +1253,6 @@ sub get_Source_Directory_For_Files_From_Includepathlist $infoline = "WARNING: Using $onefilename instead of $oldname\n"; push( @installer::globals::logfileinfo, $infoline); print " $infoline"; - # if ( $onefile->{'destination'} ) { $onefile->{'destination'} =~ s/\Q$oldname\E/$onefile->{'Name'}/; } # If the directory, in which the new file is installed, is not language dependent, # the filename has to be changed to avoid installation conflicts @@ -1338,7 +1335,7 @@ sub remove_Files_Without_Sourcedirectory my $infoline; - my $error_occured = 0; + my $error_occurred = 0; my @missingfiles = (); push(@missingfiles, "ERROR: The following files could not be found: \n"); @@ -1372,7 +1369,7 @@ sub remove_Files_Without_Sourcedirectory push( @installer::globals::logfileinfo, $infoline); push(@missingfiles, "ERROR: File not found: $filename\n"); - $error_occured = 1; + $error_occurred = 1; next; # removing this file from list, if sourcepath is empty } @@ -1394,7 +1391,7 @@ sub remove_Files_Without_Sourcedirectory $infoline = "\n"; push( @installer::globals::logfileinfo, $infoline); - if ( $error_occured ) + if ( $error_occurred ) { for ( my $i = 0; $i <= $#missingfiles; $i++ ) { print "$missingfiles[$i]"; } installer::exiter::exit_program("ERROR: Missing files", "remove_Files_Without_Sourcedirectory"); @@ -2009,18 +2006,14 @@ sub quoting_illegal_filenames # sourcepath and destination have to be quoted for epm list file - # $filename =~ s/\$/\$\$/g; $destpath =~ s/\$/\$\$/g; $sourcepath =~ s/\$/\$\$/g; - # my $infoline = "ATTENTION: Files: Renaming $onefile->{'Name'} to $filename\n"; - # push( @installer::globals::logfileinfo, $infoline); my $infoline = "ATTENTION: Files: Quoting sourcepath $onefile->{'sourcepath'} to $sourcepath\n"; push( @installer::globals::logfileinfo, $infoline); $infoline = "ATTENTION: Files: Quoting destination path $onefile->{'destination'} to $destpath\n"; push( @installer::globals::logfileinfo, $infoline); - # $onefile->{'Name'} = $filename; $onefile->{'sourcepath'} = $sourcepath; $onefile->{'destination'} = $destpath; } @@ -2028,17 +2021,22 @@ sub quoting_illegal_filenames } ############################################################################ -# Removing multiple occurences of same module. +# Removing multiple occurrences of same module. ############################################################################ sub optimize_list { my ( $longlist ) = @_; - + my %tmpHash; my $shortlist = ""; - my $hashref = installer::converter::convert_stringlist_into_hash(\$longlist, ","); - foreach my $key (sort keys %{$hashref} ) { $shortlist = "$shortlist,$key"; } - $shortlist =~ s/^\s*\,//; + + $longlist =~ s/^\s*|\s*$//g; + $longlist =~ s/\s*,\s*/,/g; + + foreach ( split /,/, $longlist ) { $tmpHash{$_} = 1; } + + foreach (sort keys %tmpHash ) { $shortlist .= "$_,"; } + chop( $shortlist ); return $shortlist; } @@ -2085,7 +2083,6 @@ sub collect_directories_from_filesarray $directoryhash{'specificlanguage'} = $onefile->{'specificlanguage'}; $directoryhash{'Dir'} = $onefile->{'Dir'}; $directoryhash{'modules'} = $onefile->{'modules'}; # NEW, saving modules - # NEVER!!! if ( ! $installer::globals::iswindowsbuild ) { $directoryhash{'Styles'} = "(CREATE)"; } # this directories must be created if ( $onefile->{'Dir'} eq "PREDEFINED_PROGDIR" ) { $predefinedprogdir_added = 1; } @@ -2110,7 +2107,6 @@ sub collect_directories_from_filesarray $directoryhash{'specificlanguage'} = $onefile->{'specificlanguage'}; $directoryhash{'Dir'} = $onefile->{'Dir'}; $directoryhash{'modules'} = $onefile->{'modules'}; # NEW, saving modules - # NEVER!!! if ( ! $installer::globals::iswindowsbuild ) { $directoryhash{'Styles'} = "(CREATE)"; } # this directories must be created $alldirectoryhash{$destinationpath} = \%directoryhash; } @@ -2195,7 +2191,6 @@ sub collect_directories_with_create_flag_from_directoryarray my %directoryhash = (); $directoryhash{'HostName'} = $directoryname; $directoryhash{'specificlanguage'} = $onedir->{'specificlanguage'}; - # $directoryhash{'gid'} = $onedir->{'gid'}; $directoryhash{'Dir'} = $onedir->{'gid'}; $directoryhash{'Styles'} = $onedir->{'Styles'}; @@ -2468,7 +2463,6 @@ sub insert_for_item ($$$) { my ($hash, $item, $id) = @_; - # print STDERR "insert '$id' for '$item'\n"; if (!defined $hash->{$item}) { my @gids = (); @@ -2522,7 +2516,6 @@ sub get_string_of_modulegids_for_itemgid my $haslanguagemodule = 0; my %foundmodules = (); - # print STDERR "lookup '" . lc($itemgid) . "'\n"; my $gid_list = $module_lookup_table->{lc($itemgid)}; for my $gid (@{$gid_list}) @@ -2542,8 +2535,6 @@ sub get_string_of_modulegids_for_itemgid if ( ! $isreallylanguagemodule ) { installer::exiter::exit_program("ERROR: \"$itemgid\" is assigned to modules with flag \"LANGUAGEMODULE\" and also to modules without this flag! Modules: $allmodules", "get_string_of_modulegids_for_itemgid"); } } - # print STDERR "get_string_for_itemgid ($itemgid, $itemname) => $allmodules, $haslanguagemodule\n"; - return ($allmodules, $haslanguagemodule); } diff --git a/solenv/bin/modules/installer/setupscript.pm b/solenv/bin/modules/installer/setupscript.pm index b22105104..1099b162b 100644 --- a/solenv/bin/modules/installer/setupscript.pm +++ b/solenv/bin/modules/installer/setupscript.pm @@ -292,7 +292,6 @@ sub replace_all_setupscriptvariables_in_script if (( $check =~ /%1/ ) || ( $check =~ /%2/ ) || ( $check =~ /%verify/ )) { next; } my $infoline = "WARNING: mis-named or un-known '%' variable in setup script at line $num:\n$check\n"; push( @installer::globals::globallogfileinfo, $infoline); - # print STDERR "Warning: mis-named or un-known '%' variable at line $num:\n$check\n"; } } diff --git a/solenv/bin/modules/installer/simplepackage.pm b/solenv/bin/modules/installer/simplepackage.pm index 38c7bd9bb..74da887eb 100644 --- a/solenv/bin/modules/installer/simplepackage.pm +++ b/solenv/bin/modules/installer/simplepackage.pm @@ -27,7 +27,6 @@ package installer::simplepackage; -# use Archive::Zip qw( :ERROR_CODES :CONSTANTS ); use Cwd; use File::Copy; use installer::download; @@ -192,9 +191,6 @@ sub register_extensions sub get_mac_translation_file { my $translationfilename = $installer::globals::maclangpackfilename; - # my $translationfilename = $installer::globals::idtlanguagepath . $installer::globals::separator . $installer::globals::maclangpackfilename; - # if ( $installer::globals::unicodensis ) { $translationfilename = $translationfilename . ".uulf"; } - # else { $translationfilename = $translationfilename . ".mlf"; } if ( ! -f $translationfilename ) { installer::exiter::exit_program("ERROR: Could not find language file $translationfilename!", "get_mac_translation_file"); } my $translationfile = installer::files::read_file($translationfilename); @@ -306,8 +302,6 @@ sub localize_scriptfile { my ($scriptfile, $translationfile, $languagestringref) = @_; - # my $translationfile = get_mac_translation_file(); - my $onelanguage = $$languagestringref; if ( $onelanguage =~ /^\s*(.*?)_/ ) { $onelanguage = $1; } diff --git a/solenv/bin/modules/installer/substfilenamefiles.pm b/solenv/bin/modules/installer/substfilenamefiles.pm index 4500d7b58..8a5736cc7 100644 --- a/solenv/bin/modules/installer/substfilenamefiles.pm +++ b/solenv/bin/modules/installer/substfilenamefiles.pm @@ -79,7 +79,6 @@ sub resolving_subst_filename_flag my $sourcepath = $onefile->{'sourcepath'}; - # if ( $onefilename =~ /^\s*\Q$installer::globals::separator\E/ ) # filename begins with a slash, for instance /registry/schema/org/openoffice/VCL.xcs if ( $onefilename =~ /\Q$installer::globals::separator\E/ ) # filename begins with a slash, for instance /registry/schema/org/openoffice/VCL.xcs { $onefilename =~ s/^\s*\Q$installer::globals::separator\E//; diff --git a/solenv/bin/modules/installer/systemactions.pm b/solenv/bin/modules/installer/systemactions.pm index e3ef783cb..d75417461 100644 --- a/solenv/bin/modules/installer/systemactions.pm +++ b/solenv/bin/modules/installer/systemactions.pm @@ -1195,8 +1195,6 @@ sub rename_directory else { installer::exiter::exit_program("ERROR: Could not move directory from $olddir to $newdir", "rename_directory"); - # $infoline = "\nATTENTION: Could not move directory from $olddir to $newdir, \"rename_directory\"\n"; - # push(@installer::globals::logfileinfo, $infoline); } return $newdir; diff --git a/solenv/bin/modules/installer/windows/admin.pm b/solenv/bin/modules/installer/windows/admin.pm index 2e3074742..9ecf2ab02 100644 --- a/solenv/bin/modules/installer/windows/admin.pm +++ b/solenv/bin/modules/installer/windows/admin.pm @@ -54,13 +54,6 @@ sub unpack_cabinet_file # But this wrong expand.exe is typically in the PATH before this expand.exe, to unpack # cabinet files. -# if ( $^O =~ /cygwin/i ) -# { -# $expandfile = $ENV{'SYSTEMROOT'} . "/system32/expand.exe"; # Has to be located in the systemdirectory -# $expandfile =~ s/\\/\//; -# if ( ! -f $expandfile ) { exit_program("ERROR: Did not find file $expandfile in the Windows system folder!"); } -# } - if ( $^O =~ /cygwin/i ) { $expandfile = qx(cygpath -u "$ENV{WINDIR}"/System32/expand.exe); @@ -70,7 +63,6 @@ sub unpack_cabinet_file my $expandlogfile = $unpackdir . $installer::globals::separator . "expand.log"; # exclude cabinet file - # my $systemcall = $cabarc . " -o X " . $mergemodulehash->{'cabinetfile'}; my $systemcall = ""; if ( $^O =~ /cygwin/i ) { @@ -326,7 +318,6 @@ sub analyze_registry_file my $component = $6; my %helphash = (); - # $helphash{'Registry'} = $registry; $helphash{'Root'} = $root; $helphash{'Key'} = $key; $helphash{'Name'} = $name; @@ -492,10 +483,6 @@ sub copy_files_into_directory_structure # installer::systemactions::copy_one_file($sourcefile, $destfile); } - # else # allowing missing sequence numbers ? - # { - # installer::exiter::exit_program("ERROR: No file assigned to sequence $i", "copy_files_into_directory_structure"); - # } } return $unopkgfile; diff --git a/solenv/bin/modules/installer/windows/assembly.pm b/solenv/bin/modules/installer/windows/assembly.pm index 686e5b721..1a2869075 100644 --- a/solenv/bin/modules/installer/windows/assembly.pm +++ b/solenv/bin/modules/installer/windows/assembly.pm @@ -81,7 +81,6 @@ sub get_msiassembly_filemanifest my $filemanifest = ""; $filemanifest = $onefile->{'uniquename'}; - # $filemanifest = $onefile->{'Name'}; return $filemanifest; } @@ -139,8 +138,6 @@ sub get_msiassembly_file } # It does not need to exist. For example products that do not contain the libraries. - # if (! $foundfile ) { installer::exiter::exit_program("ERROR: No unique file name found for $filename !", "get_selfreg_file"); } - if (! $foundfile ) { $onefile = ""; } return $onefile; @@ -170,8 +167,6 @@ sub get_msiassembly_file_by_gid } # It does not need to exist. For example products that do not contain the libraries. - # if (! $foundfile ) { installer::exiter::exit_program("ERROR: No unique file name found for $filename !", "get_selfreg_file"); } - if (! $foundfile ) { $onefile = ""; } return $onefile; @@ -344,7 +339,6 @@ sub add_assembly_condition_into_component_table { # setting the condition - # $condition = "MsiNetAssemblySupport"; $condition = "DOTNET_SUFFICIENT=1"; $oneline = $component . "\t" . $componentid . "\t" . $directory . "\t" . $attributes . "\t" . $condition . "\t" . $keypath . "\n"; ${$componenttable}[$j] = $oneline; @@ -368,4 +362,4 @@ sub add_assembly_condition_into_component_table } } -1;
\ No newline at end of file +1; diff --git a/solenv/bin/modules/installer/windows/component.pm b/solenv/bin/modules/installer/windows/component.pm index c507fd6e7..83da8bd79 100644 --- a/solenv/bin/modules/installer/windows/component.pm +++ b/solenv/bin/modules/installer/windows/component.pm @@ -389,9 +389,6 @@ sub create_component_table installer::windows::idtglobal::write_idt_header(\@componenttable, "component"); - # collect_layer_conditions(); - - # File components for ( my $i = 0; $i <= $#{$allfilecomponentsref}; $i++ ) diff --git a/solenv/bin/modules/installer/windows/directory.pm b/solenv/bin/modules/installer/windows/directory.pm index e78f0ae9c..a06d513b9 100644 --- a/solenv/bin/modules/installer/windows/directory.pm +++ b/solenv/bin/modules/installer/windows/directory.pm @@ -235,7 +235,6 @@ sub create_defaultdir_directorynames $hostname =~ s/\Q$installer::globals::separator\E\s*$//; get_last_directory_name(\$hostname); - # installer::pathanalyzer::make_absolute_filename_to_relative_filename(\$hostname); # making program/classes to classes my $uniquename = $onedir->{'uniquename'}; my $shortstring; if (( $installer::globals::updatedatabase ) && ( exists($shortdirnamehashref->{$uniquename}) )) diff --git a/solenv/bin/modules/installer/windows/feature.pm b/solenv/bin/modules/installer/windows/feature.pm index 3830dc1c3..c35f06f11 100644 --- a/solenv/bin/modules/installer/windows/feature.pm +++ b/solenv/bin/modules/installer/windows/feature.pm @@ -399,7 +399,6 @@ sub create_feature_table $feature{'feature'} = get_feature_gid($onefeature); $feature{'feature_parent'} = get_feature_parent($onefeature); - # if ( $onefeature->{'ParentID'} eq "" ) { $feature{'feature_parent'} = ""; } # Root has no parent $feature{'Title'} = $onefeature->{'Name'}; $feature{'Description'} = $onefeature->{'Description'}; $feature{'Display'} = get_feature_display($onefeature); diff --git a/solenv/bin/modules/installer/windows/file.pm b/solenv/bin/modules/installer/windows/file.pm index 871db9bea..0192c3e32 100644 --- a/solenv/bin/modules/installer/windows/file.pm +++ b/solenv/bin/modules/installer/windows/file.pm @@ -773,7 +773,6 @@ sub create_files_table # The filenames must be collected because of uniqueness # 01-44-~1.DAT, 01-44-~2.DAT, ... - # my @shortnames = (); my %shortnames = (); if ( $installer::globals::updatedatabase ) { collect_shortnames_from_old_database($uniquefilenamehashref, \%shortnames); } @@ -798,7 +797,6 @@ sub create_files_table $onefile->{'componentname'} = $file{'Component_'}; # Collecting all components - # if (!(installer::existence::exists_in_array($file{'Component_'}, $allfilecomponentsref))) { push(@{$allfilecomponentsref}, $file{'Component_'}); } if ( ! exists($allfilecomponents{$file{'Component_'}}) ) { $allfilecomponents{$file{'Component_'}} = 1; } @@ -880,7 +878,6 @@ sub create_files_table } # Collecting all language specific conditions - # if ( $onefile->{'haslanguagemodule'} ) if ( $onefile->{'ismultilingual'} ) { if ( $onefile->{'ComponentCondition'} ) { installer::exiter::exit_program("ERROR: Cannot set language condition. There is already another component condition for file $onefile->{'gid'}: \"$onefile->{'ComponentCondition'}\" !", "create_files_table"); } diff --git a/solenv/bin/modules/installer/windows/font.pm b/solenv/bin/modules/installer/windows/font.pm index b7ca68487..64dbc39f6 100644 --- a/solenv/bin/modules/installer/windows/font.pm +++ b/solenv/bin/modules/installer/windows/font.pm @@ -58,7 +58,6 @@ sub create_font_table my %font = (); $font{'File_'} = $onefile->{'uniquename'}; - # $font{'FontTitle'} = $onefile->{'FontName'}; # results in a warning during validation $font{'FontTitle'} = ""; my $oneline = $font{'File_'} . "\t" . $font{'FontTitle'} . "\n"; diff --git a/solenv/bin/modules/installer/windows/idtglobal.pm b/solenv/bin/modules/installer/windows/idtglobal.pm index 3e77be999..bb799f909 100644 --- a/solenv/bin/modules/installer/windows/idtglobal.pm +++ b/solenv/bin/modules/installer/windows/idtglobal.pm @@ -138,7 +138,6 @@ sub get_next_free_number_with_hash if (!($dontsave)) { - # push(@{$shortnamesref}, $newname); # adding the new shortname to the array of shortnames $shortnamesref->{$newname} = 1; # adding the new shortname to the array of shortnames, always uppercase $saved = 1; } @@ -256,7 +255,6 @@ sub make_eight_three_conform_with_hash my $changed = 0; my $saved; - # if (( $inputstring =~ /^\s*(.*?)\.(.*?)\s*$/ ) && ( $pattern eq "file" )) # files with a dot if (( $inputstring =~ /^\s*(.*)\.(.*?)\s*$/ ) && ( $pattern eq "file" )) # files with a dot { # extension has to be non-greedy, but name is. This is important to find the last dot in the filename @@ -612,7 +610,6 @@ sub get_languagefilename { my ($idtfilename, $basedir) = @_; - # $idtfilename =~ s/\.idt/\.ulf/; $idtfilename =~ s/\.idt/\.mlf/; my $languagefilename = $basedir . $installer::globals::separator . $idtfilename; @@ -741,7 +738,6 @@ sub translate_idtfile my $language_block = get_language_block_from_language_file($oldstring, $languagefile); my $newstring = get_language_string_from_language_block($language_block, $onelanguage, $oldstring); - # if (!( $newstring eq "" )) { ${$idtfile}[$i] =~ s/$oldstring/$newstring/; } ${$idtfile}[$i] =~ s/$oldstring/$newstring/; # always substitute, even if $newstring eq "" (there are empty strings for control.idt) } } @@ -905,18 +901,12 @@ sub get_rtf_licensetext for ( my $i = 0; $i <= $#{$licensefile}; $i++ ) { my $oneline = ${$licensefile}[$i]; - # if ( $oneline =~ /^\s*$/ ) { $oneline = '\par'; } # empty lines if ( $i == 0 ) { $oneline =~ s/^\W*//; } $oneline =~ s/\t/ /g; # no tabs allowed, converting to four spaces $oneline =~ s/\n$//g; # no newline at line end -# $oneline =~ s/ä/\\\'e4/g; # converting "ä" -# $oneline =~ s/ö/\\\'f6/g; # converting "ö" -# $oneline =~ s/ü/\\\'fc/g; # converting "ü" -# $oneline =~ s/ß/\\\'df/g; # converting "ß" - # german replacements $oneline =~ s/\Ã\„/\\\'c4/g; # converting "Ä" @@ -1129,11 +1119,7 @@ sub add_language_checkboxes_to_database my $onelanguage = ${$languagesarrayref}[$i]; my $windowslanguage = installer::windows::language::get_windows_language($onelanguage); - # my $is_english = 0; - # if ( $windowslanguage eq "1033" ) { $is_english = 1; } - my $checkboxattribute = "3"; - # if ( $is_english ) { $checkboxattribute = "1"; } # english is not deselectable my $count = $i + 1; my $nextcount = $i + 2; @@ -1150,7 +1136,6 @@ sub add_language_checkboxes_to_database my $yvalue = $offset + $i * $multiplier; my $property = "IS" . $windowslanguage; - # if ( ! exists($installer::globals::languageproperties{$property}) ) { installer::exiter::exit_program("ERROR: Could not find property \"$property\" in the list of language properties!", "add_language_checkboxes_to_database"); } my $controlnext = ""; if ( $last ) { $controlnext = "Next"; } @@ -2080,7 +2065,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 @@ -2090,7 +2075,7 @@ sub set_positions_in_table my $infoline = "\nSetting positions in table \"$tablename\".\n"; push(@installer::globals::logfileinfo, $infoline); - # Step 1: Resolving all occurences of "POSITIONTEMPLATE_end" + # Step 1: Resolving all occurrences of "POSITIONTEMPLATE_end" my $lastposition = get_last_position_in_sequencetable($sequencetable); @@ -2106,9 +2091,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; @@ -2163,7 +2148,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) @@ -2176,9 +2161,6 @@ sub set_positions_in_table if (( $template_exists ) && ( ! $template_replaced )) { - # Giving a precise error message, collecting all unresolved templates - # my $templatestring = ""; - for ( my $i = 0; $i <= $#{$sequencetable}; $i++ ) { if ( ${$sequencetable}[$i] =~ /^\s*([\w\.]+)\t.*\t\s*(POSITIONTEMPLATE_.*?)\s*$/ ) @@ -2187,22 +2169,12 @@ sub set_positions_in_table my $fulltemplate = $2; my $template = $fulltemplate; $template =~ s/POSITIONTEMPLATE_//; - # my $newstring = $customactionname . " (" . $template . ")"; - # $templatestring = $templatestring . $newstring . ", "; - # Setting at the end! $lastposition = $lastposition + 25; ${$sequencetable}[$i] =~ s/$fulltemplate/$lastposition/; $infoline = "WARNING: Setting position \"$lastposition\" for custom action \"$customactionname\". Could not find CustomAction \"$template\".\n"; push(@installer::globals::logfileinfo, $infoline); } } - # $templatestring =~ s/,\s*$//; - - # $infoline = "Error: Saving table \"$tablename\"\n"; - # push(@installer::globals::logfileinfo, $infoline); - # print $infoline; - # installer::files::save_file($tablename, $sequencetable); - # installer::exiter::exit_program("ERROR: Unresolved positions in CustomActions in scp2: $templatestring", "set_positions_in_table"); } } diff --git a/solenv/bin/modules/installer/windows/language.pm b/solenv/bin/modules/installer/windows/language.pm index 093d1c2ff..d0a4ec892 100644 --- a/solenv/bin/modules/installer/windows/language.pm +++ b/solenv/bin/modules/installer/windows/language.pm @@ -60,7 +60,6 @@ sub get_windows_encoding if ( $installer::globals::msiencoding->{$language} ) { $windowsencoding = $installer::globals::msiencoding->{$language}; } - # if ( $windowsencoding eq "" ) { installer::exiter::exit_program("ERROR: Unknown language $language in function get_windows_encoding", "get_windows_encoding"); } if ( $windowsencoding eq "" ) { $windowsencoding = "0"; } # setting value, if the language is not listed in the encodinglist if ( $windowsencoding eq "0" ) { $windowsencoding = "65001"; } # languages with "0" have to be available in UTF-8 (65001) diff --git a/solenv/bin/modules/installer/windows/media.pm b/solenv/bin/modules/installer/windows/media.pm index e8d32b874..efa515769 100644 --- a/solenv/bin/modules/installer/windows/media.pm +++ b/solenv/bin/modules/installer/windows/media.pm @@ -351,7 +351,6 @@ sub create_media_table if ( $allvariables->{'CABFILENUMBER'} ) { $maxcabfilenumber = $allvariables->{'CABFILENUMBER'}; } my $allfiles = $#{$filesref} + 1; my $maxfilenumber = get_maximum_filenumber($allfiles, $maxcabfilenumber); - # my $maxfilenumber = 1000; # maximum 1000 files in each cabinet file my $cabfilenumber = 0; my $cabfull = 0; my $counter = 0; @@ -385,7 +384,6 @@ sub create_media_table $cabfilenumber++; $media{'DiskId'} = get_media_diskid($cabfilenumber); - # $media{'LastSequence'} = get_media_lastsequence($onefile); $media{'LastSequence'} = $i + 1; # This should be correct, also for unsorted files collectors $media{'DiskPrompt'} = get_media_diskprompt(); $media{'Cabinet'} = generate_cab_filename_for_some_cabs($allvariables, $cabfilenumber); @@ -420,7 +418,6 @@ sub create_media_table my $maximumfile = $#{$filesref}; $media{'DiskId'} = get_media_diskid($diskid); - # $media{'LastSequence'} = ${$filesref}[$maximumfile]->{'sequencenumber'}; # sequence number of the last file $media{'LastSequence'} = $maximumfile + 1; # This works also for unsorted file collector $media{'DiskPrompt'} = get_media_diskprompt(); $media{'Cabinet'} = generate_cab_filename($allvariables); diff --git a/solenv/bin/modules/installer/windows/mergemodule.pm b/solenv/bin/modules/installer/windows/mergemodule.pm index 1998863e0..c0963c33a 100755 --- a/solenv/bin/modules/installer/windows/mergemodule.pm +++ b/solenv/bin/modules/installer/windows/mergemodule.pm @@ -79,7 +79,6 @@ sub merge_mergemodules_into_msi_database %installer::globals::mergemodules = (); my $mergemoduledir = installer::systemactions::create_directories("mergefiles", $languagestringref); - # push(@installer::globals::removedirs, $mergemoduledir); my $mergemodule; foreach $mergemodule ( @{$mergemodules} ) @@ -144,7 +143,6 @@ sub merge_mergemodules_into_msi_database } else { - # $systemcall = $msidb . " -d " . $filename . " -f " . $workdir . " -e File Component MsiAssembly Directory"; $systemcall = $msidb . " -d " . $filename . " -f " . $workdir . " -e \*"; } @@ -1105,23 +1103,6 @@ sub change_file_table { if ( ! -d $unpackdir ) { installer::systemactions::create_directory($unpackdir); } - # Unpack the cab file, so that in can be included into the last office cabinet file. Attention: cararc.exe from cabsdk required. - # cabarc.exe -o X <fullcabfilepath> - - # my $cabarcfilename = "cabarc.exe"; - # my $cabarcfile = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$cabarcfilename, $includepatharrayref, 1); - - # if ( ! -f $$cabarcfile ) - # { - # $cabarcfilename = "CABARC.EXE"; - # $cabarcfile = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$cabarcfilename, $includepatharrayref, 1); - # if ( ! -f $$cabarcfile ) - # { - # installer::exiter::exit_program("ERROR: cabarc.exe not found !", "change_file_table"); - # } - # } - # my $cabarc = $$cabarcfile; - # changing directory my $from = cwd(); my $to = $mergemodulehash->{'workdir'}; @@ -1148,9 +1129,6 @@ sub change_file_table my $cabfilename = "MergeModule.CABinet"; - # exclude cabinet file - # my $systemcall = $cabarc . " -o X " . $mergemodulehash->{'cabinetfile'}; - my $systemcall = ""; if ( $^O =~ /cygwin/i ) { my $localunpackdir = qx(cygpath -m "$unpackdir"); diff --git a/solenv/bin/modules/installer/windows/msiglobal.pm b/solenv/bin/modules/installer/windows/msiglobal.pm index 571ba609f..b38284304 100644 --- a/solenv/bin/modules/installer/windows/msiglobal.pm +++ b/solenv/bin/modules/installer/windows/msiglobal.pm @@ -1005,9 +1005,9 @@ sub create_transforms my $infoline = "Systemcall: $systemcall\n"; push( @installer::globals::logfileinfo, $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" @@ -1052,13 +1052,13 @@ sub create_transforms } else { - $infoline = "Filesize indicates that an error occured.\n"; + $infoline = "Filesize indicates that an error occurred.\n"; push( @installer::globals::logfileinfo, $infoline); } } else { - $infoline = "File $transformfile does not exist -> An error occured.\n"; + $infoline = "File $transformfile does not exist -> An error occurred.\n"; push( @installer::globals::logfileinfo, $infoline); } } @@ -1471,7 +1471,6 @@ sub get_guid_list # "-c" for uppercase output - # my $systemcall = "$uuidgen -n$number -c |"; my $systemcall = "$uuidgen -n$number |"; open (UUIDGEN, "$systemcall" ) or die("uuidgen is missing."); my @uuidlist = <UUIDGEN>; @@ -1514,7 +1513,6 @@ sub calculate_guid my $digest = $md5->hexdigest; $digest = uc($digest); - # my $id = pack("A32", $digest); my ($first, $second, $third, $fourth, $fifth) = unpack ('A8 A4 A4 A4 A12', $digest); $guid = "$first-$second-$third-$fourth-$fifth"; @@ -1588,8 +1586,6 @@ sub set_uuid_into_component_table my $infoline = ""; my $counter = 0; - # my $componentfile = installer::files::read_file($installer::globals::componentfilename); - # my $componenthash = fill_component_hash($componentfile); for ( my $i = 3; $i <= $#{$componenttable}; $i++ ) # ignoring the first three lines { @@ -1599,13 +1595,6 @@ sub set_uuid_into_component_table my $uuid = ""; - # if ( $componenthash->{$componentname} ) - # { - # $uuid = $componenthash->{$componentname}; - # } - # else - # { - if ( exists($installer::globals::calculated_component_guids{$componentname})) { $uuid = $installer::globals::calculated_component_guids{$componentname}; @@ -1629,44 +1618,12 @@ sub set_uuid_into_component_table if ( exists($installer::globals::allcalculated_guids{$uuid}) ) { installer::exiter::exit_program("ERROR: \"$uuid\" was already created before!", "set_uuid_into_component_table"); } $installer::globals::allcalculated_guids{$uuid} = 1; $installer::globals::calculated_component_guids{$componentname} = $uuid; - - # Setting new uuid - # $componenthash->{$componentname} = $uuid; - - # Setting flag - # $installer::globals::created_new_component_guid = 1; # this is very important! } - # } ${$componenttable}[$i] =~ s/COMPONENTGUID/$uuid/; } installer::files::save_file($componenttablename, $componenttable); - -# if ( $installer::globals::created_new_component_guid ) -# { -# # create new component file! -# $componentfile = create_new_component_file($componenthash); -# installer::worker::sort_array($componentfile); -# -# # To avoid conflict the components file cannot be saved at the same place -# # All important data have to be saved in the directory: $installer::globals::infodirectory -# my $localcomponentfilename = $installer::globals::componentfilename; -# installer::pathanalyzer::make_absolute_filename_to_relative_filename(\$localcomponentfilename); -# $localcomponentfilename = $installer::globals::infodirectory . $installer::globals::separator . $localcomponentfilename; -# installer::files::save_file($localcomponentfilename, $componentfile); -# -# # installer::files::save_file($installer::globals::componentfilename, $componentfile); # version using new file in solver -# -# $infoline = "COMPONENTCODES: Created $counter new GUIDs for components ! \n"; -# push( @installer::globals::logfileinfo, $infoline); -# } -# else -# { -# $infoline = "SUCCESS COMPONENTCODES: All component codes exist! \n"; -# push( @installer::globals::logfileinfo, $infoline); -# } - } ################################################################# @@ -1781,8 +1738,6 @@ sub execute_packaging installer::logger::print_message( "... makecab.exe ($callscounter/$allmakecabcalls) ... \n" ); - # my $returnvalue = system($systemcall); - for ( my $n = 1; $n <= $maxmakecabcalls; $n++ ) { my @ddfoutput = (); @@ -1810,7 +1765,6 @@ sub execute_packaging } push( @installer::globals::logfileinfo, $infoline); - # for ( my $j = 0; $j <= $#ddfoutput; $j++ ) { push( @installer::globals::logfileinfo, "$ddfoutput[$j]"); } for ( my $m = 0; $m <= $#ddfoutput; $m++ ) { @@ -1827,7 +1781,6 @@ sub execute_packaging } else { - # installer::logger::print_message( "Success (Try $n): \"$systemcall\"\n" ); $infoline = "Success (Try $n): $systemcall"; push( @installer::globals::logfileinfo, $infoline); last; @@ -1930,7 +1883,6 @@ sub set_global_code_variables $installer::globals::upgradecode = installer::windows::idtglobal::get_language_string_from_language_block($codeblock, $onelanguage, ""); } - # if (( $installer::globals::productcode eq "" ) && ( ! $isopensource )) { installer::exiter::exit_program("ERROR: ProductCode for language $onelanguage not defined in $installer::globals::codefilename !", "set_global_code_variables"); } if ( $installer::globals::upgradecode eq "" ) { installer::exiter::exit_program("ERROR: UpgradeCode not defined in $installer::globals::codefilename !", "set_global_code_variables"); } $infoline = "Setting ProductCode to: $installer::globals::productcode \n"; @@ -2123,8 +2075,8 @@ sub read_saved_mappings { my @errorlines = (); my $errorstring = ""; - my $error_occured = 0; - my $file_error_occured = 0; + my $error_occurred = 0; + my $file_error_occurred = 0; my $dir_error = 0; my $idtdir = $installer::globals::previous_idt_dir; @@ -2148,28 +2100,28 @@ sub read_saved_mappings if ( exists($installer::globals::savedmapping{"$2/$5"})) { - if ( ! $file_error_occured ) + if ( ! $file_error_occurred ) { $errorstring = "\nErrors in $idtfile: \n"; push(@errorlines, $errorstring); } $errorstring = "Duplicate savedmapping{" . "$2/$5}\n"; push(@errorlines, $errorstring); - $error_occured = 1; - $file_error_occured = 1; + $error_occurred = 1; + $file_error_occurred = 1; } if ( exists($installer::globals::savedrevmapping{$lc1})) { - if ( ! $file_error_occured ) + if ( ! $file_error_occurred ) { $errorstring = "\nErrors in $idtfile: \n"; push(@errorlines, $errorstring); } $errorstring = "Duplicate savedrevmapping{" . "$lc1}\n"; push(@errorlines, $errorstring); - $error_occured = 1; - $file_error_occured = 1; + $error_occurred = 1; + $file_error_occurred = 1; } my $shortname = $4 || ''; @@ -2183,15 +2135,15 @@ sub read_saved_mappings if (( $shortname ne '' ) && ( index($shortname, '~') > 0 ) && ( exists($installer::globals::savedrev83mapping{$shortname}) )) { - if ( ! $file_error_occured ) + if ( ! $file_error_occurred ) { $errorstring = "\nErrors in $idtfile: \n"; push(@errorlines, $errorstring); } $errorstring = "Duplicate savedrev83mapping{" . "$shortname}\n"; push(@errorlines, $errorstring); - $error_occured = 1; - $file_error_occured = 1; + $error_occurred = 1; + $file_error_occurred = 1; } $installer::globals::savedmapping{"$2/$5"} = "$1;$shortname"; @@ -2223,15 +2175,15 @@ sub read_saved_mappings if ( exists($installer::globals::saved83dirmapping{$1}) ) { - if ( ! $dir_error_occured ) + if ( ! $dir_error_occurred ) { $errorstring = "\nErrors in $idtfile: \n"; push(@errorlines, $errorstring); } $errorstring = "Duplicate saved83dirmapping{" . "$1}\n"; push(@errorlines, $errorstring); - $error_occured = 1; - $dir_error_occured = 1; + $error_occurred = 1; + $dir_error_occurred = 1; } $installer::globals::saved83dirmapping{$1} = $4; @@ -2243,7 +2195,7 @@ sub read_saved_mappings # Analyzing errors - if ( $error_occured ) + if ( $error_occurred ) { for ( my $i = 0; $i <= $#errorlines; $i++ ) { @@ -2253,7 +2205,6 @@ sub read_saved_mappings installer::exiter::exit_program("ERROR: Duplicate entries in saved mappings!", "read_saved_mappings"); } } else { - # push( @installer::globals::globallogfileinfo, "WARNING: Windows patch shall be prepared, but PREVIOUS_IDT_DIR is not set!\n" ); installer::exiter::exit_program("ERROR: Windows patch shall be prepared, but environment variable PREVIOUS_IDT_DIR is not set!", "read_saved_mappings"); } diff --git a/solenv/bin/modules/installer/windows/msp.pm b/solenv/bin/modules/installer/windows/msp.pm index e449d706a..526f33c67 100644 --- a/solenv/bin/modules/installer/windows/msp.pm +++ b/solenv/bin/modules/installer/windows/msp.pm @@ -229,7 +229,6 @@ sub execute_msimsp $locallogfilename =~ s/\//\\\\/g; $localmspfilename =~ s/\\/\\\\/g; # path already contains backslash - # $localmspfilename =~ s/\//\\\\/g; $localmsimsptemppath = qx{cygpath -w "$localmsimsptemppath"}; $localmsimsptemppath =~ s/\\/\\\\/g; @@ -1082,10 +1081,7 @@ sub convert_unicode_to_ascii my $savfilename = $filename . "_before.unicode"; installer::systemactions::copy_one_file($filename, $savfilename); -# open( IN, "<:utf16", $filename ) || installer::exiter::exit_program("ERROR: Cannot open file $filename for reading", "convert_unicode_to_ascii"); -# open( IN, "<:para:crlf:uni", $filename ) || installer::exiter::exit_program("ERROR: Cannot open file $filename for reading", "convert_unicode_to_ascii"); open( IN, "<:encoding(UTF16-LE)", $filename ) || installer::exiter::exit_program("ERROR: Cannot open file $filename for reading", "convert_unicode_to_ascii"); -# open( IN, "<:encoding(UTF-8)", $filename ) || installer::exiter::exit_program("ERROR: Cannot open file $filename for reading", "convert_unicode_to_ascii"); while ( $line = <IN> ) { push @localfile, $line; } diff --git a/solenv/bin/modules/installer/windows/shortcut.pm b/solenv/bin/modules/installer/windows/shortcut.pm index 5b82c346b..91e630261 100644 --- a/solenv/bin/modules/installer/windows/shortcut.pm +++ b/solenv/bin/modules/installer/windows/shortcut.pm @@ -357,10 +357,9 @@ sub get_folderitem_directory { my ($shortcut) = @_; - # my $directory = "$installer::globals::programmenufolder"; # default my $directory = "$installer::globals::officemenufolder"; # default - # The value $installer::globals::programmenufolder is not correct for the + # The default is not correct for the # PREDEFINED folders, like PREDEFINED_AUTOSTART if ( $shortcut->{'FolderID'} eq "PREDEFINED_AUTOSTART" ) @@ -694,4 +693,4 @@ sub create_shortcut_table } -1;
\ No newline at end of file +1; diff --git a/solenv/bin/modules/installer/windows/sign.pm b/solenv/bin/modules/installer/windows/sign.pm index f23626db5..08ea6c388 100644 --- a/solenv/bin/modules/installer/windows/sign.pm +++ b/solenv/bin/modules/installer/windows/sign.pm @@ -243,9 +243,6 @@ sub execute_open_system_call if( $^O =~ /cygwin/i ) { - # $comspec =~ s/\\/\\\\/g; - # $comspec = qx{cygpath -u "$comspec"}; - # $comspec =~ s/\s*$//g; $comspec = ""; } @@ -1050,8 +1047,6 @@ sub already_certified if ( $returnvalue ) { $success = 0; } - # my $success = make_systemcall($systemcall, $systemcall); - if ( $success ) { $is_certified = 1; diff --git a/solenv/bin/modules/installer/windows/update.pm b/solenv/bin/modules/installer/windows/update.pm index da9417198..578246368 100644 --- a/solenv/bin/modules/installer/windows/update.pm +++ b/solenv/bin/modules/installer/windows/update.pm @@ -334,7 +334,6 @@ sub readdatabase } else { - # installer::logger::print_message( "... no update process, no database found ...\n" ); $infoline = "\nNo database found in $completelistname. This is no update process!\n\n"; } push( @installer::globals::logfileinfo, $infoline); @@ -597,4 +596,4 @@ sub create_database_hashes } -1;
\ No newline at end of file +1; diff --git a/solenv/bin/modules/installer/worker.pm b/solenv/bin/modules/installer/worker.pm index 2c26290c1..f29c6f8de 100644 --- a/solenv/bin/modules/installer/worker.pm +++ b/solenv/bin/modules/installer/worker.pm @@ -184,17 +184,6 @@ sub make_checksum_file my $checksumfileref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$installer::globals::checksumfile, $includepatharrayref, 1); if ( $$checksumfileref eq "" ) { installer::exiter::exit_program("ERROR: Could not find file $installer::globals::checksumfile !", "make_checksum_file"); } -# # very slow on Windows -# for ( my $i = 0; $i <= $#{$filesref}; $i++ ) -# { -# my $onefile = ${$filesref}[$i]; -# my $systemcall = "$$checksumfileref $onefile->{'sourcepath'} |"; -# open (CHECK, "$systemcall"); -# my $localchecksum = <CHECK>; -# close (CHECK); -# push(@checksum, $localchecksum); -# } - my $systemcall = "$$checksumfileref"; for ( my $i = 0; $i <= $#{$filesref}; $i++ ) @@ -818,7 +807,6 @@ sub install_simple ($$$$$$) my $target = $onelink->{'Target'}; my $destination = $onelink->{'destination'}; - # print "Unix link $target -> $destdir$destination\n"; `ln -sf '$target' '$destdir$destination'`; push @lines, "$destination\n"; } @@ -1491,7 +1479,6 @@ sub reorg_patchfile for ( my $j = 0; $j <= $#{$patchfiles}; $j++ ) { - # "\tXXXXX\t" . $olddestination . "\n"; if ( ${$patchfiles}[$j] =~ /^\s*(.*?)\s*\tXXXXX\t\Q$directory\E\s*$/ ) { $line = $1 . "\n"; @@ -1625,7 +1612,6 @@ sub prepare_windows_patchfiles my $patchfilename2 = "patchmsi.dll"; if ( ! $allvariableshashref->{'WINDOWSPATCHLEVEL'} ) { installer::exiter::exit_program("ERROR: No Windows patch level defined in list file (WINDOWSPATCHLEVEL) !", "prepare_windows_patchfiles"); } - # my $windowspatchlevel = $allvariableshashref->{'WINDOWSPATCHLEVEL'}; my $windowspatchlevel = $installer::globals::buildid; # the environment variable CWS_WORK_STAMP is set only in CWS @@ -1701,9 +1687,6 @@ sub prepare_windows_patchfiles $infoline = "Size of patch file list: $filesize\n\n"; push( @installer::globals::logfileinfo, $infoline); installer::logger::print_message( "... size of patch list file: $filesize Byte ... \n" ); - - # Win 98: Maximum size of ini file is 65 kB - # if ( $filesize > 64000 ) { installer::exiter::exit_program("ERROR: Maximum size of patch file list is 65 kB (Win98), now reached: $filesize Byte !", "prepare_windows_patchfiles"); } } } @@ -2108,8 +2091,6 @@ sub check_jds_language my $infoline = ""; - # languagesarrayref and $allvariableshashref->{'JDSLANG'} - if ( ! $allvariableshashref->{'JDSLANG'} ) { installer::exiter::exit_program("ERROR: For building JDS installation sets \"JDSLANG\" must be defined!", "check_jds_language"); } my $languagestring = $allvariableshashref->{'JDSLANG'}; @@ -2273,7 +2254,6 @@ sub get_platform_name } else { - # $platformname = $installer::globals::packageformat; $platformname = $installer::globals::compiler; } @@ -2369,7 +2349,6 @@ sub collect_all_files_from_includepathes my @sourcefiles = (); my $pathstring = ""; - # installer::systemactions::read_complete_directory($includepath, $pathstring, \@sourcefiles); installer::systemactions::read_full_directory($includepath, $pathstring, \@sourcefiles); if ( ! ( $#sourcefiles > -1 )) @@ -2424,9 +2403,6 @@ sub find_file_by_id } } - # It does not need to exist. For example products that do not contain the libraries. - # if (! $foundfile ) { installer::exiter::exit_program("ERROR: No unique file name found for $filename !", "get_selfreg_file"); } - if (! $foundfile ) { $onefile = ""; } return $onefile; @@ -2974,7 +2950,6 @@ sub resolving_hidden_flag if ( $copysuccess ) { - # $onefile->{'Name'} = $newfilename; $onefile->{'sourcepath'} = $destfile; $destination = $onefile->{'destination'}; installer::pathanalyzer::get_path_from_fullqualifiedname(\$destination); @@ -3184,7 +3159,6 @@ sub tar_package if ( $getuidlibrary ne "" ) { $ldpreloadstring = "LD_PRELOAD=" . $getuidlibrary; } my $systemcall = "cd $installdir; $ldpreloadstring tar -cf - $packagename > $tarfilename"; - # my $systemcall = "cd $installdir; $ldpreloadstring tar -cf - * > $tarfilename"; my $returnvalue = system($systemcall); @@ -3252,32 +3226,12 @@ sub shuffle_array { my ( $arrayref ) = @_; - # my $counter = 0; - # my $infoline = "Old package order: \n"; - # push( @installer::globals::logfileinfo, $infoline); - # foreach my $onepackage ( @{$arrayref} ) - # { - # $counter++; - # $infoline = "$counter: $onepackage->{'module'}\n"; - # push( @installer::globals::logfileinfo, $infoline); - # } - my $i = @$arrayref; while (--$i) { my $j = int rand ($i+1); @$arrayref[$i,$j] = @$arrayref[$j,$i]; } - - # $counter = 0; - # $infoline = "New package order: \n"; - # push( @installer::globals::logfileinfo, $infoline); - # foreach my $onepackage ( @{$arrayref} ) - # { - # $counter++; - # $infoline = "$counter: $onepackage->{'module'}\n"; - # push( @installer::globals::logfileinfo, $infoline); - # } } ################################################ @@ -3427,7 +3381,6 @@ sub collectpackagemaps # Create a tar gz file with all package maps my $tarfilename = $subdirname . ".tar"; my $targzname = $tarfilename . ".gz"; - # my $systemcall = "cd $pkgmapdir; tar -cf - $subdirname > $tarfilename"; $systemcall = "cd $pkgmapdir; tar -cf - $subdirname | gzip > $targzname"; make_systemcall($systemcall); installer::systemactions::remove_complete_directory($pkgmapsubdir, 1); diff --git a/solenv/bin/modules/installer/xpdinstaller.pm b/solenv/bin/modules/installer/xpdinstaller.pm index 914259b67..d3a359499 100644 --- a/solenv/bin/modules/installer/xpdinstaller.pm +++ b/solenv/bin/modules/installer/xpdinstaller.pm @@ -109,8 +109,6 @@ sub get_module $found = 1; last; } - - # if ( ! $found ) { installer::exiter::exit_program("ERROR: Could not find module belonging to gid $modulegid!", "get_module (xpdinstaller)"); } } return $searchmodule; @@ -579,9 +577,8 @@ sub get_size_value my $isrpmfile = 0; if ( $packagename =~ /\.rpm\s*$/ ) { $isrpmfile = 1; } - if (( $installer::globals::islinuxrpmbuild ) && ( $isrpmfile )) + if (( $installer::globals::isrpmbuild ) && ( $isrpmfile )) { - # if ( ! $installer::globals::rpmquerycommand ) { installer::exiter::exit_program("ERROR: rpm not found for querying packages!", "get_size_value"); } if ( ! $installer::globals::rpmquerycommand ) { $installer::globals::rpmquerycommand = "rpm"; } my $systemcall = "$installer::globals::rpmquerycommand -qp --queryformat \"\[\%\{FILESIZES\}\\n\]\" $packagename 2\>\&1 |"; @@ -658,7 +655,7 @@ sub get_md5_value return $value; } - if ( $installer::globals::islinuxrpmbuild ) + if ( $installer::globals::isrpmbuild ) { my $md5file = "/usr/bin/md5sum"; @@ -712,7 +709,7 @@ sub get_fullpkgname_value my $isrpmfile = 0; if ( $packagename =~ /\.rpm\s*$/ ) { $isrpmfile = 1; } - if (( $installer::globals::islinuxrpmbuild ) && ( $isrpmfile )) + if (( $installer::globals::isrpmbuild ) && ( $isrpmfile )) { if ( $xpdinfo->{'FullPackageName'} ) { @@ -720,7 +717,6 @@ sub get_fullpkgname_value return $value; } - # if ( ! $installer::globals::rpmquerycommand ) { installer::exiter::exit_program("ERROR: rpm not found for querying packages!", "get_fullpkgname_value"); } if ( ! $installer::globals::rpmquerycommand ) { $installer::globals::rpmquerycommand = "rpm"; } my $systemcall = "$installer::globals::rpmquerycommand -qp $packagename |"; my $ld_library_backup = $ENV{LD_LIBRARY_PATH}; @@ -888,7 +884,7 @@ sub make_systemcall { $infoline = "ERROR: $systemcall\n"; push( @installer::globals::logfileinfo, $infoline); - $error_occured = 1; + $error_occurred = 1; } else { @@ -931,13 +927,13 @@ sub make_systemcall_allowing_error { $infoline = "WARNING: Failed system call: $systemcall\n"; push( @installer::globals::logfileinfo, $infoline); - $error_occured = 1; + $error_occurred = 1; } else { $infoline = "ERROR: $systemcall\n"; push( @installer::globals::logfileinfo, $infoline); - $error_occured = 1; + $error_occurred = 1; } } else @@ -1076,7 +1072,6 @@ sub set_productdir_tag if ( $allvariables->{"BRANDPACKAGEVERSION"} ) { $productdir = $productdir . $allvariables->{"BRANDPACKAGEVERSION"}; -# if ( $allvariables->{"LCPRODUCTEXTENSION"} ) { $productdir = $productdir . $allvariables->{"LCPRODUCTEXTENSION"}; } } else { @@ -1487,7 +1482,6 @@ sub create_emptyparents_xpd_file push(@installer::globals::logfileinfo, $infoline); } - # push(@installer::globals::emptyxpdparents, $parentgid); push( @installer::globals::createdxpdfiles, $parentgid); return $grandpagid; @@ -1558,7 +1552,6 @@ sub create_xpd_file my $xpddir = installer::systemactions::create_directories("xpdinstaller", $languagestringref); $xpddir =~ s/\/\s*$//; $installer::globals::xpddir = $xpddir; - # push(@installer::globals::removedirs, $xpddir); my $modulegid = $onepackage->{'module'}; @@ -1616,7 +1609,6 @@ sub create_xpd_file { my $create_missing_parent = is_empty_parent($parentgid, $allpackages); - # if (( $create_missing_parent ) && ( ! installer::existence::exists_in_array($parentgid, \@installer::globals::emptyxpdparents) )) if (( $create_missing_parent ) && ( ! installer::existence::exists_in_array($parentgid, \@installer::globals::createdxpdfiles) )) { $grandpagid = create_emptyparents_xpd_file($parentgid, $modulesarrayref, $xpddir); @@ -1627,7 +1619,6 @@ sub create_xpd_file { my $create_missing_parent = is_empty_parent($grandpagid, $allpackages); - # if (( $create_missing_parent ) && ( ! installer::existence::exists_in_array($parentgid, \@installer::globals::emptyxpdparents) )) if (( $create_missing_parent ) && ( ! installer::existence::exists_in_array($grandpagid, \@installer::globals::createdxpdfiles) )) { create_emptyparents_xpd_file($grandpagid, $modulesarrayref, $xpddir); @@ -1671,7 +1662,6 @@ sub create_xpd_file_for_childproject if ( $parentgid ne "root" ) { - # my $create_missing_parent = is_empty_parent($parentgid, $allpackages); my $create_missing_parent = 1; # -> Always missing parent by child projects! # Parent is now created, if it was not created before. Attention: Parent module must not come later. if (( $create_missing_parent ) && ( ! installer::existence::exists_in_array($parentgid, \@installer::globals::createdxpdfiles) )) @@ -1698,8 +1688,6 @@ sub create_xpd_file_for_systemintegration { my $newpackagename = ${$newcontent}[$i]; - # installer::pathanalyzer::make_absolute_filename_to_relative_filename(\$newpackagename); - my $infoline = "Creating xpd file for package: $newpackagename\n"; push( @installer::globals::logfileinfo, $infoline); diff --git a/solenv/bin/modules/packager/work.pm b/solenv/bin/modules/packager/work.pm index ace8aef69..158e9214e 100644 --- a/solenv/bin/modules/packager/work.pm +++ b/solenv/bin/modules/packager/work.pm @@ -293,7 +293,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/inc/_tg_app.mk b/solenv/inc/_tg_app.mk index 960c8d229..f5233345e 100644 --- a/solenv/inc/_tg_app.mk +++ b/solenv/inc/_tg_app.mk @@ -1,6 +1,6 @@ # unroll begin -.IF "$(GUI)" == "OS2" && "$(TARGETTYPE)" == "GUI" +.IF "$(GUI)" == "OS2" && "$(TARGETTYPE)" == "GUI" APP1DEF = $(MISC)/$(APP1TARGET).def .ENDIF @@ -64,7 +64,7 @@ APP1PRODUCTDEF+:=-DPRODUCT_NAME=\"$(APP1PRODUCTNAME)\" $(MISC)/$(APP1TARGET)_linkinc.ls .PHONY: @@-$(RM) $@ sed -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(APP1LIBS) $(i:s/.lib/.lin/)) >> $@ -.ENDIF #"$(APP1LIBS)"!="" +.ENDIF #"$(APP1LIBS)"!="" .ENDIF LINKINCTARGETS+=$(MISC)/$(APP1TARGETN:b)_linkinc.ls @@ -75,10 +75,10 @@ $(APP1TARGETN) : $(LINKINCTARGETS) APP1LIBSALCPPRT*=$(LIBSALCPPRT) .IF "$(GUI)" == "OS2" -_APP1IMP_ORD = $(APP1STDLIBS:^"$(SOLARVERSION)/$(INPATH)/lib/") $(APP1STDLIBS:^"$(LB)/") +_APP1IMP_ORD = $(APP1STDLIBS:^"$(SOLARVERSION)/$(INPATH)/lib/") $(APP1STDLIBS:^"$(LB)/") APP1IMP_ORD = $(foreach,i,$(_APP1IMP_ORD) $(shell @-ls $i)) .ELSE -APP1IMP_ORD = +APP1IMP_ORD = .ENDIF $(APP1TARGETN): $(APP1OBJS) $(APP1LIBS) \ @@ -232,7 +232,7 @@ $(APP1TARGETN): $(APP1OBJS) $(APP1LIBS) \ $(COMMAND_ECHO)$(RC) -r -DOS2 $(APP1PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP1LINKRES:b).rc .ENDIF # "$(APP1LINKRES)" != "" -.IF "$(TARGETTYPE)" == "GUI" +.IF "$(TARGETTYPE)" == "GUI" @echo NAME $(APP1TARGET) WINDOWAPI > $(MISC)/$(APP1TARGET).def .ENDIF @@ -250,7 +250,7 @@ $(APP1TARGETN): $(APP1OBJS) $(APP1LIBS) \ $(APP1OBJS) \ $(APP1LIBS) \ $(APP1STDLIBS:^"-l") \ - $(APP1STDLIB:^"-l") $(STDLIB1:^"-l") + $(APP1STDLIB:^"-l") $(STDLIB1:^"-l") .ENDIF $(COMMAND_ECHO)$(APP1LINKER) -v \ $(APP1LINKFLAGS) \ @@ -266,7 +266,7 @@ $(APP1TARGETN): $(APP1OBJS) $(APP1LIBS) \ $(APP1OBJS) \ $(APP1LIBS) \ $(APP1STDLIBS:^"-l") \ - $(APP1STDLIB:^"-l") $(STDLIB1:^"-l") + $(APP1STDLIB:^"-l") $(STDLIB1:^"-l") .IF "$(APP1TARGET)" == "loader" @@ -284,7 +284,7 @@ $(APP1TARGETN): $(APP1OBJS) $(APP1LIBS) \ # Instruction for linking # unroll begin -.IF "$(GUI)" == "OS2" && "$(TARGETTYPE)" == "GUI" +.IF "$(GUI)" == "OS2" && "$(TARGETTYPE)" == "GUI" APP2DEF = $(MISC)/$(APP2TARGET).def .ENDIF @@ -348,7 +348,7 @@ APP2PRODUCTDEF+:=-DPRODUCT_NAME=\"$(APP2PRODUCTNAME)\" $(MISC)/$(APP2TARGET)_linkinc.ls .PHONY: @@-$(RM) $@ sed -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(APP2LIBS) $(i:s/.lib/.lin/)) >> $@ -.ENDIF #"$(APP2LIBS)"!="" +.ENDIF #"$(APP2LIBS)"!="" .ENDIF LINKINCTARGETS+=$(MISC)/$(APP2TARGETN:b)_linkinc.ls @@ -359,10 +359,10 @@ $(APP2TARGETN) : $(LINKINCTARGETS) APP2LIBSALCPPRT*=$(LIBSALCPPRT) .IF "$(GUI)" == "OS2" -_APP2IMP_ORD = $(APP2STDLIBS:^"$(SOLARVERSION)/$(INPATH)/lib/") $(APP2STDLIBS:^"$(LB)/") +_APP2IMP_ORD = $(APP2STDLIBS:^"$(SOLARVERSION)/$(INPATH)/lib/") $(APP2STDLIBS:^"$(LB)/") APP2IMP_ORD = $(foreach,i,$(_APP2IMP_ORD) $(shell @-ls $i)) .ELSE -APP2IMP_ORD = +APP2IMP_ORD = .ENDIF $(APP2TARGETN): $(APP2OBJS) $(APP2LIBS) \ @@ -516,7 +516,7 @@ $(APP2TARGETN): $(APP2OBJS) $(APP2LIBS) \ $(COMMAND_ECHO)$(RC) -r -DOS2 $(APP2PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP2LINKRES:b).rc .ENDIF # "$(APP2LINKRES)" != "" -.IF "$(TARGETTYPE)" == "GUI" +.IF "$(TARGETTYPE)" == "GUI" @echo NAME $(APP2TARGET) WINDOWAPI > $(MISC)/$(APP2TARGET).def .ENDIF @@ -534,7 +534,7 @@ $(APP2TARGETN): $(APP2OBJS) $(APP2LIBS) \ $(APP2OBJS) \ $(APP2LIBS) \ $(APP2STDLIBS:^"-l") \ - $(APP2STDLIB:^"-l") $(STDLIB2:^"-l") + $(APP2STDLIB:^"-l") $(STDLIB2:^"-l") .ENDIF $(COMMAND_ECHO)$(APP2LINKER) -v \ $(APP2LINKFLAGS) \ @@ -550,7 +550,7 @@ $(APP2TARGETN): $(APP2OBJS) $(APP2LIBS) \ $(APP2OBJS) \ $(APP2LIBS) \ $(APP2STDLIBS:^"-l") \ - $(APP2STDLIB:^"-l") $(STDLIB2:^"-l") + $(APP2STDLIB:^"-l") $(STDLIB2:^"-l") .IF "$(APP2TARGET)" == "loader" @@ -568,7 +568,7 @@ $(APP2TARGETN): $(APP2OBJS) $(APP2LIBS) \ # Instruction for linking # unroll begin -.IF "$(GUI)" == "OS2" && "$(TARGETTYPE)" == "GUI" +.IF "$(GUI)" == "OS2" && "$(TARGETTYPE)" == "GUI" APP3DEF = $(MISC)/$(APP3TARGET).def .ENDIF @@ -632,7 +632,7 @@ APP3PRODUCTDEF+:=-DPRODUCT_NAME=\"$(APP3PRODUCTNAME)\" $(MISC)/$(APP3TARGET)_linkinc.ls .PHONY: @@-$(RM) $@ sed -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(APP3LIBS) $(i:s/.lib/.lin/)) >> $@ -.ENDIF #"$(APP3LIBS)"!="" +.ENDIF #"$(APP3LIBS)"!="" .ENDIF LINKINCTARGETS+=$(MISC)/$(APP3TARGETN:b)_linkinc.ls @@ -643,10 +643,10 @@ $(APP3TARGETN) : $(LINKINCTARGETS) APP3LIBSALCPPRT*=$(LIBSALCPPRT) .IF "$(GUI)" == "OS2" -_APP3IMP_ORD = $(APP3STDLIBS:^"$(SOLARVERSION)/$(INPATH)/lib/") $(APP3STDLIBS:^"$(LB)/") +_APP3IMP_ORD = $(APP3STDLIBS:^"$(SOLARVERSION)/$(INPATH)/lib/") $(APP3STDLIBS:^"$(LB)/") APP3IMP_ORD = $(foreach,i,$(_APP3IMP_ORD) $(shell @-ls $i)) .ELSE -APP3IMP_ORD = +APP3IMP_ORD = .ENDIF $(APP3TARGETN): $(APP3OBJS) $(APP3LIBS) \ @@ -800,7 +800,7 @@ $(APP3TARGETN): $(APP3OBJS) $(APP3LIBS) \ $(COMMAND_ECHO)$(RC) -r -DOS2 $(APP3PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP3LINKRES:b).rc .ENDIF # "$(APP3LINKRES)" != "" -.IF "$(TARGETTYPE)" == "GUI" +.IF "$(TARGETTYPE)" == "GUI" @echo NAME $(APP3TARGET) WINDOWAPI > $(MISC)/$(APP3TARGET).def .ENDIF @@ -818,7 +818,7 @@ $(APP3TARGETN): $(APP3OBJS) $(APP3LIBS) \ $(APP3OBJS) \ $(APP3LIBS) \ $(APP3STDLIBS:^"-l") \ - $(APP3STDLIB:^"-l") $(STDLIB3:^"-l") + $(APP3STDLIB:^"-l") $(STDLIB3:^"-l") .ENDIF $(COMMAND_ECHO)$(APP3LINKER) -v \ $(APP3LINKFLAGS) \ @@ -834,7 +834,7 @@ $(APP3TARGETN): $(APP3OBJS) $(APP3LIBS) \ $(APP3OBJS) \ $(APP3LIBS) \ $(APP3STDLIBS:^"-l") \ - $(APP3STDLIB:^"-l") $(STDLIB3:^"-l") + $(APP3STDLIB:^"-l") $(STDLIB3:^"-l") .IF "$(APP3TARGET)" == "loader" @@ -852,7 +852,7 @@ $(APP3TARGETN): $(APP3OBJS) $(APP3LIBS) \ # Instruction for linking # unroll begin -.IF "$(GUI)" == "OS2" && "$(TARGETTYPE)" == "GUI" +.IF "$(GUI)" == "OS2" && "$(TARGETTYPE)" == "GUI" APP4DEF = $(MISC)/$(APP4TARGET).def .ENDIF @@ -916,7 +916,7 @@ APP4PRODUCTDEF+:=-DPRODUCT_NAME=\"$(APP4PRODUCTNAME)\" $(MISC)/$(APP4TARGET)_linkinc.ls .PHONY: @@-$(RM) $@ sed -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(APP4LIBS) $(i:s/.lib/.lin/)) >> $@ -.ENDIF #"$(APP4LIBS)"!="" +.ENDIF #"$(APP4LIBS)"!="" .ENDIF LINKINCTARGETS+=$(MISC)/$(APP4TARGETN:b)_linkinc.ls @@ -927,10 +927,10 @@ $(APP4TARGETN) : $(LINKINCTARGETS) APP4LIBSALCPPRT*=$(LIBSALCPPRT) .IF "$(GUI)" == "OS2" -_APP4IMP_ORD = $(APP4STDLIBS:^"$(SOLARVERSION)/$(INPATH)/lib/") $(APP4STDLIBS:^"$(LB)/") +_APP4IMP_ORD = $(APP4STDLIBS:^"$(SOLARVERSION)/$(INPATH)/lib/") $(APP4STDLIBS:^"$(LB)/") APP4IMP_ORD = $(foreach,i,$(_APP4IMP_ORD) $(shell @-ls $i)) .ELSE -APP4IMP_ORD = +APP4IMP_ORD = .ENDIF $(APP4TARGETN): $(APP4OBJS) $(APP4LIBS) \ @@ -1084,7 +1084,7 @@ $(APP4TARGETN): $(APP4OBJS) $(APP4LIBS) \ $(COMMAND_ECHO)$(RC) -r -DOS2 $(APP4PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP4LINKRES:b).rc .ENDIF # "$(APP4LINKRES)" != "" -.IF "$(TARGETTYPE)" == "GUI" +.IF "$(TARGETTYPE)" == "GUI" @echo NAME $(APP4TARGET) WINDOWAPI > $(MISC)/$(APP4TARGET).def .ENDIF @@ -1102,7 +1102,7 @@ $(APP4TARGETN): $(APP4OBJS) $(APP4LIBS) \ $(APP4OBJS) \ $(APP4LIBS) \ $(APP4STDLIBS:^"-l") \ - $(APP4STDLIB:^"-l") $(STDLIB4:^"-l") + $(APP4STDLIB:^"-l") $(STDLIB4:^"-l") .ENDIF $(COMMAND_ECHO)$(APP4LINKER) -v \ $(APP4LINKFLAGS) \ @@ -1118,7 +1118,7 @@ $(APP4TARGETN): $(APP4OBJS) $(APP4LIBS) \ $(APP4OBJS) \ $(APP4LIBS) \ $(APP4STDLIBS:^"-l") \ - $(APP4STDLIB:^"-l") $(STDLIB4:^"-l") + $(APP4STDLIB:^"-l") $(STDLIB4:^"-l") .IF "$(APP4TARGET)" == "loader" @@ -1136,7 +1136,7 @@ $(APP4TARGETN): $(APP4OBJS) $(APP4LIBS) \ # Instruction for linking # unroll begin -.IF "$(GUI)" == "OS2" && "$(TARGETTYPE)" == "GUI" +.IF "$(GUI)" == "OS2" && "$(TARGETTYPE)" == "GUI" APP5DEF = $(MISC)/$(APP5TARGET).def .ENDIF @@ -1200,7 +1200,7 @@ APP5PRODUCTDEF+:=-DPRODUCT_NAME=\"$(APP5PRODUCTNAME)\" $(MISC)/$(APP5TARGET)_linkinc.ls .PHONY: @@-$(RM) $@ sed -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(APP5LIBS) $(i:s/.lib/.lin/)) >> $@ -.ENDIF #"$(APP5LIBS)"!="" +.ENDIF #"$(APP5LIBS)"!="" .ENDIF LINKINCTARGETS+=$(MISC)/$(APP5TARGETN:b)_linkinc.ls @@ -1211,10 +1211,10 @@ $(APP5TARGETN) : $(LINKINCTARGETS) APP5LIBSALCPPRT*=$(LIBSALCPPRT) .IF "$(GUI)" == "OS2" -_APP5IMP_ORD = $(APP5STDLIBS:^"$(SOLARVERSION)/$(INPATH)/lib/") $(APP5STDLIBS:^"$(LB)/") +_APP5IMP_ORD = $(APP5STDLIBS:^"$(SOLARVERSION)/$(INPATH)/lib/") $(APP5STDLIBS:^"$(LB)/") APP5IMP_ORD = $(foreach,i,$(_APP5IMP_ORD) $(shell @-ls $i)) .ELSE -APP5IMP_ORD = +APP5IMP_ORD = .ENDIF $(APP5TARGETN): $(APP5OBJS) $(APP5LIBS) \ @@ -1368,7 +1368,7 @@ $(APP5TARGETN): $(APP5OBJS) $(APP5LIBS) \ $(COMMAND_ECHO)$(RC) -r -DOS2 $(APP5PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP5LINKRES:b).rc .ENDIF # "$(APP5LINKRES)" != "" -.IF "$(TARGETTYPE)" == "GUI" +.IF "$(TARGETTYPE)" == "GUI" @echo NAME $(APP5TARGET) WINDOWAPI > $(MISC)/$(APP5TARGET).def .ENDIF @@ -1386,7 +1386,7 @@ $(APP5TARGETN): $(APP5OBJS) $(APP5LIBS) \ $(APP5OBJS) \ $(APP5LIBS) \ $(APP5STDLIBS:^"-l") \ - $(APP5STDLIB:^"-l") $(STDLIB5:^"-l") + $(APP5STDLIB:^"-l") $(STDLIB5:^"-l") .ENDIF $(COMMAND_ECHO)$(APP5LINKER) -v \ $(APP5LINKFLAGS) \ @@ -1402,7 +1402,7 @@ $(APP5TARGETN): $(APP5OBJS) $(APP5LIBS) \ $(APP5OBJS) \ $(APP5LIBS) \ $(APP5STDLIBS:^"-l") \ - $(APP5STDLIB:^"-l") $(STDLIB5:^"-l") + $(APP5STDLIB:^"-l") $(STDLIB5:^"-l") .IF "$(APP5TARGET)" == "loader" @@ -1420,7 +1420,7 @@ $(APP5TARGETN): $(APP5OBJS) $(APP5LIBS) \ # Instruction for linking # unroll begin -.IF "$(GUI)" == "OS2" && "$(TARGETTYPE)" == "GUI" +.IF "$(GUI)" == "OS2" && "$(TARGETTYPE)" == "GUI" APP6DEF = $(MISC)/$(APP6TARGET).def .ENDIF @@ -1484,7 +1484,7 @@ APP6PRODUCTDEF+:=-DPRODUCT_NAME=\"$(APP6PRODUCTNAME)\" $(MISC)/$(APP6TARGET)_linkinc.ls .PHONY: @@-$(RM) $@ sed -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(APP6LIBS) $(i:s/.lib/.lin/)) >> $@ -.ENDIF #"$(APP6LIBS)"!="" +.ENDIF #"$(APP6LIBS)"!="" .ENDIF LINKINCTARGETS+=$(MISC)/$(APP6TARGETN:b)_linkinc.ls @@ -1495,10 +1495,10 @@ $(APP6TARGETN) : $(LINKINCTARGETS) APP6LIBSALCPPRT*=$(LIBSALCPPRT) .IF "$(GUI)" == "OS2" -_APP6IMP_ORD = $(APP6STDLIBS:^"$(SOLARVERSION)/$(INPATH)/lib/") $(APP6STDLIBS:^"$(LB)/") +_APP6IMP_ORD = $(APP6STDLIBS:^"$(SOLARVERSION)/$(INPATH)/lib/") $(APP6STDLIBS:^"$(LB)/") APP6IMP_ORD = $(foreach,i,$(_APP6IMP_ORD) $(shell @-ls $i)) .ELSE -APP6IMP_ORD = +APP6IMP_ORD = .ENDIF $(APP6TARGETN): $(APP6OBJS) $(APP6LIBS) \ @@ -1652,7 +1652,7 @@ $(APP6TARGETN): $(APP6OBJS) $(APP6LIBS) \ $(COMMAND_ECHO)$(RC) -r -DOS2 $(APP6PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP6LINKRES:b).rc .ENDIF # "$(APP6LINKRES)" != "" -.IF "$(TARGETTYPE)" == "GUI" +.IF "$(TARGETTYPE)" == "GUI" @echo NAME $(APP6TARGET) WINDOWAPI > $(MISC)/$(APP6TARGET).def .ENDIF @@ -1670,7 +1670,7 @@ $(APP6TARGETN): $(APP6OBJS) $(APP6LIBS) \ $(APP6OBJS) \ $(APP6LIBS) \ $(APP6STDLIBS:^"-l") \ - $(APP6STDLIB:^"-l") $(STDLIB6:^"-l") + $(APP6STDLIB:^"-l") $(STDLIB6:^"-l") .ENDIF $(COMMAND_ECHO)$(APP6LINKER) -v \ $(APP6LINKFLAGS) \ @@ -1686,7 +1686,7 @@ $(APP6TARGETN): $(APP6OBJS) $(APP6LIBS) \ $(APP6OBJS) \ $(APP6LIBS) \ $(APP6STDLIBS:^"-l") \ - $(APP6STDLIB:^"-l") $(STDLIB6:^"-l") + $(APP6STDLIB:^"-l") $(STDLIB6:^"-l") .IF "$(APP6TARGET)" == "loader" @@ -1704,7 +1704,7 @@ $(APP6TARGETN): $(APP6OBJS) $(APP6LIBS) \ # Instruction for linking # unroll begin -.IF "$(GUI)" == "OS2" && "$(TARGETTYPE)" == "GUI" +.IF "$(GUI)" == "OS2" && "$(TARGETTYPE)" == "GUI" APP7DEF = $(MISC)/$(APP7TARGET).def .ENDIF @@ -1768,7 +1768,7 @@ APP7PRODUCTDEF+:=-DPRODUCT_NAME=\"$(APP7PRODUCTNAME)\" $(MISC)/$(APP7TARGET)_linkinc.ls .PHONY: @@-$(RM) $@ sed -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(APP7LIBS) $(i:s/.lib/.lin/)) >> $@ -.ENDIF #"$(APP7LIBS)"!="" +.ENDIF #"$(APP7LIBS)"!="" .ENDIF LINKINCTARGETS+=$(MISC)/$(APP7TARGETN:b)_linkinc.ls @@ -1779,10 +1779,10 @@ $(APP7TARGETN) : $(LINKINCTARGETS) APP7LIBSALCPPRT*=$(LIBSALCPPRT) .IF "$(GUI)" == "OS2" -_APP7IMP_ORD = $(APP7STDLIBS:^"$(SOLARVERSION)/$(INPATH)/lib/") $(APP7STDLIBS:^"$(LB)/") +_APP7IMP_ORD = $(APP7STDLIBS:^"$(SOLARVERSION)/$(INPATH)/lib/") $(APP7STDLIBS:^"$(LB)/") APP7IMP_ORD = $(foreach,i,$(_APP7IMP_ORD) $(shell @-ls $i)) .ELSE -APP7IMP_ORD = +APP7IMP_ORD = .ENDIF $(APP7TARGETN): $(APP7OBJS) $(APP7LIBS) \ @@ -1936,7 +1936,7 @@ $(APP7TARGETN): $(APP7OBJS) $(APP7LIBS) \ $(COMMAND_ECHO)$(RC) -r -DOS2 $(APP7PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP7LINKRES:b).rc .ENDIF # "$(APP7LINKRES)" != "" -.IF "$(TARGETTYPE)" == "GUI" +.IF "$(TARGETTYPE)" == "GUI" @echo NAME $(APP7TARGET) WINDOWAPI > $(MISC)/$(APP7TARGET).def .ENDIF @@ -1954,7 +1954,7 @@ $(APP7TARGETN): $(APP7OBJS) $(APP7LIBS) \ $(APP7OBJS) \ $(APP7LIBS) \ $(APP7STDLIBS:^"-l") \ - $(APP7STDLIB:^"-l") $(STDLIB7:^"-l") + $(APP7STDLIB:^"-l") $(STDLIB7:^"-l") .ENDIF $(COMMAND_ECHO)$(APP7LINKER) -v \ $(APP7LINKFLAGS) \ @@ -1970,7 +1970,7 @@ $(APP7TARGETN): $(APP7OBJS) $(APP7LIBS) \ $(APP7OBJS) \ $(APP7LIBS) \ $(APP7STDLIBS:^"-l") \ - $(APP7STDLIB:^"-l") $(STDLIB7:^"-l") + $(APP7STDLIB:^"-l") $(STDLIB7:^"-l") .IF "$(APP7TARGET)" == "loader" @@ -1988,7 +1988,7 @@ $(APP7TARGETN): $(APP7OBJS) $(APP7LIBS) \ # Instruction for linking # unroll begin -.IF "$(GUI)" == "OS2" && "$(TARGETTYPE)" == "GUI" +.IF "$(GUI)" == "OS2" && "$(TARGETTYPE)" == "GUI" APP8DEF = $(MISC)/$(APP8TARGET).def .ENDIF @@ -2052,7 +2052,7 @@ APP8PRODUCTDEF+:=-DPRODUCT_NAME=\"$(APP8PRODUCTNAME)\" $(MISC)/$(APP8TARGET)_linkinc.ls .PHONY: @@-$(RM) $@ sed -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(APP8LIBS) $(i:s/.lib/.lin/)) >> $@ -.ENDIF #"$(APP8LIBS)"!="" +.ENDIF #"$(APP8LIBS)"!="" .ENDIF LINKINCTARGETS+=$(MISC)/$(APP8TARGETN:b)_linkinc.ls @@ -2063,10 +2063,10 @@ $(APP8TARGETN) : $(LINKINCTARGETS) APP8LIBSALCPPRT*=$(LIBSALCPPRT) .IF "$(GUI)" == "OS2" -_APP8IMP_ORD = $(APP8STDLIBS:^"$(SOLARVERSION)/$(INPATH)/lib/") $(APP8STDLIBS:^"$(LB)/") +_APP8IMP_ORD = $(APP8STDLIBS:^"$(SOLARVERSION)/$(INPATH)/lib/") $(APP8STDLIBS:^"$(LB)/") APP8IMP_ORD = $(foreach,i,$(_APP8IMP_ORD) $(shell @-ls $i)) .ELSE -APP8IMP_ORD = +APP8IMP_ORD = .ENDIF $(APP8TARGETN): $(APP8OBJS) $(APP8LIBS) \ @@ -2220,7 +2220,7 @@ $(APP8TARGETN): $(APP8OBJS) $(APP8LIBS) \ $(COMMAND_ECHO)$(RC) -r -DOS2 $(APP8PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP8LINKRES:b).rc .ENDIF # "$(APP8LINKRES)" != "" -.IF "$(TARGETTYPE)" == "GUI" +.IF "$(TARGETTYPE)" == "GUI" @echo NAME $(APP8TARGET) WINDOWAPI > $(MISC)/$(APP8TARGET).def .ENDIF @@ -2238,7 +2238,7 @@ $(APP8TARGETN): $(APP8OBJS) $(APP8LIBS) \ $(APP8OBJS) \ $(APP8LIBS) \ $(APP8STDLIBS:^"-l") \ - $(APP8STDLIB:^"-l") $(STDLIB8:^"-l") + $(APP8STDLIB:^"-l") $(STDLIB8:^"-l") .ENDIF $(COMMAND_ECHO)$(APP8LINKER) -v \ $(APP8LINKFLAGS) \ @@ -2254,7 +2254,7 @@ $(APP8TARGETN): $(APP8OBJS) $(APP8LIBS) \ $(APP8OBJS) \ $(APP8LIBS) \ $(APP8STDLIBS:^"-l") \ - $(APP8STDLIB:^"-l") $(STDLIB8:^"-l") + $(APP8STDLIB:^"-l") $(STDLIB8:^"-l") .IF "$(APP8TARGET)" == "loader" @@ -2272,7 +2272,7 @@ $(APP8TARGETN): $(APP8OBJS) $(APP8LIBS) \ # Instruction for linking # unroll begin -.IF "$(GUI)" == "OS2" && "$(TARGETTYPE)" == "GUI" +.IF "$(GUI)" == "OS2" && "$(TARGETTYPE)" == "GUI" APP9DEF = $(MISC)/$(APP9TARGET).def .ENDIF @@ -2336,7 +2336,7 @@ APP9PRODUCTDEF+:=-DPRODUCT_NAME=\"$(APP9PRODUCTNAME)\" $(MISC)/$(APP9TARGET)_linkinc.ls .PHONY: @@-$(RM) $@ sed -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(APP9LIBS) $(i:s/.lib/.lin/)) >> $@ -.ENDIF #"$(APP9LIBS)"!="" +.ENDIF #"$(APP9LIBS)"!="" .ENDIF LINKINCTARGETS+=$(MISC)/$(APP9TARGETN:b)_linkinc.ls @@ -2347,10 +2347,10 @@ $(APP9TARGETN) : $(LINKINCTARGETS) APP9LIBSALCPPRT*=$(LIBSALCPPRT) .IF "$(GUI)" == "OS2" -_APP9IMP_ORD = $(APP9STDLIBS:^"$(SOLARVERSION)/$(INPATH)/lib/") $(APP9STDLIBS:^"$(LB)/") +_APP9IMP_ORD = $(APP9STDLIBS:^"$(SOLARVERSION)/$(INPATH)/lib/") $(APP9STDLIBS:^"$(LB)/") APP9IMP_ORD = $(foreach,i,$(_APP9IMP_ORD) $(shell @-ls $i)) .ELSE -APP9IMP_ORD = +APP9IMP_ORD = .ENDIF $(APP9TARGETN): $(APP9OBJS) $(APP9LIBS) \ @@ -2504,7 +2504,7 @@ $(APP9TARGETN): $(APP9OBJS) $(APP9LIBS) \ $(COMMAND_ECHO)$(RC) -r -DOS2 $(APP9PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP9LINKRES:b).rc .ENDIF # "$(APP9LINKRES)" != "" -.IF "$(TARGETTYPE)" == "GUI" +.IF "$(TARGETTYPE)" == "GUI" @echo NAME $(APP9TARGET) WINDOWAPI > $(MISC)/$(APP9TARGET).def .ENDIF @@ -2522,7 +2522,7 @@ $(APP9TARGETN): $(APP9OBJS) $(APP9LIBS) \ $(APP9OBJS) \ $(APP9LIBS) \ $(APP9STDLIBS:^"-l") \ - $(APP9STDLIB:^"-l") $(STDLIB9:^"-l") + $(APP9STDLIB:^"-l") $(STDLIB9:^"-l") .ENDIF $(COMMAND_ECHO)$(APP9LINKER) -v \ $(APP9LINKFLAGS) \ @@ -2538,7 +2538,7 @@ $(APP9TARGETN): $(APP9OBJS) $(APP9LIBS) \ $(APP9OBJS) \ $(APP9LIBS) \ $(APP9STDLIBS:^"-l") \ - $(APP9STDLIB:^"-l") $(STDLIB9:^"-l") + $(APP9STDLIB:^"-l") $(STDLIB9:^"-l") .IF "$(APP9TARGET)" == "loader" @@ -2556,7 +2556,7 @@ $(APP9TARGETN): $(APP9OBJS) $(APP9LIBS) \ # Instruction for linking # unroll begin -.IF "$(GUI)" == "OS2" && "$(TARGETTYPE)" == "GUI" +.IF "$(GUI)" == "OS2" && "$(TARGETTYPE)" == "GUI" APP10DEF = $(MISC)/$(APP10TARGET).def .ENDIF @@ -2620,7 +2620,7 @@ APP10PRODUCTDEF+:=-DPRODUCT_NAME=\"$(APP10PRODUCTNAME)\" $(MISC)/$(APP10TARGET)_linkinc.ls .PHONY: @@-$(RM) $@ sed -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(APP10LIBS) $(i:s/.lib/.lin/)) >> $@ -.ENDIF #"$(APP10LIBS)"!="" +.ENDIF #"$(APP10LIBS)"!="" .ENDIF LINKINCTARGETS+=$(MISC)/$(APP10TARGETN:b)_linkinc.ls @@ -2631,10 +2631,10 @@ $(APP10TARGETN) : $(LINKINCTARGETS) APP10LIBSALCPPRT*=$(LIBSALCPPRT) .IF "$(GUI)" == "OS2" -_APP10IMP_ORD = $(APP10STDLIBS:^"$(SOLARVERSION)/$(INPATH)/lib/") $(APP10STDLIBS:^"$(LB)/") +_APP10IMP_ORD = $(APP10STDLIBS:^"$(SOLARVERSION)/$(INPATH)/lib/") $(APP10STDLIBS:^"$(LB)/") APP10IMP_ORD = $(foreach,i,$(_APP10IMP_ORD) $(shell @-ls $i)) .ELSE -APP10IMP_ORD = +APP10IMP_ORD = .ENDIF $(APP10TARGETN): $(APP10OBJS) $(APP10LIBS) \ @@ -2788,7 +2788,7 @@ $(APP10TARGETN): $(APP10OBJS) $(APP10LIBS) \ $(COMMAND_ECHO)$(RC) -r -DOS2 $(APP10PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP10LINKRES:b).rc .ENDIF # "$(APP10LINKRES)" != "" -.IF "$(TARGETTYPE)" == "GUI" +.IF "$(TARGETTYPE)" == "GUI" @echo NAME $(APP10TARGET) WINDOWAPI > $(MISC)/$(APP10TARGET).def .ENDIF @@ -2806,7 +2806,7 @@ $(APP10TARGETN): $(APP10OBJS) $(APP10LIBS) \ $(APP10OBJS) \ $(APP10LIBS) \ $(APP10STDLIBS:^"-l") \ - $(APP10STDLIB:^"-l") $(STDLIB10:^"-l") + $(APP10STDLIB:^"-l") $(STDLIB10:^"-l") .ENDIF $(COMMAND_ECHO)$(APP10LINKER) -v \ $(APP10LINKFLAGS) \ @@ -2822,7 +2822,7 @@ $(APP10TARGETN): $(APP10OBJS) $(APP10LIBS) \ $(APP10OBJS) \ $(APP10LIBS) \ $(APP10STDLIBS:^"-l") \ - $(APP10STDLIB:^"-l") $(STDLIB10:^"-l") + $(APP10STDLIB:^"-l") $(STDLIB10:^"-l") .IF "$(APP10TARGET)" == "loader" diff --git a/solenv/inc/_tg_shl.mk b/solenv/inc/_tg_shl.mk index c0205d3b3..aa50613f0 100644 --- a/solenv/inc/_tg_shl.mk +++ b/solenv/inc/_tg_shl.mk @@ -245,10 +245,10 @@ SHL1TARGET8=$(shell @fix_shl $(SHL1TARGET)) .ENDIF .IF "$(GUI)" == "OS2" -_SHL1IMP_ORD = $(SHL1STDLIBS:^"$(SOLARVERSION)/$(INPATH)/lib/") $(SHL1STDLIBS:^"$(LB)/") +_SHL1IMP_ORD = $(SHL1STDLIBS:^"$(SOLARVERSION)/$(INPATH)/lib/") $(SHL1STDLIBS:^"$(LB)/") SHL1IMP_ORD = $(foreach,i,$(_SHL1IMP_ORD) $(shell @-ls $i)) .ELSE -SHL1IMP_ORD = +SHL1IMP_ORD = .ENDIF @@ -789,10 +789,10 @@ SHL2TARGET8=$(shell @fix_shl $(SHL2TARGET)) .ENDIF .IF "$(GUI)" == "OS2" -_SHL2IMP_ORD = $(SHL2STDLIBS:^"$(SOLARVERSION)/$(INPATH)/lib/") $(SHL2STDLIBS:^"$(LB)/") +_SHL2IMP_ORD = $(SHL2STDLIBS:^"$(SOLARVERSION)/$(INPATH)/lib/") $(SHL2STDLIBS:^"$(LB)/") SHL2IMP_ORD = $(foreach,i,$(_SHL2IMP_ORD) $(shell @-ls $i)) .ELSE -SHL2IMP_ORD = +SHL2IMP_ORD = .ENDIF @@ -1333,10 +1333,10 @@ SHL3TARGET8=$(shell @fix_shl $(SHL3TARGET)) .ENDIF .IF "$(GUI)" == "OS2" -_SHL3IMP_ORD = $(SHL3STDLIBS:^"$(SOLARVERSION)/$(INPATH)/lib/") $(SHL3STDLIBS:^"$(LB)/") +_SHL3IMP_ORD = $(SHL3STDLIBS:^"$(SOLARVERSION)/$(INPATH)/lib/") $(SHL3STDLIBS:^"$(LB)/") SHL3IMP_ORD = $(foreach,i,$(_SHL3IMP_ORD) $(shell @-ls $i)) .ELSE -SHL3IMP_ORD = +SHL3IMP_ORD = .ENDIF @@ -1877,10 +1877,10 @@ SHL4TARGET8=$(shell @fix_shl $(SHL4TARGET)) .ENDIF .IF "$(GUI)" == "OS2" -_SHL4IMP_ORD = $(SHL4STDLIBS:^"$(SOLARVERSION)/$(INPATH)/lib/") $(SHL4STDLIBS:^"$(LB)/") +_SHL4IMP_ORD = $(SHL4STDLIBS:^"$(SOLARVERSION)/$(INPATH)/lib/") $(SHL4STDLIBS:^"$(LB)/") SHL4IMP_ORD = $(foreach,i,$(_SHL4IMP_ORD) $(shell @-ls $i)) .ELSE -SHL4IMP_ORD = +SHL4IMP_ORD = .ENDIF @@ -2421,10 +2421,10 @@ SHL5TARGET8=$(shell @fix_shl $(SHL5TARGET)) .ENDIF .IF "$(GUI)" == "OS2" -_SHL5IMP_ORD = $(SHL5STDLIBS:^"$(SOLARVERSION)/$(INPATH)/lib/") $(SHL5STDLIBS:^"$(LB)/") +_SHL5IMP_ORD = $(SHL5STDLIBS:^"$(SOLARVERSION)/$(INPATH)/lib/") $(SHL5STDLIBS:^"$(LB)/") SHL5IMP_ORD = $(foreach,i,$(_SHL5IMP_ORD) $(shell @-ls $i)) .ELSE -SHL5IMP_ORD = +SHL5IMP_ORD = .ENDIF @@ -2965,10 +2965,10 @@ SHL6TARGET8=$(shell @fix_shl $(SHL6TARGET)) .ENDIF .IF "$(GUI)" == "OS2" -_SHL6IMP_ORD = $(SHL6STDLIBS:^"$(SOLARVERSION)/$(INPATH)/lib/") $(SHL6STDLIBS:^"$(LB)/") +_SHL6IMP_ORD = $(SHL6STDLIBS:^"$(SOLARVERSION)/$(INPATH)/lib/") $(SHL6STDLIBS:^"$(LB)/") SHL6IMP_ORD = $(foreach,i,$(_SHL6IMP_ORD) $(shell @-ls $i)) .ELSE -SHL6IMP_ORD = +SHL6IMP_ORD = .ENDIF @@ -3509,10 +3509,10 @@ SHL7TARGET8=$(shell @fix_shl $(SHL7TARGET)) .ENDIF .IF "$(GUI)" == "OS2" -_SHL7IMP_ORD = $(SHL7STDLIBS:^"$(SOLARVERSION)/$(INPATH)/lib/") $(SHL7STDLIBS:^"$(LB)/") +_SHL7IMP_ORD = $(SHL7STDLIBS:^"$(SOLARVERSION)/$(INPATH)/lib/") $(SHL7STDLIBS:^"$(LB)/") SHL7IMP_ORD = $(foreach,i,$(_SHL7IMP_ORD) $(shell @-ls $i)) .ELSE -SHL7IMP_ORD = +SHL7IMP_ORD = .ENDIF @@ -4053,10 +4053,10 @@ SHL8TARGET8=$(shell @fix_shl $(SHL8TARGET)) .ENDIF .IF "$(GUI)" == "OS2" -_SHL8IMP_ORD = $(SHL8STDLIBS:^"$(SOLARVERSION)/$(INPATH)/lib/") $(SHL8STDLIBS:^"$(LB)/") +_SHL8IMP_ORD = $(SHL8STDLIBS:^"$(SOLARVERSION)/$(INPATH)/lib/") $(SHL8STDLIBS:^"$(LB)/") SHL8IMP_ORD = $(foreach,i,$(_SHL8IMP_ORD) $(shell @-ls $i)) .ELSE -SHL8IMP_ORD = +SHL8IMP_ORD = .ENDIF @@ -4597,10 +4597,10 @@ SHL9TARGET8=$(shell @fix_shl $(SHL9TARGET)) .ENDIF .IF "$(GUI)" == "OS2" -_SHL9IMP_ORD = $(SHL9STDLIBS:^"$(SOLARVERSION)/$(INPATH)/lib/") $(SHL9STDLIBS:^"$(LB)/") +_SHL9IMP_ORD = $(SHL9STDLIBS:^"$(SOLARVERSION)/$(INPATH)/lib/") $(SHL9STDLIBS:^"$(LB)/") SHL9IMP_ORD = $(foreach,i,$(_SHL9IMP_ORD) $(shell @-ls $i)) .ELSE -SHL9IMP_ORD = +SHL9IMP_ORD = .ENDIF @@ -5141,10 +5141,10 @@ SHL10TARGET8=$(shell @fix_shl $(SHL10TARGET)) .ENDIF .IF "$(GUI)" == "OS2" -_SHL10IMP_ORD = $(SHL10STDLIBS:^"$(SOLARVERSION)/$(INPATH)/lib/") $(SHL10STDLIBS:^"$(LB)/") +_SHL10IMP_ORD = $(SHL10STDLIBS:^"$(SOLARVERSION)/$(INPATH)/lib/") $(SHL10STDLIBS:^"$(LB)/") SHL10IMP_ORD = $(foreach,i,$(_SHL10IMP_ORD) $(shell @-ls $i)) .ELSE -SHL10IMP_ORD = +SHL10IMP_ORD = .ENDIF diff --git a/solenv/inc/libs.mk b/solenv/inc/libs.mk index 9706eb71e..f217d17b6 100644 --- a/solenv/inc/libs.mk +++ b/solenv/inc/libs.mk @@ -92,7 +92,6 @@ REGLIB=-lreg$(UDK_MAJOR) REGLIB=-lreg .ENDIF # "$(GUI)$(COM)"=="WNTGCC" .INCLUDE .IGNORE : vos/version.mk -VOSLIB=-lvos$(VOS_MAJOR)$(COMID) XMLOFFLIB=-lxo$(DLLPOSTFIX) XMLOFFLLIB=-lxol .IF "$(GUI)$(COM)"=="WNTGCC" @@ -113,7 +112,6 @@ RMCXTLIB=-lrmcxt .ENDIF # "$(GUI)$(COM)"=="WNTGCC" BTSTRPLIB=-lbtstrp BTSTRPDTLIB=-lbootstrpdt$(DLLPOSTFIX) -SOLDEPLIB=-lsoldep$(DLLPOSTFIX) TRANSEXLIB=-ltransex OTXLIB=-lotx_ind OSXLIB=-losx @@ -321,7 +319,7 @@ BFSVTOOLLIB=-lbf_svt$(DLLPOSTFIX) # Libraries USED_OSL_LIBS = USED_VOS_LIBS = $(OSLLIB) -USED_UNO_LIBS = $(VOSLIB) $(OSLLIB) +USED_UNO_LIBS = $(OSLLIB) USED_TOOLS_LIBS = USED_SOT_LIBS = $(TOOLSLIB) USED_VCL_LIBS = $(SOTLIB) $(TOOLSLIB) $(USED_UNO_LIBS) @@ -391,7 +389,6 @@ TOOLSLIB=itools.lib TOOLSLIBST=atools.lib BPICONVLIB=bpiconv.lib SALLIB=isal.lib -VOSLIB=ivos.lib UNOTOOLSLIB=iutl.lib RMCXTLIB=irmcxt.lib XMLOFFLIB=ixo.lib @@ -412,7 +409,6 @@ FWELIB=ifwe.lib FWILIB=ifwi.lib BTSTRPLIB=btstrp.lib BTSTRPDTLIB=bootstrpdt.lib -SOLDEPLIB=soldep.lib TRANSEXLIB=transex.lib ICOLIB=icom.lib SVTOOLLIB=svtool.lib diff --git a/solenv/inc/postmac.h b/solenv/inc/postmac.h index 1519de9d5..10376e415 100644 --- a/solenv/inc/postmac.h +++ b/solenv/inc/postmac.h @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -50,3 +51,5 @@ #undef Line #undef TimeValue #undef Pattern + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/solenv/inc/preinclude.h b/solenv/inc/preinclude.h index d68aa4352..0d99bc93b 100644 --- a/solenv/inc/preinclude.h +++ b/solenv/inc/preinclude.h @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -36,3 +37,5 @@ #include <wchar.h> #include <features.h> #include <assert.h> + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/solenv/inc/premac.h b/solenv/inc/premac.h index 15cafb75d..4366ccf32 100644 --- a/solenv/inc/premac.h +++ b/solenv/inc/premac.h @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -50,3 +51,5 @@ #define Line MacOSLine #define TimeValue MacOSTimeValue #define Pattern MacOSPattern + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/solenv/inc/tg_merge.mk b/solenv/inc/tg_merge.mk index a40d48a81..19f44cb82 100644 --- a/solenv/inc/tg_merge.mk +++ b/solenv/inc/tg_merge.mk @@ -31,36 +31,27 @@ MKFILENAME:=tg_merge.mk .IF "$(WITH_LANG)"!="" .IF "$(ULFFILES)"!="" -$(foreach,i,$(ULFFILES) $(COMMONMISC)/$(TARGET)/$i) : $$(@:f) $(LOCALIZESDF) -.ENDIF # "$(ULFFILES)"!="" +$(foreach,i,$(ULFFILES) $(COMMONMISC)/$(TARGET)/$i) : $$(@:f) $(LOCALIZESDF) +.ENDIF # *.xrb merge .IF "$(XMLPROPERTIES)"!="" -$(foreach,i,$(XMLPROPERTIES) $(COMMONMISC)/$(TARGET)/$i) : $$(@:f) $(LOCALIZESDF) -.ENDIF # "$(ULFFILES)"!="" +$(foreach,i,$(XMLPROPERTIES) $(COMMONMISC)/$(TARGET)/$i) : $$(@:f) $(LOCALIZESDF) +.ENDIF # *.xrm merge .IF "$(READMEFILES)"!="" -$(foreach,i,$(READMEFILES) $(COMMONMISC)/$(TARGET)/$(i:b).xrm) : $$(@:f) $(LOCALIZESDF) -.ENDIF # "$(ULFFILES)"!="" +$(foreach,i,$(READMEFILES) $(COMMONMISC)/$(TARGET)/$(i:b).xrm) : $$(@:f) $(LOCALIZESDF) +.ENDIF -# *.xrm merge -#.IF "$(APOCHELPFILES)"!="" -#$(foreach,i,$(APOCHELPFILES) $(COMMONMISC)/$(MYPATH)/$(i:b).xrm) : $$(@:f) $(LOCALIZESDF) -#.ENDIF # "$(ULFFILES)"!="" # *.xcu merge .IF "$(LOCALIZEDFILES)"!="" $(foreach,i,$(LOCALIZEDFILES) $(PROCESSOUT)/merge/{$(subst,.,/ $(PACKAGE))}/$(i:b).xcu) : $$(@:f) $(LOCALIZESDF) -.ENDIF # "$(ULFFILES)"!="" -.ENDIF # "$(WITH_LANG)"!="" +.ENDIF +.ENDIF # "$(WITH_LANG)"!="" # dependencies from *.ulf to par-files .IF "$(ULFPARFILES)"!="" $(ULFPARFILES) : $(COMMONMISC)/$(TARGET)/$$(@:b).$(LANGFILEEXT) .ENDIF # "$(ULFPARFILES)"!="" -# *.xrm merge -#.IF "$(READMEFILES)"!="" -#$(uniq $(foreach,i,$(READMEFILES) $(COMMONMISC)/$(TARGET)/$(i:b).xrm)) : $$(@:f) $(LOCALIZESDF) -#.ENDIF # "$(ULFFILES)"!="" - diff --git a/solenv/inc/unxsoli4.mk b/solenv/inc/unxsoli4.mk index b1778a0ed..3c7e47787 100644 --- a/solenv/inc/unxsoli4.mk +++ b/solenv/inc/unxsoli4.mk @@ -106,8 +106,7 @@ CFLAGSWERRCXX=-xwe # Once all modules on this platform compile without warnings, set # COMPILER_WARN_ERRORS=TRUE here instead of setting MODULES_WITH_WARNINGS (see # settings.mk): -MODULES_WITH_WARNINGS := \ - soldep +MODULES_WITH_WARNINGS := STDOBJVCL=$(L)/salmain.o diff --git a/solenv/inc/unxsols4.mk b/solenv/inc/unxsols4.mk index 4febb67d4..dbe9a226f 100644 --- a/solenv/inc/unxsols4.mk +++ b/solenv/inc/unxsols4.mk @@ -112,8 +112,7 @@ CFLAGSWERRCXX=-xwe # Once all modules on this platform compile without warnings, set # COMPILER_WARN_ERRORS=TRUE here instead of setting MODULES_WITH_WARNINGS (see # settings.mk): -MODULES_WITH_WARNINGS := \ - soldep +MODULES_WITH_WARNINGS := STDOBJVCL=$(L)/salmain.o diff --git a/solenv/inc/unxsolu4.mk b/solenv/inc/unxsolu4.mk index c73d6fc37..8ef4e7eba 100644 --- a/solenv/inc/unxsolu4.mk +++ b/solenv/inc/unxsolu4.mk @@ -111,8 +111,7 @@ CFLAGSWERRCXX=-xwe # Once all modules on this platform compile without warnings, set # COMPILER_WARN_ERRORS=TRUE here instead of setting MODULES_WITH_WARNINGS (see # settings.mk): -MODULES_WITH_WARNINGS := \ - soldep +MODULES_WITH_WARNINGS := STDOBJVCL=$(L)/salmain.o diff --git a/solenv/inc/wntgcci.mk b/solenv/inc/wntgcci.mk index 595153845..1bc21d43f 100755 --- a/solenv/inc/wntgcci.mk +++ b/solenv/inc/wntgcci.mk @@ -98,7 +98,6 @@ MODULES_WITH_WARNINGS := \ extensions \ lingu \ r_tools \ - soldep \ starmath \ sw \ xmlsecurity diff --git a/solenv/src/version.c b/solenv/src/version.c index 9615dbf33..8a065a638 100644 --- a/solenv/src/version.c +++ b/solenv/src/version.c @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -63,17 +64,4 @@ const struct VersionInfo *GetVersionInfo(void) return &g_aVersionInfo; } -#if 0 -#include <stdio.h> - -int main( int argc, char **argv ) -{ - const VersionInfo *pInfo = GetVersionInfo(); - fprintf( stderr, "Date : %s\n", pInfo->pDate); - fprintf( stderr, "Time : %s\n", pInfo->pTime); - fprintf( stderr, "UPD : %s\n", pInfo->pUpd); - delete pInfo; - return 0; -} -#endif - +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/solenv/unxmacxp/inc/poll.h b/solenv/unxmacxp/inc/poll.h index b30bfd393..78dd8f9ba 100644 --- a/solenv/unxmacxp/inc/poll.h +++ b/solenv/unxmacxp/inc/poll.h @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ // poll.h // MacOS X does not implement poll(). Therefore, this replacement // is required. It uses select(). @@ -171,3 +172,5 @@ inline int poll(struct pollfd *pollSet, int pollCount, int pollTimeout) #undef FD_SETSIZE #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/soltools/adjustvisibility/adjustvisibility.cxx b/soltools/adjustvisibility/adjustvisibility.cxx index 4e69095dd..443ab2f61 100644 --- a/soltools/adjustvisibility/adjustvisibility.cxx +++ b/soltools/adjustvisibility/adjustvisibility.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -309,3 +310,5 @@ int main(int argc, char* argv[]) return 0; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/soltools/checkdll/checkdll.c b/soltools/checkdll/checkdll.c index 239b97e30..8aaf05358 100644 --- a/soltools/checkdll/checkdll.c +++ b/soltools/checkdll/checkdll.c @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -50,7 +51,6 @@ void usage() int main(int argc, char *argv[]) { - int rc; int silent=0; void *phandle; char *(*pfun)(void); @@ -65,7 +65,7 @@ int main(int argc, char *argv[]) ++argv, --argc; } - if ( (rc = access( argv[1], R_OK )) == -1 ) { + if ( access( argv[1], R_OK ) == -1 ) { fprintf(stderr, "%s: ERROR: %s: %s\n", pprog_name, argv[1], strerror(errno)); return 2; @@ -95,3 +95,4 @@ int main(int argc, char *argv[]) } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/soltools/cpp/_cpp.c b/soltools/cpp/_cpp.c index 40d6ad67d..3b031d8c4 100644 --- a/soltools/cpp/_cpp.c +++ b/soltools/cpp/_cpp.c @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ #include <stdio.h> #include <stdlib.h> #include <string.h> @@ -381,3 +382,5 @@ void nerrs = 1; fflush(stderr); } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/soltools/cpp/_eval.c b/soltools/cpp/_eval.c index 82ea036ac..4afcf3702 100644 --- a/soltools/cpp/_eval.c +++ b/soltools/cpp/_eval.c @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ #include <stdlib.h> #include <string.h> #include "cpp.h" @@ -764,3 +765,5 @@ int i = -1; return i; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/soltools/cpp/_getopt.c b/soltools/cpp/_getopt.c index 3b1b18337..458664067 100644 --- a/soltools/cpp/_getopt.c +++ b/soltools/cpp/_getopt.c @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ #include <stdio.h> #include <string.h> @@ -69,3 +70,5 @@ int } return c; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/soltools/cpp/_include.c b/soltools/cpp/_include.c index 6056f8372..b179bd158 100644 --- a/soltools/cpp/_include.c +++ b/soltools/cpp/_include.c @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ #if (defined(_WIN32) || defined(_MSDOS) || defined(__IBMC__)) # include <io.h> #else @@ -233,3 +234,4 @@ void } } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/soltools/cpp/_lex.c b/soltools/cpp/_lex.c index 0ea15c7d9..912530a62 100644 --- a/soltools/cpp/_lex.c +++ b/soltools/cpp/_lex.c @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ #include <stdio.h> #include <stdlib.h> #include <string.h> @@ -686,3 +687,5 @@ void cursource = s->next; dofree(s); } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/soltools/cpp/_macro.c b/soltools/cpp/_macro.c index 22f0bfbbd..600cc1ae0 100644 --- a/soltools/cpp/_macro.c +++ b/soltools/cpp/_macro.c @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ #ifdef _MSC_VER # define _POSIX_ #endif @@ -45,14 +46,13 @@ void args = NULL; if (tp < trp->lp && tp->type == LP && tp->wslen == 0) { - /* macro with args */ - int narg = 0; - tp += 1; args = new(Tokenrow); maketokenrow(2, args); if (tp->type != RP) { + /* macro with args */ + int narg = 0; int err = 0; for (;;) @@ -294,7 +294,7 @@ void { // Token * pOldNextTp; Tokenrow ntr; - int ntokc, narg, i; + int ntokc, narg; Tokenrow *atr[NARG + 1]; if (Mflag == 2) @@ -310,6 +310,8 @@ void ntokc = 1; else { + int i; + ntokc = gatherargs(trp, atr, &narg); if (narg < 0) { /* not actually a call (no '(') */ @@ -754,3 +756,4 @@ void outptr = op; } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/soltools/cpp/_mcrvalid.c b/soltools/cpp/_mcrvalid.c index b8e129525..fd997d1f8 100644 --- a/soltools/cpp/_mcrvalid.c +++ b/soltools/cpp/_mcrvalid.c @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ #include <stdio.h> #include <stdlib.h> #include <string.h> @@ -127,3 +128,4 @@ tokenrow_zeroTokenIdentifiers(Tokenrow* trp) } } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/soltools/cpp/_nlist.c b/soltools/cpp/_nlist.c index edef14bdc..fa29fb142 100644 --- a/soltools/cpp/_nlist.c +++ b/soltools/cpp/_nlist.c @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ #include <stdio.h> #include <stdlib.h> #include <string.h> @@ -115,3 +116,5 @@ Nlist * } return NULL; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/soltools/cpp/_tokens.c b/soltools/cpp/_tokens.c index be71371b5..688b93c27 100644 --- a/soltools/cpp/_tokens.c +++ b/soltools/cpp/_tokens.c @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ #include <stdio.h> #include <stdlib.h> #include <string.h> @@ -533,3 +534,5 @@ uchar * ns[l + o] = '\0'; return (uchar *) strncpy((char *) ns + o, (char *) s, l) - o; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/soltools/cpp/_unix.c b/soltools/cpp/_unix.c index ce4ca4059..525f0417c 100644 --- a/soltools/cpp/_unix.c +++ b/soltools/cpp/_unix.c @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ #include <stdio.h> #include <stddef.h> #include <stdlib.h> @@ -232,3 +233,4 @@ void * #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/soltools/cpp/cpp.h b/soltools/cpp/cpp.h index b3a6dba5c..bb305e4ba 100644 --- a/soltools/cpp/cpp.h +++ b/soltools/cpp/cpp.h @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /* $Id: cpp.h,v 1.4 2006-06-20 05:07:28 hr Exp $ */ #define INS 32768 /* input buffer */ @@ -237,3 +238,4 @@ extern Includelist includelist[NINCLUDE]; extern Wraplist wraplist[NINCLUDE]; extern char wd[]; +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/soltools/giparser/gen_info.cxx b/soltools/giparser/gen_info.cxx index 77dbd8ddf..8cbd820e3 100644 --- a/soltools/giparser/gen_info.cxx +++ b/soltools/giparser/gen_info.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -86,3 +87,4 @@ GenericInfo::CreateMyList() const } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/soltools/giparser/gi_list.cxx b/soltools/giparser/gi_list.cxx index 02289dcb6..edf3a3efa 100644 --- a/soltools/giparser/gi_list.cxx +++ b/soltools/giparser/gi_list.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -232,3 +233,4 @@ List_GenericInfo::lower_bound( bool & o_bExists, return &aChildren[low]; } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/soltools/giparser/gi_parse.cxx b/soltools/giparser/gi_parse.cxx index 1280b29b9..02cc4257e 100644 --- a/soltools/giparser/gi_parse.cxx +++ b/soltools/giparser/gi_parse.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -405,3 +406,4 @@ GenericInfo_Parser::WriteIndentation( ostream & o_rFile ) +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/soltools/giparser/st_gilrw.cxx b/soltools/giparser/st_gilrw.cxx index b6542c7c6..bd00bae3d 100644 --- a/soltools/giparser/st_gilrw.cxx +++ b/soltools/giparser/st_gilrw.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -106,75 +107,4 @@ ST_InfoListReader::CloseList() aListStack.pop_back(); } - -#if 0 -ST_InfoListWriter::ST_InfoListWriter() -{ - -} - -ST_InfoListWriter::~ST_InfoListWriter() - -bool -ST_InfoListWriter::SaveList( const Simstr & i_sFileName, - List_GenericInfo & io_rList ) -{ - -} - -E_Error -ST_InfoListWriter::GetLastError() const -{ - return dpParser->GetLastError(o_pErrorLine); -} - -bool -ST_InfoListWriter::Start_CurList() -{ - -} - -bool -ST_InfoListWriter::NextOf_CurList() -{ - -} - -void -ST_InfoListWriter::Get_CurKey( char * o_rKey ) const -{ - -} - -void -ST_InfoListWriter::Get_CurValue( char * o_rValue ) const -{ - -} - -void -ST_InfoListWriter::Get_CurComment( char * o_rComment ) const -{ - -} - -bool -ST_InfoListWriter::HasSubList_CurKey() const -{ - -} - -void -ST_InfoListWriter::Push_CurList() -{ - -} - -void -ST_InfoListWriter::Pop_CurList() -{ - -} -#endif - - +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/soltools/inc/gen_info.hxx b/soltools/inc/gen_info.hxx index 550a37a1b..050edc8f5 100644 --- a/soltools/inc/gen_info.hxx +++ b/soltools/inc/gen_info.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -87,3 +88,4 @@ class GenericInfo #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/soltools/inc/gi_list.hxx b/soltools/inc/gi_list.hxx index fb6774b96..be2b37412 100644 --- a/soltools/inc/gi_list.hxx +++ b/soltools/inc/gi_list.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -213,3 +214,4 @@ List_GenericInfo::End() #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/soltools/inc/gi_parse.hxx b/soltools/inc/gi_parse.hxx index 32b33c351..23b145333 100644 --- a/soltools/inc/gi_parse.hxx +++ b/soltools/inc/gi_parse.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -163,3 +164,4 @@ GenericInfo_Parser::GetLastError( UINT32 * o_pErrorLine ) const #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/soltools/inc/gilacces.hxx b/soltools/inc/gilacces.hxx index 097fade4d..0b76ed7c1 100644 --- a/soltools/inc/gilacces.hxx +++ b/soltools/inc/gilacces.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -102,3 +103,4 @@ class GenericInfoList_Browser #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/soltools/inc/pch/precompiled_soltools.cxx b/soltools/inc/pch/precompiled_soltools.cxx index 973a59219..3512522b4 100644 --- a/soltools/inc/pch/precompiled_soltools.cxx +++ b/soltools/inc/pch/precompiled_soltools.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -27,3 +28,4 @@ #include "precompiled_soltools.hxx" +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/soltools/inc/pch/precompiled_soltools.hxx b/soltools/inc/pch/precompiled_soltools.hxx index 1c08114b5..e77fa163f 100644 --- a/soltools/inc/pch/precompiled_soltools.hxx +++ b/soltools/inc/pch/precompiled_soltools.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -30,3 +31,4 @@ #ifdef PRECOMPILED_HEADERS #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/soltools/inc/simstr.hxx b/soltools/inc/simstr.hxx index 1a9196c09..bc3636c0d 100644 --- a/soltools/inc/simstr.hxx +++ b/soltools/inc/simstr.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -221,3 +222,4 @@ Simstr::is_empty() const { return len == 0; } #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/soltools/inc/st_gilrw.hxx b/soltools/inc/st_gilrw.hxx index 1562e0c66..e533210ec 100644 --- a/soltools/inc/st_gilrw.hxx +++ b/soltools/inc/st_gilrw.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -123,3 +124,4 @@ class ST_InfoListWriter : public GenericInfoParseTypes, #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/soltools/inc/st_list.hxx b/soltools/inc/st_list.hxx index a71422514..f77f4a3b9 100644 --- a/soltools/inc/st_list.hxx +++ b/soltools/inc/st_list.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -328,3 +329,4 @@ DynamicList<XY>::Remove( unsigned pos ) #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/soltools/inc/st_types.hxx b/soltools/inc/st_types.hxx index 16218a3eb..9320dfd61 100644 --- a/soltools/inc/st_types.hxx +++ b/soltools/inc/st_types.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -38,3 +39,4 @@ typedef short INT16; #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/soltools/javadep/javadep.c b/soltools/javadep/javadep.c index b68467193..9c1de2a7b 100644 --- a/soltools/javadep/javadep.c +++ b/soltools/javadep/javadep.c @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -456,6 +457,9 @@ process_class_file(const char *pfilename, const struct growable *pfilt) printf("Magic: %p\n", (void*)nmagic); printf("Major %d, Minor %d\n", nmajor, nminor); printf("Const_pool_count %d\n", ncnt); +#else + (void)nmajor; + (void)nminor; #endif /* There can be ncount entries in the constant_pool table @@ -603,9 +607,11 @@ xcalloc(size_t nmemb, size_t size) void * xrealloc(void *ptr, size_t size) { - ptr = realloc(ptr, size); + void *newptr = realloc(ptr, size); - if ( !ptr ) + if (newptr) + ptr = newptr; + else err_quit("out of memory"); return ptr; @@ -909,3 +915,4 @@ main(int argc, char *argv[]) exit(0); } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/soltools/ldump/hashtbl.cxx b/soltools/ldump/hashtbl.cxx index 33bbc5edb..93f40d9bf 100644 --- a/soltools/ldump/hashtbl.cxx +++ b/soltools/ldump/hashtbl.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -456,3 +457,5 @@ void* HashTableIterator::FindValidObject(bool bForward) return pObject; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/soltools/ldump/hashtbl.hxx b/soltools/ldump/hashtbl.hxx index 22bcfab43..b65767147 100644 --- a/soltools/ldump/hashtbl.hxx +++ b/soltools/ldump/hashtbl.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -109,3 +110,4 @@ public: #endif // _HASHTBL_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/soltools/ldump/ldump.cxx b/soltools/ldump/ldump.cxx index 9e246db21..d06885328 100644 --- a/soltools/ldump/ldump.cxx +++ b/soltools/ldump/ldump.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -219,13 +220,13 @@ bool LibDump::Dump() if ( bLdump3 ) { int nChar = '@'; char *pNeu = strchr( aBuf, nChar ); - int nPos = pNeu - aBuf + 1; + size_t nPos = pNeu - aBuf + 1; if ( nPos > 0 ) { char aOldBuf[MAX_MAN]; strcpy( aOldBuf, aBuf ); char pChar[MAX_MAN]; - strncpy( pChar, aBuf, (size_t) (nPos -1) ); + strncpy( pChar, aBuf, nPos - 1 ); pChar[nPos-1] = '\0'; strcpy( aBuf, pChar ); strcat( aBuf, "=" ); @@ -754,5 +755,8 @@ main( int argc, char **argv ) pDump->PrintDefFile(); pDump->PrintDataBase(); delete pDump; + delete [] pLibName; return 0; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/soltools/ldump/ldump.hxx b/soltools/ldump/ldump.hxx index 096e94117..7d66204bf 100644 --- a/soltools/ldump/ldump.hxx +++ b/soltools/ldump/ldump.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -76,3 +77,4 @@ public: static void DumpError(unsigned long nError); }; +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/soltools/mkdepend/collectdircontent.cxx b/soltools/mkdepend/collectdircontent.cxx index c9308faf0..60654bd41 100755..100644 --- a/soltools/mkdepend/collectdircontent.cxx +++ b/soltools/mkdepend/collectdircontent.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ #include "collectdircontent.hxx" PathFilePair IncludesCollection::split_path(const string& filePath) { @@ -41,6 +42,7 @@ void IncludesCollection::add_to_collection(const string& dirPath) { while ((pent = readdir(pdir))) { dirContent.insert(pent->d_name); }; + closedir(pdir); #endif // defined( WNT ) allIncludes.insert(EntriesPair(dirPath, dirContent)); }; @@ -81,3 +83,5 @@ extern "C" { return m->exists(filePath); } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/soltools/mkdepend/collectdircontent.hxx b/soltools/mkdepend/collectdircontent.hxx index 78a2b58c6..76ac39e36 100644 --- a/soltools/mkdepend/collectdircontent.hxx +++ b/soltools/mkdepend/collectdircontent.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ #ifndef COLLECTDIRCONTENT_H #define COLLECTDIRCONTENT_H @@ -56,3 +57,5 @@ int call_IncludesCollection_exists(struct IncludesCollection* m, const char* fil #endif #endif // COLLECTDIRCONTENT_H + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/soltools/mkdepend/cppsetup.c b/soltools/mkdepend/cppsetup.c index 446c4281e..1ec025c5f 100644 --- a/soltools/mkdepend/cppsetup.c +++ b/soltools/mkdepend/cppsetup.c @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /* $XConsortium: cppsetup.c,v 1.13 94/04/17 20:10:32 gildea Exp $ */ /* @@ -232,3 +233,4 @@ int cppsetup(line, filep, inc) } #endif /* CPP */ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/soltools/mkdepend/def.h b/soltools/mkdepend/def.h index de7e48628..17bfdadd2 100644 --- a/soltools/mkdepend/def.h +++ b/soltools/mkdepend/def.h @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /* $XConsortium: def.h,v 1.25 94/04/17 20:10:33 gildea Exp $ */ /* @@ -187,3 +188,5 @@ void warning1(char *, ...); void convert_slashes(char *); char *append_slash(char *); + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/soltools/mkdepend/ifparser.c b/soltools/mkdepend/ifparser.c index 1bc415478..e0ad748ff 100644 --- a/soltools/mkdepend/ifparser.c +++ b/soltools/mkdepend/ifparser.c @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /* * $XConsortium: ifparser.c,v 1.8 95/06/03 00:01:41 gildea Exp $ * @@ -458,3 +459,4 @@ ParseIfExpression (g, cp, valp) } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/soltools/mkdepend/ifparser.h b/soltools/mkdepend/ifparser.h index a6d7e84fd..316cdca9f 100644 --- a/soltools/mkdepend/ifparser.h +++ b/soltools/mkdepend/ifparser.h @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /* * $XConsortium: ifparser.h,v 1.1 92/08/22 13:05:39 rws Exp $ * @@ -73,3 +74,4 @@ typedef struct _if_parser { const char *ParseIfExpression (/* IfParser *, const char *, int * */); +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/soltools/mkdepend/imakemdep.h b/soltools/mkdepend/imakemdep.h index d75d1e072..b2971e0d5 100644 --- a/soltools/mkdepend/imakemdep.h +++ b/soltools/mkdepend/imakemdep.h @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /* $XConsortium: imakemdep.h,v 1.83 95/04/07 19:47:46 kaleb Exp $ */ /* $XFree86: xc/config/imake/imakemdep.h,v 3.12 1995/07/08 10:22:17 dawes Exp $ */ @@ -728,3 +729,5 @@ struct pair predefs[] = { #endif /* MAKEDEPEND */ #endif /* CCIMAKE */ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/soltools/mkdepend/include.c b/soltools/mkdepend/include.c index a349607e3..e79b1cbdf 100644 --- a/soltools/mkdepend/include.c +++ b/soltools/mkdepend/include.c @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /* $XConsortium: include.c,v 1.17 94/12/05 19:33:08 gildea Exp $ */ /* @@ -215,7 +216,7 @@ void remove_dotdot(path) int isdot(p) register char *p; { - if(p && *p++ == '.' && *p++ == '\0') + if(p && p[0] == '.' && p[1] == '\0') return(TRUE); return(FALSE); } @@ -223,7 +224,7 @@ int isdot(p) int isdotdot(p) register char *p; { - if(p && *p++ == '.' && *p++ == '.' && *p++ == '\0') + if(p && p[0] == '.' && p[1] == '.' && p[2] == '\0') return(TRUE); return(FALSE); } @@ -327,3 +328,5 @@ void inc_clean () ip->i_marked = FALSE; } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/soltools/mkdepend/main.c b/soltools/mkdepend/main.c index 4e2e1bcbb..0e796376d 100644 --- a/soltools/mkdepend/main.c +++ b/soltools/mkdepend/main.c @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /* $XConsortium: main.c,v 1.84 94/11/30 16:10:44 kaleb Exp $ */ /* $XFree86: xc/config/makedepend/main.c,v 3.4 1995/07/15 14:53:49 dawes Exp $ */ /* @@ -797,3 +798,4 @@ char* append_slash(path) return new_string; } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/soltools/mkdepend/parse.c b/soltools/mkdepend/parse.c index 60f513724..ec7e7d42e 100644 --- a/soltools/mkdepend/parse.c +++ b/soltools/mkdepend/parse.c @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /* $XConsortium: parse.c,v 1.30 94/04/17 20:10:38 gildea Exp $ */ /* @@ -346,7 +347,7 @@ int deftype (line, filep, file_red, file, parse_it, symbols) /* * copy the definition back to the beginning of the line. */ - strcpy (line, p); + memmove (line, p, strlen(p)); break; case ELSE: case ENDIF: @@ -612,3 +613,5 @@ void hash_undefine( symbol, symbols ) } } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/soltools/mkdepend/pr.c b/soltools/mkdepend/pr.c index 932455857..67e227a08 100644 --- a/soltools/mkdepend/pr.c +++ b/soltools/mkdepend/pr.c @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /* $XConsortium: pr.c,v 1.17 94/04/17 20:10:38 gildea Exp $ */ /* @@ -135,3 +136,5 @@ void pr(ip, file, base) for (i=0; i<ip->i_listlen; i++) printf("\n#\t%s", ip->i_list[ i ]->i_incstring); } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/soltools/support/simstr.cxx b/soltools/support/simstr.cxx index 2128a6a5a..596c94342 100644 --- a/soltools/support/simstr.cxx +++ b/soltools/support/simstr.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -831,3 +832,4 @@ operator>=(const char * str, const Simstr & S) } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/soltools/testSHL/inc/tlog.hxx b/soltools/testSHL/inc/tlog.hxx index d78f95798..267b54367 100644 --- a/soltools/testSHL/inc/tlog.hxx +++ b/soltools/testSHL/inc/tlog.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -30,9 +31,7 @@ #include <osl/file.hxx> #include <rtl/tres.hxx> -#ifndef _SOLTOOLS_TESTSHL_TUTIL_HXX_ #include "tutil.hxx" -#endif #include <iostream> @@ -98,3 +97,5 @@ public: } // </namespace_tstutl> #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/soltools/testSHL/inc/tstMgr.hxx b/soltools/testSHL/inc/tstMgr.hxx index 26e9cb18a..d3c86873c 100644 --- a/soltools/testSHL/inc/tstMgr.hxx +++ b/soltools/testSHL/inc/tstMgr.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -49,7 +50,7 @@ class tstMgr { // </private_methods> public: - + tstMgr() : pImpl(0) {} // <dtor> ~tstMgr(){ cleanup(); @@ -71,3 +72,4 @@ public: +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/soltools/testSHL/inc/tutil.hxx b/soltools/testSHL/inc/tutil.hxx index 3ede9faa5..06d5b30cc 100644 --- a/soltools/testSHL/inc/tutil.hxx +++ b/soltools/testSHL/inc/tutil.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -47,3 +48,5 @@ sal_uInt32 ln( const sal_Char* str ); } // </namespace_tstutl> #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/soltools/testSHL/testshl.cxx b/soltools/testSHL/testshl.cxx index 868f2d674..abb0649ca 100644 --- a/soltools/testSHL/testshl.cxx +++ b/soltools/testSHL/testshl.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -30,13 +31,9 @@ #include <stdio.h> -#ifndef _SOLTOOLS_TESTSHL_TLOG_HXX_ #include "inc/tlog.hxx" -#endif -#ifndef _SOLTOOLS_TESTSHL_TSTMGR_HXX_ #include "inc/tstMgr.hxx" -#endif using namespace tstutl; @@ -96,3 +93,4 @@ void usage(){ exit(0); } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/soltools/testSHL/util/tlog.cxx b/soltools/testSHL/util/tlog.cxx index a9e2e7af2..c6d475d99 100644 --- a/soltools/testSHL/util/tlog.cxx +++ b/soltools/testSHL/util/tlog.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -51,8 +52,8 @@ void tLog::initialize( const ::rtl::OString& name ) { ret = ::osl::File::remove( m_logname ); } - if( m_logfile->open( OpenFlag_Write ) == ::osl::FileBase::E_NOENT ) { - ret = m_logfile->open( OpenFlag_Write | OpenFlag_Create ); + if( m_logfile->open( osl_File_OpenFlag_Write ) == ::osl::FileBase::E_NOENT ) { + ret = m_logfile->open( osl_File_OpenFlag_Write | osl_File_OpenFlag_Create ); } else { ret = m_logfile->setPos( Pos_End, 0 ); @@ -92,7 +93,6 @@ void tLog::initialize( const ::rtl::OString& name ) { } sal_uInt64 uBytes=0; sal_uInt32 len = ln( buf ); - const sal_Char* ptr = buf; if ( v ) { fprintf( stderr, "%s", buf ); @@ -106,3 +106,4 @@ void tLog::initialize( const ::rtl::OString& name ) { +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/soltools/testSHL/util/tstMgr.cxx b/soltools/testSHL/util/tstMgr.cxx index b074a5f36..aea1926f2 100644 --- a/soltools/testSHL/util/tstMgr.cxx +++ b/soltools/testSHL/util/tstMgr.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -31,13 +32,9 @@ #include <osl/module.hxx> #include <rtl/tres.hxx> -#ifndef _SOLTOOLS_TESTSHL_TLOG_HXX_ #include "tlog.hxx" -#endif -#ifndef _SOLTOOLS_TESTSHL_TUTIL_HXX_ #include "tutil.hxx" -#endif using namespace rtl; @@ -83,7 +80,7 @@ sal_Bool tstMgr::test_Entries( vector< sal_Char* > entries, bOK &= oRes.getState(); log.writeRes( oRes ); } - iter++; + ++iter; } log.close(); } @@ -117,7 +114,7 @@ sal_Bool tstMgr::test_EntriesFromFile( sal_Char* fName, sal_Char* logName ) { if ( *iter ) { delete [] *iter; } - iter++; + ++iter; } } else { @@ -162,3 +159,5 @@ void test_Entry_Impl( ::osl::Module& oMod, ::rtl::TestResult* oRes ) { } // </function_test_Entry_Impl> } // </namespace_tstutl> + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/soltools/testSHL/util/tutil.cxx b/soltools/testSHL/util/tutil.cxx index da548fe0f..0cf734f31 100644 --- a/soltools/testSHL/util/tutil.cxx +++ b/soltools/testSHL/util/tutil.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -74,7 +75,7 @@ sal_uInt32 getEntriesFromFile( sal_Char* fName, vector< sal_Char* >& entries ) { ::osl::File inFile( cnvrtPth( fName ) ); - if ( inFile.open( OpenFlag_Read ) == ::osl::FileBase::E_None) { + if ( inFile.open( osl_File_OpenFlag_Read ) == ::osl::FileBase::E_None) { ::rtl::ByteSequence byteSeq; inFile.readLine( byteSeq ); while ( byteSeq.getLength() ) { @@ -145,3 +146,4 @@ sal_uInt32 ln( const sal_Char* str ) { } // </namespace_tstutl> +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/soltools/testhxx/testhxx.cxx b/soltools/testhxx/testhxx.cxx index 4f3924d57..2f6e06759 100644 --- a/soltools/testhxx/testhxx.cxx +++ b/soltools/testhxx/testhxx.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -30,3 +31,5 @@ //#include "precompiled_soltools.hxx" // This is just a dummy file; see the makefile.mk for the real work. + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/soltools/winunistd/unistd.h b/soltools/winunistd/unistd.h index 92c2035c0..c3343f5f5 100644 --- a/soltools/winunistd/unistd.h +++ b/soltools/winunistd/unistd.h @@ -1,4 +1,6 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /* Dummy unistd.h for the wntmsci3 environment. Required because flex * generates a lexical scanner which includes <unistd.h> */ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/stlport/systemstl/functional b/stlport/systemstl/functional index 59b61f95f..50d650503 100644 --- a/stlport/systemstl/functional +++ b/stlport/systemstl/functional @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -59,4 +60,4 @@ namespace std #endif #endif -/* vi:set tabstop=4 shiftwidth=4 expandtab: */ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/stlport/systemstl/hash_map b/stlport/systemstl/hash_map index 415e39f77..083188d1c 100644 --- a/stlport/systemstl/hash_map +++ b/stlport/systemstl/hash_map @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -78,4 +79,4 @@ namespace std #endif -/* vi:set tabstop=4 shiftwidth=4 expandtab: */ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/stlport/systemstl/hash_set b/stlport/systemstl/hash_set index 11ac7edb5..f7b0ffc3c 100644 --- a/stlport/systemstl/hash_set +++ b/stlport/systemstl/hash_set @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -49,4 +50,4 @@ namespace std #endif #endif -/* vi:set tabstop=4 shiftwidth=4 expandtab: */ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/stlport/systemstl/numeric b/stlport/systemstl/numeric index 3510ccb5b..13e3f0905 100644 --- a/stlport/systemstl/numeric +++ b/stlport/systemstl/numeric @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -50,4 +51,4 @@ namespace std #endif #endif -/* vi:set tabstop=4 shiftwidth=4 expandtab: */ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/stlport/systemstl/rope b/stlport/systemstl/rope index 71ea13a02..bfb28ffa1 100644 --- a/stlport/systemstl/rope +++ b/stlport/systemstl/rope @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -45,4 +46,4 @@ namespace std #endif -/* vi:set tabstop=4 shiftwidth=4 expandtab: */ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/stlport/systemstl/slist b/stlport/systemstl/slist index 6535c545e..eb0df9b53 100644 --- a/stlport/systemstl/slist +++ b/stlport/systemstl/slist @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -42,4 +43,4 @@ namespace std #endif -/* vi:set tabstop=4 shiftwidth=4 expandtab: */ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/stlport/systemstl/vector b/stlport/systemstl/vector index f15038f9e..965753c20 100644 --- a/stlport/systemstl/vector +++ b/stlport/systemstl/vector @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -46,4 +47,4 @@ namespace std #error UNSUPPORTED COMPILER #endif #endif -/* vi:set tabstop=4 shiftwidth=4 expandtab: */ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/stlport/systemstlguards/postextstl.h b/stlport/systemstlguards/postextstl.h index efbdaddba..8ab646e51 100644 --- a/stlport/systemstlguards/postextstl.h +++ b/stlport/systemstlguards/postextstl.h @@ -1,7 +1,8 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -34,3 +35,4 @@ # undef _STLP_CONFIG_H # include <stddef.h> #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |
