[Libreoffice-commits] .: solenv/bin
solenv/bin/ooinstall | 62 +++
1 file changed, 34 insertions(+), 28 deletions(-)
New commits:
commit 3230aa240e4028d4dc52c6da0b4cbf9870012e77
Author: Tor Lillqvist t...@iki.fi
Date: Wed Jan 30 09:25:09 2013 +0200
Cosmetics: Consistent indentation and whitespace
Change-Id: I28a8b8ba01e7f1c16af745078f9075888e4b304b
diff --git a/solenv/bin/ooinstall b/solenv/bin/ooinstall
index 9e806ca..c2959bc 100755
--- a/solenv/bin/ooinstall
+++ b/solenv/bin/ooinstall
@@ -31,17 +31,17 @@ if ($ENV{OS} eq 'WNT') {
$is_windows = 1;
}
-if( defined($ENV{TMPDIR}) ) {
+if (defined($ENV{TMPDIR})) {
$tmp_dir = $ENV{TMPDIR};
-} elsif( defined($ENV{TMP}) ) {
- $tmp_dir = $ENV{TMP};
+} elsif (defined($ENV{TMP})) {
+$tmp_dir = $ENV{TMP};
} else {
- $tmp_dir = '/tmp';
+$tmp_dir = '/tmp';
}
if (!-d $tmp_dir) {die Set TMP or TMPDIR!\n;}
# Workaround for system Mozilla
-if ( $ENV{'SYSTEM_MOZILLA'} eq 'YES' ) {
+if ($ENV{'SYSTEM_MOZILLA'} eq 'YES') {
$ENV{'LD_LIBRARY_PATH'} = $ENV{'MOZ_LIB'}:$ENV{'LD_LIBRARY_PATH'};
}
@@ -50,15 +50,15 @@ $ENV{'PYTHONPATH'} =
$ENV{'SRC_ROOT'}/instsetoo_native/$ENV{'INPATH'}/bin:$ENV{
for $arg (@ARGV) {
if ($arg eq '-l' || $arg eq '--link') {
- $do_link = 1;
+$do_link = 1;
} elsif ($arg eq '-s' || $arg eq '--strip') {
- $strip = -strip;
+$strip = -strip;
} elsif ($arg eq '-h' || $arg eq '--help') {
- $help = 1;
+$help = 1;
} else {
- # Cwd::realpath does not work if the path does not exist
- mkpath($ENV{DESTDIR} . $arg) unless -d $ENV{DESTDIR} . $arg;
- $path = Cwd::realpath( $ENV{DESTDIR} . $arg );
+# Cwd::realpath does not work if the path does not exist
+mkpath($ENV{DESTDIR} . $arg) unless -d $ENV{DESTDIR} . $arg;
+$path = Cwd::realpath($ENV{DESTDIR} . $arg);
}
}
@@ -75,10 +75,10 @@ my $BUILD=undef;
my $LAST_MINOR=undef;
open MINORMK, $ENV{'SOLARENV'}/inc/minor.mk;
while (MINORMK) {
- my $t = \$ . $_;
- if(/^BUILD/ || /^LAST_MINOR/) {
- eval $t;
- }
+my $t = \$ . $_;
+if (/^BUILD/ || /^LAST_MINOR/) {
+eval $t;
+}
}
close MINORMK;
$ENV{LAST_MINOR} = $LAST_MINOR;
@@ -96,8 +96,8 @@ $langs=$ENV{WITH_LANG_LIST};
$langs = join (,, @larr);
$destdir='';
-if ( defined $ENV{DESTDIR}
- $ENV{DESTDIR} ne ) {
+if (defined $ENV{DESTDIR}
+$ENV{DESTDIR} ne ) {
$destdir = -destdir \$ENV{DESTDIR}\;
}
@@ -118,24 +118,30 @@ if ($destdir $ENV{DESTDIR} ne / -d
$ENV{DESTDIR}) {
print Running LibreOffice installer\n;
system (cd $ENV{SRC_ROOT}/instsetoo_native/util ; .
- perl -w $ENV{SOLARENV}/bin/make_installer.pl .
- -f openoffice.lst -l $langs -p LibreOffice .
- -u $tmp_dir .
- -buildid $BUILD $destdir $strip $msi .
- -simple $path) die Failed to install: $!;
+perl -w $ENV{SOLARENV}/bin/make_installer.pl .
+-f openoffice.lst -l $langs -p LibreOffice .
+-u $tmp_dir .
+-buildid $BUILD $destdir $strip $msi .
+-simple $path) die Failed to install: $!;
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: $!;
+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: $!;
}
print Installer finished\n;
if ($do_link !$is_windows) {
system($ENV{SOLARENV}/bin/linkoo $path $ENV{SRC_ROOT})
-die linkoo failed: $!;
+ die linkoo failed: $!;
}
+
+# Local Variables:
+# cperl-indent-level: 4
+# indent-tabs-mode: nil
+# End:
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/bin
solenv/bin/modules/installer/windows/property.pm |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 3c0f360995741c16e93f49b1a1e771d0f4e40dc7
Author: Michael Stahl mst...@redhat.com
Date: Thu Jan 24 12:52:55 2013 +0100
fdo#59798: MSI installer spurious space in version number
(regression from e024a8d88dbca3a2d178ad88c069721a92156ddf)
Change-Id: I0a94f7265d310f0f5c48c747ffca49a7aeb05a01
diff --git a/solenv/bin/modules/installer/windows/property.pm
b/solenv/bin/modules/installer/windows/property.pm
index 58435d6..796b87b 100644
--- a/solenv/bin/modules/installer/windows/property.pm
+++ b/solenv/bin/modules/installer/windows/property.pm
@@ -160,7 +160,7 @@ sub get_productname_for_property_table($$)
if ( $allvariables-{'PRODUCTEXTENSION'} )
{
$productextension = $allvariables-{'PRODUCTEXTENSION'};
-$productname = $productname . . $productextension;
+$productname = $productname . $productextension;
}
if ( $installer::globals::languagepack )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/bin
solenv/bin/modules/installer/windows/property.pm | 14 +++---
1 file changed, 7 insertions(+), 7 deletions(-)
New commits:
commit e2d60ae0bf885a39bb392729797b0fc6ec3a5fe5
Author: Michael Stahl mst...@redhat.com
Date: Thu Jan 24 13:33:13 2013 +0100
fdo#59798: fix SDK MSI version LOdev 4.1 SDK.0.0.alpha0
... by adding POSTVERSIONEXTENSION after PRODUCTEXTENSION.
(regression from e024a8d88dbca3a2d178ad88c069721a92156ddf)
Change-Id: Ie130dd5be08247ae9202f98cd58a6922fed27f32
diff --git a/solenv/bin/modules/installer/windows/property.pm
b/solenv/bin/modules/installer/windows/property.pm
index 796b87b..f780a6d 100644
--- a/solenv/bin/modules/installer/windows/property.pm
+++ b/solenv/bin/modules/installer/windows/property.pm
@@ -149,13 +149,6 @@ sub get_productname_for_property_table($$)
my $version = $allvariables-{'PRODUCTVERSION'};
my $productname = $name . . $version;
-my $postversionextension = ;
-if ( $allvariables-{'POSTVERSIONEXTENSION'} )
-{
-$postversionextension = $allvariables-{'POSTVERSIONEXTENSION'};
-$productname = $productname . . $postversionextension;
-}
-
my $productextension = ;
if ( $allvariables-{'PRODUCTEXTENSION'} )
{
@@ -163,6 +156,13 @@ sub get_productname_for_property_table($$)
$productname = $productname . $productextension;
}
+my $postversionextension = ;
+if ( $allvariables-{'POSTVERSIONEXTENSION'} )
+{
+$postversionextension = $allvariables-{'POSTVERSIONEXTENSION'};
+$productname = $productname . . $postversionextension;
+}
+
if ( $installer::globals::languagepack )
{
my $langstring = get_english_language_string(); # Example: (English,
German)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/bin
solenv/bin/exectest.pl | 24 +++-
1 file changed, 23 insertions(+), 1 deletion(-)
New commits:
commit 409de33c5739db45b896935c79eba40b68e106ec
Author: Stephan Bergmann sberg...@redhat.com
Date: Wed Jan 23 11:18:55 2013 +0100
In exectest.pl support commands prefixed by shell-style variable assignments
...and properly encode the command passed to Perl's open |..., which in
turn
apparently passes the command to the shell.
Change-Id: I19ab8f677dced6c1421fd9b4910d8a84743c1506
diff --git a/solenv/bin/exectest.pl b/solenv/bin/exectest.pl
index d504d62..06c9072 100644
--- a/solenv/bin/exectest.pl
+++ b/solenv/bin/exectest.pl
@@ -16,6 +16,13 @@
# the License at http://www.apache.org/licenses/LICENSE-2.0 .
#
+sub encode($)
+{
+my ($arg) = @_;
+$arg =~ s/'/'\\''/g;
+return $arg
+}
+
$#ARGV = 1
or die Usage: $0 input file|-SUCCESS|-FAILURE command arguments...;
if ($ARGV[0] eq -SUCCESS)
@@ -78,7 +85,22 @@ while (1) {
{
undef $title;
}
-open PIPE, | @ARGV or die cannot start process: $!;
+my $prog = '';
+my $assigns = 1;
+for ($i = 0; $i != scalar(@ARGV); ++$i)
+{
+$prog .= ' ' unless $i == 0;
+if ($assigns $ARGV[$i] =~ /^([A-Za-z_][A-Za-z0-9_]+)=(.*)$/)
+{
+$prog .= $1 . =' . encode($2) . ';
+}
+else
+{
+$prog .= ' . encode($ARGV[$i]) . ';
+$assigns = 0;
+}
+}
+open PIPE, | $prog or die cannot start process: $!;
$open = 1;
}
elsif ($open $input)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/bin
solenv/bin/modules/installer/windows/idtglobal.pm |1 +
1 file changed, 1 insertion(+)
New commits:
commit 05923e058a6b90f05c90d5f9aef4de58233a51ac
Author: Andras Timar ati...@suse.com
Date: Wed Jan 16 17:16:03 2013 +0100
fdo#59321 un-escape quotes in Windows Installer's idt files
Change-Id: Iecd39e00ed61449a720354f95cbb695447797bff
diff --git a/solenv/bin/modules/installer/windows/idtglobal.pm
b/solenv/bin/modules/installer/windows/idtglobal.pm
index de80cef..909dc34 100644
--- a/solenv/bin/modules/installer/windows/idtglobal.pm
+++ b/solenv/bin/modules/installer/windows/idtglobal.pm
@@ -662,6 +662,7 @@ sub get_language_string_from_language_block
if ( ${$language_block}[$i] =~ /^\s*$language\s*\=\s*\(.*)\\s*$/ )
{
$newstring = $1;
+$newstring =~ s/\\\/\/g; #un-escape quotes, fdo#59321
last;
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/bin
solenv/bin/striplanguagetags.sh |6 ++ 1 file changed, 6 insertions(+) New commits: commit 83b729ebcf525d03ce4c0c85dd871c91968e78ac Author: Eike Rathke er...@redhat.com Date: Wed Jan 16 18:12:18 2013 +0100 also strip fo:script and *:rfc-language-tag For future reference, before this gets forgotten. Change-Id: Ibe8d0ac673a12b53cb53169ba9afe721029375ff diff --git a/solenv/bin/striplanguagetags.sh b/solenv/bin/striplanguagetags.sh index 591e22f..4734306 100755 --- a/solenv/bin/striplanguagetags.sh +++ b/solenv/bin/striplanguagetags.sh @@ -44,6 +44,12 @@ cat $XSL EOF xsl:template match=@fo:language/ xsl:template match=@fo:country/ +xsl:template match=@fo:script/ +xsl:template match=@number:rfc-language-tag/ +xsl:template match=@style:rfc-language-tag/ +xsl:template match=@table:rfc-language-tag/ +xsl:template match=@style:rfc-language-tag-asian/ +xsl:template match=@style:rfc-language-tag-complex/ /xsl:stylesheet EOF ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/bin
solenv/bin/striplanguagetags.sh |6 ++
1 file changed, 6 insertions(+)
New commits:
commit 02edfcaddf1a06775eab01ef742bb9eff640949b
Author: Eike Rathke er...@redhat.com
Date: Wed Jan 16 19:18:11 2013 +0100
check if $CALLXSLTPROC is defined and bail out if not
Change-Id: I2cbaffc35699942318b24492d02cf06397740009
diff --git a/solenv/bin/striplanguagetags.sh b/solenv/bin/striplanguagetags.sh
index 4734306..0df4b0b 100755
--- a/solenv/bin/striplanguagetags.sh
+++ b/solenv/bin/striplanguagetags.sh
@@ -14,6 +14,12 @@
#
# All a bit hacky, but it should work
+if [ -z $CALLXSLTPROC ]; then
+echo $0: \$CALLXSLTPROC not defined!
+echo $0: Apparently we are not called from the build process, bailing
out.
+exit 1
+fi
+
tempfoo=`basename $0`
XSL=`mktemp /tmp/${tempfoo}.XX`
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/bin
dev/null |binary 1 file changed New commits: commit f84bd3f065b31e3f7a8acb5590a6561838b5aa7c Author: Norbert Thiebaud nthieb...@gmail.com Date: Sun Dec 30 15:27:59 2012 -0600 remove accidental adding of concat-deps Change-Id: Ia0e60c5246e5e45b934548ebbf09a2f67910785e diff --git a/solenv/bin/concat-deps b/solenv/bin/concat-deps deleted file mode 100755 index 6391ed6..000 Binary files a/solenv/bin/concat-deps and /dev/null differ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/bin solenv/gbuild
solenv/bin/concat-deps |binary solenv/gbuild/platform/com_MSC_class.mk |3 ++- 2 files changed, 2 insertions(+), 1 deletion(-) New commits: commit de1cbc17952a7e5838c0ded2ed3042171cb997c4 Author: Michael Stahl mst...@redhat.com Date: Mon Dec 17 13:41:12 2012 +0100 Revert hide rc.exe splash screen This reverts commit c2e3d09bb740749e1a6e045ff08bf32e5812fa9e. Quoting from my last revert of the exact same rc.exe -nologo: commit a6e3c2b4800144df40e5f78f6f912cdc6a575a32 gbuild: Microsoft Resource Compiler does not do -nologo At least the version 6.1.6723.1 that is in the Windows SDK 6.0A only complains about invalid option: -ologo. Change-Id: Id6affdf4c833796691c903257dd515cc0d0e861e diff --git a/solenv/bin/concat-deps b/solenv/bin/concat-deps new file mode 100755 index 000..2fc20c3 Binary files /dev/null and b/solenv/bin/concat-deps differ diff --git a/solenv/gbuild/platform/com_MSC_class.mk b/solenv/gbuild/platform/com_MSC_class.mk index 9a960a5..cbd39d0 100644 --- a/solenv/gbuild/platform/com_MSC_class.mk +++ b/solenv/gbuild/platform/com_MSC_class.mk @@ -481,11 +481,12 @@ endif gb_WinResTarget_POSTFIX :=.res +# rc.exe does not support -nologo in 6.1.6723.1 that is in the Windows SDK 6.0A define gb_WinResTarget__command $(call gb_Output_announce,$(2),$(true),RC ,1) $(call gb_Helper_abbreviate_dirs,\ mkdir -p $(dir $(1)) \ - $(gb_RC) -nologo \ + $(gb_RC) \ $(DEFS) $(FLAGS) \ $(INCLUDE) \ -Fo$(1) \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/bin
dev/null |binary 1 file changed New commits: commit bfbbb83857834ac21ec61e201de3b778625b8d1f Author: Michael Stahl mst...@redhat.com Date: Mon Dec 17 13:50:55 2012 +0100 argh... remove accidentally committed concat-deps Change-Id: I212bda7ac80c9903bb72ec919c4c8fc232a89cfc diff --git a/solenv/bin/concat-deps b/solenv/bin/concat-deps deleted file mode 100755 index 2fc20c3..000 Binary files a/solenv/bin/concat-deps and /dev/null differ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/bin
solenv/bin/build.pl | 31 +++
1 file changed, 3 insertions(+), 28 deletions(-)
New commits:
commit b30bfddc2b75aa5a540c4eadfc4f7eca90a8d67f
Author: LuboÅ¡ LuÅák l.lu...@suse.cz
Date: Sat Dec 1 11:43:10 2012 +0100
do not redirect output in build.pl, i.e. dump build_error.log and other logs
Given that nowadays almost everything builds inside tail_build, this
feature is somewhat
pointless, as this almost everything is in that one tail_build log.
Moreover:
- stdout is never a tty, breaking compiler output colorization
- for some obscure reason I do not get, this makes 'make python3.all' work
with msvc2010,
whereas previously the invocation of MSBuild.exe somehow prevented the
rest of make
rules from running. Plain 'make python3' that does not go via build.pl
works though.
No idea if the problem is in gbuild, build.pl, cygwin, make, MSBuild.exe
or somewhere else,
Change-Id: Ibe6e11109e2eefaa65646071c2db01871e5e751f
Reviewed-on: https://gerrit.libreoffice.org/1216
Reviewed-by: LuboÅ¡ LuÅák l.lu...@suse.cz
Tested-by: LuboÅ¡ LuÅák l.lu...@suse.cz
diff --git a/solenv/bin/build.pl b/solenv/bin/build.pl
index c8e62ee..5893669 100755
--- a/solenv/bin/build.pl
+++ b/solenv/bin/build.pl
@@ -1570,11 +1570,9 @@ sub cancel_build {
print STDERR please re-run build inside each one to isolate the
problem.\n;
} else {
print STDERR it seems that the error is inside '$module', please
re-run build\n;
-print STDERR inside this module to isolate the error and/or test
your fix:\n;
+print STDERR inside this module to isolate the error and/or test
your fix.\n;
}
print STDERR \n;
-print STDERR build_error.log should contain the captured output of the
failed module(s)\n;
-print STDERR \n;
print STDERR
---\n;
print STDERR To rebuild a specific module:\n;
print STDERR \n;
@@ -1887,10 +1885,6 @@ sub run_job {
chdir $path;
getcwd();
-my $log_file = $jobs_hash{$registered_name}-{LONG_LOG_PATH};
-
-my $log_dir = File::Basename::dirname($log_file);
-
if ( $source_config-is_gbuild($jobs_hash{$registered_name}-{MODULE}) )
{
if ( $job eq 'deliver' )
@@ -1900,7 +1894,6 @@ sub run_job {
else
{
return 1 if (! $path =~ /prj$/ );
-mkpath($workdir/Logs);
my $gbuild_flags = '-j' . $ENV{PARALLELISM};
my $gbuild_target = 'all slowcheck';
if ($registered_name =~ /tail_build\/prj$/ )
@@ -1916,26 +1909,8 @@ sub run_job {
print gbuild module $make_path: $job_to_do\n;
}
}
-else
-{
-if (!-d $log_dir)
-{
-system($perl $mkout);
-};
-}
-open (MAKE, $job_to_do 21 |) or return 8;
-open (LOGFILE, $log_file) or return 8;
-while (MAKE) { print LOGFILE $_; print $_ }
-close MAKE;
-$error_code = $?;
-close LOGFILE;
-if ( $error_code != 0)
-{
-system(echo \log for $path\ $build_error_log);
-system(cat $log_file $build_error_log);
-}
-
-return $error_code;
+system($job_to_do);
+return $?;
};
sub do_custom_job {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/bin
solenv/bin/modules/installer/windows/directory.pm |1 + 1 file changed, 1 insertion(+) New commits: commit 73f509f3b988ea05afdc3515ba79b6019edaf590 Author: Tor Lillqvist tlillqv...@suse.com Date: Thu Nov 29 22:18:54 2012 +0200 Shorten more Avoid mysterios error message Already existing unique directory: LOdev_progr_pytho-core-330_lib_plat-linux by shortening _plat-linux to _plx. Change-Id: Ib1594d9164a328f1ca7332f60bb27720746ed916 diff --git a/solenv/bin/modules/installer/windows/directory.pm b/solenv/bin/modules/installer/windows/directory.pm index fd947d0..92cb920 100644 --- a/solenv/bin/modules/installer/windows/directory.pm +++ b/solenv/bin/modules/installer/windows/directory.pm @@ -170,6 +170,7 @@ sub create_unique_directorynames $uniquename =~ s/_frame/_frm/g; $uniquename =~ s/_table/_tbl/g; $uniquename =~ s/_chart/_crt/g; +$uniquename =~ s/_plat-linux/_plx/g; my $startlength = 5; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/bin
solenv/bin/modules/installer/archivefiles.pm |3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
New commits:
commit 6215da2dfb96ed6b36ef42bc1afa1ab43c803f3d
Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com
Date: Sun Nov 25 17:49:01 2012 +0100
honor USE_INTERNAL_RIGHTS from scp2
Archive::Zip doensn't restore file permissions when unpacking, so
stat'ing the extracted copy is useless.
Change-Id: Ifdc586fbe76bc55af35f10c6ad9468ae69947f13
Reviewed-on: https://gerrit.libreoffice.org/1167
Reviewed-by: Michael Stahl mst...@redhat.com
Tested-by: Michael Stahl mst...@redhat.com
diff --git a/solenv/bin/modules/installer/archivefiles.pm
b/solenv/bin/modules/installer/archivefiles.pm
index 6862c6f..396da4f 100644
--- a/solenv/bin/modules/installer/archivefiles.pm
+++ b/solenv/bin/modules/installer/archivefiles.pm
@@ -364,8 +364,7 @@ sub resolving_archive_flag
if (( $use_internal_rights ) ( !
$installer::globals::iswin ))
{
-my $value = sprintf(%o,
(stat($newfile{'sourcepath'}))[2]);
-$newfile{'UnixRights'} = substr($value, 3);
+$newfile{'UnixRights'} = sprintf(%o,
($zip-memberNamed($zipname)-unixFileAttributes() 0);
$infoline = Setting unix rights for
\$newfile{'sourcepath'}\ to \$newfile{'UnixRights'}\\n;
push( @installer::globals::logfileinfo, $infoline);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/bin
solenv/bin/install-gdb-printers |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit d85fd8a85501547d5bb87822d2589a07aed7f2d6
Author: Stephan Bergmann sberg...@redhat.com
Date: Wed Nov 21 12:41:41 2012 +0100
Fix install-gdb-printers for Mac OS X
Change-Id: I685d277806e757fc6247f34d4db7386955dab7b7
diff --git a/solenv/bin/install-gdb-printers b/solenv/bin/install-gdb-printers
index 51ab9e2..c478929 100755
--- a/solenv/bin/install-gdb-printers
+++ b/solenv/bin/install-gdb-printers
@@ -168,8 +168,8 @@ if [[ ${DESTDIR}${pythondir} != ${GDBDIR} ]]; then
cp -pr ${GDBDIR}/libreoffice ${DESTDIR}${pythondir}
fi
-make_autoload cppu ure/lib libuno_cppu.$DYLIB.3
-make_autoload sal ure/lib libuno_sal.$DYLIB.3
+make_autoload cppu ure-link/lib libuno_cppu.$DYLIB.3
+make_autoload sal ure-link/lib libuno_sal.$DYLIB.3
make_autoload svl program libsvllo.$DYLIB
make_autoload sw program libswlo.$DYLIB
make_autoload tl program libtllo.$DYLIB
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/bin
solenv/bin/linkoo |1 +
1 file changed, 1 insertion(+)
New commits:
commit 07f4845e485c5582089fa5551b874be600a94018
Author: LuboÅ¡ LuÅák l.lu...@suse.cz
Date: Wed Nov 21 16:50:05 2012 +0100
unlink file before copying over it, to avoid it getting truncated first
Change-Id: I60cd57a5ae54bbe72c29568c1bbec65da3719491
diff --git a/solenv/bin/linkoo b/solenv/bin/linkoo
index 96abfa6..7b9ee4a 100755
--- a/solenv/bin/linkoo
+++ b/solenv/bin/linkoo
@@ -216,6 +216,7 @@ sub do_link(@)
if ($src_mtime $dest_mtime) {
# print copy $src/$src_name ($src_mtime) - $dest/$dest_name
($dest_mtime)\n;
print copy $src/$src_name - $dest/$dest_name\n;
+ unlink ($dest/$dest_name);
copy($src/$src_name, $dest/$dest_name) || die Failed top copy:
$!;
} else {
# print up-to-date $src/$src_name - $dest/$dest_name\n;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/bin
solenv/bin/linkoo | 14 +++---
1 file changed, 11 insertions(+), 3 deletions(-)
New commits:
commit 2c1555a5504162ec36704cc0156f3c0f2b0bc59b
Author: Jan Holesovsky ke...@suse.cz
Date: Thu Nov 15 17:36:28 2012 +0100
Fix linkoo to work with MinGW again.
Change-Id: I26bcc8f2026872729f5f4658c46c3226df3749f7
diff --git a/solenv/bin/linkoo b/solenv/bin/linkoo
index 3e2d08f..96abfa6 100755
--- a/solenv/bin/linkoo
+++ b/solenv/bin/linkoo
@@ -61,6 +61,7 @@ my $TARGET;
my $LIBVER;
my $OOO_BUILD;
my $OOO_INSTALL;
+my $SOLARVER;
if ($ENV{'OS'} eq 'MACOSX') {
print FIXME: linkoo currently does not work on Mac OS X\n;
@@ -108,8 +109,15 @@ File::Spec-file_name_is_absolute($OOO_BUILD) || die
linkoo requires absolute p
($TARGET, $LIBVER, $LANG) = sniff_target ($OOO_BUILD);
+$SOLARVER = $OOO_BUILD/solver;
+
if ($TARGET =~ /^wntgcci/ || $TARGET =~ /^wntmsci[0-9]+/) {
$windows = 1;
+}
+
+if ($TARGET =~ /^wntmsci[0-9]+/) {
+# wntgcci means are cross-compiling can symlink, so copy only on real
+# Windows
$copy = 1;
}
@@ -329,7 +337,7 @@ sub scan_and_link_files($$$)
}
# Now scan the solver
-scan_one_dir ($installed_files, \%build_files, $ENV{'SOLARVER'}/$target,
1);
+scan_one_dir ($installed_files, \%build_files, $SOLARVER/$target, 1);
for my $file (keys %build_files) {
my $src = $build_files{$file};
@@ -393,7 +401,7 @@ sub link_gdb_py()
my $dirh;
my @basis;
my @ure;
-my $src = $ENV{'SOLARVER'}/$TARGET/lib;
+my $src = $SOLARVER/$TARGET/lib;
opendir ($dirh, $src) || die can't open solver: $src: $!;
while (my $dent = readdir ($dirh)) {
$dent =~ /^\./ next;
@@ -423,7 +431,7 @@ sub link_pagein_files()
return if ($windows);
print pagein case:;
-my $src = $ENV{'SOLARVER'}/$TARGET/bin;
+my $src = $SOLARVER/$TARGET/bin;
my $dest = $OOO_INSTALL/ . $brand_program_dir;
for my $c ('calc', 'draw', 'impress', 'writer', 'common') {
do_link ($src, $dest, pagein-$c, pagein-$c);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/bin
solenv/bin/modules/installer.pm |4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
New commits:
commit bae7ec75a1ce284a713c446ed2b4b05299a96f13
Author: Petr Mladek pmla...@suse.cz
Date: Wed Nov 14 11:28:17 2012 +0100
do not remove logging directory under hands
the installer is called several times for langpacks and helppacks
in parallel; it has removed the whole toplevel logging directory
and the logging failed
better solution would be to remove only the lang-specific subdirectories;
well, the installer removed only emptry directories in the past, see
2584a460b5e560fce8719879414311b16b2c63d9
Change-Id: I9dc9591346c7447677f46bca15085a3877e067ce
diff --git a/solenv/bin/modules/installer.pm b/solenv/bin/modules/installer.pm
index 4c50d3b..76455f1 100644
--- a/solenv/bin/modules/installer.pm
+++ b/solenv/bin/modules/installer.pm
@@ -182,7 +182,9 @@ sub run {
my $oldloggingdir = $loggingdir;
-installer::systemactions::remove_complete_directory($oldloggingdir);
+# FIXME: It would be better to use
installer::systemactions::remove_complete_directory
+#Though, we would need to remove only the lang-specific
subdirectory for langpacks and helppacks
+rmdir $oldloggingdir;
$loggingdir = installer::systemactions::create_directories(logging, );
$loggingdir = $loggingdir . $installer::globals::separator;
$installer::globals::exitlog = $loggingdir;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/bin
solenv/bin/concat-deps.c |6 ++
1 file changed, 6 insertions(+)
New commits:
commit f9c89b0662a3ffbf8af082451beda45f1087738d
Author: Jan Holesovsky ke...@suse.cz
Date: Wed Nov 7 16:57:05 2012 +0100
Eat unneeded spaces at the beginning of .d files, they confuse concat-deps.
Change-Id: I541fb875d4d0bc46eb1bbb21793343c0283fd412
diff --git a/solenv/bin/concat-deps.c b/solenv/bin/concat-deps.c
index 6db6e71..843cad1 100644
--- a/solenv/bin/concat-deps.c
+++ b/solenv/bin/concat-deps.c
@@ -892,6 +892,12 @@ off_t size;
{
base = cursor_out = cursor = end = buffer;
end += size;
+
+/* first eat unneeded space at the beginning of file
+ */
+while(cursor end (*cursor == ' ' || *cursor == '\\'))
+++cursor;
+
while(cursor end)
{
if(*cursor == '\\')
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/bin
solenv/bin/linkoo | 92 +-
1 file changed, 84 insertions(+), 8 deletions(-)
New commits:
commit 99338b4b11fab0a857029d35edf6421be05353c7
Author: Cédric Bosdonnat cedric.bosdon...@free.fr
Date: Tue Nov 6 11:54:43 2012 +0100
linkoo can now link the en-US .ui files
Change-Id: I22b74096d01d56282771f01eb5e966980607632c
diff --git a/solenv/bin/linkoo b/solenv/bin/linkoo
index 6aa4972..da2e720 100755
--- a/solenv/bin/linkoo
+++ b/solenv/bin/linkoo
@@ -5,6 +5,8 @@
use strict;
use File::stat;
use File::Copy;
+use File::Find;
+use File::Spec::Functions qw[splitdir catdir];
#*
#
@@ -301,24 +303,35 @@ sub scan_one_dir()
}
}
-sub scan_and_link_files($$$)
+sub get_modules($$)
{
my $build_path = shift;
-my $installed_files = shift;
my $target = shift;
my @modules = ();
my $dirh_toplevel;
opendir ($dirh_toplevel, $build_path) || die Can't open '$build_path':
$!;
-while (my $subdir = readdir ($dirh_toplevel)) {
- $subdir =~ m/\./ next; # eg. vcl.old,
- $subdir eq 'solver' next; # skip solver dir itself
- my $test = $build_path/$subdir/$target;
- -d $test || next;
- push @modules, $test;
+while ( my $subdir = readdir ($dirh_toplevel) )
+{
+$subdir =~ m/\./ next; # eg. vcl.old,
+$subdir eq 'solver' next; # skip solver dir itself
+my $test = $build_path/$subdir/$target;
+-d $test || next;
+push @modules, $test;
}
closedir ($dirh_toplevel);
+return \@modules;
+}
+
+sub scan_and_link_files($$$)
+{
+my $build_path = shift;
+my $installed_files = shift;
+my $target = shift;
+
+my @modules = get_modules( $build_path, $target );
+
# Scan the old-style module/$target/lib directories ...
my %build_files;
for my $module (@modules) {
@@ -428,6 +441,68 @@ sub link_pagein_files()
print \n;
}
+sub link_ui_files()
+{
+# First find all the en-US .ui files installed
+my @files = ();
+
+find( sub
+ {
+ if ( $File::Find::dir !~ /\/res\// $_ =~ /\.ui$/ )
+ {
+ push( @files, $File::Find::name );
+ }
+ }, $OOO_INSTALL );
+
+my @modules = get_modules( $OOO_BUILD, $TARGET );
+
+# Search the files in the source tree
+for my $dest ( @files )
+{
+my @dest_dirs = splitdir( $dest );
+my $module_dir = @dest_dirs[-3];
+
+my $name = @dest_dirs[-1];
+my $nb_dirs = @dest_dirs - 2;
+my $dest_dir = catdir( @dest_dirs[0..$nb_dirs] );
+
+# Find out the file to link to in the source tree
+my $modulepath = ;
+my $nb_segments = 3;
+if ( $dest =~ /\/modules\// )
+{
+# Handle the modules/* cases
+if ( $module_dir =~ /^sw/ || $module_dir eq sglobal ) {
$modulepath = sw/uiconfig; }
+elsif ( $module_dir eq smath ) { $modulepath =
starmath/uiconfig; }
+elsif ( $module_dir eq simpress || $module_dir eq sdraw ) {
$modulepath = sd/uiconfig; }
+elsif ( $module_dir eq scalc ) { $modulepath = sc/uiconfig; }
+elsif ( $module_dir =~ /^db/ ) { $modulepath =
dbaccess/uiconfig; }
+elsif ( $module_dir eq BasicIDE ) { $modulepath =
basctl/uiconfig/basicide; $nb_segments = 2; }
+elsif ( $module_dir eq schart ) { $modulepath =
chart2/uiconfig; $nb_segments = 2; }
+elsif ( $module_dir eq tubes ) { $modulepath = tubes/uiconfig;
}
+elsif ( $module_dir eq StartModule ) { $modulepath =
framework/uiconfig/startmodule; $nb_segments = 2; }
+}
+else
+{
+$nb_segments = 2;
+# Handle the module/ui/ cases
+my $module = $module_dir;
+if ( $module_dir eq sfx ) { $module = sfx2; }
+elsif ( $module_dir eq svt ) { $module = svtools; }
+elsif ( $module_dir eq sw ) { $module = sw; $nb_segments = 3; }
+
+$modulepath = $module/uiconfig;
+}
+my $subpath = catdir( @dest_dirs[-$nb_segments..-2] );
+my $src_dir = $OOO_BUILD/$modulepath/$subpath;
+
+if ( -e $src_dir/$name )
+{
+do_link ( $src_dir, $dest_dir, $name, $name );
+}
+}
+}
+
evilness ('undo');
my $installed_files = build_installed_list ($OOO_INSTALL);
@@ -435,6 +510,7 @@ my $installed_files = build_installed_list ($OOO_INSTALL);
scan_and_link_files ($OOO_BUILD, $installed_files, $TARGET);
link_gdb_py();
link_pagein_files();
+link_ui_files();
if (!-f $OOO_INSTALL/ . $brand_program_dir . /ooenv) {
my $ooenv;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/bin
solenv/bin/linkoo |1 + 1 file changed, 1 insertion(+) New commits: commit b0d37e7f010bc159585e20c2792dcb9c4f3863c8 Author: Lionel Elie Mamane lio...@mamane.lu Date: Fri Nov 2 16:27:07 2012 +0100 detect even more memory mismanagement on glibc Change-Id: I3a06e5970638c755e89f8ffdf96b68d3c6cdbe61 Reviewed-on: https://gerrit.libreoffice.org/969 Reviewed-by: Norbert Thiebaud nthieb...@gmail.com Reviewed-by: Michael Meeks michael.me...@suse.com Tested-by: Michael Meeks michael.me...@suse.com diff --git a/solenv/bin/linkoo b/solenv/bin/linkoo index c97df91..6aa4972 100755 --- a/solenv/bin/linkoo +++ b/solenv/bin/linkoo @@ -54,6 +54,7 @@ export STAR_RESOURCEPATH=$thisdir/resource export SAL_DISABLE_FLOATGRAB=1 export G_SLICE=always-malloc export MALLOC_CHECK_=2 +export MALLOC_PERTURB_=153 export OOO_DISABLE_RECOVERY=1 export SAL_ALLOW_LINKOO_SYMLINKS=1 '; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/bin
solenv/bin/linkoo | 13 -
1 file changed, 13 deletions(-)
New commits:
commit b76d45e3153f47125f841c8d6c5827291d1536b8
Author: Lionel Elie Mamane lio...@mamane.lu
Date: Fri Nov 2 11:04:47 2012 +0100
Revert detect even more memory mismanagement on glibc
Intended to push a whole series of things, but *not* this one.
Was still under discussion at gerrit.
This reverts commit fcee486849c2e5a07c0eef630beb427742f54d8e.
diff --git a/solenv/bin/linkoo b/solenv/bin/linkoo
index 7820234..c97df91 100755
--- a/solenv/bin/linkoo
+++ b/solenv/bin/linkoo
@@ -54,19 +54,6 @@ export STAR_RESOURCEPATH=$thisdir/resource
export SAL_DISABLE_FLOATGRAB=1
export G_SLICE=always-malloc
export MALLOC_CHECK_=2
-#get some random value between 0 and 255
-rndbyte=$RANDOM
-if test -n ${rndbyte}; then
- rndbyte=$(( $rndbyte % 256 ))
-else
- if test -r /dev/urandom; then
-rndbyte=$(dd if=/dev/urandom bs=1 count=1 2/dev/null | od -tu1 | cut -s
-d -f2)
- else
-rndbyte=$(( (( $(date +%S) + 1 ) * $$ ) % 255 ))
- fi
-fi
-export MALLOC_PERTURB_=${rndbyte}
-unset rndbyte
export OOO_DISABLE_RECOVERY=1
export SAL_ALLOW_LINKOO_SYMLINKS=1
';
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/bin
solenv/bin/modules/installer/scriptitems.pm |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 9a4f81c333f23462f4fa462d8fba539b0b10a9a8
Author: Lior Kaplan kaplanl...@gmail.com
Date: Sun Oct 28 01:44:34 2012 +0200
./g doesn't support -s option or log command any more, use git directly
Change-Id: Icb8fa341fe76abb03ba59cbc57e8b54dbb9acbec
Reviewed-on: https://gerrit.libreoffice.org/935
Reviewed-by: Norbert Thiebaud nthieb...@gmail.com
Tested-by: Norbert Thiebaud nthieb...@gmail.com
diff --git a/solenv/bin/modules/installer/scriptitems.pm
b/solenv/bin/modules/installer/scriptitems.pm
index 9ce5bd6..15fbdb2 100644
--- a/solenv/bin/modules/installer/scriptitems.pm
+++ b/solenv/bin/modules/installer/scriptitems.pm
@@ -702,7 +702,7 @@ sub replace_setup_variables
if ( $localbuild =~ /^\s*(\w+?)(\d+)\s*$/ ) { $localbuild = $2; } #
using 680 instead of src680
-my $buildidstring = join( '-', split( ' ', `$ENV{'SRC_ROOT'}/g -s log -n 1
--pretty=format:%h ` ));
+my $buildidstring = join( '-', split( ' ', `git log -n 1
--pretty=format:%h ` ));
if ($? || !$buildidstring) {
$buildidstring = $localbuild . $localminor . (Build: .
$installer::globals::buildid . );
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/bin
solenv/bin/concat-deps.c |6 --
1 file changed, 4 insertions(+), 2 deletions(-)
New commits:
commit 3d3993969f11400c96ddff3632edd4b60c0cc163
Author: LuboÅ¡ LuÅák l.lu...@suse.cz
Date: Fri Oct 26 12:43:55 2012 +0200
fix incorrect assert() usage
In final (NDEBUG) builds assert expands to (more or less) nothing.
Change-Id: Ie6d43cac381975880c9db2b4a01bd9ed30e2714b
diff --git a/solenv/bin/concat-deps.c b/solenv/bin/concat-deps.c
index 64d2d36..50e9a98 100644
--- a/solenv/bin/concat-deps.c
+++ b/solenv/bin/concat-deps.c
@@ -798,12 +798,14 @@ static inline void print_fullpaths(char* line)
else if(*token == ':' || *token == '\\' || *token == '/' ||
*token == '$' || ':' == token[1])
{
-assert(fwrite(token, token_len, 1, stdout) == 1);
+if(fwrite(token, token_len, 1, stdout) != 1)
+abort();
fputc(' ', stdout);
}
else
{
-assert(fwrite(token, end - token, 1, stdout) == 1);
+if(fwrite(token, end - token, 1, stdout) != 1)
+abort();
fputc(' ', stdout);
}
token = end;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/bin
solenv/bin/concat-deps.c | 21 ++---
1 file changed, 18 insertions(+), 3 deletions(-)
New commits:
commit f893618745f8ca12533a6bcedbc224e4b9ee3479
Author: Michael Stahl mst...@redhat.com
Date: Wed Oct 24 14:33:43 2012 +0200
concat-deps: fix breakage introduced by eliding:
The call to elide_dependency in _process was broken because it checked
the full line, which ends with : usually, breaking the build with LO
customised GNU make on cygwin.
(regression from 140281898f21f707582f395918e5234bdb67e435)
Also handle empty lines following '\' better while at it.
Change-Id: Iadc6349e5b6930945e46e244bcbee37a632e0d71
diff --git a/solenv/bin/concat-deps.c b/solenv/bin/concat-deps.c
index ccc117f..d2d9d50 100644
--- a/solenv/bin/concat-deps.c
+++ b/solenv/bin/concat-deps.c
@@ -811,6 +811,17 @@ static inline void print_fullpaths(char* line)
}
}
+static inline char * eat_space_at_end(char * end)
+{
+assert('\0' == *end);
+char * real_end = end - 1;
+while (' ' == *real_end || '\t' == *real_end || '\n' == *real_end
+|| ':' == *real_end)
+{/* eat colon and whitespace at end */
+ --real_end;
+}
+return real_end;
+}
static int _process(struct hash* dep_hash, char* fn)
{
@@ -866,8 +877,8 @@ off_t size;
* these are the one for which we want to filter
* duplicate out
*/
-int key_len = cursor_out - base;
-if(!elide_dependency(base,key_len - 1, NULL)
+int key_len = eat_space_at_end(cursor_out) - base;
+if(!elide_dependency(base,key_len + 1, NULL)
hash_store(dep_hash, base, key_len))
{
/* DO NOT modify base after it has been added
@@ -882,6 +893,7 @@ off_t size;
print_fullpaths(base);
putc('\n', stdout);
}
+last_ns = ' '; // cannot hurt to reset it
}
cursor += 1;
base = cursor_out = cursor;
@@ -892,6 +904,7 @@ off_t size;
* i.e not a complete rule yet
*/
*cursor_out++ = *cursor++;
+continuation = 0; // cancel current one (empty lines!)
}
}
else
@@ -910,7 +923,9 @@ off_t size;
{
if(last_ns == ':')
{
-if(hash_store(dep_hash, base, (int)(cursor_out - base)))
+int key_len = eat_space_at_end(cursor_out) - base;
+if (!elide_dependency(base,key_len + 1, NULL)
+hash_store(dep_hash, base, key_len))
{
puts(base);
putc('\n', stdout);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/bin
solenv/bin/concat-deps.c |8
1 file changed, 8 deletions(-)
New commits:
commit 349cf01b1dd3a4c08fb3e17ffd89aa7ea9211f6c
Author: Stephan Bergmann sberg...@redhat.com
Date: Mon Oct 22 10:46:11 2012 +0200
Remove spurious find_substr
Change-Id: I4b001e6fd963df2fad97aaf5885b0b38189e59d6
diff --git a/solenv/bin/concat-deps.c b/solenv/bin/concat-deps.c
index 81a4792..ccc117f 100644
--- a/solenv/bin/concat-deps.c
+++ b/solenv/bin/concat-deps.c
@@ -711,14 +711,6 @@ static inline void eat_space(char ** token)
}
/*
- * Find substring in bounded length string
- */
-static inline const char *find_substr(const char *key, int key_len,
- const char *substr, int substr_len)
-{
-}
-
-/*
* Prune LibreOffice specific duplicate dependencies to improve
* gnumake startup time, and shrink the disk-space footprint.
*/
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/bin
solenv/bin/create-tags |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 4089a38466b67908200aa4120324dc2ff959f39d
Author: Miklos Vajna vmik...@suse.cz
Date: Mon Oct 15 10:58:16 2012 +0200
ctags: fix warning
ignoring null tag in filter/source/svg/presentation_engine.js
Change-Id: I84e077373d872031308b12c2b336e7e4972973f1
diff --git a/solenv/bin/create-tags b/solenv/bin/create-tags
index 0388928..03f8377 100755
--- a/solenv/bin/create-tags
+++ b/solenv/bin/create-tags
@@ -11,6 +11,6 @@ fi
omnicppoptions=--c++-kinds=+p --fields=+iaS --extra=+q
ctags -h +.hdl.hrc --langmap=c:+.hdl.hrc.src $omnicppoptions \
- --languages=-HTML,Java \
+ --languages=-HTML,Java,JavaScript \
-R --exclude=`echo ${INPATH} | sed 's/\./\\\./g'` --exclude=binfilter
--exclude=solver \
--exclude=clone --exclude=install --totals=yes --sort=foldcase *
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/bin
solenv/bin/linkoo |4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
New commits:
commit f4b412ebd57016823dde50c5d41bdc39337b6b74
Author: David Ostrovsky da...@ostrovsky.org
Date: Sat Sep 29 22:16:41 2012 +0200
remove superfluous linkoo output
Change-Id: I09a14fd50cf69cec8693b7058d105ee5f2998e02
diff --git a/solenv/bin/linkoo b/solenv/bin/linkoo
index ae97944..c6e6a2b 100755
--- a/solenv/bin/linkoo
+++ b/solenv/bin/linkoo
@@ -446,8 +446,6 @@ if (!-f $OOO_INSTALL/ . $brand_program_dir . /ooenv) {
evilness ('do');
-print \nlinkoo finished;
-print , please don't forget to source ooenv before ./soffice. if (!$windows);
-print \n;
+print \nlinkoo finished\n;
# vim:set shiftwidth=4 softtabstop=4 expandtab:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/bin
solenv/bin/modules/installer/windows/feature.pm | 39
1 file changed, 39 deletions(-)
New commits:
commit 08fef531b59412bd6a1ae4cf986c102994711127
Author: Andras Timar ati...@suse.com
Date: Thu Sep 27 18:24:09 2012 +0200
Revert sorting additional language packs and dictionaries fdo#34479
This reverts commit f34252f647db9f5d274afb0b12bc897544236003.
We sort these lists with a custom action, no need to sort them in
Perl script. See 39bb77fd667
diff --git a/solenv/bin/modules/installer/windows/feature.pm
b/solenv/bin/modules/installer/windows/feature.pm
index 80f7954..c22b864 100644
--- a/solenv/bin/modules/installer/windows/feature.pm
+++ b/solenv/bin/modules/installer/windows/feature.pm
@@ -426,45 +426,6 @@ sub create_feature_table
}
}
-# Sorting names of language packs and dictionaries
-my @tempfeaturetable;
-my @langlist;
-my @langpack;
-my @dictlist;
-my @sorteddictlist;
-my @sortedlanglist;
-
-foreach (@featuretable) {
-if (/^gm_r_Extension_Dictionary_/) {
-push (@dictlist, $_);
-}
-elsif (/^gm_Langpack_r_/) {
-push (@langlist, $_);
-}
-elsif (/\tgm_Langpack_r_/) {
-push (@langpack, $_);
-}
-else {
-push (@tempfeaturetable, $_);
-}
-}
-
-@sorteddictlist = sort { (split(/\t/, $a))[2] cmp (split(/\t/, $b))[2]
} @dictlist;
-@sortedlanglist = sort { (split(/\t/, $a))[2] cmp (split(/\t/, $b))[2]
} @langlist;
-
-@featuretable = (@tempfeaturetable, @sorteddictlist);
-
-foreach (@sortedlanglist) {
-my $sortedlanglistline = $_;
-push (@featuretable, $sortedlanglistline);
-foreach (@langpack) {
-my $langpackline = $_;
-if ( (split(/\t/, $langpackline))[1] eq (split(/\t/,
$sortedlanglistline))[0] ) {
-push (@featuretable, $langpackline);
-}
-}
-}
-
# Saving the file
my $featuretablename = $basedir . $installer::globals::separator .
Feature.idt . . . $onelanguage;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/bin
solenv/bin/modules/installer.pm |3 +--
solenv/bin/modules/installer/archivefiles.pm |5 ++---
solenv/bin/modules/installer/environment.pm |3 +--
solenv/bin/modules/installer/profiles.pm |3 +--
4 files changed, 5 insertions(+), 9 deletions(-)
New commits:
commit 39157dfbcb96d3df7a90c1819d0f5492a1c05d6b
Author: Tim Retout t...@retout.co.uk
Date: Thu Sep 27 22:02:19 2012 +0100
installer: Replace various uses of exit_program with die
Change-Id: I1b16de6b01e34afb19bc394f33f16eef08b1703e
diff --git a/solenv/bin/modules/installer.pm b/solenv/bin/modules/installer.pm
index 2c1f855..54b64b0 100644
--- a/solenv/bin/modules/installer.pm
+++ b/solenv/bin/modules/installer.pm
@@ -40,7 +40,6 @@ use installer::copyproject;
use installer::download;
use installer::environment;
use installer::epmfile;
-use installer::exiter;
use installer::files;
use installer::globals;
use installer::helppack;
@@ -273,7 +272,7 @@ sub run {
my $includepathref =
installer::ziplist::getinfofromziplist($allsettingsarrayref, include);
if ( $$includepathref eq )
{
-installer::exiter::exit_program(ERROR: Definition for \include\ not
found in $installer::globals::ziplistname, Main);
+die 'Definition for include not found in ' .
$installer::globals::ziplistname;
}
my $includepatharrayref =
installer::converter::convert_stringlist_into_array($includepathref, ,);
diff --git a/solenv/bin/modules/installer/archivefiles.pm
b/solenv/bin/modules/installer/archivefiles.pm
index 066aed0..6862c6f 100644
--- a/solenv/bin/modules/installer/archivefiles.pm
+++ b/solenv/bin/modules/installer/archivefiles.pm
@@ -28,7 +28,6 @@
package installer::archivefiles;
use Archive::Zip qw( :ERROR_CODES :CONSTANTS );
-use installer::exiter;
use installer::files;
use installer::globals;
use installer::logger;
@@ -277,7 +276,7 @@ sub resolving_archive_flag
{
if ( $installer::globals::dounzip ) # really unpacking
the files
{
-if ( $zip-extractTree(, $unzipdir) != AZ_OK ) {
installer::exiter::exit_program(ERROR: $infoline, resolving_archive_flag); }
+if ( $zip-extractTree(, $unzipdir) != AZ_OK ) { die
Could not unzip: $!; }
if (( $^O =~ /cygwin/i ) ( $contains_dll ))
{
@@ -533,7 +532,7 @@ sub resolving_archive_flag
if ( $maxcounter == 5 ) # exiting the program
{
-installer::exiter::exit_program(ERROR: Failed to
unzip $sourcepath !, resolving_archive_flag);
+die Failed to unzip $sourcepath !;
}
}
else
diff --git a/solenv/bin/modules/installer/environment.pm
b/solenv/bin/modules/installer/environment.pm
index b0c541b..a0cf5f3 100644
--- a/solenv/bin/modules/installer/environment.pm
+++ b/solenv/bin/modules/installer/environment.pm
@@ -27,7 +27,6 @@
package installer::environment;
-use installer::exiter;
use installer::globals;
##
@@ -94,7 +93,7 @@ sub check_tilde_in_directory
# exit, because ~ is not allowed, if HOME is not set
my $infoline = ERROR: If \~\ is used in \LOCALINSTALLDIR\,
environment variable \HOME\ needs to be defined!\n;
push(@installer::globals::logfileinfo, $infoline);
-installer::exiter::exit_program(ERROR: If \~\ is used in
\LOCALINSTALLDIR\, environment variable \HOME\ needs to be defined!,
check_tilde_in_directory);
+die 'If ~ is used in LOCALINSTALLDIR, environment variable HOME
needs to be defined!';
}
}
diff --git a/solenv/bin/modules/installer/profiles.pm
b/solenv/bin/modules/installer/profiles.pm
index ef0ce7d..7b621f7 100644
--- a/solenv/bin/modules/installer/profiles.pm
+++ b/solenv/bin/modules/installer/profiles.pm
@@ -28,7 +28,6 @@
package installer::profiles;
use installer::converter;
-use installer::exiter;
use installer::files;
use installer::globals;
use installer::logger;
@@ -98,7 +97,7 @@ sub add_profile_into_filelist
if ( $allvariables-{'GLOBALFILEGID'} ) { $vclgid =
$allvariables-{'GLOBALFILEGID'}; }
my ($vclfile) = grep {$_-{gid} eq $vclgid} @{$filesarrayref};
if (! defined $vclfile) {
-installer::exiter::exit_program(ERROR: Could not find file $vclgid in
list of files!, add_profile_into_filelist);
+die Could not find file $vclgid in list of files!;
}
# copying all base data
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/bin
solenv/bin/modules/installer/globals.pm |1
solenv/bin/modules/installer/windows/media.pm | 29 -
solenv/bin/modules/installer/windows/msiglobal.pm | 122 --
3 files changed, 152 deletions(-)
New commits:
commit 272e59094ac1390d5fde34947c724f36d2809ce4
Author: Andras Timar ati...@suse.com
Date: Thu Sep 20 20:51:03 2012 +0200
reduce complexity of installer maker script
$one_cab_file variable was always 0, so I deleted the code dealing
with the non-zero case.
Change-Id: I17288070eb94dec00ce970585046da11136b78eb
diff --git a/solenv/bin/modules/installer/globals.pm
b/solenv/bin/modules/installer/globals.pm
index 48e377b..ab570e5 100644
--- a/solenv/bin/modules/installer/globals.pm
+++ b/solenv/bin/modules/installer/globals.pm
@@ -230,7 +230,6 @@ BEGIN
%usedtreeconditions = ();
%moduledestination = ();
-$one_cab_file = 0;
$fix_number_of_cab_files = 1;
$cabfilecompressionlevel = 21; # Using LZX compression, possible values
are: 15 | 16 | ... | 21 (best compression)
$number_of_cabfiles = 1;# only for $fix_number_of_cab_files = 1
diff --git a/solenv/bin/modules/installer/windows/media.pm
b/solenv/bin/modules/installer/windows/media.pm
index 13154c6..ad560b8 100644
--- a/solenv/bin/modules/installer/windows/media.pm
+++ b/solenv/bin/modules/installer/windows/media.pm
@@ -311,35 +311,6 @@ sub create_media_table
}
}
}
-elsif ( $installer::globals::one_cab_file )
-{
-my %media = ();
-$diskid++;
-
-my $maximumfile = $#{$filesref};
-
-$media{'DiskId'} = get_media_diskid($diskid);
-$media{'LastSequence'} = $maximumfile + 1; # This works also for
unsorted file collector
-$media{'DiskPrompt'} = get_media_diskprompt();
-$media{'Cabinet'} = generate_cab_filename($allvariables);
-$media{'VolumeLabel'} = get_media_volumelabel();
-$media{'Source'} = get_media_source();
-
-my $oneline = $media{'DiskId'} . \t . $media{'LastSequence'} . \t
. $media{'DiskPrompt'} . \t
-. $media{'Cabinet'} . \t . $media{'VolumeLabel'} . \t
. $media{'Source'} . \n;
-
-push(@mediatable, $oneline);
-
-# Saving the cabinet file name in the file collector
-
-$media{'Cabinet'} =~ s/^\s*\#//;# removing leading hash
-
-for ( my $i = 0; $i = $#{$filesref}; $i++ )
-{
-my $onefile = ${$filesref}[$i];
-$onefile-{'cabinet'} = $media{'Cabinet'};
-}
-}
else
{
installer::exiter::exit_program(ERROR: No cab file specification in
globals.pm !, create_media_table);
diff --git a/solenv/bin/modules/installer/windows/msiglobal.pm
b/solenv/bin/modules/installer/windows/msiglobal.pm
index 1b6223d..c7bbf55 100644
--- a/solenv/bin/modules/installer/windows/msiglobal.pm
+++ b/solenv/bin/modules/installer/windows/msiglobal.pm
@@ -350,128 +350,6 @@ sub generate_cab_file_list
push(@installer::globals::allddffiles, $ddffilename);
}
}
-elsif (( $installer::globals::one_cab_file ) (
$installer::globals::updatedatabase ))
-{
-my $sequenceorder = get_sequenceorder($filesref);
-
-my $counter = 1;
-my $currentcabfile = ;
-
-while ( ( exists($sequenceorder-{$counter}) ) || (
exists($installer::globals::allmergemodulefilesequences{$counter}) ) ) # Taking
care of files from merge modules
-{
-if (
exists($installer::globals::allmergemodulefilesequences{$counter}) )
-{
-# Skipping this sequence, it is not included in $filesref,
because it is assigned to a file from a merge module.\n;
-$counter++;
-next;
-}
-
-my $onefile = ${$filesref}[$sequenceorder-{$counter}];
-
-$cabinetfile = $onefile-{'cabinet'};
-my $sourcepath = $onefile-{'sourcepath'};
-if ( $^O =~ /cygwin/i ) { $sourcepath =
$onefile-{'cyg_sourcepath'}; }
-my $uniquename = $onefile-{'uniquename'};
-
-# to avoid lines with more than 256 characters, it can be useful
to use relative paths
-$sourcepath = make_relative_ddf_path($sourcepath);
-
-if ( $counter == 1 ) { write_ddf_file_header(\@ddffile,
$cabinetfile, $installdir); }
-
-my $styles = ;
-my $doinclude = 1;
-if ( $onefile-{'Styles'} ) { $styles = $onefile-{'Styles'}; };
-if ( $styles =~ /\bDONT_PACK\b/ ) { $doinclude = 0; }
-
-my $ddfline = \ . $sourcepath . \ \ . $uniquename . \\n;
-if ( $doinclude ) { push(@ddffile, $ddfline); }
-
-$counter++; # increasing the counter
-}
-
-# creating the DDF file
-
-my $ddffilename = $cabinetfile;
-$ddffilename =~ s/.cab/.ddf/;
-$ddfdir =~ s/[\/\\]\s*$//;
-$ddffilename = $ddfdir .
[Libreoffice-commits] .: solenv/bin
solenv/bin/modules/installer/windows/removefile.pm |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 11b85ee29966df2e4942e236a629205f4280930b
Author: Andras Timar ati...@suse.com
Date: Wed Sep 12 18:09:01 2012 +0200
fdo#44565 do not delete empty Desktop folder on uninstall
Change-Id: I74f0f3a5bcfb381ea941a853c3d5e5e27f7f57e7
diff --git a/solenv/bin/modules/installer/windows/removefile.pm
b/solenv/bin/modules/installer/windows/removefile.pm
index 7b302ac..2fed529 100644
--- a/solenv/bin/modules/installer/windows/removefile.pm
+++ b/solenv/bin/modules/installer/windows/removefile.pm
@@ -128,6 +128,8 @@ sub create_removefile_table
$removefile{'Component_'} = get_removefile_component($onelink);
$removefile{'FileName'} = get_removefile_filename($onelink);
$removefile{'DirProperty'} = get_removefile_dirproperty($onelink);
+# fdo#44565 do not remove empty Desktop folder
+if ( $removefile{'DirProperty'} eq $installer::globals::desktopfolder
) { next; }
$removefile{'InstallMode'} = get_removefile_installmode($onelink);
my $oneline = $removefile{'FileKey'} . \t .
$removefile{'Component_'} . \t . $removefile{'FileName'} . \t
@@ -145,4 +147,4 @@ sub create_removefile_table
}
-1;
\ No newline at end of file
+1;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/bin
solenv/bin/modules/installer/epmfile.pm |2 ++
1 file changed, 2 insertions(+)
New commits:
commit 2ad7f82e4af8a894b42157ccaabfeb90870d080f
Author: Stephan Bergmann sberg...@redhat.com
Date: Fri Sep 7 18:01:54 2012 +0200
Prevent epm from stripping unless explicitly requested
Change-Id: I9f89d78d5772a1a60c89ab4aa4b6ef9bd6179754
diff --git a/solenv/bin/modules/installer/epmfile.pm
b/solenv/bin/modules/installer/epmfile.pm
index 7425a78..8045536 100644
--- a/solenv/bin/modules/installer/epmfile.pm
+++ b/solenv/bin/modules/installer/epmfile.pm
@@ -829,6 +829,8 @@ sub call_epm
my $extraflags = ;
if ($ENV{'EPM_FLAGS'}) { $extraflags = $ENV{'EPM_FLAGS'}; }
+$extraflags .= ' -g' unless $installer::globals::strip;
+
my $systemcall = $ldpreloadstring . $epmname . -f . $packageformat .
. $extraflags . . $localpackagename . . $epmlistfilename .
$outdirstring . -v . 2\\1 |;
installer::logger::print_message( ... $systemcall ...\n );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/bin
solenv/bin/modules/installer/windows/msiglobal.pm | 18 +-
1 file changed, 9 insertions(+), 9 deletions(-)
New commits:
commit a297372210396260da57f34da3790f76682603cc
Author: Stephan Bergmann sberg...@redhat.com
Date: Mon Sep 3 13:54:28 2012 +0200
Quote .ddf content (potentially containing stuff like %2F)
Change-Id: I532cbc97fe0a85f10dba4f52897c3744516c31c9
diff --git a/solenv/bin/modules/installer/windows/msiglobal.pm
b/solenv/bin/modules/installer/windows/msiglobal.pm
index 243c489..3583c3d 100644
--- a/solenv/bin/modules/installer/windows/msiglobal.pm
+++ b/solenv/bin/modules/installer/windows/msiglobal.pm
@@ -210,7 +210,7 @@ sub generate_cab_file_list
write_ddf_file_header(\@ddffile, $cabinetfile, $installdir);
-my $ddfline = \ . $sourcepath . \ . . $uniquename . \n;
+my $ddfline = \ . $sourcepath . \ \ . $uniquename . \\n;
if ( $doinclude ) { push(@ddffile, $ddfline); }
$counter++; # increasing the counter
@@ -230,7 +230,7 @@ sub generate_cab_file_list
my $nextfilestyles = ;
if ( $nextfile-{'Styles'} ) { $nextfilestyles =
$nextfile-{'Styles'}; }
if ( $nextfilestyles =~ /\bDONT_PACK\b/ ) { $localdoinclude =
0; }
-$ddfline = \ . $sourcepath . \ . . $uniquename .
\n;
+$ddfline = \ . $sourcepath . \ \ . $uniquename . \\n;
if ( $localdoinclude ) { push(@ddffile, $ddfline); }
$counter++; # increasing the counter!
@@ -306,7 +306,7 @@ sub generate_cab_file_list
write_ddf_file_header(\@ddffile, $cabinetfile, $installdir);
-my $ddfline = \ . $sourcepath . \ . . $uniquename . \n;
+my $ddfline = \ . $sourcepath . \ \ . $uniquename . \\n;
if ( $doinclude ) { push(@ddffile, $ddfline); }
my $nextfile = ;
@@ -327,7 +327,7 @@ sub generate_cab_file_list
my $nextfilestyles = ;
if ( $nextfile-{'Styles'} ) { $nextfilestyles =
$nextfile-{'Styles'}; }
if ( $nextfilestyles =~ /\bDONT_PACK\b/ ) { $localdoinclude =
0; }
-$ddfline = \ . $sourcepath . \ . . $uniquename .
\n;
+$ddfline = \ . $sourcepath . \ \ . $uniquename . \\n;
if ( $localdoinclude ) { push(@ddffile, $ddfline); }
$counter++;
$nextfile = ;
@@ -392,7 +392,7 @@ sub generate_cab_file_list
write_ddf_file_header(\@ddffile, $cabinetfile, $installdir);
-my $ddfline = \ . $sourcepath . \ . . $uniquename . \n;
+my $ddfline = \ . $sourcepath . \ \ . $uniquename . \\n;
if ( $doinclude ) { push(@ddffile, $ddfline); }
my $nextfile = ${$filesref}[$i+1];
@@ -411,7 +411,7 @@ sub generate_cab_file_list
my $nextfilestyles = ;
if ( $nextfile-{'Styles'} ) { $nextfilestyles =
$nextfile-{'Styles'}; }
if ( $nextfilestyles =~ /\bDONT_PACK\b/ ) { $localdoinclude =
0; }
-$ddfline = \ . $sourcepath . \ . . $uniquename .
\n;
+$ddfline = \ . $sourcepath . \ \ . $uniquename . \\n;
if ( $localdoinclude ) { push(@ddffile, $ddfline); }
$i++; # increasing
the counter!
$nextfile = ${$filesref}[$i+1];
@@ -480,7 +480,7 @@ sub generate_cab_file_list
if ( $onefile-{'Styles'} ) { $styles = $onefile-{'Styles'}; };
if ( $styles =~ /\bDONT_PACK\b/ ) { $doinclude = 0; }
-my $ddfline = \ . $sourcepath . \ . . $uniquename . \n;
+my $ddfline = \ . $sourcepath . \ \ . $uniquename . \\n;
if ( $doinclude ) { push(@ddffile, $ddfline); }
$counter++; # increasing the counter
@@ -538,7 +538,7 @@ sub generate_cab_file_list
if ( $onefile-{'Styles'} ) { $styles = $onefile-{'Styles'}; };
if ( $styles =~ /\bDONT_PACK\b/ ) { $doinclude = 0; }
-my $ddfline = \ . $sourcepath . \ . . $uniquename . \n;
+my $ddfline = \ . $sourcepath . \ \ . $uniquename . \\n;
if ( $doinclude ) { push(@ddffile, $ddfline); }
}
@@ -616,7 +616,7 @@ sub save_packorder
if ( $oneline =~ /^\s*\.Set\s+CabinetName.*\=(.*?)\s*$/ ) {
$cabinetfile = $1; }
if ( $oneline =~ /^\s*\.Set\s+/ ) { next; }
-if ( $oneline =~ /^\s*\(.*?)\\s+(.*?)\s*$/ )
+if ( $oneline =~ /^\s*\(.*?)\\s+\(.*?)\\s*$/ )
{
my $sourcefile = $1;
my $uniquefilename = $2;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/bin
solenv/bin/modules/installer.pm |2
solenv/bin/modules/installer/scpzipfiles.pm | 63 ++-
solenv/bin/modules/t/installer-scpzipfiles.t | 71 +++
3 files changed, 88 insertions(+), 48 deletions(-)
New commits:
commit b08f8494e67bb433686853328df68f377c45e019
Author: Tim Retout t...@retout.co.uk
Date: Wed Aug 22 18:41:10 2012 +0100
installer: Second attempt at scpzipfiles interpolation functions.
Call replace_all_ziplistvariables_in_rtffile with a hashref rather
than arrayref.
Also rewrite implementation of installer::scpzipfiles variable
replacement functions, and add test case. Note that unknown
variables should be ignored rather than replaced with an empty string.
Change-Id: Ic4548b9df8c50cbf2d3049052c637e859542a1e8
diff --git a/solenv/bin/modules/installer.pm b/solenv/bin/modules/installer.pm
index 656bfb9..d5d0be5 100644
--- a/solenv/bin/modules/installer.pm
+++ b/solenv/bin/modules/installer.pm
@@ -1634,7 +1634,7 @@ sub main {
{
my $licensefilesource =
installer::windows::idtglobal::get_rtflicensefilesource($onelanguage,
$includepatharrayref_lang);
my $licensefile =
installer::files::read_file($licensefilesource);
-
installer::scpzipfiles::replace_all_ziplistvariables_in_rtffile($licensefile,
$allvariablesarrayref, $onelanguage, $loggingdir);
+
installer::scpzipfiles::replace_all_ziplistvariables_in_rtffile($licensefile,
$allvariableshashref);
my $controltablename = $languageidtdir .
$installer::globals::separator . Control.idt;
my $controltable =
installer::files::read_file($controltablename);
installer::windows::idtglobal::add_licensefile_to_database($licensefile,
$controltable);
diff --git a/solenv/bin/modules/installer/scpzipfiles.pm
b/solenv/bin/modules/installer/scpzipfiles.pm
index cb0e640..b1dc8a5 100644
--- a/solenv/bin/modules/installer/scpzipfiles.pm
+++ b/solenv/bin/modules/installer/scpzipfiles.pm
@@ -33,66 +33,35 @@ use installer::logger;
use installer::pathanalyzer;
use installer::systemactions;
-
-# Replacing all zip list variables in setup script and files with flag
scpzip_replace
-
+# Replacing all zip list variables.
+# Called for setup script as well as files with flag scpzip_replace.
sub replace_all_ziplistvariables_in_file
{
-my ( $fileref, $variableshashref ) = @_;
+my ( $fileref, $variablesref ) = @_;
-for ( my $i = 0; $i = $#{$fileref}; $i++ )
+for my $line ( @{$fileref} )
{
-my $line = ${$fileref}[$i];
-
-if ( $line =~ /^.*\$\{\w+\}.*$/ ) # only occurrence of ${abc}
-{
-my $key;
-
-foreach $key (keys %{$variableshashref})
-{
-my $value = $variableshashref-{$key};
-$key = '${' . $key . '}';
-$line =~ s/\Q$key\E/$value/g;
-${$fileref}[$i] = $line;
-}
-}
+# Avoid removing variables we do not recognise.
+$line =~ s/\$\{(\w+)\}/defined $variablesref-{$1}
+ ? $variablesref-{$1}
+ : $/eg;
}
}
-
-# Replacing all zip list variables in rtf files. In rtf files
-# the brackets are masked.
-
+# Replacing all zip list variables in rtf files.
sub replace_all_ziplistvariables_in_rtffile
{
-my ( $fileref, $variablesref, $onelanguage, $loggingdir ) = @_;
+my ( $fileref, $variablesref ) = @_;
-for ( my $i = 0; $i = $#{$fileref}; $i++ )
+for my $line ( @{$fileref} )
{
-my $line = ${$fileref}[$i];
-
-if ( $line =~ /^.*\$\\\{\w+\\\}.*$/ ) # only occurrence of $\{abc\}
-{
-for ( my $j = 0; $j = $#{$variablesref}; $j++ )
-{
-my $variableline = ${$variablesref}[$j];
-
-my ($key, $value);
-
-if ( $variableline =~ /^\s*([\w-]+?)\s+(.*?)\s*$/ )
-{
-$key = $1;
-$value = $2;
-$key = '$\{' . $key . '\}';
-}
-
-$line =~ s/\Q$key\E/$value/g;
-
-${$fileref}[$i] = $line;
-}
-}
+# In rtf files the braces are backslash-escaped.
+# Avoid removing variables we do not recognise.
+$line =~ s/\$\\\{(\w+)\\\}/defined $variablesref-{$1}
+ ? $variablesref-{$1}
+
[Libreoffice-commits] .: solenv/bin
solenv/bin/modules/installer.pm | 21 ---
solenv/bin/modules/installer/control.pm | 20 ---
solenv/bin/modules/installer/epmfile.pm | 76
solenv/bin/modules/installer/globals.pm |1
solenv/bin/modules/installer/windows/directory.pm |3
solenv/bin/modules/installer/windows/idtglobal.pm | 134 --
solenv/bin/modules/installer/windows/msiglobal.pm | 21 ---
7 files changed, 1 insertion(+), 275 deletions(-)
New commits:
commit d9d7c85b591baed37e5b670081cc08bef422de81
Author: Andras Timar ati...@suse.com
Date: Thu Aug 30 17:29:00 2012 +0200
LibreOffice installer does not use child projects
Change-Id: Iee968a748406228c116bef26793d74d5712d1f13
diff --git a/solenv/bin/modules/installer.pm b/solenv/bin/modules/installer.pm
index ebfae1a..1e69b4a 100644
--- a/solenv/bin/modules/installer.pm
+++ b/solenv/bin/modules/installer.pm
@@ -240,7 +240,6 @@ sub main {
# setting global variables
-installer::control::set_addchildprojects($allvariableshashref);
installer::control::set_addsystemintegration($allvariableshashref);
@@ -514,7 +513,6 @@ sub main {
if ( $installer::globals::languagepack )
{
-$installer::globals::addchildprojects = 0;
$installer::globals::addsystemintegration = 0;
$installer::globals::addlicensefile = 0;
$installer::globals::makedownload = 1;
@@ -522,7 +520,6 @@ sub main {
if ( $installer::globals::helppack )
{
-$installer::globals::addchildprojects = 0;
$installer::globals::addsystemintegration = 0;
$installer::globals::addlicensefile = 0;
$installer::globals::makedownload = 1;
@@ -1359,9 +1356,6 @@ sub main {
# Adding license and readme into installation set
if ($installer::globals::addlicensefile) {
installer::worker::put_scpactions_into_installset(.); }
-# Adding child projects to installation dynamically
-if ($installer::globals::addchildprojects) {
installer::epmfile::put_childprojects_into_installset($installer::globals::epmoutpath,
$allvariableshashref, $modulesinproductarrayref, $includepatharrayref); }
-
# Adding license file into setup
if ( $allvariableshashref-{'PUT_LICENSE_INTO_SETUP'} ) {
installer::worker::put_license_into_setup(., $includepatharrayref); }
@@ -1683,14 +1677,6 @@ sub main {
installer::windows::idtglobal::addcustomactions($languageidtdir,
$windowscustomactionsarrayref, $filesinproductlanguageresolvedarrayref);
-# Adding child projects if specified
-
-if ($installer::globals::addchildprojects)
-{
-# Adding child projects to installation dynamically (also
in feature table)
-
installer::windows::idtglobal::add_childprojects($languageidtdir,
$filesinproductlanguageresolvedarrayref, $allvariableshashref);
-}
-
# Then the language specific msi database can be created
if ( $installer::globals::iswin ||
$installer::globals::packageformat eq 'msi' )
@@ -1746,13 +1732,6 @@ sub main {
if ( ! $installer::globals::fix_number_of_cab_files ) {
installer::windows::msiglobal::copy_merge_modules_into_installset($installdir);
}
-# ... copying the child projects
-
-if ($installer::globals::addchildprojects)
-{
-
installer::windows::msiglobal::copy_child_projects_into_installset($installdir,
$allvariableshashref);
-}
-
installer::logger::print_message( ... creating ddf files ...\n );
# Creating all needed ddf files and generating a list
diff --git a/solenv/bin/modules/installer/control.pm
b/solenv/bin/modules/installer/control.pm
index 45994b1..bbb613a 100644
--- a/solenv/bin/modules/installer/control.pm
+++ b/solenv/bin/modules/installer/control.pm
@@ -478,26 +478,6 @@ sub check_oxtfiles
}
}
-
-# Setting global variable $installer::globals::addchildprojects
-
-
-sub set_addchildprojects
-{
-my ($allvariables) = @_;
-
-if (( $allvariables-{'UREPRODUCT'} ) ||
-( $allvariables-{'ADDREQUIREDPACKAGES'} )) {
$installer::globals::addchildprojects = 1; }
-
-if ( $installer::globals::patch )
-{
-$installer::globals::addchildprojects = 0; # no child projects for
patches
-}
-
-my $infoline = Value of \$installer::globals::addchildprojects:
$installer::globals::addchildprojects\n;
-push( @installer::globals::globallogfileinfo,
[Libreoffice-commits] .: solenv/bin
solenv/bin/modules/installer/globals.pm |1
solenv/bin/modules/installer/windows/file.pm | 26 ---
solenv/bin/modules/installer/windows/property.pm |8 ---
3 files changed, 35 deletions(-)
New commits:
commit 743e51000adbf6cf0f50d96189511fe1649e47c8
Author: Andras Timar ati...@suse.com
Date: Thu Aug 30 22:16:26 2012 +0200
remove obsoleted ISLCIÄ properties and conditions based on them
Change-Id: I75efbc3815551a9cff43f0c1501e94db7c834afd
diff --git a/solenv/bin/modules/installer/globals.pm
b/solenv/bin/modules/installer/globals.pm
index 7473b31..d8d5273 100644
--- a/solenv/bin/modules/installer/globals.pm
+++ b/solenv/bin/modules/installer/globals.pm
@@ -347,7 +347,6 @@ BEGIN
%componentcondition = ();
%componentid = ();
%comparecomponentname = ();
-%languageproperties = ();
%allcabinets = ();
%allcabinetassigns = ();
%cabfilecounter = ();
diff --git a/solenv/bin/modules/installer/windows/file.pm
b/solenv/bin/modules/installer/windows/file.pm
index 2279129..f5449ce 100644
--- a/solenv/bin/modules/installer/windows/file.pm
+++ b/solenv/bin/modules/installer/windows/file.pm
@@ -992,32 +992,6 @@ sub create_files_table
}
}
-# Collecting all language specific conditions
-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); }
-
-if ( $onefile-{'specificlanguage'} eq ) {
installer::exiter::exit_program(ERROR: There is no specific language for file
at language module: $onefile-{'gid'} !, create_files_table); }
-my $locallanguage = $onefile-{'specificlanguage'};
-my $property = IS . $file{'Language'};
-my $value = 1;
-my $condition = $property . = . $value;
-
-$onefile-{'ComponentCondition'} = $condition;
-
-if (
exists($installer::globals::componentcondition{$file{'Component_'}}))
-{
-if (
$installer::globals::componentcondition{$file{'Component_'}} ne $condition ) {
installer::exiter::exit_program(ERROR: There is already another component
condition for file $onefile-{'gid'}:
\$installer::globals::componentcondition{$file{'Component_'}}\ and
\$condition\ !, create_files_table); }
-}
-else
-{
-$installer::globals::componentcondition{$file{'Component_'}} =
$condition;
-}
-
-# collecting all properties for table Property
-if ( ! exists($installer::globals::languageproperties{$property})
) { $installer::globals::languageproperties{$property} = $value; }
-}
-
unless ( $file{'Version'} )
{
my $path = $onefile-{'sourcepath'};
diff --git a/solenv/bin/modules/installer/windows/property.pm
b/solenv/bin/modules/installer/windows/property.pm
index 7d4ba0d..6e70a1c 100644
--- a/solenv/bin/modules/installer/windows/property.pm
+++ b/solenv/bin/modules/installer/windows/property.pm
@@ -523,7 +523,6 @@ sub update_property_table
# Setting language specific Properties in file Property.idt dynamically
# Adding:
-# is1033 = 1
# isMulti = 1
@@ -534,13 +533,6 @@ sub set_languages_in_property_table
my $properyfilename = $basedir . $installer::globals::separator .
Property.idt;
my $propertyfile = installer::files::read_file($properyfilename);
-# Setting the component properties saved in
%installer::globals::languageproperties
-foreach my $localproperty ( keys %installer::globals::languageproperties )
-{
-$onepropertyline = $localproperty . \t .
$installer::globals::languageproperties{$localproperty} . \n;
-push(@{$propertyfile}, $onepropertyline);
-}
-
# Setting the info about multilingual installation in property isMulti
my $propertyname = isMulti;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/bin
solenv/bin/concat-deps.c |1 -
1 file changed, 1 deletion(-)
New commits:
commit 9c907513be0f30d47d7fc61bf537677c63e19ba1
Author: Tor Lillqvist t...@iki.fi
Date: Fri Aug 24 15:53:17 2012 +0300
Remove debugging output
Change-Id: Ibd80b49eba4b259027d57845b8ebba3e35908e82
diff --git a/solenv/bin/concat-deps.c b/solenv/bin/concat-deps.c
index 65fda1d..5180f46 100644
--- a/solenv/bin/concat-deps.c
+++ b/solenv/bin/concat-deps.c
@@ -166,7 +166,6 @@ void* data = NULL;
if(pool-extent)
{
-fputs(taking a pool extent\n, stderr);
/* we already have an extent, so this is a secondary */
if(pool-secondary)
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/bin
solenv/bin/modules/installer/simplepackage.pm |5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
New commits:
commit 7b4394f35b3557ffe61c8e9b0f0b630b31ca0977
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu Aug 23 15:51:34 2012 +0200
...but remove obsolete prereg-specific code again
Change-Id: I98b20e2ef7f0ec8f609464980398ca09847b40e9
diff --git a/solenv/bin/modules/installer/simplepackage.pm
b/solenv/bin/modules/installer/simplepackage.pm
index 4111378..5bc319d 100755
--- a/solenv/bin/modules/installer/simplepackage.pm
+++ b/solenv/bin/modules/installer/simplepackage.pm
@@ -71,9 +71,8 @@ sub get_extensions_dir
my $extensiondir = $subfolderdir . $installer::globals::separator;
if ( $installer::globals::officedirhostname ne ) { $extensiondir =
$extensiondir . $installer::globals::officedirhostname .
$installer::globals::separator; }
my $extensionsdir = $extensiondir . share .
$installer::globals::separator . extensions;
-my $preregdir = $extensiondir . share . $installer::globals::separator .
prereg . $installer::globals::separator . bundled;
-return ( $extensionsdir, $preregdir );
+return $extensionsdir;
}
##
@@ -671,7 +670,7 @@ sub create_simple_package
installer::logger::print_message( ... removing superfluous directories
...\n );
installer::logger::include_header_into_logfile(Removing superfluous
directories:);
-my ( $extensionfolder, $preregdir ) = get_extensions_dir($subfolderdir);
+my $extensionfolder = get_extensions_dir($subfolderdir);
installer::systemactions::remove_empty_dirs_in_folder($extensionfolder);
if ( $installer::globals::compiler =~ /^unxmacx/ )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/bin
solenv/bin/modules/installer.pm |2
solenv/bin/modules/installer/scpzipfiles.pm | 50 +++--
solenv/bin/modules/t/installer-scpzipfiles.t | 63 +++
3 files changed, 72 insertions(+), 43 deletions(-)
New commits:
commit 46a977081c6f1886f8fff8457c85e6d426dcc20f
Author: Tim Retout t...@retout.co.uk
Date: Wed Aug 22 18:41:10 2012 +0100
installer: Use hashref for replace_all_ziplistvariables_in_rtffile
Also rewrite implementation of installer::scpzipfiles variable
replacement functions, and add test case.
Change-Id: Ic4548b9df8c50cbf2d3049052c637e859542a1e8
diff --git a/solenv/bin/modules/installer.pm b/solenv/bin/modules/installer.pm
index 24e0c4e..ceafede 100644
--- a/solenv/bin/modules/installer.pm
+++ b/solenv/bin/modules/installer.pm
@@ -1644,7 +1644,7 @@ sub main {
{
my $licensefilesource =
installer::windows::idtglobal::get_rtflicensefilesource($onelanguage,
$includepatharrayref_lang);
my $licensefile =
installer::files::read_file($licensefilesource);
-
installer::scpzipfiles::replace_all_ziplistvariables_in_rtffile($licensefile,
$allvariablesarrayref, $onelanguage, $loggingdir);
+
installer::scpzipfiles::replace_all_ziplistvariables_in_rtffile($licensefile,
$allvariableshashref);
my $controltablename = $languageidtdir .
$installer::globals::separator . Control.idt;
my $controltable =
installer::files::read_file($controltablename);
installer::windows::idtglobal::add_licensefile_to_database($licensefile,
$controltable);
diff --git a/solenv/bin/modules/installer/scpzipfiles.pm
b/solenv/bin/modules/installer/scpzipfiles.pm
index cb0e640..70283f2 100644
--- a/solenv/bin/modules/installer/scpzipfiles.pm
+++ b/solenv/bin/modules/installer/scpzipfiles.pm
@@ -39,60 +39,26 @@ use installer::systemactions;
sub replace_all_ziplistvariables_in_file
{
-my ( $fileref, $variableshashref ) = @_;
+my ( $fileref, $variablesref ) = @_;
-for ( my $i = 0; $i = $#{$fileref}; $i++ )
+for my $line ( @{$fileref} )
{
-my $line = ${$fileref}[$i];
-
-if ( $line =~ /^.*\$\{\w+\}.*$/ ) # only occurrence of ${abc}
-{
-my $key;
-
-foreach $key (keys %{$variableshashref})
-{
-my $value = $variableshashref-{$key};
-$key = '${' . $key . '}';
-$line =~ s/\Q$key\E/$value/g;
-${$fileref}[$i] = $line;
-}
-}
+$line =~ s/\$\{(\w+)\}/$variablesref-{$1}/eg;
}
}
-# Replacing all zip list variables in rtf files. In rtf files
-# the brackets are masked.
+# Replacing all zip list variables in rtf files.
sub replace_all_ziplistvariables_in_rtffile
{
-my ( $fileref, $variablesref, $onelanguage, $loggingdir ) = @_;
+my ( $fileref, $variablesref ) = @_;
-for ( my $i = 0; $i = $#{$fileref}; $i++ )
+for my $line ( @{$fileref} )
{
-my $line = ${$fileref}[$i];
-
-if ( $line =~ /^.*\$\\\{\w+\\\}.*$/ ) # only occurrence of $\{abc\}
-{
-for ( my $j = 0; $j = $#{$variablesref}; $j++ )
-{
-my $variableline = ${$variablesref}[$j];
-
-my ($key, $value);
-
-if ( $variableline =~ /^\s*([\w-]+?)\s+(.*?)\s*$/ )
-{
-$key = $1;
-$value = $2;
-$key = '$\{' . $key . '\}';
-}
-
-$line =~ s/\Q$key\E/$value/g;
-
-${$fileref}[$i] = $line;
-}
-}
+# In rtf files the braces are backslash-escaped.
+$line =~ s/\$\\\{(\w+)\\\}/$variablesref-{$1}/eg;
}
}
diff --git a/solenv/bin/modules/t/installer-scpzipfiles.t
b/solenv/bin/modules/t/installer-scpzipfiles.t
new file mode 100644
index 000..e98bfd0
--- /dev/null
+++ b/solenv/bin/modules/t/installer-scpzipfiles.t
@@ -0,0 +1,63 @@
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the License); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an AS IS basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# [ Copyright (C) 2012 Tim Retout t...@retout.co.uk (initial developer) ]
+#
+# All Rights Reserved.
+#
+# For minor
[Libreoffice-commits] .: solenv/bin
solenv/bin/modules/installer/globals.pm |1 -
solenv/bin/modules/installer/parameter.pm |4
2 files changed, 5 deletions(-)
New commits:
commit 04fd2bf36e7100132f1ee555d9c84640baf1747b
Author: Tim Retout t...@retout.co.uk
Date: Wed Aug 22 20:53:49 2012 +0100
installer: Remove unused -javalanguage command-line option.
Change-Id: Ia6f52713dd3cf5ab7d5716c7b6a6f5c1440ed323
diff --git a/solenv/bin/modules/installer/globals.pm
b/solenv/bin/modules/installer/globals.pm
index d8afbe1..af8d8dd 100644
--- a/solenv/bin/modules/installer/globals.pm
+++ b/solenv/bin/modules/installer/globals.pm
@@ -245,7 +245,6 @@ BEGIN
$lastcabfilename = ;
$defaultlanguage = ;
-$javalanguagepath = ;
$addlicensefile = 1;
$addsystemintegration = 0;
$makedownload = 1;
diff --git a/solenv/bin/modules/installer/parameter.pm
b/solenv/bin/modules/installer/parameter.pm
index c3469b7..7cbc28d 100644
--- a/solenv/bin/modules/installer/parameter.pm
+++ b/solenv/bin/modules/installer/parameter.pm
@@ -57,7 +57,6 @@ The following parameter are needed:
-u: Path, in which zipfiles are unpacked (optional)
-msitemplate: Source of the msi file templates (Windows compiler only)
-msilanguage: Source of the msi file templates (Windows compiler only)
--javalanguage: Source of the Java language files (opt., non-Windows only)
-buildid: Current BuildID (optional)
-pro: Product version
-format: Package format
@@ -141,7 +140,6 @@ sub getparameter
elsif ($param eq -msitemplate) {
$installer::globals::idttemplatepath = shift(@ARGV); }
elsif ($param eq -msilanguage) {
$installer::globals::idtlanguagepath = shift(@ARGV); }
elsif ($param eq -patchinc) { $installer::globals::patchincludepath
= shift(@ARGV); }
-elsif ($param eq -javalanguage) {
$installer::globals::javalanguagepath = shift(@ARGV); }
elsif ($param eq -buildid) { $installer::globals::buildid =
shift(@ARGV); }
elsif ($param eq -copyproject) {
$installer::globals::is_copy_only_project = 1; }
elsif ($param eq -languagepack) { $installer::globals::languagepack
= 1; }
@@ -565,8 +563,6 @@ sub outputparameter
if ((!($installer::globals::idtlanguagepath eq ))
(!($installer::globals::iswindowsbuild))) { push(@output, msi language path
will be ignored for non Windows builds!\n); }
if ((!($installer::globals::iswindowsbuild)) (
$installer::globals::call_epm )) { push(@output, Calling epm\n); }
if ((!($installer::globals::iswindowsbuild))
(!($installer::globals::call_epm))) { push(@output, Not calling epm\n); }
-if (!($installer::globals::javalanguagepath eq )) { push(@output, Java
language path: $installer::globals::javalanguagepath\n); }
-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); }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/bin
solenv/bin/concat-deps.c |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 410b6f01f07f8f1a84f2118c71735cdbb5331d5f Author: Rene Engelhard r...@debian.org Date: Mon Aug 20 10:01:47 2012 +0200 concat-deps.c: add || defined (__FreeBSD_kernel__) for arch-specifics Change-Id: Ie321ada6d2c078881fdedc61d72c94034297fea3 diff --git a/solenv/bin/concat-deps.c b/solenv/bin/concat-deps.c index 3770755..65fda1d 100644 --- a/solenv/bin/concat-deps.c +++ b/solenv/bin/concat-deps.c @@ -39,7 +39,7 @@ #if defined(__linux) || defined(__OpenBSD__) || \ defined(__FreeBSD__) || defined(__NetBSD__) || \ -defined(__DragonFly__) +defined(__DragonFly__) || defined(__FreeBSD_kernel__) #if __BYTE_ORDER == __LITTLE_ENDIAN #define CORE_BIG_ENDIAN 0 #define CORE_LITTLE_ENDIAN 1 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/bin
solenv/bin/make_installer.pl| 46 ++--
solenv/bin/modules/installer/globals.pm |3 --
2 files changed, 15 insertions(+), 34 deletions(-)
New commits:
commit fa98546caa64ff830c5fa91bc603f2685e99c64f
Author: Tim Retout t...@retout.co.uk
Date: Sun Aug 19 13:33:53 2012 +0100
installer: Some cleanup of packages loop and unused globals.
Change-Id: I219247cacc9924eed33d0aeb85097dbbe73697d0
diff --git a/solenv/bin/make_installer.pl b/solenv/bin/make_installer.pl
index 1603c5d..18f3838 100644
--- a/solenv/bin/make_installer.pl
+++ b/solenv/bin/make_installer.pl
@@ -1071,18 +1071,24 @@ for ( my $n = 0; $n =
$#installer::globals::languageproducts; $n++ )
if ( $installer::globals::issolarisbuild ) {
installer::epmfile::read_packagemap($allvariableshashref, $includepatharrayref,
$languagesarrayref); }
+###
+# Checking epm state
+###
+
my $epmexecutable = ;
-my $found_epm = 0;
+if ( $installer::globals::call_epm )
+{
+$epmexecutable =
installer::epmfile::find_epm_on_system($includepatharrayref);
+installer::epmfile::set_patch_state($epmexecutable);# setting
$installer::globals::is_special_epm
+}
# shuffle array to reduce parallel packaging process in pool
installer::worker::shuffle_array($packages)
unless $installer::globals::simple;
# iterating over all packages
-for ( my $k = 0; $k = $#{$packages}; $k++ )
+for my $onepackage ( @{$packages} )
{
-my $onepackage = ${$packages}[$k];
-
# checking, if this is a language pack or a project pack.
# Creating language packs only, if
$installer::globals::languagepack is set. Parameter: -languagepack
@@ -1123,14 +1129,11 @@ for ( my $n = 0; $n =
$#installer::globals::languageproducts; $n++ )
# Debian allows no underline in package name
if ( $installer::globals::debian ) { $packagename =~ s/_/-/g; }
-# Debian allows no underline in package name
-if ( $installer::globals::debian ) { $packagename =~ s/_/-/g; }
-
# Header for this package into log file
-installer::logger::include_header_into_logfile(Creating package:
$packagename ($k));
+installer::logger::include_header_into_logfile(Creating package:
$packagename);
###
# Root path, can be defined as parameter
@@ -1218,29 +1221,10 @@ for ( my $n = 0; $n =
$#installer::globals::languageproducts; $n++ )
strip_libraries($filesinpackage, $languagestringref);
}
-###
-# Simple installation mechanism
-###
-
-if ( $installer::globals::simple ) {
installer::worker::install_simple($onepackagename, $$languagestringref,
$dirsinpackage, $filesinpackage, $linksinpackage, $unixlinksinpackage); }
-
-###
-# Checking epm state
-###
-
-if (( $installer::globals::call_epm ) ( ! $found_epm ))
-{
-$epmexecutable =
installer::epmfile::find_epm_on_system($includepatharrayref);
-installer::epmfile::set_patch_state($epmexecutable);#
setting $installer::globals::is_special_epm
-$found_epm = 1; # searching only once
+if ( $installer::globals::simple ) {
+installer::worker::install_simple($onepackagename,
$$languagestringref, $dirsinpackage, $filesinpackage, $linksinpackage,
$unixlinksinpackage);
}
-
-###
-# Creating epm list file
-###
-
-if ( ! $installer::globals::simple )
-{
+else {
# epm list file format:
# type mode owner group destination source options
# Example for a file: f 755 root sys /usr/bin/foo foo
@@ -1372,7 +1356,7 @@ for ( my $n = 0; $n =
$#installer::globals::languageproducts; $n++ )
} # end of if ( ! $installer::globals::simple )
-} # end of for ( my $k = 0; $k = $#{$packages}; $k++ )
+} # end of for ( @{$packages} )
##
# Post epm functionality, after the last package is packed
diff --git a/solenv/bin/modules/installer/globals.pm
b/solenv/bin/modules/installer/globals.pm
index
[Libreoffice-commits] .: solenv/bin
solenv/bin/modules/installer/epmfile.pm | 16 ++---
solenv/bin/modules/installer/systemactions.pm | 32 --
2 files changed, 8 insertions(+), 40 deletions(-)
New commits:
commit c55a340a992199c5eb2d8b9cbe2fea539c6f83aa
Author: Tim Retout t...@retout.co.uk
Date: Sun Aug 19 19:50:05 2012 +0100
installer: Replace remove_empty_directory with rmdir.
Change-Id: Ief3248e0b591a9216ac243fca38904366bab6391
diff --git a/solenv/bin/modules/installer/epmfile.pm
b/solenv/bin/modules/installer/epmfile.pm
index 36fd78d..7d7da01 100644
--- a/solenv/bin/modules/installer/epmfile.pm
+++ b/solenv/bin/modules/installer/epmfile.pm
@@ -2602,14 +2602,14 @@ sub create_new_directory_structure
if ( $machine ne )
{
-
installer::systemactions::remove_empty_directory($installer::globals::epmoutpath/RPMS/$machine);
-}
-
installer::systemactions::remove_empty_directory($installer::globals::epmoutpath/RPMS/powerpc);
-
installer::systemactions::remove_empty_directory($installer::globals::epmoutpath/RPMS/x86_64);
-
installer::systemactions::remove_empty_directory($installer::globals::epmoutpath/RPMS/i586);
-
installer::systemactions::remove_empty_directory($installer::globals::epmoutpath/RPMS/i386);
-
installer::systemactions::remove_empty_directory($installer::globals::epmoutpath/RPMS);
-
+rmdir $installer::globals::epmoutpath/RPMS/$machine;
+}
+rmdir $installer::globals::epmoutpath/RPMS/powerpc;
+rmdir $installer::globals::epmoutpath/RPMS/x86_64;
+rmdir $installer::globals::epmoutpath/RPMS/i586;
+rmdir $installer::globals::epmoutpath/RPMS/i386;
+rmdir $installer::globals::epmoutpath/RPMS
+or warn Could not remove RPMS dir: $!;
}
# Setting unix rights to 775 for $newdir (RPMS or packages)
diff --git a/solenv/bin/modules/installer/systemactions.pm
b/solenv/bin/modules/installer/systemactions.pm
index 2607588..3c54ed1 100644
--- a/solenv/bin/modules/installer/systemactions.pm
+++ b/solenv/bin/modules/installer/systemactions.pm
@@ -154,38 +154,6 @@ sub create_directory_with_privileges
}
}
-##
-# Removing a new direcotory
-##
-
-sub remove_empty_directory
-{
-my ($directory) = @_;
-
-my $returnvalue = 1;
-
-if (-d $directory)
-{
-my $systemcall = rmdir $directory;
-
-$returnvalue = system($systemcall);
-
-my $infoline = Systemcall: $systemcall\n;
-push( @installer::globals::logfileinfo, $infoline);
-
-if ($returnvalue)
-{
-$infoline = ERROR: Could not remove \$directory\!\n;
-push( @installer::globals::logfileinfo, $infoline);
-}
-else
-{
-$infoline = Success: Removed \$directory\!\n;
-push( @installer::globals::logfileinfo, $infoline);
-}
-}
-}
-
###
# Calculating the number of languages in the string
###
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/bin
solenv/bin/modules/installer/control.pm |1 +
1 file changed, 1 insertion(+)
New commits:
commit 32dafb7494ec3b7023c5f71ec1d921c1c7e074c2
Author: Tim Retout t...@retout.co.uk
Date: Sun Aug 19 20:54:02 2012 +0100
installer::control: Put back changing of $local_pathseparator on cygwin.
Change-Id: Ia4fdbe027eb09e297c3d8abbd5817ff062722874
diff --git a/solenv/bin/modules/installer/control.pm
b/solenv/bin/modules/installer/control.pm
index c097fb1..45994b1 100644
--- a/solenv/bin/modules/installer/control.pm
+++ b/solenv/bin/modules/installer/control.pm
@@ -97,6 +97,7 @@ sub check_system_path
$pathvariable = join ';',
map { $dir = qx{cygpath -m $_}; chomp($dir); $dir }
split /\Q$local_pathseparator\E\s*/, $pathvariable;
+$local_pathseparator = ';';
}
my $patharrayref =
installer::converter::convert_stringlist_into_array(\$pathvariable,
$local_pathseparator);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/bin
solenv/bin/modules/installer/archivefiles.pm |5 +--
solenv/bin/modules/installer/control.pm | 13 +++--
solenv/bin/modules/installer/converter.pm | 12
solenv/bin/modules/installer/windows/component.pm | 19 +
solenv/bin/modules/installer/windows/directory.pm | 30 +++---
solenv/bin/modules/installer/worker.pm|8 +
6 files changed, 32 insertions(+), 55 deletions(-)
New commits:
commit 248ea1924e90ee22f55852c42f4e5cfea342737f
Author: Tim Retout t...@retout.co.uk
Date: Sun Aug 19 02:41:45 2012 +0100
Replace all uses of convert_stringlist_into_array_without_newline
Change-Id: I7c835e6202f21f250045f2e6517ac75847f8eb03
diff --git a/solenv/bin/modules/installer/archivefiles.pm
b/solenv/bin/modules/installer/archivefiles.pm
index 0d75b67..066aed0 100644
--- a/solenv/bin/modules/installer/archivefiles.pm
+++ b/solenv/bin/modules/installer/archivefiles.pm
@@ -28,7 +28,6 @@
package installer::archivefiles;
use Archive::Zip qw( :ERROR_CODES :CONSTANTS );
-use installer::converter;
use installer::exiter;
use installer::files;
use installer::globals;
@@ -87,9 +86,9 @@ sub get_patch_file_list
$patchfilestring =~ s/^\s*\///;
$patchfilestring =~ s/^\s*\\//;
-my $patchfilesarray =
installer::converter::convert_stringlist_into_array_without_newline(\$patchfilestring,
,);
+my @patchfilesarray = split /,\s*/, $patchfilestring;
-return $patchfilesarray;
+return \@patchfilesarray;
}
#
diff --git a/solenv/bin/modules/installer/control.pm
b/solenv/bin/modules/installer/control.pm
index 57659a1..c097fb1 100644
--- a/solenv/bin/modules/installer/control.pm
+++ b/solenv/bin/modules/installer/control.pm
@@ -91,15 +91,12 @@ sub check_system_path
my $local_pathseparator = $installer::globals::pathseparator;
if( $^O =~ /cygwin/i )
-{ # When using cygwin's perl the PATH variable is POSIX style and ...
-my $temparrayref =
installer::converter::convert_stringlist_into_array_without_newline(\$pathvariable,
$local_pathseparator);
-foreach $i (0..$#$temparrayref) {
-$$temparrayref[$i] = qx{cygpath -m $$temparrayref[$i]};
-chomp($$temparrayref[$i]);
-}
+{
+# When using cygwin's perl the PATH variable is POSIX style and
# has to be converted to DOS style for further use.
-$local_pathseparator = ';';
-$pathvariable = join($local_pathseparator, @$temparrayref);
+$pathvariable = join ';',
+map { $dir = qx{cygpath -m $_}; chomp($dir); $dir }
+split /\Q$local_pathseparator\E\s*/, $pathvariable;
}
my $patharrayref =
installer::converter::convert_stringlist_into_array(\$pathvariable,
$local_pathseparator);
diff --git a/solenv/bin/modules/installer/converter.pm
b/solenv/bin/modules/installer/converter.pm
index a80426e..7c9598c 100644
--- a/solenv/bin/modules/installer/converter.pm
+++ b/solenv/bin/modules/installer/converter.pm
@@ -65,18 +65,6 @@ sub convert_stringlist_into_array
#
# Converting a string list with separator $listseparator
-# into an array
-#
-
-sub convert_stringlist_into_array_without_newline
-{
-my ( $includestringref, $listseparator ) = @_;
-
-return [split /\Q$listseparator\E\s*/, ${$includestringref}];
-}
-
-#
-# Converting a string list with separator $listseparator
# into a hash with values 1.
#
diff --git a/solenv/bin/modules/installer/windows/component.pm
b/solenv/bin/modules/installer/windows/component.pm
index cd87209..555c99c 100644
--- a/solenv/bin/modules/installer/windows/component.pm
+++ b/solenv/bin/modules/installer/windows/component.pm
@@ -27,7 +27,6 @@
package installer::windows::component;
-use installer::converter;
use installer::exiter;
use installer::files;
use installer::globals;
@@ -460,20 +459,16 @@ sub get_component_name_from_modulegid
my $componentname = ;
-for ( my $i = 0; $i = $#{$filesref}; $i++ )
+for my $file ( @{$filesref} )
{
-my $onefile = ${$filesref}[$i];
+next if ( ! $file-{'modules'} );
-if ( $onefile-{'modules'} )
-{
-my $filemodules = $onefile-{'modules'};
-my $filemodulesarrayref =
installer::converter::convert_stringlist_into_array_without_newline(\$filemodules,
,);
+my @filemodules = split /,\s*/, $file-{'modules'};
-if (grep {$_ eq $modulegid} @{$filemodulesarrayref})
-{
-$componentname = $onefile-{'componentname'};
-last;
-
[Libreoffice-commits] .: solenv/bin
solenv/bin/modules/installer/windows/admin.pm | 306 --
1 file changed, 306 deletions(-)
New commits:
commit 81dcbc38d24acd76d0d1bcda5750d2e99c965c98
Author: Thomas Arnhold tho...@arnhold.org
Date: Sat Aug 18 12:03:51 2012 +0200
installer: cleanup admin.pm
Those are unused, because their calls are commented out.
Looks like include_tables_into_pcpfile should have been
include_tables_into_msifile. Seems like copy and paste from
msp.pm.
Change-Id: I01435277b49027b6d685fb27748e513f6bc525ae
diff --git a/solenv/bin/modules/installer/windows/admin.pm
b/solenv/bin/modules/installer/windows/admin.pm
index e6e69b8..a0dc529 100644
--- a/solenv/bin/modules/installer/windows/admin.pm
+++ b/solenv/bin/modules/installer/windows/admin.pm
@@ -101,65 +101,6 @@ sub unpack_cabinet_file
}
#
-# Include tables into a msi database
-#
-
-sub include_tables_into_pcpfile
-{
-my ($fullmsidatabasepath, $workdir, $tables) = @_;
-
-my $msidb = msidb.exe;# Has to be in the path
-if ( $installer::globals::isunix )
-{
-$msidb = $ENV{'OUTDIR_FOR_BUILD'}/bin/msidb.exe;
-}
-my $infoline = ;
-my $systemcall = ;
-my $returnvalue = ;
-
-# Make all table 8+3 conform
-my $alltables =
installer::converter::convert_stringlist_into_array(\$tables, );
-
-for ( my $i = 0; $i = $#{$alltables}; $i++ )
-{
-my $tablename = ${$alltables}[$i];
-$tablename =~ s/\s*$//;
-my $namelength = length($tablename);
-if ( $namelength 8 )
-{
-my $newtablename = substr($tablename, 0, 8);# name, offset,
length
-my $oldfile = $workdir . $installer::globals::separator .
$tablename . .idt;
-my $newfile = $workdir . $installer::globals::separator .
$newtablename . .idt;
-if ( -f $newfile ) { unlink $newfile; }
-installer::systemactions::copy_one_file($oldfile, $newfile);
-my $savfile = $oldfile . .orig;
-installer::systemactions::copy_one_file($oldfile, $savfile);
-}
-}
-
-# Import of tables
-
-$systemcall = $msidb . -d . $fullmsidatabasepath . -f . $workdir .
-i . $tables;
-
-$returnvalue = system($systemcall);
-
-$infoline = Systemcall: $systemcall\n;
-push( @installer::globals::logfileinfo, $infoline);
-
-if ($returnvalue)
-{
-$infoline = ERROR: Could not execute $systemcall !\n;
-push( @installer::globals::logfileinfo, $infoline);
-installer::exiter::exit_program(ERROR: Could not include tables into
msi database: $fullmsidatabasepath !, include_tables_into_pcpfile);
-}
-else
-{
-$infoline = Success: Executed $systemcall successfully!\n;
-push( @installer::globals::logfileinfo, $infoline);
-}
-}
-
-#
# Extracting tables from msi database
#
@@ -281,70 +222,6 @@ sub analyze_component_file
}
#
-# Analyzing the full content of Component.idt
-#
-
-sub analyze_keypath_component_file
-{
-my ($filecontent) = @_;
-
-my %keypathtable = ();
-
-for ( my $i = 0; $i = $#{$filecontent}; $i++ )
-{
-if (( $i == 0 ) || ( $i == 1 ) || ( $i == 2 )) { next; }
-
-if ( ${$filecontent}[$i] =~
/^\s*(.*?)\t(.*?)\t(.*?)\t(.*?)\t(.*?)\t(.*?)\s*$/ )
-{
-my $component = $1;
-my $keypath = $6;
-
-$keypathtable{$keypath} = $component;
-}
-}
-
-return (\%keypathtable);
-
-}
-
-#
-# Analyzing the content of Registry.idt
-#
-
-sub analyze_registry_file
-{
-my ($filecontent) = @_;
-
-my %table = ();
-
-for ( my $i = 0; $i = $#{$filecontent}; $i++ )
-{
-if (( $i == 0 ) || ( $i == 1 ) || ( $i == 2 )) { next; }
-
-if ( ${$filecontent}[$i] =~
/^\s*(.*?)\t(.*?)\t(.*?)\t(.*?)\t(.*?)\t(.*?)\s*$/ )
-{
-my $registry = $1;
-my $root = $2;
-my $key = $3;
-my $name = $4;
-my $value = $5;
-my $component = $6;
-
-my %helphash = ();
-$helphash{'Root'} = $root;
-$helphash{'Key'} = $key;
-$helphash{'Name'} = $name;
-$helphash{'Value'} = $value;
-$helphash{'Component'} = $component;
-
-$table{$registry} = \%helphash;
-}
-}
-
[Libreoffice-commits] .: solenv/bin
solenv/bin/modules/installer/windows/idtglobal.pm | 81 --
1 file changed, 81 deletions(-)
New commits:
commit 238d69e6a3108595b4ea8587ee29e3447ad2321f
Author: Thomas Arnhold tho...@arnhold.org
Date: Sat Aug 18 12:04:36 2012 +0200
installer: remove get_rtf_licensetext
Change-Id: I57bdc7ace795b7f85116654157cdc2989ca1f99a
diff --git a/solenv/bin/modules/installer/windows/idtglobal.pm
b/solenv/bin/modules/installer/windows/idtglobal.pm
index f8a4fa1..650666b 100644
--- a/solenv/bin/modules/installer/windows/idtglobal.pm
+++ b/solenv/bin/modules/installer/windows/idtglobal.pm
@@ -851,86 +851,6 @@ sub get_rtflicensefilesource
}
##
-# A simple converter to create the license text
-# in rtf format
-##
-
-sub get_rtf_licensetext
-{
-my ($licensefile) = @_;
-
-# A very simple rtf converter
-
-# The static header
-
-my $rtf_licensetext = '{\rtf1\ansi\deff0';
-$rtf_licensetext = $rtf_licensetext .
'{\fonttbl{\f0\froman\fprq2\fcharset0 Times New Roman;}}';
-$rtf_licensetext = $rtf_licensetext .
'{\colortbl\red0\green0\blue0;\red255\green255\blue255;\red128\green128\blue128;}';
-$rtf_licensetext = $rtf_licensetext . '{\stylesheet{\s1\snext1
Standard;}}';
-$rtf_licensetext = $rtf_licensetext . '{\info{\comment
StarWriter}{\vern5690}}\deftab709';
-$rtf_licensetext = $rtf_licensetext . '{\*\pgdsctbl';
-$rtf_licensetext = $rtf_licensetext .
'{\pgdsc0\pgdscuse195\pgwsxn11905\pghsxn16837\marglsxn1134\margrsxn1134\margtsxn1134\margbsxn1134\pgdscnxt0
Standard;}}';
-$rtf_licensetext = $rtf_licensetext .
'\paperh16837\paperw11905\margl1134\margr1134\margt1134\margb1134\sectd\sbknone\pgwsxn11905\pghsxn16837\marglsxn1134\margrsxn1134\margtsxn1134\margbsxn1134\ftnbj\ftnstart1\ftnrstcont\ftnnar\aenddoc\aftnrstcont\aftnstart1\aftnnrlc';
-$rtf_licensetext = $rtf_licensetext . '\pard\plain \s1';
-
-for ( my $i = 0; $i = $#{$licensefile}; $i++ )
-{
-my $oneline = ${$licensefile}[$i];
-
-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
-
-# german replacements
-
-$oneline =~ s/\Ã\/\\\'c4/g;# converting Ä
-$oneline =~ s/\Ã\/\\\'d6/g;# converting Ö
-$oneline =~ s/\Ã\/\\\'dc/g;# converting Ü
-$oneline =~ s/\Ã\¤/\\\'e4/g;# converting ä
-$oneline =~ s/\Ã\¶/\\\'f6/g;# converting ö
-$oneline =~ s/\Ã\¼/\\\'fc/g;# converting ü
-$oneline =~ s/\Ã\/\\\'df/g;# converting ß
-
-# french replacements
-
-$oneline =~ s/\Ã\/\\\'c9/g;
-$oneline =~ s/\Ã\/\\\'c0/g;
-$oneline =~ s/\Â\«/\\\'ab/g;
-$oneline =~ s/\Â\»/\\\'bb/g;
-$oneline =~ s/\Ã\©/\\\'e9/g;
-$oneline =~ s/\Ã\¨/\\\'e8/g;
-$oneline =~ s/\Ã\ /\\\'e0/g;
-$oneline =~ s/\Ã\´/\\\'f4/g;
-$oneline =~ s/\Ã\§/\\\'e7/g;
-$oneline =~ s/\Ã\ª/\\\'ea/g;
-$oneline =~ s/\Ã\/\\\'ca/g;
-$oneline =~ s/\Ã\»/\\\'fb/g;
-$oneline =~ s/\Ã\¹/\\\'f9/g;
-$oneline =~ s/\Ã\®/\\\'ee/g;
-
-# quotation marks
-
-$oneline =~ s/\â\\/\\\'84/g;
-$oneline =~ s/\â\\/\\ldblquote/g;
-$oneline =~ s/\â\\/\\rquote/g;
-
-
-$oneline =~ s/\Â\ /\\\~/g;
-
-$oneline = '\par ' . $oneline;
-
-$rtf_licensetext = $rtf_licensetext . $oneline;
-}
-
-# and the end
-
-$rtf_licensetext = $rtf_licensetext . '\par \par }';
-
-return $rtf_licensetext;
-}
-
-##
# A simple converter to create a license txt string from
# the rtf format
##
@@ -1007,7 +927,6 @@ sub add_licensefile_to_database
installer::exiter::exit_program(ERROR: Could not split line
correctly!, add_licensefile_to_database);
}
-# my $licensetext = get_rtf_licensetext($licensefile);
my $licensetext = make_string_licensetext($licensefile);
$control{'Text'} = $licensetext;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/bin
solenv/bin/make_installer.pl| 50 -
solenv/bin/modules/installer/epmfile.pm | 26 -
solenv/bin/modules/installer/globals.pm |5
solenv/bin/modules/installer/worker.pm | 162
4 files changed, 1 insertion(+), 242 deletions(-)
New commits:
commit b5d1380f3a0c88fff40c9a7134e373f11ea03b9d
Author: Tim Retout t...@retout.co.uk
Date: Sun Aug 19 03:50:12 2012 +0100
installer: Remove code related to linuxlinkrpms.
$installer::globals::linuxlinkrpms is always , which means that
$installer::globals::makelinuxlinkrpm is always 0.
Change-Id: I4fc1fc8afc2bcff528e327a64a784020081c2262
diff --git a/solenv/bin/make_installer.pl b/solenv/bin/make_installer.pl
index 0da4dc5..1603c5d 100644
--- a/solenv/bin/make_installer.pl
+++ b/solenv/bin/make_installer.pl
@@ -1126,23 +1126,6 @@ for ( my $n = 0; $n =
$#installer::globals::languageproducts; $n++ )
# Debian allows no underline in package name
if ( $installer::globals::debian ) { $packagename =~ s/_/-/g; }
-my $linkaddon = ;
-my $linkpackage = 0;
-$installer::globals::add_required_package = ;
-$installer::globals::linuxlinkrpmprocess = 0;
-
-if ( $installer::globals::makelinuxlinkrpm )
-{
-my $oldpackagename = $packagename;
-$installer::globals::add_required_package = $oldpackagename;
# the link rpm requires the non-linked version
-if ( $installer::globals::languagepack ) { $packagename =
$packagename . _u; }
-elsif ( $installer::globals::helppack ) { $packagename =
$packagename . _v; } # wtf...
-else { $packagename = $packagename . u; }
-$linkaddon = _links;
-$installer::globals::linuxlinkrpmprocess = 1;
-$linkpackage = 1;
-}
-
# Header for this package into log file
@@ -1235,35 +1218,6 @@ for ( my $n = 0; $n =
$#installer::globals::languageproducts; $n++ )
strip_libraries($filesinpackage, $languagestringref);
}
-###
-# Searching for files in $filesinpackage with flag LINUXLINK
-###
-
-if (( $installer::globals::islinuxbuild ) ( !
$installer::globals::simple )) # for rpms and debian packages
-{
-# special handling for all RPMs in
$installer::globals::linuxlinkrpms
-
-if ( $installer::globals::linuxlinkrpms =~
/\b$onepackagename\b/ )
-{
-if ( $installer::globals::makelinuxlinkrpm )
-{
-$filesinpackage =
\@installer::globals::linuxpatchfiles;
-$linksinpackage = \@installer::globals::linuxlinks;
-$installer::globals::makelinuxlinkrpm = 0;
-if ( $installer::globals::patch ) {
$installer::globals::call_epm = 1; } # enabling packing again
-}
-else
-{
-$filesinpackage =
installer::worker::prepare_linuxlinkfiles($filesinpackage);
-$linksinpackage =
installer::worker::prepare_forced_linuxlinkfiles($linksinpackage);
-$installer::globals::makelinuxlinkrpm = 1;
-$installer::globals::add_required_package =
$packagename . u;
-if ( $installer::globals::patch ) {
$installer::globals::call_epm = 0; } # no packing of core module in patch
-$shellscriptsfilename = ; # shell scripts only need
to be included into the link rpm
-}
-}
-}
-
###
# Simple installation mechanism
###
@@ -1294,7 +1248,7 @@ for ( my $n = 0; $n =
$#installer::globals::languageproducts; $n++ )
# Example for a link: l 000 root sys /usr/bin/linkname filename
# The source field specifies the file to link to
-my $epmfilename = epm_ . $onepackagename . $linkaddon .
.lst;
+my $epmfilename = epm_ . $onepackagename . .lst;
installer::logger::print_message( ... creating epm list file
$epmfilename ... \n );
@@ -1418,8 +1372,6 @@ for ( my $n = 0; $n =
$#installer::globals::languageproducts; $n++ )
} # end of if ( ! $installer::globals::simple )
-if ( $installer::globals::makelinuxlinkrpm ) { $k--; } #
decreasing the counter to create the link rpm!
-
}
[Libreoffice-commits] .: solenv/bin
solenv/bin/make_installer.pl |4 -
solenv/bin/modules/installer/followme.pm | 102 ---
2 files changed, 106 deletions(-)
New commits:
commit c65bc1d7ac6671dc5099c66fea38ff9c4f975e5d
Author: Thomas Arnhold tho...@arnhold.org
Date: Wed Aug 15 14:43:19 2012 +0200
installer: remove save_followme_info
Change-Id: I87875922d952387d9ffd2667dd621d5cd94b4ea4
diff --git a/solenv/bin/make_installer.pl b/solenv/bin/make_installer.pl
index fce4522..91e8ca6 100644
--- a/solenv/bin/make_installer.pl
+++ b/solenv/bin/make_installer.pl
@@ -43,7 +43,6 @@ use installer::environment;
use installer::epmfile;
use installer::exiter;
use installer::files;
-use installer::followme;
use installer::globals;
use installer::helppack;
use installer::languagepack;
@@ -1502,7 +1501,6 @@ for ( my $n = 0; $n =
$#installer::globals::languageproducts; $n++ )
installer::worker::clean_output_tree(); # removing directories created
in the output tree
($is_success, $finalinstalldir) =
installer::worker::analyze_and_save_logfile($loggingdir, $installdir,
$installlogdir, $allsettingsarrayref, $languagestringref,
$current_install_number);
my $downloadname =
installer::ziplist::getinfofromziplist($allsettingsarrayref, downloadname);
-if ( $is_success ) {
installer::followme::save_followme_info($finalinstalldir, $includepatharrayref,
$allvariableshashref, $$downloadname, $languagestringref, $languagesarrayref,
$current_install_number, $loggingdir, $installlogdir); }
###
# Creating download installation set
@@ -1917,8 +1915,6 @@ for ( my $n = 0; $n =
$#installer::globals::languageproducts; $n++ )
if ( $installer::globals::helppack ) { $downloadname =
installer::ziplist::getinfofromziplist($allsettingsarrayref,
helppackdownloadname); }
if ( $installer::globals::patch ) { $downloadname =
installer::ziplist::getinfofromziplist($allsettingsarrayref,
patchdownloadname); }
-if ( $is_success ) {
installer::followme::save_followme_info($finalinstalldir, $includepatharrayref,
$allvariableshashref, $$downloadname, $languagestringref, $languagesarrayref,
$current_install_number, $loggingdir, $installlogdir); }
-
if ( $$downloadname ne ) { $create_download = 1; }
if ( $installer::globals::iswindowsbuild )
{
diff --git a/solenv/bin/modules/installer/followme.pm
b/solenv/bin/modules/installer/followme.pm
deleted file mode 100644
index 73b1d2e..000
--- a/solenv/bin/modules/installer/followme.pm
+++ /dev/null
@@ -1,102 +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::followme;
-
-use File::Spec;
-use installer::exiter;
-use installer::files;
-use installer::globals;
-use installer::logger;
-use installer::systemactions;
-
-
-# Creating a file, that contains all information
-# to create a follow up process.
-
-
-sub save_followme_info
-{
-my ($finalinstalldir, $includepatharrayref, $allvariableshashref,
$downloadname, $languagestringref, $languagesarrayref, $current_install_number,
$loggingdir, $installlogdir) = @_;
-
-my $downloadinfofilename = $installer::globals::logfilename;
-$downloadinfofilename =~ s/log_/follow_me_/;
-
-# Creating directory
-my $downloadinfodir =
installer::systemactions::create_directory_next_to_directory($finalinstalldir,
follow_me);
-
-my @filecontent = ();
-
-push(@filecontent, finalinstalldir: $finalinstalldir\n);
-push(@filecontent, downloadname: $downloadname\n);
-push(@filecontent, currentinstallnumber: $current_install_number\n);
-push(@filecontent, loggingdir: $loggingdir\n);
-push(@filecontent, installlogdir: $installlogdir\n);
-
[Libreoffice-commits] .: solenv/bin
solenv/bin/make_installer.pl |1
solenv/bin/modules/installer/environment.pm |1
solenv/bin/modules/installer/epmfile.pm |4
solenv/bin/modules/installer/globals.pm | 89 --
solenv/bin/modules/installer/parameter.pm | 24 -
solenv/bin/modules/installer/windows/directory.pm |2
solenv/bin/modules/par2script/globals.pm |7 -
solenv/bin/modules/pre2par/globals.pm |8 -
8 files changed, 136 deletions(-)
New commits:
commit e327840a6d41d8d68e5b5157c944d2acbd3232b0
Author: Thomas Arnhold tho...@arnhold.org
Date: Wed Aug 15 15:27:09 2012 +0200
installer: remove unused globals
Change-Id: I521e2c816b3dbc4aba1770e5a3b5eb47d5542ac1
diff --git a/solenv/bin/make_installer.pl b/solenv/bin/make_installer.pl
index 91e8ca6..57dedc3 100644
--- a/solenv/bin/make_installer.pl
+++ b/solenv/bin/make_installer.pl
@@ -517,7 +517,6 @@ for ( my $n = 0; $n =
$#installer::globals::languageproducts; $n++ )
{
my $languagesarrayref =
installer::languages::get_all_languages_for_one_product($installer::globals::languageproducts[$n],
$allvariableshashref);
-$installer::globals::alllanguagesinproductarrayref = $languagesarrayref;
my $languagestringref =
installer::languages::get_language_string($languagesarrayref);
installer::logger::print_message( \n
);
installer::logger::print_message( ... languages $$languagestringref ...
\n );
diff --git a/solenv/bin/modules/installer/environment.pm
b/solenv/bin/modules/installer/environment.pm
index 5459761..b0c541b 100644
--- a/solenv/bin/modules/installer/environment.pm
+++ b/solenv/bin/modules/installer/environment.pm
@@ -122,7 +122,6 @@ sub set_global_environment_variables
if ( $ENV{'LOCALUNPACKDIR'} ) { $installer::globals::localunpackdir =
$ENV{'LOCALUNPACKDIR'}; }
if ( $ENV{'MAX_LANG_LENGTH'} ) { $installer::globals::max_lang_length =
$ENV{'MAX_LANG_LENGTH'}; }
-if ( $ENV{'SOLAR_JAVA'} ) { $installer::globals::solarjavaset = 1; }
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; }
diff --git a/solenv/bin/modules/installer/epmfile.pm
b/solenv/bin/modules/installer/epmfile.pm
index 1ea9572..bc50aeb 100644
--- a/solenv/bin/modules/installer/epmfile.pm
+++ b/solenv/bin/modules/installer/epmfile.pm
@@ -2360,10 +2360,6 @@ sub create_packages_without_epm
my $rpmcommand = $installer::globals::rpm;
my $rpmversion = determine_rpm_version();
-# saving globally for later usage
-$installer::globals::rpmcommand = $rpmcommand;
-$installer::globals::rpmquerycommand = rpm;
-
my $target = ;
if ( $installer::globals::compiler =~ /unxlngi/) { $target = i586; }
elsif ( $installer::globals::compiler =~ /unxaigppc/) { $target =
ppc; }
diff --git a/solenv/bin/modules/installer/globals.pm
b/solenv/bin/modules/installer/globals.pm
index 7b5876f..6a2bc77 100644
--- a/solenv/bin/modules/installer/globals.pm
+++ b/solenv/bin/modules/installer/globals.pm
@@ -108,7 +108,6 @@ BEGIN
$languagelist = ;
$added_english = 0;
$set_office_start_language = 0;
-$solarjavaset = 0;
$destdir = ;
$rootpath = ;
@@ -124,19 +123,10 @@ BEGIN
$dounzip = 1;
$languages_defined_in_productlist = 0;
$setupscript_defined_in_productlist = 0;
-$islinux = 0;
-$issolaris = 0;
-$ismacosx = 0;
$iswindowsbuild = 0;
$islinuxbuild = 0;
$isrpmbuild = 0;
$isdebbuild = 0;
-$islinuxintelrpmbuild = 0;
-$islinuxppcrpmbuild = 0;
-$islinuxinteldebbuild = 0;
-$islinuxppcdebbuild = 0;
-$islinuxx86_64rpmbuild = 0;
-$islinuxx86_64debbuild = 0;
$issolarisbuild = 0;
$issolarispkgbuild = 0;
$issolarissparcbuild = 0;
@@ -149,13 +139,11 @@ BEGIN
$idttemplatepath = ;
$idtlanguagepath = ;
$buildid = Not set;
-$guidcounter = 1000; # for uniqueness of guids
$fontsfolder = FontsFolder;
$fontsfoldername = Fonts;
$fontsdirparent = ;
$fontsdirname = ;
$fontsdirhostname = truetype;
-$officefolder = OfficeFolder;
$officemenufolder = OfficeMenuFolder;
$startupfolder = StartupFolder;
$startmenufolder = StartMenuFolder;
@@ -180,12 +168,10 @@ BEGIN
$packagerevision = 1;
$rpm = ;
$rpmcommand = ;
-$rpmquerycommand = ;
$rpminfologged = 0;
$debian = ;
$installertypedir = ;
$controlledmakecabversion = 5;
-$saved_packages_path = ;
$max_lang_length = 50;
$globalblock = Globals;
$rootmodulegid = ;
@@ -206,11 +192,6 @@ BEGIN
$packageformat = ;
$packagename = ;
$packagelist = ;
-$addpackagelist = ;
-$is_unix_multi = 0;
-$unixmultipath =
[Libreoffice-commits] .: solenv/bin
solenv/bin/modules/installer/windows/property.pm |3 +++
1 file changed, 3 insertions(+)
New commits:
commit 6abaf44f813e76d80e76b5f42504e772de8c211b
Author: Jan Holesovsky ke...@suse.cz
Date: Thu Aug 16 18:19:39 2012 +0200
Revert fdo#49919 Don't default to desktop pollution
If somebody made a mistake in his / her preferences during installation, it
is much easier to remove the unwanted icon, than to add it.
This reverts commit 6af68b494dafcc6822463a0445692929735eb0af.
diff --git a/solenv/bin/modules/installer/windows/property.pm
b/solenv/bin/modules/installer/windows/property.pm
index 62919a1..7d4ba0d 100644
--- a/solenv/bin/modules/installer/windows/property.pm
+++ b/solenv/bin/modules/installer/windows/property.pm
@@ -324,6 +324,9 @@ sub set_important_properties
{
my $onepropertyline = DESKTOPLINKEXISTS . \t . 1 . \n;
push(@{$propertyfile}, $onepropertyline);
+
+$onepropertyline = CREATEDESKTOPLINK . \t . 1 . \n; # Setting
the default
+push(@{$propertyfile}, $onepropertyline);
}
if ( $installer::globals::patch )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/bin
solenv/bin/modules/installer/download.pm | 58 ---
1 file changed, 58 deletions(-)
New commits:
commit e6ac2ad7ac9bbdae9ac226a2c8202f627dd0ba8a
Author: Tim Retout t...@retout.co.uk
Date: Tue Aug 14 08:33:22 2012 +0100
installer::download: Remove unused unicode conversion functions.
Change-Id: Ie4a22b0e88c5509d291b47f4af67ab780d60e3a8
diff --git a/solenv/bin/modules/installer/download.pm
b/solenv/bin/modules/installer/download.pm
index ac48fe5..b21bbe3 100644
--- a/solenv/bin/modules/installer/download.pm
+++ b/solenv/bin/modules/installer/download.pm
@@ -778,64 +778,6 @@ sub get_language_string_from_language_block
return $newstring;
}
-##
-# Converting utf 16 file to utf 8
-##
-
-sub convert_utf16_to_utf8
-{
-my ( $filename ) = @_;
-
-my @localfile = ();
-
-my $savfilename = $filename . _before.utf16;
-installer::systemactions::copy_one_file($filename, $savfilename);
-
-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;
-}
-close( IN );
-
-if ( open( OUT, :utf8, $filename ) )
-{
-print OUT @localfile;
-close(OUT);
-}
-
-$savfilename = $filename . _before.utf8;
-installer::systemactions::copy_one_file($filename, $savfilename);
-}
-
-##
-# Converting utf 8 file to utf 16
-##
-
-sub convert_utf8_to_utf16
-{
-my ( $filename ) = @_;
-
-my @localfile = ();
-
-my $savfilename = $filename . _after.utf8;
-installer::systemactions::copy_one_file($filename, $savfilename);
-
-open( IN, :utf8, $filename ) || installer::exiter::exit_program(ERROR:
Cannot open file $filename for reading, convert_utf8_to_utf16);
-while ( $line = IN ) {
-push @localfile, $line;
-}
-close( IN );
-
-if ( open( OUT, :raw:encoding(UTF16-LE):crlf:utf8, $filename ) )
-{
-print OUT @localfile;
-close(OUT);
-}
-
-$savfilename = $filename . _after.utf16;
-installer::systemactions::copy_one_file($filename, $savfilename);
-}
-
# Creating link tree for upload
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/bin
solenv/bin/modules/installer/download.pm | 26 --
1 file changed, 26 deletions(-)
New commits:
commit 065b591504096661ac9f421902e108fbb8624b23
Author: Tim Retout t...@retout.co.uk
Date: Tue Aug 14 22:21:11 2012 +0100
installer::download: Remove unused create_link_tree.
Change-Id: I2ec409d25ae46580898dda180d991554d89ee501
diff --git a/solenv/bin/modules/installer/download.pm
b/solenv/bin/modules/installer/download.pm
index 7c4e23d..fb651a8 100644
--- a/solenv/bin/modules/installer/download.pm
+++ b/solenv/bin/modules/installer/download.pm
@@ -781,32 +781,6 @@ sub get_language_string_from_language_block
return $newstring;
}
-
-# Creating link tree for upload
-
-
-sub create_link_tree
-{
-my ($sourcedownloadfile, $destfilename, $versionstring) = @_;
-
-if ( ! $installer::globals::ooouploaddir ) {
installer::exiter::exit_program(ERROR: Directory for LO upload not defined!,
create_link_tree); }
-my $versiondir = $installer::globals::ooouploaddir .
$installer::globals::separator . $versionstring;
-my $infoline = Directory for the link: $versiondir\n;
-push(@installer::globals::logfileinfo, $infoline);
-
-if ( ! -d $versiondir ) {
installer::systemactions::create_directory_structure($versiondir); }
-
-# inside directory $versiondir all links have to be created
-my $linkdestination = $versiondir . $installer::globals::separator .
$destfilename;
-
-# If there is an older version of this file (link), it has to be removed
-if ( -f $linkdestination ) { unlink($linkdestination); }
-
-$infoline = Creating hard link from $sourcedownloadfile to
$linkdestination\n;
-push(@installer::globals::logfileinfo, $infoline);
-installer::systemactions::hardlink_one_file($sourcedownloadfile,
$linkdestination);
-}
-
###
# Setting supported platform for LibreOffice
# builds
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/bin
solenv/bin/modules/installer/download.pm | 12 +---
1 file changed, 5 insertions(+), 7 deletions(-)
New commits:
commit 4b180f51c5cbaaabfcaba6899b5047c89d623cc2
Author: Tim Retout t...@retout.co.uk
Date: Mon Aug 13 22:18:17 2012 +0100
installer::download: Clean up get_versionstring and make private
Change-Id: I9499b7eb580b499ea63bbf8d6ba5bf45a1c460e1
diff --git a/solenv/bin/modules/installer/download.pm
b/solenv/bin/modules/installer/download.pm
index 8174067..ac48fe5 100644
--- a/solenv/bin/modules/installer/download.pm
+++ b/solenv/bin/modules/installer/download.pm
@@ -542,18 +542,16 @@ sub get_downloadname_addon
# This has to be the only content of this file.
#
-sub get_versionstring
+sub _get_versionstring
{
my ( $versionfile ) = @_;
my $versionstring = ;
-for ( my $i = 0; $i = $#{$versionfile}; $i++ )
+for ( @{$versionfile} )
{
-my $oneline = ${$versionfile}[$i];
-
-if ( $oneline =~ /^\s*\#/ ) { next; } # comment line
-if ( $oneline =~ /^\s*\\s*(.*?)\s*\\s*$/ )
+next if /^\s*\#/; # comment line
+if ( /^\s*\\s*(.*?)\s*\\s*$/ )
{
$versionstring = $1;
last;
@@ -580,7 +578,7 @@ sub get_current_version
$infoline = File $filename exists. Trying to find current version.\n;
push( @installer::globals::logfileinfo, $infoline);
my $versionfile = installer::files::read_file($filename);
-$versionstring = get_versionstring($versionfile);
+$versionstring = _get_versionstring($versionfile);
$infoline = Setting version string: $versionstring\n;
push( @installer::globals::logfileinfo, $infoline);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/bin
solenv/bin/make_installer.pl |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit fbf9794729337dd24ee11f85e052133db50d4d56
Author: Michael Meeks michael.me...@suse.com
Date: Thu Aug 9 13:42:45 2012 +0100
fix typo in make_installer.pl
Change-Id: Icc0f1d1e91c704282bfd18b6218bf0659cccb63e
diff --git a/solenv/bin/make_installer.pl b/solenv/bin/make_installer.pl
index 38b4793..fce4522 100644
--- a/solenv/bin/make_installer.pl
+++ b/solenv/bin/make_installer.pl
@@ -625,7 +625,7 @@ for ( my $n = 0; $n =
$#installer::globals::languageproducts; $n++ )
if (!($installer::globals::is_copy_only_project))
{
-if ((( $installer::globals::iswindowsbuild ) (
$installer::globals::packageformat ne archive ) (
$installer::globals::packageformat ne installed ) ) ||
$insaller::globals::packageformat eq 'msi' )
+if ((( $installer::globals::iswindowsbuild ) (
$installer::globals::packageformat ne archive ) (
$installer::globals::packageformat ne installed ) ) ||
$installer::globals::packageformat eq 'msi' )
{
installer::windows::msiglobal::set_global_code_variables($languagesarrayref,
$languagestringref, $allvariableshashref, $alloldproperties);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/bin
solenv/bin/concat-deps.c | 65 ---
1 file changed, 40 insertions(+), 25 deletions(-)
New commits:
commit 3ea6b1c1594fa3fdb7e13c544b3beecd369b67d0
Author: Michael Stahl mst...@redhat.com
Date: Wed Aug 8 23:30:40 2012 +0200
concat-deps: fix crashes due to modifying hash keys:
After a string has been passed as key parameter to hash_store, it must
not be modified, as happens in the print_nodotdot and print_fullpaths
functions; if it doesn't crash then the dep files are twice as large
in a MSVC build because duplicates are not eliminated.
(regression from c2b467b84a81bd45ca9df1f7f07e2700fd6e396a)
Change-Id: I0ae96a7fbcefa20b118717d923f60b4f2255a642
diff --git a/solenv/bin/concat-deps.c b/solenv/bin/concat-deps.c
index 4c2aaf4..38d251f 100644
--- a/solenv/bin/concat-deps.c
+++ b/solenv/bin/concat-deps.c
@@ -687,52 +687,58 @@ int fd;
return buffer;
}
-static inline void print_nodotdot(char* path)
+static void _cancel_relative(char* base, char** ref_cursor, char**
ref_cursor_out, char* end)
{
-char* pathpart;
-char* lastnondotdot;
-pathpart = path;
-lastnondotdot = NULL;
-while(pathpart != NULL)
+char* cursor = *ref_cursor;
+char* cursor_out = *ref_cursor_out;
+
+do
{
-if(strncmp(pathpart, /../, 4) == 0)
-{
-if(!lastnondotdot)
-break; /* this should never happen with abs. paths */
-memmove(lastnondotdot, pathpart+4, strlen(pathpart)-3);
-lastnondotdot = NULL;
-pathpart = path;
-}
-else
-{
-lastnondotdot = pathpart+1;
-pathpart = strchr(pathpart+1,'/');
-}
+cursor += 3;
+while(cursor_out base cursor_out[-1] == '/')
+cursor_out--;
+while(cursor_out base *--cursor_out != '/');
+}
+while(cursor + 3 end !memcmp(cursor, /../, 4));
+*ref_cursor = cursor;
+*ref_cursor_out = cursor_out;
+}
+
+static inline void eat_space(char ** token)
+{
+while ((' ' == **token) || ('\t' == **token)) {
+++(*token);
}
-fputs(path, stdout);
}
/* prefix paths to absolute */
static inline void print_fullpaths(char* line)
{
char* token;
+char* end;
-token = strtok(line, );
-while(token != NULL)
+token = line;
+eat_space(token);
+while (*token)
{
+end = token;
+while (*end (' ' != *end) ('\t' != *end)) {
+++end;
+}
if(*token == ':' || *token == '\\' || *token == '/' || *token == '$'
|| ':' == token[1])
{
-fputs(token, stdout);
+fwrite(token, end - token, 1, stdout);
}
else
{
fputs(base_dir_var, stdout);
fputc('/', stdout);
-print_nodotdot(token);
+fwrite(token, end - token, 1, stdout);
}
fputc(' ', stdout);
-token = strtok(NULL, );
+token = end;
+eat_space(token);
}
}
@@ -767,6 +773,13 @@ off_t size;
}
else if(*cursor == '/')
{
+if(cursor + 3 end)
+{
+if(!memcmp(cursor, /../, 4))
+{
+_cancel_relative(base, cursor, cursor_out, end);
+}
+}
*cursor_out++ = *cursor++;
}
else if(*cursor == '\n')
@@ -785,6 +798,8 @@ off_t size;
*/
if(hash_store(dep_hash, base, (int)(cursor_out -
base)))
{
+/* DO NOT modify base after it has been added
+ as key by hash_store */
print_fullpaths(base);
putc('\n', stdout);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/bin
solenv/bin/modules/macosxotoolhelper.pm |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 13dc61da882e1e5800665f027894d1885c42def7
Author: Stephan Bergmann sberg...@redhat.com
Date: Wed Aug 1 18:43:17 2012 +0200
Proper quoting
Change-Id: Ib619ffc06d580acb5dc5f21ad6d0a439569bee2a
diff --git a/solenv/bin/modules/macosxotoolhelper.pm
b/solenv/bin/modules/macosxotoolhelper.pm
index 96ad8b2..1a64447 100644
--- a/solenv/bin/modules/macosxotoolhelper.pm
+++ b/solenv/bin/modules/macosxotoolhelper.pm
@@ -35,7 +35,7 @@ sub otoolD($) {
my $call = otool -D $file;
open(IN, -|, $call) or die cannot $call;
my $line = IN;
-$line =~ /^$file:\n$/ or
+$line =~ /^\Q$file\E:\n$/ or
die unexpected otool -D output (\$line\, expecting \$file:\);
$line = IN;
IN == undef or die unexpected otool -D output;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/bin solenv/gbuild
solenv/bin/concat-deps.c| 42 ++--
solenv/gbuild/platform/com_GCC_class.mk |8 +++---
2 files changed, 7 insertions(+), 43 deletions(-)
New commits:
commit 79e1b9cb2305bc00665e94afd6a00e9f18b76bf8
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date: Wed Aug 1 19:44:04 2012 +0200
always compile from SRCDIR
* this helps getting nonbroken deps if using some ccache/CCACHE_BASEDIR
combos
Change-Id: I401e55cc10b16aa5901348909237e97d05ab2761
diff --git a/solenv/bin/concat-deps.c b/solenv/bin/concat-deps.c
index 8c9354b..e68093b 100644
--- a/solenv/bin/concat-deps.c
+++ b/solenv/bin/concat-deps.c
@@ -111,10 +111,7 @@
static char* base_dir_var = $(SRCDIR);
#define kBASE_DIR_VAR_LENGTH 9
-static char* current_dir;
-static size_t current_dir_length;
static char* base_dir;
-static size_t base_dir_length;
#ifdef __GNUC__
#define clz __builtin_clz
@@ -715,13 +712,10 @@ char* lastnondotdot;
fputs(path, stdout);
}
-static char* print_fullpaths_buffer = NULL;
-static size_t print_fullpaths_buffersize = 0;
/* prefix paths to absolute */
static inline void print_fullpaths(char* line)
{
char* token;
-size_t token_length;;
token = strtok(line, );
while(token != NULL)
@@ -732,19 +726,9 @@ size_t token_length;;
}
else
{
-token_length=strlen(token);
-if(print_fullpaths_buffersize current_dir_length+token_length+2)
-{
-/* we really should avoid to get there more than once, so
print a message to alert of the condition */
-if(print_fullpaths_buffersize)
-fprintf(stderr, resize fullpaths buffer %d - %d\n,
((int)print_fullpaths_buffersize),
((int)(current_dir_length+token_length))+1024);
-print_fullpaths_buffersize =
current_dir_length+token_length+1024;
-print_fullpaths_buffer = realloc(print_fullpaths_buffer,
print_fullpaths_buffersize);
-}
-memcpy(print_fullpaths_buffer, current_dir, current_dir_length);
-*(print_fullpaths_buffer+current_dir_length) = '/';
-memcpy(print_fullpaths_buffer+current_dir_length+1, token,
token_length+1);
-print_nodotdot(print_fullpaths_buffer);
+fputs(base_dir_var, stdout);
+fputc('/', stdout);
+print_nodotdot(token);
}
fputc(' ', stdout);
token = strtok(NULL, );
@@ -882,26 +866,6 @@ struct hash* dep_hash;
fputs(Error: SRCDIR is missing in the environement\n, stderr);
return 1;
}
-current_dir = getcwd(NULL, 0);
-base_dir_length = strlen(base_dir);
-current_dir_length = strlen(current_dir);
-if(strncmp(base_dir, current_dir, base_dir_length) == 0)
-{
-if(current_dir_length == base_dir_length)
-{
-current_dir = base_dir_var;
-current_dir_length = kBASE_DIR_VAR_LENGTH;
-}
-else
-{
-buffer =
malloc(kBASE_DIR_VAR_LENGTH+current_dir_length-base_dir_length+1);
-memcpy(buffer, base_dir_var, kBASE_DIR_VAR_LENGTH);
-memcpy(buffer+kBASE_DIR_VAR_LENGTH, current_dir+base_dir_length,
current_dir_length-base_dir_length+1);
-free(current_dir);
-current_dir=buffer;
-
current_dir_length=kBASE_DIR_VAR_LENGTH+current_dir_length-base_dir_length;
-}
-}
in_list = file_load(argv[1], in_list_size, rc);
if(!rc)
diff --git a/solenv/gbuild/platform/com_GCC_class.mk
b/solenv/gbuild/platform/com_GCC_class.mk
index b098c99..18a389e 100644
--- a/solenv/gbuild/platform/com_GCC_class.mk
+++ b/solenv/gbuild/platform/com_GCC_class.mk
@@ -36,7 +36,7 @@ gb_AsmObject_get_source = $(1)/$(2).s
define gb_AsmObject__command
$(call gb_Output_announce,$(2),$(true),ASM,3)
$(call gb_Helper_abbreviate_dirs,\
- mkdir -p $(dir $(1)) $(dir $(4)) \
+ mkdir -p $(dir $(1)) $(dir $(4)) cd $(SRCDIR) \
$(gb_CC) \
$(DEFS) \
$(if $(WARNINGS_NOT_ERRORS),,$(gb_CFLAGS_WERROR)) \
@@ -54,7 +54,7 @@ endef
define gb_CObject__command
$(call gb_Output_announce,$(2).c,$(true),C ,3)
$(call gb_Helper_abbreviate_dirs,\
- mkdir -p $(dir $(1)) $(dir $(4)) \
+ mkdir -p $(dir $(1)) $(dir $(4)) cd $(SRCDIR) \
$(gb_CC) \
$(DEFS) \
$(if $(filter Library,$(TARGETTYPE)),$(gb_Library_LTOFLAGS)) \
@@ -75,7 +75,7 @@ endef
define gb_CxxObject__command
$(call gb_Output_announce,$(2).cxx,$(true),CXX,3)
$(call gb_Helper_abbreviate_dirs,\
- mkdir -p $(dir $(1)) $(dir $(4)) \
+ mkdir -p $(dir $(1)) $(dir $(4)) cd $(SRCDIR) \
$(gb_CXX) \
$(DEFS) \
$(if $(filter Library,$(TARGETTYPE)),$(gb_Library_LTOFLAGS)) \
@@ -92,7 +92,7 @@ endef
define gb_SrsPartTarget__command_dep
$(call gb_Helper_abbreviate_dirs,\
- mkdir -p
[Libreoffice-commits] .: solenv/bin
solenv/bin/modules/installer/windows/msiglobal.pm |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 8429bd67715a33751f4cfd50cb4be0346d78ee65 Author: Jan Holesovsky ke...@suse.cz Date: Wed Jul 25 14:04:04 2012 +0200 Make the relativisation of the path working even on Linux. Change-Id: Ib5e617d83d12c9c1faefee7f4a768e1eb1ffc492 diff --git a/solenv/bin/modules/installer/windows/msiglobal.pm b/solenv/bin/modules/installer/windows/msiglobal.pm index 946f816..30fe348 100644 --- a/solenv/bin/modules/installer/windows/msiglobal.pm +++ b/solenv/bin/modules/installer/windows/msiglobal.pm @@ -130,7 +130,7 @@ sub make_relative_ddf_path } $sourcepath =~ s/\Q$windowstemppath\E//; -$sourcepath =~ s/^\\//; +$sourcepath =~ s/^[\\\/]//; return $sourcepath; } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/bin
solenv/bin/modules/installer/windows/msiglobal.pm |5 +
1 file changed, 5 insertions(+)
New commits:
commit 8251cd1936af5047c817adf88333fef31031c506
Author: Jan Holesovsky ke...@suse.cz
Date: Tue Jul 24 14:10:41 2012 +0200
Call uuidgen without -n when cross-compiling.
Change-Id: I533c9bcdbadcaf5caa5aa8bcefb6dc0c141a4d0e
diff --git a/solenv/bin/modules/installer/windows/msiglobal.pm
b/solenv/bin/modules/installer/windows/msiglobal.pm
index d4b626d..93cc78c 100644
--- a/solenv/bin/modules/installer/windows/msiglobal.pm
+++ b/solenv/bin/modules/installer/windows/msiglobal.pm
@@ -1272,6 +1272,11 @@ sub get_guid_list
# -c for uppercase output
my $systemcall = $uuidgen -n$number |;
+if ( $ENV{'CROSS_COMPILING'} eq 'YES' )
+{
+# -n is not present in the non-windows uuidgen
+$systemcall = for I in `seq 1 $number` ; do uuidgen ; done |;
+}
open (UUIDGEN, $systemcall ) or die(uuidgen is missing.);
my @uuidlist = UUIDGEN;
close (UUIDGEN);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/bin
solenv/bin/make_installer.pl |2 +-
solenv/bin/modules/installer/control.pm | 16 +++-
solenv/bin/modules/installer/globals.pm |2 +-
solenv/bin/modules/installer/windows/msiglobal.pm |2 +-
4 files changed, 18 insertions(+), 4 deletions(-)
New commits:
commit e8ddf693e69ea768e4cb1bd4c0445990149af07d
Author: Jan Holesovsky ke...@suse.cz
Date: Tue Jul 24 17:29:28 2012 +0200
Cross-compiling-msi-related changes; not finished.
Change-Id: Ib0d3d43a291f01c4c0d9c5adb0055c180b3ab40a
diff --git a/solenv/bin/make_installer.pl b/solenv/bin/make_installer.pl
index e58bd4d..1a7dd57 100644
--- a/solenv/bin/make_installer.pl
+++ b/solenv/bin/make_installer.pl
@@ -261,7 +261,7 @@ if (!($installer::globals::is_copy_only_project)) {
installer::ziplist::set_manu
# Checking version of makecab.exe
##
-if ( $installer::globals::iswindowsbuild (!defined($ENV{'CROSS_COMPILING'})
|| $ENV{'CROSS_COMPILING'} ne 'YES' || $ENV{'PKGFORMAT'} eq 'msi')) {
installer::control::check_makecab_version(); }
+if ( $installer::globals::iswindowsbuild (!defined($ENV{'CROSS_COMPILING'})
|| $ENV{'CROSS_COMPILING'} ne 'YES' || $installer::globals::packageformat eq
'msi')) { installer::control::check_makecab_version(); }
##
# Getting the include path from the settings in zip list
diff --git a/solenv/bin/modules/installer/control.pm
b/solenv/bin/modules/installer/control.pm
index efc6331..57659a1 100644
--- a/solenv/bin/modules/installer/control.pm
+++ b/solenv/bin/modules/installer/control.pm
@@ -79,6 +79,12 @@ sub check_system_path
# All platforms: zip
# Windows only: msiinfo.exe, msidb.exe, uuidgen.exe, makecab.exe,
msitran.exe, expand.exe for msi database and packaging
+if ($ENV{'CROSS_COMPILING'} eq 'YES')
+{
+# we build our own msi* etc. tools when cross-compiling
+$ENV{'PATH'} .= $installer::globals::pathseparator .
$ENV{'OUTDIR_FOR_BUILD'} . '/bin';
+}
+
my $onefile;
my $error = 0;
my $pathvariable = $ENV{'PATH'};
@@ -103,7 +109,11 @@ sub check_system_path
if (($installer::globals::iswin) ($installer::globals::iswindowsbuild))
{
-@needed_files_in_path = (zip.exe, msiinfo.exe, msidb.exe,
uuidgen.exe, makecab.exe, msitran.exe, expand.exe);
+@needed_files_in_path = (zip.exe, msiinfo.exe, msidb.exe,
uuidgen, makecab.exe, msitran.exe, expand.exe);
+}
+elsif ($installer::globals::isunix $installer::globals::packageformat
eq 'msi')
+{
+@needed_files_in_path = (zip, msiinfo.exe, msidb.exe, uuidgen,
makecab.exe, msitran.exe, cabextract);
}
elsif ($installer::globals::iswin)
{
@@ -168,6 +178,10 @@ sub get_makecab_version
my $makecabversion = -1;
my $systemcall = makecab.exe |;
+if ( $installer::globals::isunix )
+{
+$systemcall = $ENV{'OUTDIR_FOR_BUILD'}/bin/makecab.exe |;
+}
my @makecaboutput = ();
open (CAB, $systemcall);
diff --git a/solenv/bin/modules/installer/globals.pm
b/solenv/bin/modules/installer/globals.pm
index ddc2e21..09b3b2d 100644
--- a/solenv/bin/modules/installer/globals.pm
+++ b/solenv/bin/modules/installer/globals.pm
@@ -462,7 +462,7 @@ BEGIN
$libextension = \.dll;
$isunix = 0;
$iswin = 1;
-$archiveformat = .zip;
+$archiveformat = .zip;
%savedmapping = ();
%savedrevmapping = ();
%savedrev83mapping = ();
diff --git a/solenv/bin/modules/installer/windows/msiglobal.pm
b/solenv/bin/modules/installer/windows/msiglobal.pm
index 93cc78c..e9bd828 100644
--- a/solenv/bin/modules/installer/windows/msiglobal.pm
+++ b/solenv/bin/modules/installer/windows/msiglobal.pm
@@ -1272,7 +1272,7 @@ sub get_guid_list
# -c for uppercase output
my $systemcall = $uuidgen -n$number |;
-if ( $ENV{'CROSS_COMPILING'} eq 'YES' )
+if ( $installer::globals::isunix )
{
# -n is not present in the non-windows uuidgen
$systemcall = for I in `seq 1 $number` ; do uuidgen ; done |;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/bin
solenv/bin/modules/installer/control.pm |4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
New commits:
commit 95d6675fd89f44bf499ec4fc5ed48f547cba80fa
Author: Andras Timar ati...@suse.com
Date: Thu Jul 19 08:03:08 2012 +0200
skip empty lines in msi-encodinglist.txt
Change-Id: I1dbcf68c9581e5b66df0f4485d73ca19c5168dd9
diff --git a/solenv/bin/modules/installer/control.pm
b/solenv/bin/modules/installer/control.pm
index 43694b7..efc6331 100644
--- a/solenv/bin/modules/installer/control.pm
+++ b/solenv/bin/modules/installer/control.pm
@@ -417,6 +417,8 @@ sub read_encodinglist
if ( $line =~ /^\s*\#/ ) { next; } # this is a comment line
+if ( $line =~ /^$/ ) { next; } # this is an empty line
+
if ( $line =~ /^(.*?)(\#.*)$/ ) { $line = $1; } # removing comments
after #
if ( $line =~ /^\s*([\w-]+)\s*(\d+)\s*(\d+)\s*$/ )
@@ -430,7 +432,7 @@ sub read_encodinglist
}
else
{
-installer::exiter::exit_program(ERROR: Wrong syntax in Windows
encoding list $installer::globals::encodinglistname : en-US 1252 1033 !,
read_encodinglist);
+installer::exiter::exit_program(ERROR: Wrong syntax in Windows
encoding list $installer::globals::encodinglistname in line $i.,
read_encodinglist);
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/bin
solenv/bin/modules/installer/windows/property.pm |3 ---
1 file changed, 3 deletions(-)
New commits:
commit 6af68b494dafcc6822463a0445692929735eb0af
Author: Andras Timar ati...@suse.com
Date: Thu Jun 21 12:50:39 2012 +0200
fdo#49919 Don't default to desktop pollution
Change-Id: I4b9fda0f81d43cab80a015a2eb7374a94f3da7de
diff --git a/solenv/bin/modules/installer/windows/property.pm
b/solenv/bin/modules/installer/windows/property.pm
index 32195e1..9f29195 100644
--- a/solenv/bin/modules/installer/windows/property.pm
+++ b/solenv/bin/modules/installer/windows/property.pm
@@ -324,9 +324,6 @@ sub set_important_properties
{
my $onepropertyline = DESKTOPLINKEXISTS . \t . 1 . \n;
push(@{$propertyfile}, $onepropertyline);
-
-$onepropertyline = CREATEDESKTOPLINK . \t . 1 . \n; # Setting
the default
-push(@{$propertyfile}, $onepropertyline);
}
if ( $installer::globals::patch )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/bin
solenv/bin/addsym-macosx.sh | 22 ++
1 file changed, 22 insertions(+)
New commits:
commit 4965c3cc4b48170ce1c3bc27d033ae9132ae1e4a
Author: Tor Lillqvist t...@iki.fi
Date: Mon May 14 20:08:30 2012 +0300
Add some more information
Change-Id: Iafa671028ce73c2ec3a2706dda60f58aaeda7fda
diff --git a/solenv/bin/addsym-macosx.sh b/solenv/bin/addsym-macosx.sh
index b69f59f..89d8912 100755
--- a/solenv/bin/addsym-macosx.sh
+++ b/solenv/bin/addsym-macosx.sh
@@ -22,8 +22,30 @@ s#^#^#
s#$#$#' | tr '\n' '|' | sed s#|\$## $2
# Please note that the awk expression expects to get the output of 'nm -gx'!
+
+# The fields in the nm -gx output are apparently (see
+# /usr/include/mach-o/nlist.h):
+
+# xx xx symbol
+# !! ! !n_value
+# !! ! n_desc
+# !! n_sect
+# !n_type
+# n_strx
+
+# Original comment:
# On Panther we have to filter out symbols with a value 1f otherwise external
# symbols will erroneously be added to the generated export symbols list file.
+#
+# Of course it isn't actually the value (n_value) of the symbol that
+# is meant, but (as is seen from the use of $2) the n_type .
+#
+# Now, what does a n_type of 1f actually mean? The N_PEXT bit (0x10)
+# is on and the N_EXT (0x01) bit is on. It is what in Mach-O
+# documentation is called private external. This includes symbols
+# produced by using -fvisibility=hidden. Whether that is a problem I
+# don't know.
+#
awk -v SYMBOLSREGEXP=`cat $2` '
match ($6,SYMBOLSREGEXP) 0 $6 !~ /_GLOBAL_/ { if (($2 != 1) ( $2 !=
1f ) ) print $6 }'
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/bin
solenv/bin/modules/installer/windows/file.pm |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit bf799459d8e8eabd764450c82450036c5d0e742f
Author: Andras Timar ati...@suse.com
Date: Thu May 24 22:36:21 2012 +0200
fdo#48087 fill in MsiFileHash table for unversioned files
Change-Id: I7d409fbe813f07dc87301b6c6f01a40f531d368c
diff --git a/solenv/bin/modules/installer/windows/file.pm
b/solenv/bin/modules/installer/windows/file.pm
index f694fbe..2279129 100644
--- a/solenv/bin/modules/installer/windows/file.pm
+++ b/solenv/bin/modules/installer/windows/file.pm
@@ -1018,7 +1018,7 @@ sub create_files_table
if ( ! exists($installer::globals::languageproperties{$property})
) { $installer::globals::languageproperties{$property} = $value; }
}
-if ( $installer::globals::prepare_winpatch )
+unless ( $file{'Version'} )
{
my $path = $onefile-{'sourcepath'};
if ( $^O =~ /cygwin/i ) { $path = $onefile-{'cyg_sourcepath'}; }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/bin
solenv/bin/addsym.awk |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 9b72a692ee3ef3381a0881ead4afa5bd73fff776
Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com
Date: Mon May 21 13:19:56 2012 +0200
don't let the Mac/PPC linker complain when the symbol isn't used
diff --git a/solenv/bin/addsym.awk b/solenv/bin/addsym.awk
index a9e64fb..181a077 100644
--- a/solenv/bin/addsym.awk
+++ b/solenv/bin/addsym.awk
@@ -43,7 +43,7 @@ END {
print GLIBCXX_3.4 {
print global:
print _ZGVNSt7num_put*; _ZNSt7num_put*;
-print _ZNSs4_Rep20_S_empty_rep_storageE;
+print _ZNSs4_Rep20_S_empty_rep_storageE*;
print };
}
state == 2 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/bin
solenv/bin/make_installer.pl |6 +++---
solenv/bin/modules/installer/globals.pm|1 +
solenv/bin/modules/installer/windows/file.pm | 21 -
solenv/bin/modules/installer/windows/removefile.pm |8 ++--
4 files changed, 26 insertions(+), 10 deletions(-)
New commits:
commit 7e90e00f1499eaf4139ed53c2b896f4b4fc73fe5
Author: Andras Timar ati...@suse.com
Date: Tue May 15 20:59:18 2012 +0200
fdo#48914 uninstall process should remove .pyc files from install directory
When install location is writable to user (typical on Windows XP),
Python generates .pyc files. We can remove them using the RemoveFile table
in MSI. We generate an entry for each .py file in the install set.
Change-Id: I314582d52162c6f3ae3acc72de9d620680fb23e0
diff --git a/solenv/bin/make_installer.pl b/solenv/bin/make_installer.pl
index 1413b5f..06ff6b9 100644
--- a/solenv/bin/make_installer.pl
+++ b/solenv/bin/make_installer.pl
@@ -1594,12 +1594,12 @@ for ( my $n = 0; $n =
$#installer::globals::languageproducts; $n++ )
# Collection all available directory trees
installer::windows::directory::collectdirectorytrees($directoriesforepmarrayref);
-$filesinproductlanguageresolvedarrayref =
installer::windows::file::create_files_table($filesinproductlanguageresolvedarrayref,
\@allfilecomponents, $newidtdir, $allvariableshashref, $uniquefilename,
$allupdatesequences, $allupdatecomponents, $allupdatefileorder);
-if ( $installer::globals::updatedatabase ) {
installer::windows::file::check_file_sequences($allupdatefileorder,
$allupdatecomponentorder); }
-
# Attention: The table Director.idt contains language specific
strings - parameter: $languagesarrayref !
installer::windows::directory::create_directory_table($directoriesforepmarrayref,
$languagesarrayref, $newidtdir, $allvariableshashref, $shortdirname,
$loggingdir);
+$filesinproductlanguageresolvedarrayref =
installer::windows::file::create_files_table($filesinproductlanguageresolvedarrayref,
$directoriesforepmarrayref, \@allfilecomponents, $newidtdir,
$allvariableshashref, $uniquefilename, $allupdatesequences,
$allupdatecomponents, $allupdatefileorder);
+if ( $installer::globals::updatedatabase ) {
installer::windows::file::check_file_sequences($allupdatefileorder,
$allupdatecomponentorder); }
+
# Attention: The table Registry.idt contains language specific
strings - parameter: $languagesarrayref !
installer::windows::registry::create_registry_table($registryitemsinproductlanguageresolvedarrayref,
\@allregistrycomponents, $newidtdir, $languagesarrayref, $allvariableshashref);
diff --git a/solenv/bin/modules/installer/globals.pm
b/solenv/bin/modules/installer/globals.pm
index fed1453..ddc2e21 100644
--- a/solenv/bin/modules/installer/globals.pm
+++ b/solenv/bin/modules/installer/globals.pm
@@ -446,6 +446,7 @@ BEGIN
@forced_properties = (SERVICETAG_PRODUCTNAME,
SERVICETAG_PRODUCTVERSION, SERVICETAG_PARENTNAME, SERVICETAG_SOURCE,
SERVICETAG_URN);
@removedirs = ();
+@removefiletable = ();
@emptypackages = ();
%fontpackageexists = ();
diff --git a/solenv/bin/modules/installer/windows/file.pm
b/solenv/bin/modules/installer/windows/file.pm
index 9108876..f694fbe 100644
--- a/solenv/bin/modules/installer/windows/file.pm
+++ b/solenv/bin/modules/installer/windows/file.pm
@@ -37,6 +37,7 @@ use installer::worker;
use installer::windows::font;
use installer::windows::idtglobal;
use installer::windows::language;
+use installer::windows::component;
##
# Assigning one cabinet file to each file. This is requrired,
@@ -848,7 +849,7 @@ sub collect_shortnames_from_old_database
sub create_files_table
{
-my ($filesref, $allfilecomponentsref, $basedir, $allvariables,
$uniquefilenamehashref, $allupdatesequenceshashref,
$allupdatecomponentshashref, $allupdatefileorderhashref) = @_;
+my ($filesref, $dirref, $allfilecomponentsref, $basedir, $allvariables,
$uniquefilenamehashref, $allupdatesequenceshashref,
$allupdatecomponentshashref, $allupdatefileorderhashref) = @_;
installer::logger::include_timestamp_into_logfile(Performance Info: File
Table start);
@@ -876,6 +877,7 @@ sub create_files_table
installer::windows::idtglobal::write_idt_header(\@filetable, file);
installer::windows::idtglobal::write_idt_header(\@filehashtable,
filehash);
+
installer::windows::idtglobal::write_idt_header(\@installer::globals::removefiletable,
removefile);
for ( my $i = 0; $i = $#{$filesref}; $i++ )
{
@@ -922,6 +924,23 @@ sub create_files_table
push(@filetable, $oneline);
+if ( $file{'File'} =~ /\.py$/ )
+{
+my %removefile = ();
+
+$removefile{'FileKey'} = remove_ . $file{'File'} . c;
+
[Libreoffice-commits] .: solenv/bin
solenv/bin/modules/installer/windows/mergemodule.pm |6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
New commits:
commit 70c92c53d4133fde03c575334597909c4aada5ab
Author: Andras Timar ati...@suse.com
Date: Tue May 15 11:28:35 2012 +0200
fix log entry of mergemodule condition
Change-Id: Id88f38fb806c6178240eb69da69c2e633c2033da
diff --git a/solenv/bin/modules/installer/windows/mergemodule.pm
b/solenv/bin/modules/installer/windows/mergemodule.pm
index 7faa4b5..e60702b 100755
--- a/solenv/bin/modules/installer/windows/mergemodule.pm
+++ b/solenv/bin/modules/installer/windows/mergemodule.pm
@@ -1400,14 +1400,18 @@ sub change_component_table
{
if ( ${$filecontent}[$i] =~
/^\s*(.+?)\t(.*?)\t(.+?)\t(.+?)\t(.*?)\t(.*?)\s*$/ )
{
-$infoline = Adding condition ($5) from scp to component
$1\n;
+$infoline = Adding condition
($mergemodulehash-{'componentcondition'}) from scp2 to component $1\n;
push( @installer::globals::logfileinfo, $infoline);
if ($5)
{
+$infoline = Old condition: $5\nNew condition: ($5)
AND ($mergemodulehash-{'componentcondition'})\n;
+push( @installer::globals::logfileinfo, $infoline);
${$filecontent}[$i] = $1\t$2\t$3\t$4\t($5) AND
($mergemodulehash-{'componentcondition'})\t$6\n;
}
else
{
+$infoline = Old condition: none\nNew condition:
$mergemodulehash-{'componentcondition'}\n;
+push( @installer::globals::logfileinfo, $infoline);
${$filecontent}[$i] =
$1\t$2\t$3\t$4\t$mergemodulehash-{'componentcondition'}\t$6\n;
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/bin
solenv/bin/build.pl |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 59ff796a52bacec17f054ccdafd546680439f8c6
Author: Caolán McNamara caol...@redhat.com
Date: Mon Apr 30 15:00:29 2012 +0100
we must call the make detected at configure time
Change-Id: I57463bdcb8f580866d56741c427fd9882a151b07
diff --git a/solenv/bin/build.pl b/solenv/bin/build.pl
index e634b7c..30f7c7b 100755
--- a/solenv/bin/build.pl
+++ b/solenv/bin/build.pl
@@ -1844,7 +1844,7 @@ sub run_job {
#gbuild_target = $ENV{gb_TAILBUILDTARGET};
}
$gbuild_flags .= ' ' . $ENV{GMAKE_OPTIONS};
-$job_to_do = make -f Makefile $gbuild_flags $gbuild_target
gb_PARTIALBUILD=T;
+$job_to_do = $ENV{GNUMAKE} -f Makefile $gbuild_flags
$gbuild_target gb_PARTIALBUILD=T;
my $make_path = $path;
$make_path =~ s!/prj$!!;
chdir $make_path;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/bin
solenv/bin/create-tags |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 061e4e119cc932dadda976d2b8622f671201a6bd Author: Miklos Vajna vmik...@suse.cz Date: Tue Apr 24 12:25:22 2012 +0200 create-tags: config_host.mk reading diff --git a/solenv/bin/create-tags b/solenv/bin/create-tags index a61c5b6..0388928 100755 --- a/solenv/bin/create-tags +++ b/solenv/bin/create-tags @@ -1,7 +1,7 @@ #!/usr/bin/env bash if [ -z $INPATH ] ; then - INPATH=$(grep INPATH= ./config_host.mk | sed -e s/INPATH=//) + INPATH=$(grep INPATH= ./config_host.mk | sed -e s/export INPATH=//) fi if [ -z $INPATH ] ; then echo could not determine INPATH 2 ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/bin
solenv/bin/modules/installer/parameter.pm |5 -
1 file changed, 4 insertions(+), 1 deletion(-)
New commits:
commit 071d6daf5c798e89887a84a17fb3b64824fdbc6f
Author: Tomas Chvatal tchva...@suse.cz
Date: Mon Apr 23 14:39:39 2012 +0200
Fix undefined destdir if the directory was not existing prior the run.
diff --git a/solenv/bin/modules/installer/parameter.pm
b/solenv/bin/modules/installer/parameter.pm
index 6d99aaa..198a381 100644
--- a/solenv/bin/modules/installer/parameter.pm
+++ b/solenv/bin/modules/installer/parameter.pm
@@ -152,7 +152,10 @@ sub getparameter
elsif ($param eq -destdir)# new parameter for simple installer
{
$installer::globals::rootpath ne die must set destdir
before -i or -simple;
-$installer::globals::destdir = Cwd::realpath( shift @ARGV );
+
+ my $path = shift(@ARGV);
+ mkdir $path;
+$installer::globals::destdir = Cwd::realpath($path);
}
elsif ($param eq -simple) # new parameter for simple installer
{
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/bin
solenv/bin/modules/installer/parameter.pm |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit f3480645bd444649491942c501ec679a46eb8d09
Author: Tomas Chvatal tchva...@suse.cz
Date: Mon Apr 23 14:42:26 2012 +0200
Whitespace torture
diff --git a/solenv/bin/modules/installer/parameter.pm
b/solenv/bin/modules/installer/parameter.pm
index 198a381..e84dbdc 100644
--- a/solenv/bin/modules/installer/parameter.pm
+++ b/solenv/bin/modules/installer/parameter.pm
@@ -153,8 +153,8 @@ sub getparameter
{
$installer::globals::rootpath ne die must set destdir
before -i or -simple;
- my $path = shift(@ARGV);
- mkdir $path;
+my $path = shift(@ARGV);
+mkdir $path;
$installer::globals::destdir = Cwd::realpath($path);
}
elsif ($param eq -simple) # new parameter for simple installer
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/bin
solenv/bin/ooinstall |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit caaa4dc8fd7938d333a26562dfb5db6ef76ffd7f
Author: LuboÅ¡ LuÅák l.lu...@suse.cz
Date: Fri Apr 13 10:01:38 2012 +0200
add missing trailing space
diff --git a/solenv/bin/ooinstall b/solenv/bin/ooinstall
index 693397a..f1866c6 100755
--- a/solenv/bin/ooinstall
+++ b/solenv/bin/ooinstall
@@ -136,7 +136,7 @@ if ($ENV{BUILD_TYPE} =~ m/ODK/) {
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 .
+ -buildid $BUILD $destdir $strip $msi .
-simple $path) die Failed to install: $!;
}
print Installer finished\n;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/bin
solenv/bin/macosx-change-install-names.pl |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 0c80ad06fd96a4fec062a7edfff12bb65ef204b4
Author: David Ostrovsky david.ostrov...@gmx.de
Date: Fri Apr 13 15:50:38 2012 +0200
fix macosx build
diff --git a/solenv/bin/macosx-change-install-names.pl
b/solenv/bin/macosx-change-install-names.pl
index 91bea7e..ad0318a 100644
--- a/solenv/bin/macosx-change-install-names.pl
+++ b/solenv/bin/macosx-change-install-names.pl
@@ -53,7 +53,7 @@ sub action($$$)
('app/UREBIN/URELIB' = '@executable_path/../lib',
'app/OOO/URELIB' = '@executable_path/../ure-link/lib',
'app/OOO/OOO' = '@executable_path',
- 'app/SDK/URELIB' = '@executable_path/../../ure-link/lib',
+ 'app/SDKBIN/URELIB' = '@executable_path/../../ure-link/lib',
'app/NONE/URELIB' = '@__VIA_LIBRARY_PATH__',
'app/NONE/OOO' = '@__VIA_LIBRARY_PATH__',
'app/NONE/NONE' = '@__VIA_LIBRARY_PATH__',
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/bin
solenv/bin/modules/installer/windows/property.pm |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit ee7084c4f720c932df67c8ff033dab4d8d556179
Author: Andras Timar ati...@suse.com
Date: Wed Apr 11 16:01:06 2012 +0200
set correct value of FINDPRODUCT property
diff --git a/solenv/bin/modules/installer/windows/property.pm
b/solenv/bin/modules/installer/windows/property.pm
index 27b19d7..8650883 100644
--- a/solenv/bin/modules/installer/windows/property.pm
+++ b/solenv/bin/modules/installer/windows/property.pm
@@ -255,9 +255,9 @@ sub set_important_properties
push(@{$propertyfile}, $onepropertyline);
}
-if (( $allvariables-{'PRODUCTNAME'} ) (
$allvariables-{'PRODUCTVERSION'} ) ( $allvariables-{'MANUFACTURER'} ) (
$allvariables-{'PRODUCTCODE'} ))
+if (( $allvariables-{'PRODUCTNAME'} ) (
$allvariables-{'PRODUCTVERSION'} ) ( $allvariables-{'REGISTRYLAYERNAME'} ))
{
-my $onepropertyline = FINDPRODUCT . \t . Software\\ .
$allvariables-{'MANUFACTURER'} . \\ . $allvariables-{'PRODUCTNAME'} .
$allvariables-{'PRODUCTADDON'} . \\ . $allvariables-{'PRODUCTVERSION'} .
\\ . $allvariables-{'PRODUCTCODE'} . \n;
+my $onepropertyline = FINDPRODUCT . \t . Software\\LibreOffice .
\\ . $allvariables-{'REGISTRYLAYERNAME'} . \\ .
$allvariables-{'PRODUCTNAME'} . \\ . $allvariables-{'PRODUCTVERSION'} .
\n;
push(@{$propertyfile}, $onepropertyline);
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/bin
solenv/bin/make_installer.pl |1
solenv/bin/modules/installer/windows/patch.pm | 155 --
2 files changed, 156 deletions(-)
New commits:
commit 13a7880bc0dfc1248f1fdc884ca257248bfad2bb
Author: Andras Timar ati...@suse.com
Date: Tue Apr 10 21:01:07 2012 +0200
remove unused installer::windows::patch module
diff --git a/solenv/bin/make_installer.pl b/solenv/bin/make_installer.pl
index 5cc8306..baf4b08 100644
--- a/solenv/bin/make_installer.pl
+++ b/solenv/bin/make_installer.pl
@@ -77,7 +77,6 @@ use installer::windows::media;
use installer::windows::mergemodule;
use installer::windows::msiglobal;
use installer::windows::msp;
-use installer::windows::patch;
use installer::windows::property;
use installer::windows::removefile;
use installer::windows::registry;
diff --git a/solenv/bin/modules/installer/windows/patch.pm
b/solenv/bin/modules/installer/windows/patch.pm
deleted file mode 100644
index 5364641..000
--- a/solenv/bin/modules/installer/windows/patch.pm
+++ /dev/null
@@ -1,155 +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::patch;
-
-use installer::exiter;
-use installer::files;
-use installer::globals;
-use installer::windows::idtglobal;
-
-
-# Creating the file Upgrade.idt dynamically
-# Content:
-# UpgradeCode VersionMin VersionMax Language Attributes Remove ActionProperty
-
-
-sub update_patch_tables
-{
-my ($basedir, $allvariables) = @_;
-
-my $reglocatfile = ;
-my $appsearchfile = ;
-
-my $reglocatfilename = $basedir . $installer::globals::separator .
RegLocat.idt;
-my $appsearchfilename = $basedir . $installer::globals::separator .
AppSearc.idt;
-my $signaturefilename = $basedir . $installer::globals::separator .
Signatur.idt;
-
-if ( -f $reglocatfilename )
-{
-$reglocatfile = installer::files::read_file($reglocatfilename);
-}
-else
-{
-my @reglocattable = ();
-$reglocatfile = \@reglocattable;
-installer::windows::idtglobal::write_idt_header($reglocatfile,
reglocat);
-}
-
-if ( -f $appsearchfilename )
-{
-$appsearchfile = installer::files::read_file($appsearchfilename);
-}
-else
-{
-my @appsearchtable = ();
-$appsearchfile = \@appsearchtable;
-installer::windows::idtglobal::write_idt_header($appsearchfile,
appsearch);
-}
-
-if ( -f $signaturefilename )
-{
-$signaturefile = installer::files::read_file($signaturefilename);
-}
-else
-{
-my @signaturetable = ();
-$signaturefile = \@signaturetable;
-installer::windows::idtglobal::write_idt_header($signaturefile,
signatur);
-}
-
-# Writing content into this tables
-
-if ( ! $allvariables-{'PATCHCODEFILE'} ) {
installer::exiter::exit_program(ERROR: Variable PATCHCODEFILE must be defined
for Windows patches!, update_patch_tables); }
-my $patchcodesfilename = $installer::globals::idttemplatepath .
$installer::globals::separator . $allvariables-{'PATCHCODEFILE'};
-my $patchcodefile = installer::files::read_file($patchcodesfilename);
-
-my $number = 0;
-
-for ( my $i = 0; $i = $#{$patchcodefile}; $i++ )
-{
-my $oneline = ${$patchcodefile}[$i];
-
-if ( $oneline =~ /^\s*\#/ ) { next; } # this is a comment line
-if ( $oneline =~ /^\s*$/ ) { next; }
-
-my $code = ;
-if ( $oneline =~ /^\s*(\S+)\s/ ) { $code = $1; }
-
-foreach my $name ( sort keys %installer::globals::installlocations )
-{
-$number++;
-my $signature = dir . $number . user;
-my $rootvalue = 1;
-my $registryname = ;
-
[Libreoffice-commits] .: solenv/bin
solenv/bin/modules/installer/windows/msiglobal.pm |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 5a5f77c3b57fb1c91a178190c1db12606295bf17
Author: Andras Timar ati...@suse.com
Date: Tue Apr 10 21:38:10 2012 +0200
use correct gid of version.ini
diff --git a/solenv/bin/modules/installer/windows/msiglobal.pm
b/solenv/bin/modules/installer/windows/msiglobal.pm
index 9ff56c2..52711c6 100644
--- a/solenv/bin/modules/installer/windows/msiglobal.pm
+++ b/solenv/bin/modules/installer/windows/msiglobal.pm
@@ -1833,7 +1833,7 @@ sub put_msiproductversion_into_bootstrapfile
{
my $onefile = ${$filesref}[$i];
-if ( $onefile-{'gid'} eq gid_Profile_Version_Ini )
+if ( $onefile-{'gid'} eq gid_Brand_Profile_Version_Ini )
{
my $file = installer::files::read_file($onefile-{'sourcepath'});
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/bin
solenv/bin/linkoo |7 +--
1 file changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 6850bd15228eb496ba62fa08ef4f628336d63898
Author: Jan Holesovsky ke...@suse.cz
Date: Mon Mar 19 15:35:23 2012 +0100
Improve linkoo for MinGW.
diff --git a/solenv/bin/linkoo b/solenv/bin/linkoo
index 97ae2e3..daef867 100755
--- a/solenv/bin/linkoo
+++ b/solenv/bin/linkoo
@@ -113,7 +113,8 @@ my $brand_program_dir = 'program';
my $ure_lib_dir = 'ure-link/lib';
my $win_ure_lib_dir = 'URE/bin';
-my @exceptions = ( 'cppuhelper', 'libsunjavaplugin', 'libjvmfwk' );
+my @exceptions = ( 'libsunjavaplugin', 'libjvmfwk' );
+push @exceptions, 'cppuhelper' if ($TARGET ne 'wntgcci.pro');
my $bin;
$bin = |\\.bin if ($TARGET eq 'wntgcci.pro');
@@ -419,6 +420,8 @@ if (!-f $OOO_INSTALL/ . $brand_program_dir . /ooenv) {
evilness ('do');
-print \nlinkoo finished, please don't forget to source ooenv before
./soffice.\n;
+print \nlinkoo finished;
+print , please don't forget to source ooenv before ./soffice. if ($TARGET ne
'wntgcci.pro');
+print \n;
# vim:set shiftwidth=4 softtabstop=4 expandtab:
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/bin
solenv/bin/modules/installer/strip.pm |6 -- 1 file changed, 4 insertions(+), 2 deletions(-) New commits: commit 36c2658145c84a41a1a30e940b6b7bb7550354a5 Author: Tim Retout tim.ret...@smoothwall.net Date: Wed Mar 14 22:26:28 2012 + Turn on strict and warnings for install::strip. diff --git a/solenv/bin/modules/installer/strip.pm b/solenv/bin/modules/installer/strip.pm index 154f39b..7f0a39a 100644 --- a/solenv/bin/modules/installer/strip.pm +++ b/solenv/bin/modules/installer/strip.pm @@ -27,7 +27,9 @@ package installer::strip; -use installer::converter; +use strict; +use warnings; + use installer::globals; use installer::logger; use installer::pathanalyzer; @@ -107,7 +109,7 @@ sub strip_libraries my $shortfilename = $sourcefilename; installer::pathanalyzer::make_absolute_filename_to_relative_filename(\$shortfilename); -$infoline = Strip: $shortfilename\n; +my $infoline = Strip: $shortfilename\n; push( @installer::globals::logfileinfo, $infoline); # copy file into directory for stripped libraries ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/bin
solenv/bin/build.pl |1 +
1 file changed, 1 insertion(+)
New commits:
commit 27164d22884d27009057d13a86578419c100e2e2
Author: Korrawit Pruegsanusak detective.conan.1...@gmail.com
Date: Wed Mar 7 14:54:45 2012 +0700
if build fail, show broken module name
This solves
http://lists.freedesktop.org/archives/libreoffice/2012-February/025772.html
diff --git a/solenv/bin/build.pl b/solenv/bin/build.pl
index 9d9bcd7..1b8ed64 100755
--- a/solenv/bin/build.pl
+++ b/solenv/bin/build.pl
@@ -1652,6 +1652,7 @@ sub build_dependent {
};
if (defined $modules_with_errors{$dependencies_hash}) {
+push(@broken_modules_names,
$module_by_hash{$dependencies_hash});
cancel_build();
}
mp_success_exit();
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/bin tail_build/README
solenv/bin/build.pl |6 +-
tail_build/README |4
2 files changed, 9 insertions(+), 1 deletion(-)
New commits:
commit 10512ce508e4000e7438738c789421fd0bce2772
Author: Michael Meeks michael.me...@suse.com
Date: Tue Feb 28 14:54:28 2012 +
build.pl: add a warning about the cost of: make tail_build.clean
diff --git a/solenv/bin/build.pl b/solenv/bin/build.pl
index 31e0f73..9d9bcd7 100755
--- a/solenv/bin/build.pl
+++ b/solenv/bin/build.pl
@@ -1514,7 +1514,11 @@ sub cancel_build {
print STDERR
---\n;
print STDERR To rebuild a specific module:\n;
print STDERR \n;
-print STDERR $ENV{GNUMAKE} $module.clean #optional\n;
+if ($module eq 'tail_build') {
+ print STDERR $ENV{GNUMAKE} $module.clean # not recommended, this will
re-build almost everything\n;
+} else {
+ print STDERR $ENV{GNUMAKE} $module.clean # optional\n;
+}
print STDERR $ENV{GNUMAKE} $module\n;
print STDERR \n;
print STDERR when the problem is isolated and fixed, re-run
'$ENV{GNUMAKE}'\n;
diff --git a/tail_build/README b/tail_build/README
index 4e29fb1..88ff437 100644
--- a/tail_build/README
+++ b/tail_build/README
@@ -15,3 +15,7 @@ To migrate a module foo under tail_build, one should:
* remove the module foo from postprocess/prj/build.lst dependencies
* remove the module foo from tail_build/prj/build.lst dependencies
* add the module name in Module_tail_build.mk at the root of bootstrap
+
+This module of course, takes a lot of thought, and dependency work /
+statting until it has finished it's business, knows exactly what to
+re-build, and can start building just that.
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/bin
solenv/bin/macosx-change-install-names.pl |1 + 1 file changed, 1 insertion(+) New commits: commit 55cece225238e634b8a8ebd0445a9aca4c5c57eb Author: Stephan Bergmann sberg...@redhat.com Date: Thu Feb 23 12:43:25 2012 +0100 Add shl/LOADER/URELIB to make --without-sytem-libxml work on Mac OS X I doubt that the LOADER token is needed at all, but will investigate that later. diff --git a/solenv/bin/macosx-change-install-names.pl b/solenv/bin/macosx-change-install-names.pl index 57f4e79..290a488 100644 --- a/solenv/bin/macosx-change-install-names.pl +++ b/solenv/bin/macosx-change-install-names.pl @@ -42,6 +42,7 @@ sub action($$$) 'shl/OOO/URELIB' = '@loader_path/../ure-link/lib', 'shl/OOO/OOO' = '@loader_path', 'shl/LOADER/LOADER' = '@loader_path', + 'shl/LOADER/URELIB' = '@loader_path/../ure-link/lib', 'shl/OXT/URELIB' = '@executable_path/urelibs', 'shl/NONE/URELIB' = '@__VIA_LIBRARY_PATH__', 'shl/OOO/NONE' = '@__VIA_LIBRARY_PATH__', ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/bin
solenv/bin/modules/installer/parameter.pm | 62 +++---
1 file changed, 56 insertions(+), 6 deletions(-)
New commits:
commit 249059454f35a55bd7f6756d2b361f8c3e07c8e0
Author: Caolán McNamara caol...@redhat.com
Date: Thu Feb 23 14:27:53 2012 +
Revert Replace installer::parameter::make_absolute_path.
This reverts commit 8b65b2a3842a90ba565285f0cb796c5d76eef4ce.
Because windows install sets didn't get generated afterwards,
possibly due to cygwin absolute path complexity
diff --git a/solenv/bin/modules/installer/parameter.pm
b/solenv/bin/modules/installer/parameter.pm
index 0930144..0686e13 100644
--- a/solenv/bin/modules/installer/parameter.pm
+++ b/solenv/bin/modules/installer/parameter.pm
@@ -28,8 +28,6 @@
package installer::parameter;
use Cwd;
-use File::Spec::Functions qw(rel2abs);
-
use installer::exiter;
use installer::files;
use installer::globals;
@@ -196,6 +194,58 @@ sub control_fundamental_parameter
}
}
+##
+# The path parameters can be relative or absolute.
+# This function creates absolute paths.
+##
+
+sub make_path_absolute
+{
+my ($pathref) = @_;
+
+if ( $installer::globals::isunix )
+{
+if (!($$pathref =~ /^\s*\//)) # this is a relative unix path
+{
+$$pathref = cwd() . $installer::globals::separator . $$pathref;
+}
+}
+
+if ( $installer::globals::iswin )
+{
+if ( $^O =~ /cygwin/i )
+{
+if ( $$pathref !~ /^\s*\// $$pathref !~ /^\s*\w\:/ ) # not an
absolute POSIX or DOS path
+{
+$$pathref = cwd() . $installer::globals::separator . $$pathref;
+}
+my $p = $$pathref;
+chomp( $p );
+my $q = '';
+# Avoid the $(LANG) problem.
+if ($p =~ /(\A.*)(\$\(.*\Z)/) {
+$p = $1;
+$q = $2;
+}
+$p =~ s/\\//g;
+chomp( $p = qx{cygpath -w $p} );
+$$pathref = $p.$q;
+# Use windows paths, but with '/'s.
+$$pathref =~ s/\\/\//g;
+}
+else
+{
+if (!($$pathref =~ /^\s*\w\:/)) # this is a relative windows path
(no dos drive)
+{
+$$pathref = cwd() . $installer::globals::separator . $$pathref;
+
+$$pathref =~ s/\//\\/g;
+}
+}
+}
+$$pathref =~ s/[\/\\]\s*$//;# removing ending slashes
+}
+
##
# Setting some global parameters
# This has to be expanded with furher platforms
@@ -337,7 +387,7 @@ sub setglobalvariables
if (!($installer::globals::unpackpath eq ))
{
-$installer::globals::unpackpath =
rel2abs($installer::globals::unpackpath);
+make_path_absolute(\$installer::globals::unpackpath);
}
$installer::globals::unpackpath =~
s/\Q$installer::globals::separator\E\s*$//;
@@ -427,7 +477,7 @@ sub control_required_parameter
if (!($installer::globals::idttemplatepath eq )) # idttemplatepath
set, relative or absolute?
{
-$installer::globals::idttemplatepath =
rel2abs($installer::globals::idttemplatepath);
+make_path_absolute(\$installer::globals::idttemplatepath);
}
installer::remover::remove_ending_pathseparator(\$installer::globals::idttemplatepath);
@@ -436,7 +486,7 @@ sub control_required_parameter
if (!($installer::globals::idtlanguagepath eq )) # idtlanguagepath
set, relative or absolute?
{
-$installer::globals::idtlanguagepath =
rel2abs($installer::globals::idtlanguagepath);
+make_path_absolute(\$installer::globals::idtlanguagepath);
}
installer::remover::remove_ending_pathseparator(\$installer::globals::idtlanguagepath);
@@ -476,7 +526,7 @@ sub control_required_parameter
if (( $installer::globals::patch ) (
$installer::globals::issolarispkgbuild ) (
$installer::globals::patchincludepath ))
{
-$installer::globals::patchincludepath =
rel2abs($installer::globals::patchincludepath);
+make_path_absolute(\$installer::globals::patchincludepath);
$installer::globals::patchincludepath =
installer::converter::make_path_conform($installer::globals::patchincludepath);
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/bin
solenv/bin/modules/installer/scriptitems.pm |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 9eb6527dae59c661942a7cd91c4d4b317cd33ef0 Author: Tim Retout t...@retout.co.uk Date: Wed Feb 22 19:41:22 2012 + Re-enable errors for help pack files with no source. diff --git a/solenv/bin/modules/installer/scriptitems.pm b/solenv/bin/modules/installer/scriptitems.pm index 3252058..f91e019 100644 --- a/solenv/bin/modules/installer/scriptitems.pm +++ b/solenv/bin/modules/installer/scriptitems.pm @@ -1379,7 +1379,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 } ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/bin
solenv/bin/make_installer.pl |9 ++---
1 file changed, 2 insertions(+), 7 deletions(-)
New commits:
commit 617c91401651d96f4ad48b529efd8d2390ae7a4b
Author: Tim Retout t...@retout.co.uk
Date: Wed Feb 22 22:41:03 2012 +
Remove unnecessary $run variable from installer.
diff --git a/solenv/bin/make_installer.pl b/solenv/bin/make_installer.pl
index 685881a..e2a94d4 100644
--- a/solenv/bin/make_installer.pl
+++ b/solenv/bin/make_installer.pl
@@ -1269,18 +1269,14 @@ for ( my $n = 0; $n =
$#installer::globals::languageproducts; $n++ )
if ( $installer::globals::linuxlinkrpms =~
/\b$onepackagename\b/ )
{
-my $run = 0;
-
-if (( $installer::globals::makelinuxlinkrpm ) ( ! $run
))
+if ( $installer::globals::makelinuxlinkrpm )
{
$filesinpackage =
\@installer::globals::linuxpatchfiles;
$linksinpackage = \@installer::globals::linuxlinks;
$installer::globals::makelinuxlinkrpm = 0;
if ( $installer::globals::patch ) {
$installer::globals::call_epm = 1; } # enabling packing again
-$run = 1;
}
-
-if (( ! $installer::globals::makelinuxlinkrpm ) ( !
$run ))
+else
{
$filesinpackage =
installer::worker::prepare_linuxlinkfiles($filesinpackage);
$linksinpackage =
installer::worker::prepare_forced_linuxlinkfiles($linksinpackage);
@@ -1288,7 +1284,6 @@ for ( my $n = 0; $n =
$#installer::globals::languageproducts; $n++ )
$installer::globals::add_required_package =
$packagename . u;
if ( $installer::globals::patch ) {
$installer::globals::call_epm = 0; } # no packing of core module in patch
$shellscriptsfilename = ; # shell scripts only need
to be included into the link rpm
-$run = 1;
}
}
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/bin
solenv/bin/linkoo |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 43eefa11eb1d025b7967e75574f07603f6ac8a96
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date: Tue Feb 21 13:43:04 2012 +0100
pythonloader.uno.so, libpyuno and pyuno are duplicates for linkoo too
diff --git a/solenv/bin/linkoo b/solenv/bin/linkoo
index 5c15611..97ae2e3 100755
--- a/solenv/bin/linkoo
+++ b/solenv/bin/linkoo
@@ -136,7 +136,7 @@ my %replaceable = (
my @search_dirs = ( 'lib', 'bin', 'class' );
-my @known_duplicates = ( 'db.jar', 'libi18n', 'libnssckbi', 'libnssdbm',
'libsqlite3', 'libnssutil3' );
+my @known_duplicates = ( 'db.jar', 'libi18n', 'libnssckbi', 'libnssdbm',
'libsqlite3', 'libnssutil3', 'pythonloader.uno', 'pyuno', 'libpyuno' );
sub sniff_target($)
{
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/bin
solenv/bin/ooinstall |4
1 file changed, 4 deletions(-)
New commits:
commit 73da209a2775583ece3218893fd5659c1290cd70
Author: Stephan Bergmann sberg...@redhat.com
Date: Mon Feb 20 11:11:49 2012 +0100
Do not remove the destdir prefix in any case
708def7d94bb76ef137572a364d2643402dc590b made that code conditional on
!$do_link
so that it worked right for the case where making dev-install calls
ooinstall
-l. However, that code now starts to fail also in the --disable-linkoo case
(where building dev-install calls ooinstall w/o -l). I have no idea whether
that code serves any real purpose in any actual use case, so remove it
completely for now.
diff --git a/solenv/bin/ooinstall b/solenv/bin/ooinstall
index 794e81b..b7a5d94 100755
--- a/solenv/bin/ooinstall
+++ b/solenv/bin/ooinstall
@@ -48,10 +48,6 @@ for $arg (@ARGV) {
# Cwd::realpath does not work if the path does not exist
mkpath($ENV{DESTDIR} . $arg) unless -d $ENV{DESTDIR} . $arg;
$path = Cwd::realpath( $ENV{DESTDIR} . $arg );
- if (!$do_link) {
- my $destdir = Cwd::realpath( $ENV{DESTDIR} );
- $path =~ s|$destdir||;
- }
}
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/bin
solenv/bin/make_installer.pl | 29 --
solenv/bin/modules/installer/archivefiles.pm |2
solenv/bin/modules/installer/exiter.pm |4 -
solenv/bin/modules/installer/files.pm| 16 -
solenv/bin/modules/installer/globals.pm |3 -
solenv/bin/modules/installer/logger.pm | 27 -
solenv/bin/modules/installer/parameter.pm| 19 --
solenv/bin/modules/installer/scriptitems.pm | 74 ---
8 files changed, 174 deletions(-)
New commits:
commit 97862219d6985611b2491ffa8df1d5fed499d115
Author: Tim Retout t...@retout.co.uk
Date: Sat Feb 18 13:28:08 2012 +
Remove installer debug logging.
The -debug option to make_installer.pl is not usually called; it logs
function calls at various points during the installer. However, it is
not used consistently within the code, and the same information can be
obtained via the Perl debugger or profiling tools.
diff --git a/solenv/bin/make_installer.pl b/solenv/bin/make_installer.pl
index a823306..23fea7a 100644
--- a/solenv/bin/make_installer.pl
+++ b/solenv/bin/make_installer.pl
@@ -120,10 +120,6 @@
installer::environment::set_global_environment_variables($environmentvariablesha
installer::parameter::saveparameter();
installer::parameter::getparameter();
-# debugging can start after function getparameter
-if ( $installer::globals::debug ) { installer::logger::debuginfo(\nPart 1:
The platform independent part\n); }
-if ( $installer::globals::debug ) { installer::logger::debuginfo(\nPart 1a:
The language independent part\n); }
-
installer::parameter::control_fundamental_parameter();
installer::parameter::setglobalvariables();
installer::parameter::control_required_parameter();
@@ -594,11 +590,6 @@ if (!($installer::globals::is_copy_only_project))
if ( $installer::globals::globallogging ) {
installer::files::save_array_of_hashes($loggingdir .
productdirectories2aa.log, $dirsinproductarrayref); }
}
-if ( $installer::globals::debug ) { installer::logger::debuginfo(\nEnd of
part 1a: The language independent part\n); }
-
-# saving debug info, before staring part 1b
-if ( $installer::globals::debug ) {
installer::logger::savedebug($installer::globals::exitlog); }
-
#
# Part 1b: The language dependent part
# (still platform independent)
@@ -612,8 +603,6 @@ if ( $installer::globals::debug ) {
installer::logger::savedebug($installer::glo
# The for iterates over all products, separated by an # in the language list
###
-if ( $installer::globals::debug ) { installer::logger::debuginfo(\nPart 1b:
The language dependent part\n); }
-
for ( my $n = 0; $n = $#installer::globals::languageproducts; $n++ )
{
my $languagesarrayref =
installer::languages::get_all_languages_for_one_product($installer::globals::languageproducts[$n],
$allvariableshashref);
@@ -1217,23 +1206,14 @@ for ( my $n = 0; $n =
$#installer::globals::languageproducts; $n++ )
installer::packagelist::log_packages_content($packages);
installer::packagelist::create_module_destination_hash($packages,
$allvariableshashref);
-if ( $installer::globals::debug ) { installer::logger::debuginfo(\nEnd of
part 1b: The language dependent part\n); }
-
-# saving debug info, before starting part 2
-if ( $installer::globals::debug ) {
installer::logger::savedebug($installer::globals::exitlog); }
-
#
# Part 2: The platform dependent part
#
-if ( $installer::globals::debug ) { installer::logger::debuginfo(\nPart
2: The platform dependent part\n); }
-
#
# Part 2a: All non-Windows platforms
#
-if ( $installer::globals::debug ) { installer::logger::debuginfo(\nPart
2a: All non-Windows platforms\n); }
-
#
# ... creating epm list file ...
# Only for non-Windows platforms
@@ -1767,14 +1747,10 @@ for ( my $n = 0; $n =
$#installer::globals::languageproducts; $n++ )
}
} # end of if (!( $installer::globals::iswindowsbuild ))
-if ( $installer::globals::debug ) { installer::logger::debuginfo(\nEnd of
part 2a: All non-Windows platforms\n); }
-
#
# Part 2b: The Windows platform
#
-if ( $installer::globals::debug ) { installer::logger::debuginfo(\nPart
2b: The Windows platform\n); }
-
#
# ... creating idt files ...
# Only for Windows builds ($installer::globals::compiler is wntmsci)
@@ -2221,17 +2197,12 @@ for ( my $n = 0;
[Libreoffice-commits] .: solenv/bin
solenv/bin/make_installer.pl|7 +---
solenv/bin/modules/installer/sorter.pm | 53
solenv/bin/modules/t/installer-sorter.t | 48
3 files changed, 3 insertions(+), 105 deletions(-)
New commits:
commit d6adf7c7b38d72328bd0c8867c472be677cd91ef
Author: Tim Retout t...@retout.co.uk
Date: Thu Feb 16 18:58:20 2012 +
Inline and remove installer::sorter
diff --git a/solenv/bin/make_installer.pl b/solenv/bin/make_installer.pl
index 45dede0..08c118b 100644
--- a/solenv/bin/make_installer.pl
+++ b/solenv/bin/make_installer.pl
@@ -57,7 +57,6 @@ use installer::scpzipfiles;
use installer::scriptitems;
use installer::setupscript;
use installer::simplepackage;
-use installer::sorter qw(sorting_array_of_hashes);
use installer::strip;
use installer::substfilenamefiles;
use installer::systemactions;
@@ -1101,7 +1100,7 @@ for ( my $n = 0; $n =
$#installer::globals::languageproducts; $n++ )
if ( $installer::globals::globallogging ) {
installer::files::save_array_of_hashes($loggingdir .
directoriesforepmlist3alangpack.log, $directoriesforepmarrayref); }
($directoriesforepmarrayref, $alldirectoryhash) =
installer::scriptitems::collect_directories_with_create_flag_from_directoryarray($dirsinproductlanguageresolvedarrayref,
$alldirectoryhash);
if ( $installer::globals::globallogging ) {
installer::files::save_array_of_hashes($loggingdir .
directoriesforepmlist3blangpack.log, $directoriesforepmarrayref); }
-sorting_array_of_hashes($directoriesforepmarrayref, HostName);
+@$directoriesforepmarrayref = sort { $a-{HostName} cmp
$b-{HostName} } @$directoriesforepmarrayref;
if ( $installer::globals::globallogging ) {
installer::files::save_array_of_hashes($loggingdir .
directoriesforepmlist3clangpack.log, $directoriesforepmarrayref); }
if ( $installer::globals::iswindowsbuild )
@@ -1130,7 +1129,7 @@ for ( my $n = 0; $n =
$#installer::globals::languageproducts; $n++ )
if ( $installer::globals::globallogging ) {
installer::files::save_array_of_hashes($loggingdir .
directoriesforepmlist3ahelppack.log, $directoriesforepmarrayref); }
($directoriesforepmarrayref, $alldirectoryhash) =
installer::scriptitems::collect_directories_with_create_flag_from_directoryarray($dirsinproductlanguageresolvedarrayref,
$alldirectoryhash);
if ( $installer::globals::globallogging ) {
installer::files::save_array_of_hashes($loggingdir .
directoriesforepmlist3bhelppack.log, $directoriesforepmarrayref); }
-sorting_array_of_hashes($directoriesforepmarrayref, HostName);
+@$directoriesforepmarrayref = sort { $a-{HostName} cmp
$b-{HostName} } @$directoriesforepmarrayref;
if ( $installer::globals::globallogging ) {
installer::files::save_array_of_hashes($loggingdir .
directoriesforepmlist3chelppack.log, $directoriesforepmarrayref); }
if ( $installer::globals::iswindowsbuild )
@@ -1171,7 +1170,7 @@ for ( my $n = 0; $n =
$#installer::globals::languageproducts; $n++ )
($directoriesforepmarrayref, $alldirectoryhash) =
installer::scriptitems::collect_directories_from_filesarray($filesinproductlanguageresolvedarrayref);
if ( $installer::globals::globallogging ) {
installer::files::save_array_of_hashes($loggingdir .
directoriesforepmlist4_patch.log, $directoriesforepmarrayref); }
-sorting_array_of_hashes($directoriesforepmarrayref, HostName);
+@$directoriesforepmarrayref = sort { $a-{HostName} cmp
$b-{HostName} } @$directoriesforepmarrayref;
if ( $installer::globals::globallogging ) {
installer::files::save_array_of_hashes($loggingdir .
directoriesforepmlist5_patch.log, $directoriesforepmarrayref); }
}
}
diff --git a/solenv/bin/modules/installer/sorter.pm
b/solenv/bin/modules/installer/sorter.pm
deleted file mode 100644
index b08dd80..000
--- a/solenv/bin/modules/installer/sorter.pm
+++ /dev/null
@@ -1,53 +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
[Libreoffice-commits] .: solenv/bin
solenv/bin/modules/installer/simplepackage.pm |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 178a30236e763051fa1e52f0b4de4d9540753df2
Author: Norbert Thiebaud nthieb...@gmail.com
Date: Thu Feb 16 23:15:26 2012 -0600
use bzip2 compression for dmg
On MacOSX the installable packages (dmg), can use diverse format and
diverse compression method.
Since 10.4 a new format is supported that use bzip2 as a compression
back-end. The result if a reduction of ~30MB of the main dmg.
diff --git a/solenv/bin/modules/installer/simplepackage.pm
b/solenv/bin/modules/installer/simplepackage.pm
index 8c0e9ee..8bd8bda 100755
--- a/solenv/bin/modules/installer/simplepackage.pm
+++ b/solenv/bin/modules/installer/simplepackage.pm
@@ -535,7 +535,7 @@ sub create_package
chdir $localfrom;
}
-$systemcall = cd $localtempdir hdiutil makehybrid -hfs
-hfs-openfolder $folder $folder -hfs-volume-name \$volume_name\ -ov -o
$installdir/tmp hdiutil convert -ov -format UDZO $installdir/tmp.dmg -o
$archive ;
+$systemcall = cd $localtempdir hdiutil makehybrid -hfs
-hfs-openfolder $folder $folder -hfs-volume-name \$volume_name\ -ov -o
$installdir/tmp hdiutil convert -ov -format UDBZ $installdir/tmp.dmg -o
$archive ;
if (( $ref ne ) ( $$ref ne )) {
$systemcall .= hdiutil unflatten $archive Rez -a $$ref -o
$archive hdiutil flatten $archive ;
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/bin
solenv/bin/mkdocs.sh |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit f9d2a8643548d6bc138f8b36a8fff95d658d5bc1 Author: Thorsten Behrens tbehr...@suse.com Date: Tue Feb 14 08:50:26 2012 +0100 Remove accidental comment diff --git a/solenv/bin/mkdocs.sh b/solenv/bin/mkdocs.sh index a0ad6e4..a075a74 100755 --- a/solenv/bin/mkdocs.sh +++ b/solenv/bin/mkdocs.sh @@ -177,7 +177,7 @@ do echo Ref-Tags: $DOXYGEN_REF_TAGFILES echo Title: $DOXYGEN_PROJECTNAME - #nice -15 doxygen $DOXYGEN_CFG || exit 1 + nice -15 doxygen $DOXYGEN_CFG || exit 1 # setup referenced tagfiles for next round DOXYGEN_REF_TAGFILES=$DOXYGEN_REF_TAGFILES $DOXYGEN_OUR_TAGFILE=$BASE_URL/$PROJECT/html ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/bin
solenv/bin/mkdocs.sh | 171 +++
1 file changed, 134 insertions(+), 37 deletions(-)
New commits:
commit af54a1b8b1b04860302e8a743f512d01a87f6b9c
Author: Thorsten Behrens tbehr...@suse.com
Date: Mon Feb 13 12:44:47 2012 +0100
Integrate Josh Heidenreich's nice README parser as start page.
From https://github.com/TheJosh/tdf-misc's scrape.php, ported the
concept over to bash, to have it run with the doxygen generation.
diff --git a/solenv/bin/mkdocs.sh b/solenv/bin/mkdocs.sh
index dbf4c46..a0ad6e4 100755
--- a/solenv/bin/mkdocs.sh
+++ b/solenv/bin/mkdocs.sh
@@ -1,27 +1,114 @@
-#!/bin/bash
+#!/usr/bin/env bash
#
-# Doxygen Doc generation
+# Doxygen / README doc generation
#
+# See git for contributors
+#
+
+function header {
+ title=$1
+ breadcrumb=$2
+ output=$3
+
+ cat - $output EOF
+!DOCTYPE HTML PUBLIC -//IETF//DTD HTML//EN
+html
+head
+ title$title/title
+
+ style
+ * { margin: 0; padding: 0; }
+ body { font-family: sans-serif; font-size: 12px; }
+ #head { padding: 20px; background: #18A303; }
+ #head a { color: #000; }
+ #body { padding: 20px; }
+ #foot { padding: 10px; font-size: 9px; border-top: 1px #18A303 solid;
margin-top: 25px; }
+ p { line-height: 1.7em; margin-bottom: 1em; }
+ pre { margin-bottom: 0.5em; }
+ .multi-col { -moz-column-width: 13em; -webkit-column-width: 13em;
-moz-column-gap: 1em; -webkit-column-gap: 1em; }
+ h1 {margin-bottom: 0.5em;}
+ h2,h3,h4 { margin: 1.3em 0 0.5em 0; }
+ ul, ol { margin: 0.5em 1.5em; }
+ /style
+/head
+body
+ div id=head
+ h1$title/h1
+ p$breadcrumb/p
+ /div
+ div id=body
+EOF
+}
+
+function footer {
+ output=$1
+
+ cat - $output EOF
+
+/div
+div id=foot
+ small
+pGenerated by Libreoffice a
href=http://cgit.freedesktop.org/libreoffice/core/plain/solenv/bin/mkdocs.sh;Module
Description Tool/a/p
+pLast updated:
+EOF
+LANG= date $output
+cat - $output EOF
+/p
+ /small
+/div
+/body
+/html
+EOF
+
+}
+
+function proc_text {
+ # Local links: [[...]]
+ # Git links: [git:...]
+ # Other remote links: [...]
+ # Headings: == bleh ==
+ # Paragraphs: \n\n
+ sed -re ' s/\[\[([-_a-zA-Z0-9]+)\]\]/a href=\1.html\1\/a/g' - \
+ | sed -re ' s/\[git:([^]]+)\]/a
href=http:\/\/cgit.freedesktop.org\/libreoffice\/core\/tree\/\1\1\/a/g' \
+ | sed -re ' s/\[([^]]+)\]/a href=\1\1\/a/g' \
+ | sed -re ' s/([^=]+)/h4\1\/h4/g' \
+ | sed -re ' s/===([^=]+)===/h3\1\/h3/g' \
+ | sed -re ' s/==([^=]+)==/h2\1\/h2/g' \
+ | sed -re ':a;N;$!ba;s/\n\n/\/pp/g' \
+ | awk 'BEGIN { print p } { print } END { print /p }'
+}
+
+function setup {
+ parm=$1
+ if [ -z ${!parm} ] ; then
+ echo grep \${parm}=\ ./config_host.mk | sed -re \ s/${parm}=//\)
+echo $parm=$(grep \${parm}=\ ./config_host.mk | sed -re \
s/${parm}=//\)
+eval $parm=$(grep \${parm}=\ ./config_host.mk | sed -re \
s/${parm}=//\)
+ fi
+ if [ -z ${!parm} ] ; then
+echo could not determine $parm 2
+exit 1
+ fi
+}
# binaries that we need
which doxygen /dev/null 21 || {
-echo You need doxygen for doc generation
+echo You need doxygen for doc generation 2
exit 1
}
which dot /dev/null 21 || {
-echo You need the graphviz tools to create the nice inheritance graphs
+echo You need the graphviz tools to create the nice inheritance graphs
2
exit 1
}
-# otherwise, aliases are not expanded below
-shopt -s expand_aliases
+# suck setup
+setup INPATH
+setup SOLARINC
+shopt -s nullglob
# Title of the documentation
DOXYGEN_PROJECT_PREFIX=LibreOffice
-# suck setup
-. ./Env.Host.sh
-
# get list of modules in build order - bah, blows RAM disk, static list below
INPUT_PROJECTS=o3tl basegfx basebmp basic comphelper svl vcl canvas cppcanvas
oox svtools goodies drawinglayer xmloff slideshow sfx2 editeng svx writerfilter
cui chart2 dbaccess sd starmath sc sw
@@ -44,7 +131,7 @@ fi
DOXYGEN_INCLUDE_PATH=`echo $SOLARINC | sed -e ' s/-I\.//'g | sed -e ' s/ -I/
/'g | sed -e ' s|/usr/[^ ]*| |g'`
# setup version string
-DOXYGEN_VERSION=$GITTAG
+DOXYGEN_VERSION=master
###
@@ -54,12 +141,13 @@ DOXYGEN_VERSION=$GITTAG
###
# cleanup
-rm -rf $BASE_OUTPUT/*
+echo cleaning up rm -rf $BASE_OUTPUT/*
# make the stuff world-readable
umask 022
# generate docs
+echo generating doxygen docs
DOXYGEN_REF_TAGFILES=
for PROJECT in `echo $INPUT_PROJECTS|tr ' ' '\n'|sort|tr '\n' ' '`;
do
@@ -89,39 +177,48 @@ do
echo Ref-Tags: $DOXYGEN_REF_TAGFILES
echo Title: $DOXYGEN_PROJECTNAME
- nice -15 doxygen $DOXYGEN_CFG || exit 1
+ #nice -15 doxygen $DOXYGEN_CFG || exit 1
# setup referenced tagfiles for next round
DOXYGEN_REF_TAGFILES=$DOXYGEN_REF_TAGFILES
$DOXYGEN_OUR_TAGFILE=$BASE_URL/$PROJECT/html
done
# generate entry page
-cat -
[Libreoffice-commits] .: solenv/bin
solenv/bin/concat-deps.c |2 --
1 file changed, 2 deletions(-)
New commits:
commit 5be2521a90766ba0dcefeb05af8b2bdaf06a53a0
Author: Julien Nabet serval2...@yahoo.fr
Date: Sun Feb 12 17:41:05 2012 +0100
in_list_end never read, let's drop it
diff --git a/solenv/bin/concat-deps.c b/solenv/bin/concat-deps.c
index 66b9025..a667e0a 100644
--- a/solenv/bin/concat-deps.c
+++ b/solenv/bin/concat-deps.c
@@ -822,7 +822,6 @@ int rc = 0;
off_t in_list_size = 0;
char* in_list;
char* in_list_cursor;
-char* in_list_end;
char* in_list_base;
struct hash* dep_hash;
char* base_dir;
@@ -842,7 +841,6 @@ char* base_dir;
if(!rc)
{
dep_hash = hash_create( kDEFAULT_HASH_SIZE);
-in_list_end = in_list + in_list_size;
in_list_base = in_list_cursor = in_list;
/* extract filename of dep file from a 'space' separated list */
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/bin
solenv/bin/create-ids |8 +++- solenv/bin/create-tags | 11 +-- 2 files changed, 16 insertions(+), 3 deletions(-) New commits: commit 51a3d9c07c73f86455505a074fa01b88fb802852 Author: Norbert Thiebaud nthieb...@gmail.com Date: Tue Feb 7 12:03:44 2012 -0600 adapt create-tags/create-ids to the absence of set_soenv.in diff --git a/solenv/bin/create-ids b/solenv/bin/create-ids index 4561fb8..e4d3147 100755 --- a/solenv/bin/create-ids +++ b/solenv/bin/create-ids @@ -2,7 +2,13 @@ # create ID file for the whole LibO tree. run it in toplevel dir -. ./config_host.mk +if [ -z $INPATH ] ; then + INPATH=$(grep INPATH= ./config_host.mk | sed -e s/INPATH=//) +fi +if [ -z $INPATH ] ; then +echo could not determine INPATH 2 +exit 1 +fi # --with-outpath includes projects/$INPATH/inc (also solver/$INPATH/inc) if [ $1 = --with-outpath ]; then diff --git a/solenv/bin/create-tags b/solenv/bin/create-tags index a2f640c..a61c5b6 100755 --- a/solenv/bin/create-tags +++ b/solenv/bin/create-tags @@ -1,6 +1,13 @@ -#!/usr/bin/env sh +#!/usr/bin/env bash + +if [ -z $INPATH ] ; then + INPATH=$(grep INPATH= ./config_host.mk | sed -e s/INPATH=//) +fi +if [ -z $INPATH ] ; then +echo could not determine INPATH 2 +exit 1 +fi -. ./config_host.mk omnicppoptions=--c++-kinds=+p --fields=+iaS --extra=+q ctags -h +.hdl.hrc --langmap=c:+.hdl.hrc.src $omnicppoptions \ ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/bin
solenv/bin/modules/installer/exiter.pm |6 +- 1 file changed, 5 insertions(+), 1 deletion(-) New commits: commit db3aaa31c88a65e9b39bffeda43b624257ca97ce Author: Stephan Bergmann sberg...@redhat.com Date: Mon Feb 6 17:54:13 2012 +0100 Print log file in case of error ...so that tinderbox output becomes useful. diff --git a/solenv/bin/modules/installer/exiter.pm b/solenv/bin/modules/installer/exiter.pm index 016de1d..18b3b31 100644 --- a/solenv/bin/modules/installer/exiter.pm +++ b/solenv/bin/modules/installer/exiter.pm @@ -91,7 +91,11 @@ sub exit_program installer::files::save_file($installer::globals::logfilename ,\@installer::globals::globallogfileinfo); } installer::logger::print_error($message\nin function: $function); -installer::logger::print_error(Saved logfile: $installer::globals::logfilename\n); +print(ERROR, saved logfile $installer::globals::logfilename is:\n); +open(LOG, , $installer::globals::logfilename); +print : $_ while (LOG); +print \n; +close(LOG); # Saving the debug info ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/bin
solenv/bin/modules/installer/scriptitems.pm |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 439e5279c5d334f849a6ab7b51bad1bb12f13aae
Author: Miklos Vajna vmik...@frugalware.org
Date: Thu Jan 26 17:27:03 2012 +0100
solenv: handle error code from ./g
This avoids Cannot find the git binary! Is git installed and is in
PATH? strings in the about dialog when building from a tarball.
diff --git a/solenv/bin/modules/installer/scriptitems.pm
b/solenv/bin/modules/installer/scriptitems.pm
index a8963a4..905b37e 100644
--- a/solenv/bin/modules/installer/scriptitems.pm
+++ b/solenv/bin/modules/installer/scriptitems.pm
@@ -815,8 +815,8 @@ sub replace_setup_variables
if ( $localbuild =~ /^\s*(\w+?)(\d+)\s*$/ ) { $localbuild = $2; } #
using 680 instead of src680
-my $buildidstring = `$ENV{'SRC_ROOT'}/g -s log -n 1 --pretty=format:%h- ;
git describe --abbrev=0`;
-if (!$buildidstring) {
+my $buildidstring = `$ENV{'SRC_ROOT'}/g -s log -n 1 --pretty=format:%h-
git describe --abbrev=0`;
+if ($? || !$buildidstring) {
$buildidstring = $localbuild . $localminor . (Build: .
$installer::globals::buildid . );
}
else {
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/bin
solenv/bin/modules/installer/windows/msiglobal.pm |4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
New commits:
commit 490301650899abec73128258569e0dffdc52d7c9
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date: Fri Jan 20 16:12:13 2012 +0100
Fix WiLangId.vbs operation
The script needs %TEMP% to be set in order to work properly.
Cygwin unsets TEMP which causes WiLangId.vbs to fail. Set the
TEMP variable to $TMPDIR before we call the cscript.exe.
diff --git a/solenv/bin/modules/installer/windows/msiglobal.pm
b/solenv/bin/modules/installer/windows/msiglobal.pm
index a097780..f7185d3 100644
--- a/solenv/bin/modules/installer/windows/msiglobal.pm
+++ b/solenv/bin/modules/installer/windows/msiglobal.pm
@@ -980,8 +980,10 @@ sub create_transforms
installer::logger::include_header_into_logfile(Creating Transforms);
+my $cscript = cscript.exe;# Has to be in the path
my $msitran = msitran.exe;# Has to be in the path
my $msidb = msidb.exe;# Has to be in the path
+my $tmpdir = $ENV{TMPDIR};# Variable %TEMP% will be set to it for
WiLangId.vbs to work
my $wilangid = $ENV{WINDOWS_SDK_HOME} .
/Samples/SysMgmt/Msi/scripts/WiLangId.vbs;
my $from = cwd();
@@ -1121,7 +1123,7 @@ sub create_transforms
}
}
-$systemcall = cscript.exe . $wilangid . . $basedbname . Package
. $templatevalue;
+$systemcall = TEMP= . $tmpdir . . $cscript . . $wilangid . .
$basedbname . Package . $templatevalue;
$returnvalue = system($systemcall);
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/bin
solenv/bin/modules/installer/windows/msiglobal.pm | 14 +-
1 file changed, 5 insertions(+), 9 deletions(-)
New commits:
commit 5d2f27834abd9ea13556387ffa7f773587edbebc
Author: Andras Timar ati...@suse.com
Date: Thu Jan 19 23:22:38 2012 +0100
fdo#44915 MSI installer l10n bug
Unfortunately msiinfo.exe has a limitation, it truncates Language
property in Summary Information at char position 254.
The replacement, WiLangId.vbs does not have this limitation.
diff --git a/solenv/bin/modules/installer/windows/msiglobal.pm
b/solenv/bin/modules/installer/windows/msiglobal.pm
index 8b8007a..a097780 100644
--- a/solenv/bin/modules/installer/windows/msiglobal.pm
+++ b/solenv/bin/modules/installer/windows/msiglobal.pm
@@ -982,14 +982,11 @@ sub create_transforms
my $msitran = msitran.exe;# Has to be in the path
my $msidb = msidb.exe;# Has to be in the path
-my $msiinfo = msiinfo.exe;# Has to be in the path
+my $wilangid = $ENV{WINDOWS_SDK_HOME} .
/Samples/SysMgmt/Msi/scripts/WiLangId.vbs;
my $from = cwd();
-my $architecture = Intel;
-if (( $allvariableshashref-{'64BITPRODUCT'} ) (
$allvariableshashref-{'64BITPRODUCT'} == 1 )) { $architecture = x64; }
-
-my $templatevalue = \ . $architecture . ;1033;
+my $templatevalue = 1033;
$installdir = installer::converter::make_path_conform($installdir);
@@ -1124,8 +1121,7 @@ sub create_transforms
}
}
-$templatevalue = $templatevalue . \; # adding
ending ''
-$systemcall = $msiinfo . . $basedbname . -p . $templatevalue;
+$systemcall = cscript.exe . $wilangid . . $basedbname . Package
. $templatevalue;
$returnvalue = system($systemcall);
@@ -1134,12 +1130,12 @@ sub create_transforms
if ($returnvalue)
{
-$infoline = ERROR: Could not execute $msiinfo!\n;
+$infoline = ERROR: Could not execute WiLangId.vbs!\n;
push( @installer::globals::logfileinfo, $infoline);
}
else
{
-$infoline = Success: Executed $msiinfo successfully!\n;
+$infoline = Success: Executed WiLangId.vbs successfully!\n;
push( @installer::globals::logfileinfo, $infoline);
}
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/bin
solenv/bin/create-ids |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 370551f6e8785aac0375f56d72e6a66333ebfff3 Author: Eike Rathke er...@redhat.com Date: Mon Jan 9 17:02:47 2012 +0100 ./config_host.mk is to be sourced, not invoked diff --git a/solenv/bin/create-ids b/solenv/bin/create-ids index 8744a38..2c7f976 100755 --- a/solenv/bin/create-ids +++ b/solenv/bin/create-ids @@ -2,7 +2,7 @@ # create ID file for the whole LibO tree. run it in toplevel dir -./config_host.mk . ./Env.Host.sh +. ./config_host.mk . ./Env.Host.sh # --with-outpath includes projects/$INPATH/inc (also solver/$INPATH/inc) if [ $1 = --with-outpath ]; then ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/bin
solenv/bin/create-ids |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 1245266ebc4cb228ff17eda8ac4bc0ff35a86f7d Author: Eike Rathke er...@redhat.com Date: Mon Jan 9 17:02:47 2012 +0100 ./config_host.mk is to be sourced, not invoked diff --git a/solenv/bin/create-ids b/solenv/bin/create-ids index 8744a38..2c7f976 100755 --- a/solenv/bin/create-ids +++ b/solenv/bin/create-ids @@ -2,7 +2,7 @@ # create ID file for the whole LibO tree. run it in toplevel dir -./config_host.mk . ./Env.Host.sh +. ./config_host.mk . ./Env.Host.sh # --with-outpath includes projects/$INPATH/inc (also solver/$INPATH/inc) if [ $1 = --with-outpath ]; then ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
