fdo#39643: Remove --disable-strip-solver configure option

Signed-off-by: Petr Mladek <pmladek@suse.cz>

4 files changed, 11 insertions, 71 deletions

diff --git a/solenv/bin/deliver.pl b/solenv/bin/deliver.pl
index c524ce5945df..45026152997e 100755
--- a/solenv/bin/deliver.pl
+++ b/solenv/bin/deliver.pl
@@ -63,7 +63,6 @@ use File::Spec;
 @copy_filter_patterns = (
                         );
 
-$strip              = '';
 $is_debug           = 0;
 
 $error              = 0;
@@ -135,16 +134,6 @@ use sigtrap 'handler' => \&cleanup_and_die, 'normal-signals';
 
 parse_options();
 
-if ( ! $opt_delete ) {
-    if ( $ENV{GUI} eq 'WNT' ) {
-        if ($ENV{COM} eq 'GCC') {
-            initialize_strip() ;
-        };
-    } else {
-        initialize_strip();
-    }
-}
-
 init_globals();
 push_default_actions();
 parse_dlst();
@@ -649,39 +638,6 @@ sub glob_and_copy
     }
 }
 
-sub is_unstripped {
-    my $file_name = shift;
-    my $nm_output;
-
-    if (-f $file_name.$maybedot) {
-        my $file_type = `file $file_name`;
-        # OS X file command doesn't know if a file is stripped or not
-        if (($file_type =~ /not stripped/o) || ($file_type =~ /Mach-O/o) ||
-            (($file_type =~ /PE/o) && ($ENV{GUI} eq 'WNT') &&
-             ($nm_output = `nm $file_name 2>&1`) && $nm_output &&
-             !($nm_output =~ /no symbols/i) && !($nm_output =~ /not recognized/i))) {
-            return '1' if ($file_name =~ /\.bin$/o);
-            return '1' if ($file_name =~ /\.so\.*/o);
-            return '1' if ($file_name =~ /\.dylib\.*/o);
-            return '1' if ($file_name =~ /\.com\.*/o);
-            return '1' if ($file_name =~ /\.dll\.*/o);
-            return '1' if ($file_name =~ /\.exe\.*/o);
-            return '1' if (basename($file_name) !~ /\./o);
-        }
-    };
-    return '';
-}
-
-sub initialize_strip {
-    if (((!defined $ENV{CROSS_COMPILING}) || ($ENV{CROSS_COMPILING} ne 'YES')) &&
-        ((!defined $ENV{DISABLE_STRIP}) || ($ENV{DISABLE_STRIP} eq ""))) {
-        $strip .= 'guw ' if ($^O eq 'cygwin');
-        $strip .= 'strip';
-        $strip .= " -x" if ($ENV{OS} eq 'MACOSX');
-        $strip .= " -R '.comment' -s" if ($ENV{OS} eq 'LINUX');
-    };
-};
-
 sub is_jar {
     my $file_name = shift;
 
@@ -699,15 +655,6 @@ sub execute_system {
     };
 };
 
-sub strip_target {
-    my $file = shift;
-    my $temp_file = shift;
-    $temp_file =~ s/\/{2,}/\//g;
-    my $rc = copy($file, $temp_file);
-    execute_system("$strip $temp_file");
-    return $rc;
-};
-
 sub copy_if_newer
 {
     # return 0 if file is unchanged ( for whatever reason )
@@ -752,11 +699,7 @@ sub copy_if_newer
     # to minimize the possibility for race conditions
     local $temp_file = sprintf('%s.%d-%d', $to, $$, time());
     $rc = '';
-    if (($strip ne '') && (defined $ENV{PROEXT}) && (is_unstripped($from))) {
-        $rc = strip_target($from, $temp_file);
-    } else {
-        $rc = copy($from, $temp_file);
-    };
+    $rc = copy($from, $temp_file);
     if ( $rc) {
         if ( is_newer($temp_file, $from, 0) ) {
             $rc = utime($$from_stat_ref[9], $$from_stat_ref[9], $temp_file);
diff --git a/solenv/bin/modules/installer/globals.pm b/solenv/bin/modules/installer/globals.pm
index fc65622d7df3..fed1453db402 100644
--- a/solenv/bin/modules/installer/globals.pm
+++ b/solenv/bin/modules/installer/globals.pm
@@ -235,7 +235,7 @@ BEGIN
     $mergefiles_added_into_collector = 0;
     $creating_windows_installer_patch = 0;
 
-    $strip = 1;
+    $strip = 0;
 
     $logfilename = "logfile.log";   # the default logfile name for global errors
     @logfileinfo = ();
diff --git a/solenv/bin/modules/installer/parameter.pm b/solenv/bin/modules/installer/parameter.pm
index e84dbdc1f955..b7b7c3bb2974 100644
--- a/solenv/bin/modules/installer/parameter.pm
+++ b/solenv/bin/modules/installer/parameter.pm
@@ -70,7 +70,7 @@ The following parameter are needed:
 -helppack : do create a helppack, no product pack (optional)
 -patch : do create a patch (optional)
 -patchinc: Source for the patch include files (Solaris only)
--dontstrip: No file stripping (Unix only)
+-strip: Stripping files (Unix only)
 -log : Logging all available information (optional)
 
 Examples for Windows:
@@ -148,7 +148,7 @@ sub getparameter
         elsif ($param eq "-helppack") { $installer::globals::helppack = 1;}
         elsif ($param eq "-patch") { $installer::globals::patch = 1; }
         elsif ($param eq "-debian") { $installer::globals::debian = 1; }
-        elsif ($param eq "-dontstrip") { $installer::globals::strip = 0; }
+        elsif ($param eq "-strip") { $installer::globals::strip = 1; }
         elsif ($param eq "-destdir")    # new parameter for simple installer
         {
             $installer::globals::rootpath ne "" && die "must set destdir before -i or -simple";
@@ -162,7 +162,6 @@ sub getparameter
             $installer::globals::simple = 1;
             $installer::globals::call_epm = 0;
             $installer::globals::makedownload = 0;
-            $installer::globals::strip = 0;
             my $path = shift(@ARGV);
             $path =~ s/^\Q$installer::globals::destdir\E//;
             $installer::globals::rootpath = $path;
diff --git a/solenv/bin/ooinstall b/solenv/bin/ooinstall
index f1866c6c4062..bb4d07725bbb 100755
--- a/solenv/bin/ooinstall
+++ b/solenv/bin/ooinstall
@@ -12,6 +12,7 @@ use File::Path qw(mkpath);
 use Cwd;
 
 $path = '';
+$strip = '';
 $do_link = 0;
 $is_windows = 0;
 my $tmp_dir;
@@ -41,8 +42,10 @@ if ( $ENV{'SYSTEM_MOZILLA'} eq 'YES' ) {
 $ENV{'PYTHONPATH'} = "$ENV{'SRC_ROOT'}/instsetoo_native/$ENV{'INPATH'}/bin:$ENV{'SOLARVERSION'}/$ENV{'INPATH'}/lib:$ENV{'SOLARVERSION'}/$ENV{'INPATH'}/lib/python:$ENV{'SOLARVERSION'}/$ENV{'INPATH'}/lib/python/lib-dynload";
 
 for $arg (@ARGV) {
-    if ($arg eq '-l') {
+    if ($arg eq '-l' || $arg eq '--link') {
 	$do_link = 1;
+    } elsif ($arg eq '-s' || $arg eq '--strip') {
+	$strip = "-strip";
     } elsif ($arg eq '-h' || $arg eq '--help') {
 	$help = 1;
     } else {
@@ -55,8 +58,9 @@ for $arg (@ARGV) {
 $help = 1 if $path eq '';
 
 if ($help) {
-    print "ooinstall [-l] <prefix to install to>\n";
-    print "  -l - performs a linkoo on the installed source\n";
+    print "ooinstall [-l] [-s] <prefix to install to>\n";
+    print "  -l/--link  - performs a linkoo on the installed source\n";
+    print "  -s/--strip - strip the installed binaries\n";
     exit 1;
 }
 
@@ -101,12 +105,6 @@ if ( defined $ENV{DESTDIR} &&
     $destdir = "-destdir \"$ENV{DESTDIR}\"";
 }
 
-$strip='';
-if ( defined $ENV{DISABLE_STRIP} &&
-     $ENV{DISABLE_STRIP} eq "TRUE" ) {
-    $strip = "-dontstrip";
-}
-
 $msi='';
 if ($is_windows) {
     $msi = "-msitemplate $ENV{SRC_ROOT}/instsetoo_native/$ENV{INPATH}/misc/openoffice/msi_templates " .