diff options
author | David Ostrovsky <David.Ostrovsky@gmx.de> | 2012-04-25 21:29:28 +0200 |
---|---|---|
committer | Petr Mladek <pmladek@suse.cz> | 2012-04-26 12:43:35 +0200 |
commit | 65840941eeeab7021168a17797b6129ea15a722d (patch) | |
tree | ad479f8d60ac439a758604b623ec6a86607c80fe | |
parent | fix OSL_DEBUG_LEVEL > 1 build (diff) | |
download | core-65840941eeeab7021168a17797b6129ea15a722d.tar.gz core-65840941eeeab7021168a17797b6129ea15a722d.zip |
fdo#39643: Remove --disable-strip-solver configure option
Signed-off-by: Petr Mladek <pmladek@suse.cz>
-rw-r--r-- | Makefile | 9 | ||||
-rw-r--r-- | config_host.mk.in | 1 | ||||
-rw-r--r-- | configure.in | 32 | ||||
-rw-r--r-- | instsetoo_native/util/makefile.mk | 10 | ||||
-rwxr-xr-x | solenv/bin/deliver.pl | 59 | ||||
-rw-r--r-- | solenv/bin/modules/installer/globals.pm | 2 | ||||
-rw-r--r-- | solenv/bin/modules/installer/parameter.pm | 5 | ||||
-rwxr-xr-x | solenv/bin/ooinstall | 16 | ||||
-rw-r--r-- | solenv/gbuild/gbuild.mk | 6 | ||||
-rw-r--r-- | solenv/gbuild/platform/solaris.mk | 6 | ||||
-rw-r--r-- | solenv/gbuild/platform/unxgcc.mk | 6 |
11 files changed, 25 insertions, 127 deletions
@@ -1,6 +1,6 @@ # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -.PHONY : all bootstrap build check clean clean-build clean-host dev-install distclean distro-pack-install docs fetch findunusedcode id install subsequentcheck tags +.PHONY : all bootstrap build check clean clean-build clean-host dev-install distclean distro-pack-install docs fetch findunusedcode id install install-strip subsequentcheck tags ifeq ($(MAKECMDGOALS),) MAKECMDGOALS:=all @@ -439,6 +439,13 @@ install: echo "Installation finished, you can now execute:" && \ echo "$(INSTALLDIR)/program/soffice" +install-strip: + echo "Installing and stripping binaries in $(INSTALLDIR)..." && \ + ooinstall --strip "$(INSTALLDIR)" && \ + echo "" && \ + echo "Installation finished, you can now execute:" && \ + echo "$(INSTALLDIR)/program/soffice" + dev-install: build @rm -rf $(DEVINSTALLDIR) @mkdir $(DEVINSTALLDIR) diff --git a/config_host.mk.in b/config_host.mk.in index 9a6b09c06f61..5e02107c9630 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 0b0ceda45271..f6466d8b3ee7 100644 --- a/configure.in +++ b/configure.in @@ -615,20 +615,7 @@ AC_ARG_ENABLE(symbols, --enable-symbols="all -sw/ -Library_sc" to enable symbols only for the specified gbuild-build targets (all means everything, - prepended means not to enable, / appended means everything in the directory, - there is no ordering and removal disabling takes precedence).]) - [ - 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. - ], + there is no ordering and removal disabling takes precedence).]), ,) AC_ARG_ENABLE(werror, @@ -3558,23 +3545,6 @@ fi AC_SUBST(ENABLE_SYMBOLS) AC_SUBST(ENABLE_SYMBOLS_FOR) -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/instsetoo_native/util/makefile.mk b/instsetoo_native/util/makefile.mk index 71e9184bcf24..94187ee579fd 100644 --- a/instsetoo_native/util/makefile.mk +++ b/instsetoo_native/util/makefile.mk @@ -245,7 +245,7 @@ $(MAKETARGETS){$(PKGFORMAT:^".")} : $(ADDDEPS) .ENDIF # "$(MAKETARGETS:e)"=="" && "$(MAKETARGETS:s/_//)"!="$(MAKETARGETS)" .ENDIF # "$(MAKETARGETS)"!="" openoffice_%{$(PKGFORMAT:^".") .archive} : - $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p LibreOffice -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIOFFICETEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -format $(@:e:s/.//) $(VERBOSESWITCH) + $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p LibreOffice -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIOFFICETEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -strip -format $(@:e:s/.//) $(VERBOSESWITCH) $(PERL) -w $(SOLARENV)$/bin$/gen_update_info.pl --buildid $(BUILD) --arch "$(RTL_ARCH)" --os "$(RTL_OS)" --lstfile $(PRJ)$/util$/openoffice.lst --product LibreOffice --languages $(subst,$(@:s/_/ /:1)_, $(@:b)) $(PRJ)$/util$/update.xml > $(MISC)/`date +%Y%m%d_%H%M`_$(RTL_OS)_$(RTL_ARCH)$(@:e).update.xml $(foreach,i,$(alllangiso) openofficedev_$i) : $$@{$(PKGFORMAT:^".")} @@ -271,19 +271,19 @@ ooodevhelppack_%{$(PKGFORMAT:^".")} : $(foreach,i,$(alllangiso) sdkoo_$i) : $$@{$(PKGFORMAT:^".")} sdkoo_%{$(PKGFORMAT:^".")} : - $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p LibreOffice_SDK -u $(OUT) -buildid $(BUILD) -msitemplate $(MSISDKOOTEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -dontstrip -format $(@:e:s/.//) $(VERBOSESWITCH) + $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p LibreOffice_SDK -u $(OUT) -buildid $(BUILD) -msitemplate $(MSISDKOOTEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -format $(@:e:s/.//) $(VERBOSESWITCH) $(foreach,i,$(alllangiso) sdkoodev_$i) : $$@{$(PKGFORMAT:^".")} sdkoodev_%{$(PKGFORMAT:^".")} : - $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p LibreOffice_Dev_SDK -u $(OUT) -buildid $(BUILD) -msitemplate $(MSISDKOOTEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -dontstrip -format $(@:e:s/.//) $(VERBOSESWITCH) + $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p LibreOffice_Dev_SDK -u $(OUT) -buildid $(BUILD) -msitemplate $(MSISDKOOTEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -format $(@:e:s/.//) $(VERBOSESWITCH) $(foreach,i,$(alllangiso) lotest_$i) : $$@{$(PKGFORMAT:^".")} lotest_%{$(PKGFORMAT:^".")} : - $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p LibreOffice_Test -u $(OUT) -buildid $(BUILD) -msitemplate $(MSITESTTEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -dontstrip -format $(@:e:s/.//) $(VERBOSESWITCH) + $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p LibreOffice_Test -u $(OUT) -buildid $(BUILD) -msitemplate $(MSITESTTEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -format $(@:e:s/.//) $(VERBOSESWITCH) $(foreach,i,$(alllangiso) lodevtest_$i) : $$@{$(PKGFORMAT:^".")} lodevtest_%{$(PKGFORMAT:^".")} : - $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p LibreOffice_Dev_Test -u $(OUT) -buildid $(BUILD) -msitemplate $(MSITESTTEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -dontstrip -format $(@:e:s/.//) $(VERBOSESWITCH) + $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p LibreOffice_Dev_Test -u $(OUT) -buildid $(BUILD) -msitemplate $(MSITESTTEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -format $(@:e:s/.//) $(VERBOSESWITCH) $(foreach,i,$(alllangiso) ure_$i) : $$@{$(PKGFORMAT:^".")} 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 " . diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk index 7d1d66e9b21f..f8413f635adb 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_TIMELOG := 0 ifneq ($(strip $(TIMELOG)$(timelog)),) gb_TIMELOG := 1 diff --git a/solenv/gbuild/platform/solaris.mk b/solenv/gbuild/platform/solaris.mk index 779ccf58f45c..04ec93eeb5e7 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 387b583f8f73..d288d63989c6 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 := |