Hello David,
David Ostrovsky píše v Čt 26. 04. 2012 v 08:07 +0200:
> thank you for your review and your comments.
> Here is a new version with these issues fixed:
>
> 1. no strip in solenv/bin/deliver.pl any more
> 2. solenv/bin/modules/installer preserves striping code
> 3. there is a new target install-strip that do strip during installation
> process.
Perfect! It is exactly how I imagined it :-)
> Question: i can not see where $strip var in ooinstall is parsed (in
> make_installer.pl call)?
>
> if ($ENV{BUILD_TYPE} =~ m/ODK/) {
> print "Running SDK installer\n";
> system ("cd $ENV{SRC_ROOT}/instsetoo_native/util ; " .
> "perl -w $ENV{SOLARENV}/bin/make_installer.pl " .
> "-f openoffice.lst -l en-US -p LibreOffice_SDK " .
> "-u $tmp_dir " .
> "-buildid $BUILD $destdir $strip $msi " .
> "-simple $path") && die "Failed to install: $!";
> }
>
> For the new param in Makefile ooinstall -strip to be passed to
> make_installer.pl I have to parse it myself in ooinstall, right?
Yes, I have added is, see the attached patch.
I have also added -strip option when generating the LibreOffice
installation set to make sure that the official build is the same as it
was before.
I am going to double check it in a clean build and push it within next 3
hours or so.
Thanks a lot for patience and great patch.
Best Regards,
Petr
>From 360e481ae0b349733030cedd17e48cbb900f8272 Mon Sep 17 00:00:00 2001
From: Petr Mladek <pmla...@suse.cz>
Date: Thu, 26 Apr 2012 10:43:40 +0200
Subject: [PATCH] more
---
configure.in | 2 +-
instsetoo_native/util/makefile.mk | 2 +-
solenv/bin/ooinstall | 10 +++++++---
3 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/configure.in b/configure.in
index f4e33be..f6466d8 100644
--- a/configure.in
+++ b/configure.in
@@ -615,7 +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).])
+ there is no ordering and removal disabling takes precedence).]),
,)
AC_ARG_ENABLE(werror,
diff --git a/instsetoo_native/util/makefile.mk b/instsetoo_native/util/makefile.mk
index 70e9273..94187ee 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:^".")}
diff --git a/solenv/bin/ooinstall b/solenv/bin/ooinstall
index 6f64f7b..65b1949 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;
}
--
1.7.4.2
_______________________________________________
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
