[PATCH] fdo#39643: Remove --disable-strip-solver configure option
David Ostrovsky
David.Ostrovsky at gmx.de
Wed Apr 18 13:31:41 PDT 2012
---
config_host.mk.in | 1 -
configure.in | 30 -----
solenv/bin/deliver.pl | 3 +-
solenv/bin/make_installer.pl | 28 -----
solenv/bin/modules/installer/environment.pm | 1 -
solenv/bin/modules/installer/globals.pm | 2 -
solenv/bin/modules/installer/parameter.pm | 5 -
solenv/bin/modules/installer/simplepackage.pm | 4 -
solenv/bin/modules/installer/strip.pm | 144 ----------------------
solenv/bin/modules/installer/windows/strip.pm | 158 -------------------------
solenv/bin/ooinstall | 6 -
solenv/gbuild/gbuild.mk | 6 -
solenv/gbuild/platform/solaris.mk | 6 -
solenv/gbuild/platform/unxgcc.mk | 6 -
14 files changed, 1 insertions(+), 399 deletions(-)
delete mode 100644 solenv/bin/modules/installer/strip.pm
delete mode 100644 solenv/bin/modules/installer/windows/strip.pm
diff --git a/config_host.mk.in b/config_host.mk.in
index fe5fc87..651bdc4 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -89,7 +89,6 @@ export DISABLE_SCRIPTING=@DISABLE_SCRIPTING@
export DISABLE_LINKOO=@DISABLE_LINKOO@
export DISABLE_NEON=@DISABLE_NEON@
export DISABLE_PYTHON=@DISABLE_PYTHON@
-export DISABLE_STRIP=@DISABLE_STRIP@
export DLLTOOL=@DLLTOOL@
export DMAKEROOT=@SRC_ROOT@/solenv/inc/startup
export DOCDIR=@DOCDIR@
diff --git a/configure.in b/configure.in
index 4f981fc..1f1be80 100644
--- a/configure.in
+++ b/configure.in
@@ -611,19 +611,6 @@ AC_ARG_ENABLE(symbols,
AS_HELP_STRING([--enable-symbols],
[Include debugging symbols in output. WARNING - a complete build needs
8 Gb of space and takes much longer (enables -g compiler flag).])
- [
- Enabling symbols disables the stripping of the solver
- (--disable-strip-solver).
- ],
-,)
-
-AC_ARG_ENABLE(strip-solver,
- AS_HELP_STRING([--disable-strip-solver],
- [Disable the stripping of the solver. By default the solver is stripped
- unless a build with debugging symbols (--enable-symbols) is requested.])
- [
- This switch allows to override this setting.
- ],
,)
AC_ARG_ENABLE(werror,
@@ -3483,23 +3470,6 @@ else
fi
AC_SUBST(ENABLE_SYMBOLS)
-dnl Determine if the solver is to be stripped or not.
-dnl ===================================================================
-AC_MSG_CHECKING([whether to strip the solver or not.])
-if test "$enable_strip_solver" = "no"; then
- DISABLE_STRIP="TRUE"
- AC_MSG_RESULT([no])
-else
- if test -n "$ENABLE_SYMBOLS"; then
- DISABLE_STRIP="TRUE"
- AC_MSG_RESULT([no])
- else
- DISABLE_STRIP=
- AC_MSG_RESULT([yes])
- fi
-fi
-AC_SUBST(DISABLE_STRIP)
-
if test "$enable_headless" = "yes"; then
# be sure to do not mess with uneeded stuff
test_randr=no
diff --git a/solenv/bin/deliver.pl b/solenv/bin/deliver.pl
index c524ce5..7a97446 100755
--- a/solenv/bin/deliver.pl
+++ b/solenv/bin/deliver.pl
@@ -673,8 +673,7 @@ sub is_unstripped {
}
sub initialize_strip {
- if (((!defined $ENV{CROSS_COMPILING}) || ($ENV{CROSS_COMPILING} ne 'YES')) &&
- ((!defined $ENV{DISABLE_STRIP}) || ($ENV{DISABLE_STRIP} eq ""))) {
+ if ((!defined $ENV{CROSS_COMPILING}) || ($ENV{CROSS_COMPILING} ne 'YES')) {
$strip .= 'guw ' if ($^O eq 'cygwin');
$strip .= 'strip';
$strip .= " -x" if ($ENV{OS} eq 'MACOSX');
diff --git a/solenv/bin/make_installer.pl b/solenv/bin/make_installer.pl
index baf4b08..2cc423c 100644
--- a/solenv/bin/make_installer.pl
+++ b/solenv/bin/make_installer.pl
@@ -58,7 +58,6 @@ use installer::scpzipfiles;
use installer::scriptitems;
use installer::setupscript;
use installer::simplepackage;
-use installer::strip qw(strip_libraries);
use installer::substfilenamefiles;
use installer::systemactions;
use installer::windows::assembly;
@@ -82,7 +81,6 @@ use installer::windows::removefile;
use installer::windows::registry;
use installer::windows::selfreg;
use installer::windows::shortcut;
-use installer::windows::strip;
use installer::windows::update;
use installer::windows::upgrade;
use installer::worker;
@@ -1227,19 +1225,6 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ )
}
}
- ###########################################
- # Stripping libraries
- ###########################################
-
- # Building for non Windows platforms in cws requires, that all files are stripped before packaging:
- # 1. copy all files that need to be stripped locally
- # 2. strip all these files
-
- if ( $installer::globals::strip )
- {
- strip_libraries($filesinpackage, $languagestringref);
- }
-
###############################################################
# Searching for files in $filesinpackage with flag LINUXLINK
###############################################################
@@ -1532,19 +1517,6 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ )
if ( $installer::globals::iswindowsbuild )
{
- ###########################################
- # Stripping libraries
- ###########################################
-
- # Building for gcc build in cws requires, that all files are stripped before packaging:
- # 1. copy all files that need to be stripped locally
- # 2. strip all these files
-
- if ( $installer::globals::compiler =~ /wntgcci/ )
- {
- installer::windows::strip::strip_binaries($filesinproductlanguageresolvedarrayref, $languagestringref);
- }
-
$installdir = installer::worker::create_installation_directory($shipinstalldir, $languagestringref, \$current_install_number);
my $idtdirbase = installer::systemactions::create_directories("idt_files", $languagestringref);
diff --git a/solenv/bin/modules/installer/environment.pm b/solenv/bin/modules/installer/environment.pm
index 5459761..95240f3 100644
--- a/solenv/bin/modules/installer/environment.pm
+++ b/solenv/bin/modules/installer/environment.pm
@@ -126,7 +126,6 @@ sub set_global_environment_variables
if ( $ENV{'RPM'} ) { $installer::globals::rpm = $ENV{'RPM'}; }
if ( $ENV{'DONTCOMPRESS'} ) { $installer::globals::solarisdontcompress = 1; }
if ( $ENV{'IGNORE_ERROR_IN_LOGFILE'} ) { $installer::globals::ignore_error_in_logfile = 1; }
- if (( $ENV{'DISABLE_STRIP'} ) && ( $ENV{'DISABLE_STRIP'} ne '' )) { $installer::globals::strip = 0; }
if ( $installer::globals::localinstalldir ) { $installer::globals::localinstalldirset = 1; }
# Special handling, if LOCALINSTALLDIR contains "~" in the path
diff --git a/solenv/bin/modules/installer/globals.pm b/solenv/bin/modules/installer/globals.pm
index fc65622..f07c1f8 100644
--- a/solenv/bin/modules/installer/globals.pm
+++ b/solenv/bin/modules/installer/globals.pm
@@ -235,8 +235,6 @@ BEGIN
$mergefiles_added_into_collector = 0;
$creating_windows_installer_patch = 0;
- $strip = 1;
-
$logfilename = "logfile.log"; # the default logfile name for global errors
@logfileinfo = ();
@errorlogfileinfo = ();
diff --git a/solenv/bin/modules/installer/parameter.pm b/solenv/bin/modules/installer/parameter.pm
index 6d99aaa..013b8d4 100644
--- a/solenv/bin/modules/installer/parameter.pm
+++ b/solenv/bin/modules/installer/parameter.pm
@@ -70,7 +70,6 @@ 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)
-log : Logging all available information (optional)
Examples for Windows:
@@ -148,7 +147,6 @@ 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 "-destdir") # new parameter for simple installer
{
$installer::globals::rootpath ne "" && die "must set destdir before -i or -simple";
@@ -159,7 +157,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;
@@ -591,8 +588,6 @@ sub outputparameter
if ((!($installer::globals::javalanguagepath eq "")) && ($installer::globals::iswindowsbuild)) { push(@output, "Java language path will be ignored for Windows builds!\n"); }
if ( $installer::globals::patchincludepath ) { push(@output, "Patch include path: $installer::globals::patchincludepath\n"); }
if ( $installer::globals::tab ) { push(@output, "TAB version\n"); }
- if ( $installer::globals::strip ) { push(@output, "Stripping files\n"); }
- else { push(@output, "No file stripping\n"); }
if ( $installer::globals::debian ) { push(@output, "Linux: Creating Debian packages\n"); }
if ( $installer::globals::dounzip ) { push(@output, "Unzip ARCHIVE files\n"); }
else { push(@output, "Not unzipping ARCHIVE files\n"); }
diff --git a/solenv/bin/modules/installer/simplepackage.pm b/solenv/bin/modules/installer/simplepackage.pm
index 29a98b0..e286650 100755
--- a/solenv/bin/modules/installer/simplepackage.pm
+++ b/solenv/bin/modules/installer/simplepackage.pm
@@ -33,7 +33,6 @@ use installer::download;
use installer::exiter;
use installer::globals;
use installer::logger;
-use installer::strip qw(strip_libraries);
use installer::systemactions;
use installer::worker;
@@ -671,9 +670,6 @@ sub create_simple_package
}
}
- # stripping files ?!
- if (( $installer::globals::strip ) && ( ! $installer::globals::iswindowsbuild )) { strip_libraries($filesref, $languagestringref); }
-
# copy Files
installer::logger::print_message( "... copying files ...\n" );
installer::logger::include_header_into_logfile("Copying files:");
diff --git a/solenv/bin/modules/installer/strip.pm b/solenv/bin/modules/installer/strip.pm
deleted file mode 100644
index 7a36672c..0000000
--- a/solenv/bin/modules/installer/strip.pm
+++ /dev/null
@@ -1,144 +0,0 @@
-#*************************************************************************
-#
-# 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
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-package installer::strip;
-
-use strict;
-use warnings;
-
-use base 'Exporter';
-
-use installer::globals;
-use installer::logger;
-use installer::pathanalyzer;
-use installer::systemactions;
-
-our @EXPORT_OK = qw(strip_libraries);
-
-#####################################################################
-# Checking whether a file has to be stripped
-#####################################################################
-
-sub _need_to_strip
-{
- my ( $filename ) = @_;
-
- my $strip = 0;
-
- # Check using the "file" command
-
- open (FILE, "file $filename |");
- my $fileoutput = <FILE>;
- close (FILE);
-
- if (( $fileoutput =~ /not stripped/i ) && ( $fileoutput =~ /\bELF\b/ )) { $strip = 1; }
-
- return $strip
-}
-
-#####################################################################
-# Checking whether a file has to be stripped
-#####################################################################
-
-sub _do_strip
-{
- my ( $filename ) = @_;
-
- my $systemcall = "strip" . " " . $filename;
-
- my $returnvalue = system($systemcall);
-
- my $infoline = "Systemcall: $systemcall\n";
- push( @installer::globals::logfileinfo, $infoline);
-
- if ($returnvalue)
- {
- $infoline = "ERROR: Could not strip $filename!\n";
- push( @installer::globals::logfileinfo, $infoline);
- }
- else
- {
- $infoline = "SUCCESS: Stripped library $filename!\n";
- push( @installer::globals::logfileinfo, $infoline);
- }
-}
-
-#####################################################################
-# Resolving all variables in the packagename.
-#####################################################################
-
-sub strip_libraries
-{
- my ( $filelist, $languagestringref ) = @_;
-
- installer::logger::include_header_into_logfile("Stripping files:");
-
- my $strippeddirbase = installer::systemactions::create_directories("stripped", $languagestringref);
-
- if (! grep {$_ eq $strippeddirbase} @installer::globals::removedirs)
- {
- push(@installer::globals::removedirs, $strippeddirbase);
- }
-
- for ( my $i = 0; $i <= $#{$filelist}; $i++ )
- {
- my $sourcefilename = ${$filelist}[$i]->{'sourcepath'};
-
- if ( _need_to_strip($sourcefilename) )
- {
- my $shortfilename = $sourcefilename;
- installer::pathanalyzer::make_absolute_filename_to_relative_filename(\$shortfilename);
-
- my $infoline = "Strip: $shortfilename\n";
- push( @installer::globals::logfileinfo, $infoline);
-
- # copy file into directory for stripped libraries
-
- my $onelanguage = ${$filelist}[$i]->{'specificlanguage'};
-
- # files without language into directory "00"
-
- if ($onelanguage eq "") { $onelanguage = "00"; }
-
- my $strippeddir = $strippeddirbase . $installer::globals::separator . $onelanguage;
- installer::systemactions::create_directory($strippeddir); # creating language specific subdirectories
-
- my $destfilename = $strippeddir . $installer::globals::separator . $shortfilename;
- installer::systemactions::copy_one_file($sourcefilename, $destfilename);
-
- # change sourcepath in files collector
-
- ${$filelist}[$i]->{'sourcepath'} = $destfilename;
-
- # strip file
-
- _do_strip($destfilename);
- }
- }
-}
-
-1;
diff --git a/solenv/bin/modules/installer/windows/strip.pm b/solenv/bin/modules/installer/windows/strip.pm
deleted file mode 100644
index c31a0b12..0000000
--- a/solenv/bin/modules/installer/windows/strip.pm
+++ /dev/null
@@ -1,158 +0,0 @@
-#*************************************************************************
-#
-# 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
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-package installer::windows::strip;
-
-use File::Temp qw(tmpnam);
-use installer::converter;
-use installer::globals;
-use installer::logger;
-use installer::pathanalyzer;
-use installer::systemactions;
-
-#####################################################################
-# Checking whether a file has to be stripped
-#####################################################################
-
-sub need_to_strip
-{
- my ( $filename ) = @_;
-
- my $strip = 0;
-
- # Check using the "nm" command
-
- $filename =~ s/\\/\\\\/g;
-
- open (FILE, "nm $filename 2>&1 |");
- my $nmoutput = <FILE>;
- close (FILE);
-
- if ( $nmoutput && !( $nmoutput =~ /no symbols/i || $nmoutput =~ /not recognized/i )) { $strip = 1; }
-
- return $strip
-}
-
-#####################################################################
-# Checking whether a file has to be stripped
-#####################################################################
-
-sub do_strip
-{
- my ( $filename ) = @_;
-
- my $systemcall = "strip" . " " . $filename;
-
- my $returnvalue = system($systemcall);
-
- my $infoline = "Systemcall: $systemcall\n";
- push( @installer::globals::logfileinfo, $infoline);
-
- if ($returnvalue)
- {
- $infoline = "ERROR: Could not strip $filename!\n";
- push( @installer::globals::logfileinfo, $infoline);
- }
- else
- {
- $infoline = "SUCCESS: Stripped library $filename!\n";
- push( @installer::globals::logfileinfo, $infoline);
- }
-}
-
-#####################################################################
-# Resolving all variables in the packagename.
-#####################################################################
-
-sub strip_binaries
-{
- my ( $filelist, $languagestringref ) = @_;
-
- installer::logger::include_header_into_logfile("Stripping files:");
-
- my $strippeddirbase = installer::systemactions::create_directories("stripped", $languagestringref);
-
- if (! grep {$_ eq $strippeddirbase} @installer::globals::removedirs)
- {
- push(@installer::globals::removedirs, $strippeddirbase);
- }
-
- my ($tmpfilehandle, $tmpfilename) = tmpnam();
- open SOURCEPATHLIST, ">$tmpfilename" or die "oops...\n";
- for ( my $i = 0; $i <= $#{$filelist}; $i++ )
- {
- print SOURCEPATHLIST "${$filelist}[$i]->{'sourcepath'}\n";
- }
- close SOURCEPATHLIST;
- my @filetypelist = qx{file -f "$tmpfilename"};
- chomp @filetypelist;
- unlink "$tmpfilename" or die "oops\n";
- for ( my $i = 0; $i <= $#{$filelist}; $i++ )
- {
- ${$filelist}[$i]->{'is_executable'} = ( $filetypelist[$i] =~ /:.*PE executable/ );
- }
-
- if ( $^O =~ /cygwin/i ) { installer::worker::generate_cygwin_paths($filelist); }
-
- for ( my $i = 0; $i <= $#{$filelist}; $i++ )
- {
- my $sourcefilename = ${$filelist}[$i]->{'cyg_sourcepath'};
-
- if ( ${$filelist}[$i]->{'is_executable'} && need_to_strip($sourcefilename) )
- {
- my $shortfilename = $sourcefilename;
- installer::pathanalyzer::make_absolute_filename_to_relative_filename(\$shortfilename);
-
- $infoline = "Strip: $shortfilename\n";
- push( @installer::globals::logfileinfo, $infoline);
-
- # copy file into directory for stripped libraries
-
- my $onelanguage = ${$filelist}[$i]->{'specificlanguage'};
-
- # files without language into directory "00"
-
- if ($onelanguage eq "") { $onelanguage = "00"; }
-
- my $strippeddir = $strippeddirbase . $installer::globals::separator . $onelanguage;
- installer::systemactions::create_directory($strippeddir); # creating language specific subdirectories
-
- my $destfilename = $strippeddir . $installer::globals::separator . $shortfilename;
- installer::systemactions::copy_one_file($sourcefilename, $destfilename);
-
- # change sourcepath in files collector
-
- ${$filelist}[$i]->{'sourcepath'} = $destfilename;
-
- # strip file
-
- do_strip($destfilename);
- }
- }
-}
-
-1;
diff --git a/solenv/bin/ooinstall b/solenv/bin/ooinstall
index f1866c6..6f64f7b 100755
--- a/solenv/bin/ooinstall
+++ b/solenv/bin/ooinstall
@@ -101,12 +101,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 " .
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index b12c88f..131aa8f 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -85,12 +85,6 @@ else
gb_SYMBOL := $(false)
endif
-ifeq ($(strip $(DISABLE_STRIP)$(disable_strip)),)
-gb_STRIP := $(true)
-else
-gb_STRIP := $(false)
-endif
-
gb_DEBUGLEVEL := 0
ifneq ($(strip $(DEBUG)$(debug)),)
gb_DEBUGLEVEL := 1
diff --git a/solenv/gbuild/platform/solaris.mk b/solenv/gbuild/platform/solaris.mk
index 894841b..5690760 100644
--- a/solenv/gbuild/platform/solaris.mk
+++ b/solenv/gbuild/platform/solaris.mk
@@ -167,12 +167,6 @@ gb_LinkTarget_LDFLAGS += \
endif
-ifneq ($(gb_SYMBOL),$(true))
-ifeq ($(gb_STRIP),$(true))
-gb_LinkTarget_LDFLAGS += -Wl,--strip-all
-endif
-endif
-
ifneq ($(gb_DEBUGLEVEL),0)
gb_COMPILEROPTFLAGS := -O0
gb_LINKEROPTFLAGS :=
diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index ada3ede..b4c2366 100644
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -167,12 +167,6 @@ gb_LinkTarget_LDFLAGS += \
endif
-ifneq ($(gb_SYMBOL),$(true))
-ifeq ($(gb_STRIP),$(true))
-gb_LinkTarget_LDFLAGS += -Wl,--strip-all
-endif
-endif
-
ifneq ($(gb_DEBUGLEVEL),0)
gb_COMPILEROPTFLAGS := -O0
gb_LINKEROPTFLAGS :=
--
1.7.5.4
--------------050202000708040103090600--
More information about the LibreOffice
mailing list