[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
[Libreoffice-commits] .: solenv/bin
solenv/bin/create-tags |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit be9c3de16a29a3bffde9156af346e8b9907121ed Author: Miklos Vajna vmik...@frugalware.org Date: Sun Jan 8 02:28:25 2012 +0100 create-tags: fix ./config_host.mk: Permission denied diff --git a/solenv/bin/create-tags b/solenv/bin/create-tags index 4d0f2bd..e7cc712 100755 --- a/solenv/bin/create-tags +++ b/solenv/bin/create-tags @@ -1,6 +1,6 @@ #!/usr/bin/env sh -./config_host.mk . ./Env.Host.sh +. ./config_host.mk . ./Env.Host.sh 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/make_installer.pl |1 - 1 file changed, 1 deletion(-) New commits: commit bf6ccec6334141be5e0247f9cf3f34762f668e40 Author: Michael Stahl mst...@redhat.com Date: Fri Jan 6 22:27:42 2012 +0100 solenv: that perl crud looks unhappy diff --git a/solenv/bin/make_installer.pl b/solenv/bin/make_installer.pl index 57dd86c..5bcee7f 100644 --- a/solenv/bin/make_installer.pl +++ b/solenv/bin/make_installer.pl @@ -73,7 +73,6 @@ use installer::windows::font; use installer::windows::icon; use installer::windows::idtglobal; use installer::windows::inifile; -use installer::windows::java; use installer::windows::media; use installer::windows::mergemodule; use installer::windows::msiglobal; ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/bin
solenv/bin/linkoo | 37 +++--
1 file changed, 23 insertions(+), 14 deletions(-)
New commits:
commit 8033e3343b6e043abe2ef31ba2c90e3f5382ad25
Author: Miklos Vajna vmik...@frugalware.org
Date: Sun Jan 1 20:20:46 2012 +0100
fix linkoo after moving INPATH to config_host.mk
diff --git a/solenv/bin/linkoo b/solenv/bin/linkoo
index 3008835..ade1ee7 100755
--- a/solenv/bin/linkoo
+++ b/solenv/bin/linkoo
@@ -146,20 +146,27 @@ sub sniff_target($)
opendir ($dirhandle, $build_dir) || die Can't open $build_dir;
while ($fname = readdir ($dirhandle)) {
- $fname =~ /Host.sh$/ || next;
-
- my $file;
- open ($file, $build_dir/$fname) || die Can't open $build_dir/$fname;
- while ($file) {
- /\s*(\S+)\s*=\s*\(\S+)\/ || next;
- if ($1 eq 'INPATH') {
- $target = $2;
- }
- if ($1 eq 'UPD') {
- $libver = $2;
- }
- }
- close ($file);
+if ($fname =~ /Host.sh$/) {
+my $file;
+open ($file, $build_dir/$fname) || die Can't open
$build_dir/$fname;
+while ($file) {
+/\s*(\S+)\s*=\s*\(\S+)\/ || next;
+if ($1 eq 'UPD') {
+$libver = $2;
+}
+}
+close ($file);
+} elsif ($fname =~ /host.mk$/) {
+my $file;
+open ($file, $build_dir/$fname) || die Can't open
$build_dir/$fname;
+while ($file) {
+/\s*export\s*(\S+)\s*=\s*\(\S+)\/ || next;
+if ($1 eq 'INPATH') {
+$target = $2;
+}
+}
+close ($file);
+}
}
closedir ($dirhandle);
@@ -438,3 +445,5 @@ if (!-f $OOO_INSTALL/ . $brand_program_dir . /ooenv) {
evilness ('do');
print \nlinkoo finished, please don't forget to source ooenv before
./soffice.\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/scriptitems.pm |2 ++
1 file changed, 2 insertions(+)
New commits:
commit 21fa99f44c200937f6ec2b7028b482b71457161b
Author: Miklos Vajna vmik...@frugalware.org
Date: Sat Dec 31 14:33:27 2011 +0100
Fix two perl warnings during make dev-install
diff --git a/solenv/bin/modules/installer/scriptitems.pm
b/solenv/bin/modules/installer/scriptitems.pm
index 5a4dbb3..a8963a4 100644
--- a/solenv/bin/modules/installer/scriptitems.pm
+++ b/solenv/bin/modules/installer/scriptitems.pm
@@ -845,7 +845,9 @@ sub replace_setup_variables
$value =~ s/\sourceid\/$installer::globals::build/;
$value =~ s/\updateid\/$updateid/;
$value =~ s/\pkgformat\/$installer::globals::packageformat/;
+$ENV{'OOO_VENDOR'} = if !defined $ENV{'OOO_VENDOR'};
$value =~ s/\vendor\/$ENV{'OOO_VENDOR'}/;
+$ENV{'BUILD_VER_STRING'} = if !defined $ENV{'BUILD_VER_STRING'};
$value =~ s/\buildversion\/$ENV{'BUILD_VER_STRING'}/;
$oneitem-{'Value'} = $value;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/bin
dev/null |binary 1 file changed New commits: commit ecbda593ef71de8eb27b19ad8e421f87f7b2adf5 Author: Norbert Thiebaud nthieb...@gmail.com Date: Mon Dec 26 12:51:40 2011 -0600 remove apparentely accidental addition of a linux binary module for make diff --git a/solenv/bin/make b/solenv/bin/make deleted file mode 100755 index 18a5855..000 Binary files a/solenv/bin/make and /dev/null differ ___ 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/download.pm |1 -
1 file changed, 1 deletion(-)
New commits:
commit c84ac758aa081f2b642aa9b96fda8496d0d66188
Author: Petr Mladek pmla...@suse.cz
Date: Wed Dec 21 16:36:09 2011 +0100
do not use ABOUTBOXPRODUCTVERSIONSUFFIX in download name
I did not read the code carfully enough when added this line few days ago.
diff --git a/solenv/bin/modules/installer/download.pm
b/solenv/bin/modules/installer/download.pm
index bc6ac27..5f186b7 100644
--- a/solenv/bin/modules/installer/download.pm
+++ b/solenv/bin/modules/installer/download.pm
@@ -425,7 +425,6 @@ sub get_download_version
$version = $allvariables-{'PRODUCTVERSION'};
if (( $allvariables-{'ABOUTBOXPRODUCTVERSION'} ) (
$allvariables-{'ABOUTBOXPRODUCTVERSION'} ne )) { $version =
$allvariables-{'ABOUTBOXPRODUCTVERSION'}; }
-if (( $allvariables-{'ABOUTBOXPRODUCTVERSIONSUFFIX'} ) (
$allvariables-{'ABOUTBOXPRODUCTVERSIONSUFFIX'} ne )) { $version =
$allvariables-{'ABOUTBOXPRODUCTVERSIONSUFFIX'}; }
if (( $allvariables-{'SHORT_PRODUCTEXTENSION'} ) (
$allvariables-{'SHORT_PRODUCTEXTENSION'} ne )) { $version = $version .
$allvariables-{'SHORT_PRODUCTEXTENSION'}; }
return $version;
___
Libreoffice-commits mailing list
Libreoffice-commits@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 b23f2d78c4d3ca9a79027c6251f3933a85f88053 Author: Robert Nagy rob...@openbsd.org Date: Sun Dec 18 11:18:28 2011 +0100 use the same memory alignment for *BSD as on Linux diff --git a/solenv/bin/concat-deps.c b/solenv/bin/concat-deps.c index fc23433..a0eda43 100644 --- a/solenv/bin/concat-deps.c +++ b/solenv/bin/concat-deps.c @@ -36,7 +36,9 @@ #define USE_MEMORY_ALIGNMENT 64 /* big value - no alignment */ #endif /* Def __CYGWIN__ */ -#ifdef __linux +#if defined(__linux) || defined(__OpenBSD__) || \ +defined(__FreeBSD__) || defined(__NetBSD__) || \ +defined(__DragonFly__) #if __BYTE_ORDER == __LITTLE_ENDIAN #define CORE_BIG_ENDIAN 0 #define CORE_LITTLE_ENDIAN 1 @@ -48,7 +50,7 @@ #define USE_MEMORY_ALIGNMENT 4 #endif /* __BYTE_ORDER == __BIG_ENDIAN */ #endif /* !(__BYTE_ORDER == __LITTLE_ENDIAN) */ -#endif /* Def __linux */ +#endif /* Def __linux || Def *BSD */ #ifdef __sun #ifdef __sparc ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/bin
solenv/bin/concat-deps.c | 39 ++-
1 file changed, 30 insertions(+), 9 deletions(-)
New commits:
commit 3adb006b526b8469bd98ea7b8d02ebd083e1f49c
Author: Norbert Thiebaud nthieb...@gmail.com
Date: Sat Dec 17 07:06:42 2011 -0600
concat-deps.c deal with /../ in dep path
diff --git a/solenv/bin/concat-deps.c b/solenv/bin/concat-deps.c
index d699e82..f3ecdef 100644
--- a/solenv/bin/concat-deps.c
+++ b/solenv/bin/concat-deps.c
@@ -684,9 +684,11 @@ int rc;
char* buffer;
char* end;
char* cursor;
+char* cursor_out;
char* base;
int continuation = 0;
char last_ns = 0;
+char* last_slash = NULL;
off_t size;
buffer = file_load(fn, size, rc);
@@ -697,20 +699,38 @@ off_t size;
*/
if(!rc)
{
-base = cursor = end = buffer;
+base = cursor_out = cursor = end = buffer;
end += size;
while(cursor end)
{
if(*cursor == '\\')
{
continuation = 1;
-cursor += 1;
+*cursor_out++ = *cursor++;
+}
+else if(*cursor == '/')
+{
+if(cursor + 3 end)
+{
+if(!memcmp(cursor, /../, 4))
+{
+if(last_slash != NULL)
+{
+/* bactrack to the previous '/' */
+cursor_out = last_slash;
+/* skip the /.. section */
+cursor += 3;
+}
+}
+}
+last_slash = cursor_out;
+*cursor_out++ = *cursor++;
}
else if(*cursor == '\n')
{
if(!continuation)
{
-*cursor = 0;
+*cursor_out = 0;
if(base cursor)
{
/* here we have a complete rule */
@@ -720,7 +740,7 @@ off_t size;
* these are the one for which we want to filter
* duplicate out
*/
-if(hash_store(dep_hash, base, (int)(cursor -
base)))
+if(hash_store(dep_hash, base, (int)(cursor_out -
base)))
{
puts(base);
putc('\n', stdout);
@@ -734,14 +754,15 @@ off_t size;
}
}
cursor += 1;
-base = cursor;
+base = cursor_out = cursor;
}
else
{
/* here we have a '\' followed by \n this is a continuation
* i.e not a complete rule yet
*/
-cursor += 1;
+last_slash = NULL;
+*cursor_out++ = *cursor++;
}
}
else
@@ -752,15 +773,15 @@ off_t size;
{
last_ns = *cursor;
}
-cursor += 1;
+*cursor_out++ = *cursor++;
}
}
/* just in case the file did not end with a \n, there may be a pending
rule */
-if(base cursor)
+if(base cursor_out)
{
if(last_ns == ':')
{
-if(hash_store(dep_hash, base, (int)(cursor - base)))
+if(hash_store(dep_hash, base, (int)(cursor_out - base)))
{
puts(base);
putc('\n', stdout);
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/bin
solenv/bin/concat-deps.c | 26 --
1 file changed, 16 insertions(+), 10 deletions(-)
New commits:
commit 05e787fb5e32880ff51902137cfd8da9820cd870
Author: Norbert Thiebaud nthieb...@gmail.com
Date: Sat Dec 17 12:34:29 2011 -0600
oops... bad handling of multiple ../
diff --git a/solenv/bin/concat-deps.c b/solenv/bin/concat-deps.c
index 6cf9192..fc23433 100644
--- a/solenv/bin/concat-deps.c
+++ b/solenv/bin/concat-deps.c
@@ -677,6 +677,21 @@ int fd;
return buffer;
}
+static void _cancel_relative(char* base, char** ref_cursor, char**
ref_cursor_out, char* end)
+{
+char* cursor = *ref_cursor;
+char* cursor_out = *ref_cursor_out;
+
+do
+{
+cursor += 3;
+while(cursor_out base *--cursor_out != '/');
+}
+while(cursor + 3 end !memcmp(cursor, /../, 4));
+*ref_cursor = cursor;
+*ref_cursor_out = cursor_out;
+}
+
static int _process(struct hash* dep_hash, char* fn)
{
int rc;
@@ -687,7 +702,6 @@ char* cursor_out;
char* base;
int continuation = 0;
char last_ns = 0;
-char* last_slash = NULL;
off_t size;
buffer = file_load(fn, size, rc);
@@ -713,16 +727,9 @@ off_t size;
{
if(!memcmp(cursor, /../, 4))
{
-if(last_slash != NULL)
-{
-/* bactrack to the previous '/' */
-cursor_out = last_slash;
-/* skip the /.. section */
-cursor += 3;
-}
+_cancel_relative(base, cursor, cursor_out, end);
}
}
-last_slash = cursor_out;
*cursor_out++ = *cursor++;
}
else if(*cursor == '\n')
@@ -760,7 +767,6 @@ off_t size;
/* here we have a '\' followed by \n this is a continuation
* i.e not a complete rule yet
*/
-last_slash = NULL;
*cursor_out++ = *cursor++;
}
}
___
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 05d08f187a0a7211e3fed85ee0b5d2b61abf47f8
Author: Thorsten Behrens tbehr...@suse.com
Date: Wed Dec 14 10:44:01 2011 +0100
Add latest tag name to buildid string.
diff --git a/solenv/bin/modules/installer/scriptitems.pm
b/solenv/bin/modules/installer/scriptitems.pm
index bb8fe55..5a4dbb3 100644
--- a/solenv/bin/modules/installer/scriptitems.pm
+++ b/solenv/bin/modules/installer/scriptitems.pm
@@ -815,7 +815,7 @@ 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-`;
+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 . );
}
___
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 |2 ++
1 file changed, 2 insertions(+)
New commits:
commit e07efd070d22cc7c540ffda55043ab7277d46a3e
Author: Tor Lillqvist tlillqv...@suse.com
Date: Sun Dec 11 03:49:42 2011 +0200
Add comment about OxygenOffice's use of XPD
diff --git a/solenv/bin/make_installer.pl b/solenv/bin/make_installer.pl
index 2bfdac8..9dfe9b5 100644
--- a/solenv/bin/make_installer.pl
+++ b/solenv/bin/make_installer.pl
@@ -476,6 +476,8 @@ installer::logger::print_message( ... analyzing scpactions
... \n );
my $scpactionsinproductarrayref =
installer::setupscript::get_all_items_from_script($setupscriptref, ScpAction);
if ( $installer::globals::globallogging ) {
installer::files::save_array_of_hashes($loggingdir . productscpactions1.log,
$scpactionsinproductarrayref); }
+# Note: Don't clean away XPD installer stuff before verified whether
+# OxygenOffice still uses it or not, see insesetoo_native/util/openoffice.lst
if (( ! $allvariableshashref-{'XPDINSTALLER'} ) || ( !
$installer::globals::isxpdplatform ))
{
$scpactionsinproductarrayref =
installer::scriptitems::remove_Xpdonly_Items($scpactionsinproductarrayref);
___
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|6 -
solenv/bin/modules/installer/globals.pm |1
solenv/bin/modules/installer/languages.pm | 73 -
solenv/bin/modules/installer/scriptitems.pm | 116
4 files changed, 196 deletions(-)
New commits:
commit a7664d4b09b16a4b102e595d7ea4511652c76614
Author: Andras Timar ati...@suse.com
Date: Mon Dec 5 14:05:29 2011 +0100
remove unused ONLY_ASIA_LANGUAGE and ONLY_WESTERN_LANGUAGE options
diff --git a/solenv/bin/make_installer.pl b/solenv/bin/make_installer.pl
index 6e3a68e..7cecbc9 100644
--- a/solenv/bin/make_installer.pl
+++ b/solenv/bin/make_installer.pl
@@ -823,12 +823,6 @@ for ( my $n = 0; $n =
$#installer::globals::languageproducts; $n++ )
if ( $installer::globals::globallogging ) {
installer::files::save_array_of_hashes($loggingdir . productfiles10b.log,
$filesinproductlanguageresolvedarrayref); }
}
-$filesinproductlanguageresolvedarrayref =
installer::scriptitems::remove_onlyasialanguage_files_from_productlists($filesinproductlanguageresolvedarrayref);
-if ( $installer::globals::globallogging ) {
installer::files::save_array_of_hashes($loggingdir . productfiles10d.log,
$filesinproductlanguageresolvedarrayref); }
-
-$filesinproductlanguageresolvedarrayref =
installer::scriptitems::remove_onlywesternlanguage_files_from_productlists($filesinproductlanguageresolvedarrayref);
-if ( $installer::globals::globallogging ) {
installer::files::save_array_of_hashes($loggingdir . productfiles10e.log,
$filesinproductlanguageresolvedarrayref); }
-
installer::scriptitems::make_filename_language_specific($filesinproductlanguageresolvedarrayref);
if ( $installer::globals::globallogging ) {
installer::files::save_array_of_hashes($loggingdir . productfiles10f.log,
$filesinproductlanguageresolvedarrayref); }
diff --git a/solenv/bin/modules/installer/globals.pm
b/solenv/bin/modules/installer/globals.pm
index b55bafd..c7e8954 100644
--- a/solenv/bin/modules/installer/globals.pm
+++ b/solenv/bin/modules/installer/globals.pm
@@ -98,7 +98,6 @@ BEGIN
tk
);
@items_at_modules = (Files, Dirs, Unixlinks);
-@asianlanguages = (ja, ko, zh-CN, zh-TW);
@bidilanguages = (ar, fa, he, ug);
$ziplistname = ;
diff --git a/solenv/bin/modules/installer/languages.pm
b/solenv/bin/modules/installer/languages.pm
index 8c7fc7e..82ac7d0 100644
--- a/solenv/bin/modules/installer/languages.pm
+++ b/solenv/bin/modules/installer/languages.pm
@@ -205,79 +205,6 @@ sub get_default_language
return ${$languagesref}[0]; # ToDo, only returning the first language
}
-#
-# Contains the installation set one of the asian languages?
-#
-
-sub detect_asian_language
-{
-my ($languagesref) = @_;
-
-my $containsasia = 0;
-
-for ( my $i = 0; $i = $#{$languagesref}; $i++ )
-{
-my $onelang = ${$languagesref}[$i];
-$onelang =~ s/\s*$//;
-
-for ( my $j = 0; $j = $#installer::globals::asianlanguages; $j++ )
-{
-my $asialang = $installer::globals::asianlanguages[$j];
-$asialang =~ s/\s*$//;
-
-if ( $onelang eq $asialang )
-{
-$containsasia = 1;
-last;
-}
-}
-
-if ( $containsasia ) { last; }
-}
-
-return $containsasia;
-}
-
-#
-# Contains the installation set only asian languages?
-#
-
-sub contains_only_asian_languages
-{
-my ($languagesref) = @_;
-
-my $onlyasian = 1;
-
-for ( my $i = 0; $i = $#{$languagesref}; $i++ )
-{
-my $onelang = ${$languagesref}[$i];
-$onelang =~ s/\s*$//;
-
-if (! installer::existence::exists_in_array($onelang,
\@installer::globals::asianlanguages))
-{
-$onlyasian = 0;
-last;
-}
-}
-
-return $onlyasian;
-}
-
-
-# Contains the installation set one of the western languages
-
-
-sub detect_western_language
-{
-my ($languagesref) = @_;
-
-my $containswestern = 1;
-
-if ( contains_only_asian_languages($languagesref) ) { $containswestern =
0; }
-
-return $containswestern;
-}
-
# Determining the language used by the Java installer
diff --git a/solenv/bin/modules/installer/scriptitems.pm
b/solenv/bin/modules/installer/scriptitems.pm
index 96bdec9..bb8fe55 100644
--- a/solenv/bin/modules/installer/scriptitems.pm
+++ b/solenv/bin/modules/installer/scriptitems.pm
@@ -1585,122 +1585,6 @@
[Libreoffice-commits] .: solenv/bin
solenv/bin/make_installer.pl|6 +++---
solenv/bin/modules/installer/globals.pm |2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit c26e8ca5e92dd9c4c30617bcafb02d8a4d5b24fc
Author: Lior Kaplan kaplanl...@gmail.com
Date: Mon Dec 5 18:54:03 2011 +0200
It's RTL languages not bidi languages
diff --git a/solenv/bin/make_installer.pl b/solenv/bin/make_installer.pl
index 7cecbc9..e427cd5 100644
--- a/solenv/bin/make_installer.pl
+++ b/solenv/bin/make_installer.pl
@@ -2017,8 +2017,8 @@ for ( my $n = 0; $n =
$#installer::globals::languageproducts; $n++ )
{
my $onelanguage = ${$languagesarrayref}[$m];
-my $is_bidi = 0;
-if ( installer::existence::exists_in_array($onelanguage,
\@installer::globals::bidilanguages) ) { $is_bidi = 1; }
+my $is_rtl = 0;
+if ( installer::existence::exists_in_array($onelanguage,
\@installer::globals::rtllanguages) ) { $is_rtl = 1; }
my $languageidtdir = $idtdirbase . $installer::globals::separator
. $onelanguage;
if ( -d $languageidtdir ) {
installer::systemactions::remove_complete_directory($languageidtdir, 1); }
@@ -2091,7 +2091,7 @@ for ( my $n = 0; $n =
$#installer::globals::languageproducts; $n++ )
# setting bidi attributes, if required
-if ( $is_bidi ) {
installer::windows::idtglobal::setbidiattributes($languageidtdir,
$onelanguage); }
+if ( $is_rtl ) {
installer::windows::idtglobal::setbidiattributes($languageidtdir,
$onelanguage); }
# setting the encoding in every table (replacing
WINDOWSENCODINGTEMPLATE)
installer::windows::idtglobal::set_multilanguageonly_condition($languageidtdir);
diff --git a/solenv/bin/modules/installer/globals.pm
b/solenv/bin/modules/installer/globals.pm
index c7e8954..00c4227 100644
--- a/solenv/bin/modules/installer/globals.pm
+++ b/solenv/bin/modules/installer/globals.pm
@@ -98,7 +98,7 @@ BEGIN
tk
);
@items_at_modules = (Files, Dirs, Unixlinks);
-@bidilanguages = (ar, fa, he, ug);
+@rtllanguages = (ar, fa, he, ug);
$ziplistname = ;
$pathfilename = ;
___
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/ziplist.pm |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit bee2841519d15d8df1520ef3052e3a8da19eac1b
Author: Andras Timar ati...@suse.com
Date: Mon Dec 5 18:29:16 2011 +0100
Use OOO_VENDOR as Packager whenever it is defined
It is passed by the --with-vendor configure switch and it is
visible on Control Panel in Windows. In official builds
We want TDF there, not the username of the builder.
diff --git a/solenv/bin/modules/installer/ziplist.pm
b/solenv/bin/modules/installer/ziplist.pm
index d205a10..c078155 100644
--- a/solenv/bin/modules/installer/ziplist.pm
+++ b/solenv/bin/modules/installer/ziplist.pm
@@ -638,11 +638,11 @@ sub set_manufacturer
{
$manufacturer = $ENV{'OOO_VENDOR'};
}
-if( defined $ENV{'USERNAME'} $ENV{'USERNAME'} ne )
+elsif( defined $ENV{'USERNAME'} $ENV{'USERNAME'} ne )
{
$manufacturer = $ENV{'USERNAME'};
}
-if( defined $ENV{'USER'} $ENV{'USER'} ne )
+elsif( defined $ENV{'USER'} $ENV{'USER'} ne )
{
$manufacturer = $ENV{'USER'};
}
___
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 | 33 ---
solenv/bin/modules/installer/epmfile.pm | 46
solenv/bin/modules/installer/globals.pm |6
solenv/bin/modules/installer/parameter.pm | 21 --
solenv/bin/modules/installer/systemactions.pm |8
solenv/bin/modules/installer/worker.pm| 256 --
6 files changed, 370 deletions(-)
New commits:
commit 0411cd764bc960ad737d67cffac3fa81d483e317
Author: Andras Timar ati...@suse.com
Date: Sun Dec 4 15:32:26 2011 +0100
remove packaging for Java Desktop System (JDS)
diff --git a/solenv/bin/make_installer.pl b/solenv/bin/make_installer.pl
index 5ebd70f..c9d9f02 100644
--- a/solenv/bin/make_installer.pl
+++ b/solenv/bin/make_installer.pl
@@ -632,14 +632,12 @@ for ( my $n = 0; $n =
$#installer::globals::languageproducts; $n++ )
{
$installer::globals::addlicensefile = 0;# no license files for
patches
$installer::globals::makedownload = 0;
-$installer::globals::makejds = 0;
}
if ( $installer::globals::languagepack )
{
$installer::globals::addchildprojects = 0;
$installer::globals::addsystemintegration = 0;
-$installer::globals::makejds = 0;
$installer::globals::addlicensefile = 0;
$installer::globals::makedownload = 1;
}
@@ -648,7 +646,6 @@ for ( my $n = 0; $n =
$#installer::globals::languageproducts; $n++ )
{
$installer::globals::addchildprojects = 0;
$installer::globals::addsystemintegration = 0;
-$installer::globals::makejds = 0;
$installer::globals::addlicensefile = 0;
$installer::globals::makedownload = 1;
}
@@ -1872,36 +1869,6 @@ for ( my $n = 0; $n =
$#installer::globals::languageproducts; $n++ )
installer::worker::analyze_and_save_logfile($loggingdir,
$downloaddir, $installlogdir, $allsettingsarrayref, $languagestringref,
$current_install_number);
}
}
-
-###
-# Creating jds installation set
-###
-
-if ( $installer::globals::makejds )
-{
-my $create_jds = 0;
-
-if ( $allvariableshashref-{'JDSBUILD'} ) { $create_jds = 1; }
-if (! $installer::globals::issolarispkgbuild ) { $create_jds = 0; }
-
-if (( $is_success ) ( $create_jds ))
-{
-if ( ! $installer::globals::jds_language_controlled )
-{
-my $correct_language =
installer::worker::check_jds_language($allvariableshashref, $languagestringref);
-$installer::globals::correct_jds_language =
$correct_language;
-$installer::globals::jds_language_controlled = 1;
-}
-
-if ( $installer::globals::correct_jds_language )
-{
-my $jdsdir =
installer::worker::create_jds_sets($finalinstalldir, $allvariableshashref,
$languagestringref, $languagesarrayref, $includepatharrayref);
-installer::worker::clean_jds_temp_dirs();
-installer::worker::analyze_and_save_logfile($loggingdir,
$jdsdir, $installlogdir, $allsettingsarrayref, $languagestringref,
$current_install_number);
-}
-}
-}
-
} # end of if (!( $installer::globals::iswindowsbuild ))
if ( $installer::globals::debug ) { installer::logger::debuginfo(\nEnd of
part 2a: All non-Windows platforms\n); }
diff --git a/solenv/bin/modules/installer/epmfile.pm
b/solenv/bin/modules/installer/epmfile.pm
index eff03a5..76c1792 100644
--- a/solenv/bin/modules/installer/epmfile.pm
+++ b/solenv/bin/modules/installer/epmfile.pm
@@ -2391,52 +2391,6 @@ sub create_packages_without_epm
# It might be necessary to save uncompressed Solaris packages
-if ( $allvariables-{'JDSBUILD'} )
-{
-if ( ! $installer::globals::jds_language_controlled )
-{
-my $correct_language =
installer::worker::check_jds_language($allvariables, $languagestringref);
-$installer::globals::correct_jds_language = $correct_language;
-$installer::globals::jds_language_controlled = 1;
-}
-
-if ( $installer::globals::correct_jds_language )
-{
-if ( $installer::globals::saved_packages_path eq )
-{
-$packagestempdir =
installer::systemactions::create_directories(jds, $languagestringref);
-$installer::globals::saved_packages_path =
$packagestempdir;
-push(@installer::globals::jdsremovedirs, $packagestempdir);
-}
-
-$systemcall = cd $destinationdir; cp -p -R $packagename
$installer::globals::saved_packages_path;;
-
[Libreoffice-commits] .: solenv/bin
solenv/bin/build.pl | 86 +---
1 file changed, 42 insertions(+), 44 deletions(-)
New commits:
commit f4573ceb2965ccc8abc1f5165b0fa63f5d63649f
Author: Daisuke Nishino niboshi...@gmail.com
Date: Sun Nov 13 17:19:30 2011 +0900
Fix bug in build.pl option parser
diff --git a/solenv/bin/build.pl b/solenv/bin/build.pl
index d402092..4957627 100755
--- a/solenv/bin/build.pl
+++ b/solenv/bin/build.pl
@@ -1342,51 +1342,49 @@ sub usage {
sub get_options {
my $arg;
while ($arg = shift @ARGV) {
-$arg =~ /^-P$/and $processes_to_run = shift @ARGV and
next;
-$arg =~ /^-P(\d+)$/and $processes_to_run = $1 and next;
-$arg =~ /^--all$/and $build_all_parents = 1 and
next;
-$arg =~ /^-a$/and $build_all_parents = 1 and next;
-$arg =~ /^--show$/and $show = 1 and
next;
-$arg =~ /^--checkmodules$/ and $checkparents = 1 and $ignore = 1
and next;
-$arg =~ /^-s$/and $show = 1 and next;
-$arg =~ /^--deliver$/and $deliver = 1 and next;
-$arg =~ /^(--job=)/ and $custom_job = $' and next;
-$arg =~ /^(--pre_job=)/ and $pre_custom_job = $' and next;
-$arg =~ /^(--post_job=)/ and $post_custom_job = $' and next; #'
-$arg =~ /^-d$/and $deliver = 1 and next;
-$arg =~ /^--dlv_switch$/and $dlv_switch = shift @ARGVand next;
-$arg =~ /^--file$/and $cmd_file = shift @ARGV and
next;
-$arg =~ /^-F$/and $cmd_file = shift @ARGV and next;
-$arg =~ /^--skip$/and get_modules_passed(\%skip_modules) and
next;
-
-$arg =~ /^--all:(\S+)$/ and $build_all_parents = 1
-and $build_all_cont = $1and next;
-$arg =~ /^-a:(\S+)$/ and $build_all_parents = 1
-and $build_all_cont = $1and next;
+if ($arg =~ /^-P$/) { $processes_to_run = shift @ARGV;
next; }
+if ($arg =~ /^-P(\d+)$/) { $processes_to_run = $1;
next; }
+if ($arg =~ /^--all$/) { $build_all_parents = 1;
next; }
+if ($arg =~ /^-a$/) { $build_all_parents = 1;
next; }
+if ($arg =~ /^--show$/) { $show = 1;
next; }
+if ($arg =~ /^--checkmodules$/) { $checkparents = 1; $ignore = 1;
next; }
+if ($arg =~ /^-s$/) { $show = 1;
next; }
+if ($arg =~ /^--deliver$/) { $deliver = 1;
next; }
+if ($arg =~ /^(--job=)/) { $custom_job = $';
next; }
+if ($arg =~ /^(--pre_job=)/) { $pre_custom_job = $';
next; }
+if ($arg =~ /^(--post_job=)/){ $post_custom_job = $';
next; } #'
+if ($arg =~ /^-d$/) { $deliver = 1;
next; }
+if ($arg =~ /^--dlv_switch$/){ $dlv_switch = shift @ARGV;
next; }
+if ($arg =~ /^--file$/) { $cmd_file = shift @ARGV;
next; }
+if ($arg =~ /^-F$/) { $cmd_file = shift @ARGV;
next; }
+if ($arg =~ /^--skip$/) { get_modules_passed(\%skip_modules);
next; }
+
+if ($arg =~ /^--all:(\S+)$/) { $build_all_parents = 1;
+ $build_all_cont = $1;
next; }
+if ($arg =~ /^-a:(\S+)$/){ $build_all_parents = 1;
+ $build_all_cont = $1;
next; }
if ($arg =~ /^--from$/ || $arg =~ /^-f$/) {
-$build_all_parents = 1;
-get_modules_passed(\%incompatibles);
-next;
-};
-$arg =~ /^--since$/and $build_all_parents = 1
-and $build_since = shift @ARGV and
next;
-$arg =~ /^-c$/and $build_all_parents = 1
-and $build_since = shift @ARGV and
next;
-$arg =~ /^-s$/and $build_all_parents = 1
-and $build_since = shift @ARGV and
next;
-$arg =~ /^--help$/and usage()and
do_exit(0);
-$arg =~ /^-h$/and usage()and
do_exit(0);
-$arg =~ /^--ignore$/and $ignore = 1
and next;
-$arg =~ /^--html$/and $html = 1and
next;
-$arg =~ /^--html_path$/ and $html_path = shift @ARGV and next;
-
[Libreoffice-commits] .: solenv/bin
solenv/bin/make_installer.pl |9 --
solenv/bin/modules/installer/windows/msiglobal.pm | 88 --
2 files changed, 97 deletions(-)
New commits:
commit e75175625e1152651d993fec358599625e704e22
Author: Andras Timar ati...@suse.com
Date: Thu Nov 17 12:07:09 2011 +0100
remove setup.exe and setup.ini from Windows installdir
diff --git a/solenv/bin/make_installer.pl b/solenv/bin/make_installer.pl
index 6f3ec4a..b3db464 100644
--- a/solenv/bin/make_installer.pl
+++ b/solenv/bin/make_installer.pl
@@ -2249,23 +2249,14 @@ for ( my $n = 0; $n =
$#installer::globals::languageproducts; $n++ )
installer::windows::msiglobal::rename_msi_database_in_installset($defaultlanguage,
$installdir, $allvariableshashref);
if ( $allvariableshashref-{'ADDLANGUAGEINDATABASENAME'} ) {
installer::windows::msiglobal::add_language_to_msi_database($defaultlanguage,
$installdir, $allvariableshashref); }
-
-installer::logger::print_message( ... generating setup.ini ...\n
);
-
-if ( ! $allvariableshashref-{'NOLOADERREQUIRED'} ) {
installer::windows::msiglobal::create_setup_ini($languagesarrayref,
$defaultlanguage, $installdir, $allvariableshashref); }
}
# Analyzing the ScpActions and copying the files into the installation
set
-# At least the loader.exe
installer::logger::print_message( ... copying files into installation
set ...\n );
installer::worker::put_scpactions_into_installset($installdir);
-# ... copying the setup.exe
-
-
installer::windows::msiglobal::copy_windows_installer_files_into_installset($installdir,
$includepatharrayref, $allvariableshashref);
-
# ... copying MergeModules into installation set
if ( ! $installer::globals::fix_number_of_cab_files ) {
installer::windows::msiglobal::copy_merge_modules_into_installset($installdir);
}
diff --git a/solenv/bin/modules/installer/windows/msiglobal.pm
b/solenv/bin/modules/installer/windows/msiglobal.pm
index 082afb2..d6793f4 100644
--- a/solenv/bin/modules/installer/windows/msiglobal.pm
+++ b/solenv/bin/modules/installer/windows/msiglobal.pm
@@ -1334,61 +1334,6 @@ sub include_windows_lineends
}
}
-##
-# Generation the file setup.ini, that is used by the loader setup.exe.
-##
-
-sub create_setup_ini
-{
-my ($languagesarray, $defaultlanguage, $installdir, $allvariableshashref)
= @_;
-
-installer::logger::include_header_into_logfile(Creating setup.ini);
-
-my $setupinifilename = $installdir . $installer::globals::separator .
setup.ini;
-
-my @setupinifile = ();
-my $setupinifile = \@setupinifile;
-
-my $line = \[setup\]\n;
-push(@setupinifile, $line);
-
-put_databasename_into_setupini($setupinifile, $allvariableshashref);
-put_msiversion_into_setupini($setupinifile);
-put_productname_into_setupini($setupinifile, $allvariableshashref);
-put_productcode_into_setupini($setupinifile);
-put_productversion_into_setupini($setupinifile);
-put_upgradekey_into_setupini($setupinifile);
-
-$line = \[languages\]\n;
-push(@setupinifile, $line);
-
-put_languagecount_into_setupini($setupinifile, $languagesarray);
-put_defaultlanguage_into_setupini($setupinifile, $defaultlanguage);
-
-if ( $#{$languagesarray} 0 ) # writing the transforms information
-{
-my $counter = 1;
-
-for ( my $i = 0; $i = $#{$languagesarray}; $i++ )
-{
-if ( ${$languagesarray}[$i] eq $defaultlanguage ) { next; }
-
-put_transforms_into_setupini($setupinifile,
${$languagesarray}[$i], $counter);
-$counter++;
-}
-}
-
-if ( $installer::globals::iswin $installer::globals::plat =~ /cygwin/i)
# Windows line ends only for Cygwin
-{
-include_windows_lineends($setupinifile);
-}
-
-installer::files::save_file($setupinifilename, $setupinifile);
-
-$infoline = Generated file $setupinifilename !\n;
-push( @installer::globals::logfileinfo, $infoline);
-}
-
#
# Copying the files defined as ScpActions into the
# installation set.
@@ -1421,39 +1366,6 @@ sub copy_scpactions_into_installset
}
#
-# Copying the files for the Windows installer into the
-# installation set (setup.exe).
-#
-
-sub copy_windows_installer_files_into_installset
-{
-my ($installdir, $includepatharrayref, $allvariables) = @_;
-
-installer::logger::include_header_into_logfile(Copying Windows installer
files into installation set);
-
-@copyfile = ();
-push(@copyfile, loader2.exe);
-
-if ( $allvariables-{'NOLOADERREQUIRED'} )
[Libreoffice-commits] .: solenv/bin
solenv/bin/make_installer.pl |2 ++
1 file changed, 2 insertions(+)
New commits:
commit 555a66329271846c7a7391317f0167f133e0c5d6
Author: Andras Timar ati...@suse.com
Date: Thu Nov 17 15:59:17 2011 +0100
don't create download (nsis) install sets on Windows
diff --git a/solenv/bin/make_installer.pl b/solenv/bin/make_installer.pl
index b3db464..ae4b751 100644
--- a/solenv/bin/make_installer.pl
+++ b/solenv/bin/make_installer.pl
@@ -1869,6 +1869,7 @@ for ( my $n = 0; $n =
$#installer::globals::languageproducts; $n++ )
{
my $create_download = 0;
if ( $$downloadname ne ) { $create_download = 1; }
+if ( $installer::globals::iswindowsbuild ) { $create_download = 0;
}
if (( $is_success ) ( $create_download ) (
$ENV{'ENABLE_DOWNLOADSETS'} ))
{
my $downloaddir =
installer::download::create_download_sets($finalinstalldir,
$includepatharrayref, $allvariableshashref, $$downloadname, $languagestringref,
$languagesarrayref);
@@ -2349,6 +2350,7 @@ for ( my $n = 0; $n =
$#installer::globals::languageproducts; $n++ )
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 ) { $create_download = 0; }
if (( $is_success ) ( $create_download ) (
$ENV{'ENABLE_DOWNLOADSETS'} ))
{
my $downloaddir =
installer::download::create_download_sets($finalinstalldir,
$includepatharrayref, $allvariableshashref, $$downloadname, $languagestringref,
$languagesarrayref);
___
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 |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 3e585a1725290e81940bafab3bf80d594fa70666
Author: Thorsten Behrens tbehr...@suse.com
Date: Wed Nov 16 11:25:42 2011 +0100
Fix variable name in make_installer
Seems I mis-copypasted the name here - mac dev builds were not using
the new DS_Store at any rate.
diff --git a/solenv/bin/make_installer.pl b/solenv/bin/make_installer.pl
index 3fa31f5..6f3ec4a 100644
--- a/solenv/bin/make_installer.pl
+++ b/solenv/bin/make_installer.pl
@@ -487,7 +487,7 @@ if (( ! $allvariableshashref-{'XPDINSTALLER'} ) || ( !
$installer::globals::isx
if ( $installer::globals::languagepack ) {
installer::scriptitems::use_langpack_copy_scpaction($scpactionsinproductarrayref);
}
if ( $installer::globals::helppack ) {
installer::scriptitems::use_langpack_copy_scpaction($scpactionsinproductarrayref);
}
-if ( $allvariables-{'PRODUCTNAME'} eq LibO-dev ) {
installer::scriptitems::use_devversion_copy_scpaction($scpactionsinproductarrayref);
}
+if ( $allvariableshashref-{'PRODUCTNAME'} eq LibO-dev ) {
installer::scriptitems::use_devversion_copy_scpaction($scpactionsinproductarrayref);
}
if ( $installer::globals::patch ) {
installer::scriptitems::use_patch_copy_scpaction($scpactionsinproductarrayref);
}
if ( $installer::globals::globallogging ) {
installer::files::save_array_of_hashes($loggingdir . productscpactions1b.log,
$scpactionsinproductarrayref); }
___
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 | 27 ++
1 file changed, 13 insertions(+), 14 deletions(-)
New commits:
commit 5538efab96126d9a78bb2a909de909b581f11a2d
Author: Andras Timar ati...@suse.com
Date: Mon Nov 14 15:30:34 2011 +0100
fix some comments
diff --git a/solenv/bin/modules/installer/windows/msiglobal.pm
b/solenv/bin/modules/installer/windows/msiglobal.pm
index 07f6b73..aae0e39 100644
--- a/solenv/bin/modules/installer/windows/msiglobal.pm
+++ b/solenv/bin/modules/installer/windows/msiglobal.pm
@@ -113,7 +113,7 @@ sub check_ddf_file
##
# Lines in ddf files must not be longer than 256 characters.
-# Therefore it can be useful to use relative pathes. Then it is
+# Therefore it can be useful to use relative paths. Then it is
# necessary to change into temp directory before calling
# makecab.exe.
##
@@ -201,7 +201,7 @@ sub generate_cab_file_list
if ( $onefile-{'Styles'} ) { $styles = $onefile-{'Styles'}; };
if ( $styles =~ /\bDONT_PACK\b/ ) { $doinclude = 0; }
-# to avoid lines with more than 256 characters, it can be useful
to use relative pathes
+# to avoid lines with more than 256 characters, it can be useful
to use relative paths
if ( $allvariables-{'RELATIVE_PATHES_IN_DDF'} ) { $sourcepath =
make_relative_ddf_path($sourcepath); }
# all files with the same cabinetfile have increasing
sequencenumbers
@@ -223,7 +223,7 @@ sub generate_cab_file_list
{
$sourcepath = $nextfile-{'sourcepath'};
if ( $^O =~ /cygwin/i ) { $sourcepath =
$nextfile-{'cyg_sourcepath'}; }
-# to avoid lines with more than 256 characters, it can be
useful to use relative pathes
+# to avoid lines with more than 256 characters, it can be
useful to use relative paths
if ( $allvariables-{'RELATIVE_PATHES_IN_DDF'} ) { $sourcepath
= make_relative_ddf_path($sourcepath); }
$uniquename = $nextfile-{'uniquename'};
my $localdoinclude = 1;
@@ -295,7 +295,7 @@ sub generate_cab_file_list
if ( $onefile-{'Styles'} ) { $styles = $onefile-{'Styles'}; };
if ( $styles =~ /\bDONT_PACK\b/ ) { $doinclude = 0; }
-# to avoid lines with more than 256 characters, it can be useful
to use relative pathes
+# to avoid lines with more than 256 characters, it can be useful
to use relative paths
if ( $allvariables-{'RELATIVE_PATHES_IN_DDF'} ) { $sourcepath =
make_relative_ddf_path($sourcepath); }
my @ddffile = ();
@@ -316,7 +316,7 @@ sub generate_cab_file_list
{
$sourcepath = $nextfile-{'sourcepath'};
if ( $^O =~ /cygwin/i ) { $sourcepath =
$nextfile-{'cyg_sourcepath'}; }
-# to avoid lines with more than 256 characters, it can be
useful to use relative pathes
+# to avoid lines with more than 256 characters, it can be
useful to use relative paths
if ( $allvariables-{'RELATIVE_PATHES_IN_DDF'} ) { $sourcepath
= make_relative_ddf_path($sourcepath); }
$uniquename = $nextfile-{'uniquename'};
my $localdoinclude = 1;
@@ -325,7 +325,7 @@ sub generate_cab_file_list
if ( $nextfilestyles =~ /\bDONT_PACK\b/ ) { $localdoinclude =
0; }
$ddfline = \ . $sourcepath . \ . . $uniquename .
\n;
if ( $localdoinclude ) { push(@ddffile, $ddfline); }
-$counter++; #
increasing the counter!
+$counter++;
$nextfile = ;
$nextcabinetfile = _lastfile_;
if (( exists($sequenceorder-{$counter}) ) (
${$filesref}[$sequenceorder-{$counter}] ))
@@ -375,7 +375,7 @@ sub generate_cab_file_list
if ( $styles =~ /\bDONT_PACK\b/ ) { $doinclude = 0; }
-# to avoid lines with more than 256 characters, it can be useful
to use relative pathes
+# to avoid lines with more than 256 characters, it can be useful
to use relative paths
if ( $allvariables-{'RELATIVE_PATHES_IN_DDF'} ) { $sourcepath =
make_relative_ddf_path($sourcepath); }
# all files with the same cabinetfile are directly behind each
other in the files collector
@@ -396,7 +396,7 @@ sub generate_cab_file_list
{
$sourcepath = $nextfile-{'sourcepath'};
if ( $^O =~ /cygwin/i ) { $sourcepath =
$nextfile-{'cyg_sourcepath'}; }
-# to avoid lines with more than 256 characters, it can be
useful to use relative pathes
+# to avoid lines with more than 256 characters, it can be
useful to use relative paths
[Libreoffice-commits] .: solenv/bin
solenv/bin/deliver.pl |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 97724a27a4055da1b743f3850e5382883e09172d
Author: Tor Lillqvist tlillqv...@suse.com
Date: Thu Nov 3 17:45:31 2011 +0200
Check $OS, not the build platform
diff --git a/solenv/bin/deliver.pl b/solenv/bin/deliver.pl
index 3860fc8..3211e01 100755
--- a/solenv/bin/deliver.pl
+++ b/solenv/bin/deliver.pl
@@ -815,7 +815,7 @@ sub copy_if_newer
}
if ( $success ) {
# handle special packaging of *.dylib files for Mac OS X
-if ( $^O eq 'darwin' )
+if ( $ENV{OS} eq 'MACOSX' )
{
system(macosx-create-bundle, $to=$from.app) if ( -d
$from.app );
system(ranlib, $to ) if ( $to =~ /\.a/ );
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/bin
solenv/bin/linkoo | 27 +--
1 file changed, 25 insertions(+), 2 deletions(-)
New commits:
commit f17c10545fabefd027b278798840706f2dbf4a04
Author: David Tardon dtar...@redhat.com
Date: Mon Oct 24 13:52:57 2011 +0200
create links to gdb autoloaders in the right dir
diff --git a/solenv/bin/linkoo b/solenv/bin/linkoo
index 1c22cb0..c39237f 100755
--- a/solenv/bin/linkoo
+++ b/solenv/bin/linkoo
@@ -341,11 +341,34 @@ sub evilness($)
}
}
+sub do_link_gdb_py($$$)
+{
+my $srcdir = shift;
+my $libdir = shift;
+my $loader = shift;
+
+my $lib = $loader =~ s/-gdb.py$//r;
+my $destdir = $libdir;
+# Autoloader for a library is looked for in the same directory the library
+# is (the library, not a symlink to it). Therefore it does not help to link
+# it from solver into install, because there is only a symlink in install
+# anyway. Instead, we must follow the link.
+if (-l $libdir/$lib) {
+$destdir = readlink ($libdir/$lib);
+$destdir =~ s@/[^/]*$@@;
+}
+
+if ($destdir ne $srcdir) {
+do_link ($srcdir, $destdir, $loader, $loader, 1);
+}
+}
+
sub link_gdb_py()
{
return if ($TARGET eq 'wntgcci.pro');
print Special gdb.py helpers case: ;
+
my $dirh;
my @basis;
my @ure;
@@ -365,10 +388,10 @@ sub link_gdb_py()
print STDERR Warning: missing helpful python debug helpers\n;
} else {
for my $c (@basis) {
- do_link ($src, $OOO_INSTALL/program, $c, $c, 1);
+ do_link_gdb_py ($src, $OOO_INSTALL/program, $c);
}
for my $c (@ure) {
- do_link ($src, $OOO_INSTALL/ure/lib, $c, $c, 1);
+ do_link_gdb_py ($src, $OOO_INSTALL/ure/lib, $c);
}
}
print \n;
___
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 8cfa1d73c165f9e0f09b8cbc41a93c7a66406903 Author: Caolán McNamara caol...@redhat.com Date: Mon Oct 24 15:29:56 2011 +0100 assuming this is a typo diff --git a/solenv/bin/linkoo b/solenv/bin/linkoo index fc7b38c..ac59d88 100755 --- a/solenv/bin/linkoo +++ b/solenv/bin/linkoo @@ -347,7 +347,7 @@ sub do_link_gdb_py($$$) my $libdir = shift; my $loader = shift; -my $lib = $loader =~ s/-gdb.py$//r; +my $lib = $loader =~ s/-gdb.py$//; my $destdir = $libdir; # Autoloader for a library is looked for in the same directory the library # is (the library, not a symlink to it). Therefore it does not help to link ___ 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 761b7e39ebbcd8398c2f67fcead5199285b1cbdc Author: Miklos Vajna vmik...@frugalware.org Date: Sat Oct 15 12:29:47 2011 +0200 mkdocs: sort module list diff --git a/solenv/bin/mkdocs.sh b/solenv/bin/mkdocs.sh index 1e358e6..5cc3d42 100755 --- a/solenv/bin/mkdocs.sh +++ b/solenv/bin/mkdocs.sh @@ -64,7 +64,7 @@ umask 022 # generate docs DOXYGEN_REF_TAGFILES= -for PROJECT in $INPUT_PROJECTS; +for PROJECT in `echo $INPUT_PROJECTS|tr ' ' '\n'|sort|tr '\n' ' '`; do # avoid processing of full project subdirs, only add source and inc DOXYGEN_INPUT=`printf %s $PROJECT/source $PROJECT/inc ` ___ 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 19428106ea6e1614205f6b818565daee56c9d11f Author: Thorsten Behrens tbehr...@novell.com Date: Fri Oct 7 10:14:59 2011 +0200 Miklos wants writerfilter doxygen-ified, too diff --git a/solenv/bin/mkdocs.sh b/solenv/bin/mkdocs.sh index 3d6ba29..1e358e6 100755 --- a/solenv/bin/mkdocs.sh +++ b/solenv/bin/mkdocs.sh @@ -26,7 +26,7 @@ BINDIR=`dirname $0` . ./*.Set.sh # get list of modules in build order - bah, blows RAM disk, static list below -INPUT_PROJECTS=o3tl basegfx basebmp comphelper svl vcl canvas cppcanvas oox svtools goodies drawinglayer xmloff slideshow sfx2 editeng svx cui chart2 dbaccess sd starmath sc sw +INPUT_PROJECTS=o3tl basegfx basebmp comphelper svl vcl canvas cppcanvas oox svtools goodies drawinglayer xmloff slideshow sfx2 editeng svx writerfilter cui chart2 dbaccess sd starmath sc sw # output directory for generated documentation BASE_OUTPUT=$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 | 77 --
1 file changed, 40 insertions(+), 37 deletions(-)
New commits:
commit 28cf0a3cf30c81d8e0120ed13147f1a71b5b46d5
Author: Jan Holesovsky ke...@suse.cz
Date: Tue Sep 27 14:45:00 2011 +0200
Process options early so that $TARGET is set when we need it.
diff --git a/solenv/bin/linkoo b/solenv/bin/linkoo
index d8997a8..5da680c 100755
--- a/solenv/bin/linkoo
+++ b/solenv/bin/linkoo
@@ -69,6 +69,46 @@ my $LIBVER;
my $OOO_BUILD;
my $OOO_INSTALL;
+# process options
+for my $a (@ARGV) {
+
+# options
+if ($a =~ /--dry-run/) {
+$dry_run = 1;
+} elsif (($a eq '--help') || ($a eq '-h')) {
+ $usage = 1;
+
+# ordered arguments
+} elsif (!defined $OOO_INSTALL) {
+ $OOO_INSTALL = $a;
+} elsif (!defined $OOO_BUILD) {
+ $OOO_BUILD = $a;
+} else {
+ print Unknown argument '$a'\n;
+ $usage = 1;
+}
+}
+
+if (!defined $OOO_BUILD defined $ENV{SRC_ROOT}) {
+$OOO_BUILD = $ENV{SRC_ROOT};
+}
+
+if ($usage || !defined $OOO_INSTALL || !defined $OOO_BUILD) {
+printf Usage: linkoo /path/to/ooo/install [/path/to/ooo/build/tree]
[--dry-run]\n;
+exit (1);
+}
+
+substr ($OOO_INSTALL, 0, 1) eq '/' || die linkoo requires absolute paths
($OOO_INSTALL does not qualify);
+substr ($OOO_BUILD, 0, 1) eq '/' || die linkoo requires absolute paths
($OOO_BUILD does not qualify);
+
+-d $OOO_INSTALL || die No such directory $OOO_INSTALL;
+-w $OOO_INSTALL || die You need write access to $OOO_INSTALL;
+-d $OOO_BUILD || die No such directory $OOO_BUILD;
+
+($TARGET, $LIBVER, $LANG) = sniff_target ($OOO_BUILD);
+
+
+# setup global variables
my $basis_dir = 'basis-link/program';
my $win_basis_dir = 'Basis/program';
my $brand_program_dir = 'program';
@@ -356,43 +396,6 @@ sub link_pagein_files()
print \n;
}
-for my $a (@ARGV) {
-
-# options
-if ($a =~ /--dry-run/) {
-$dry_run = 1;
-} elsif (($a eq '--help') || ($a eq '-h')) {
- $usage = 1;
-
-# ordered arguments
-} elsif (!defined $OOO_INSTALL) {
- $OOO_INSTALL = $a;
-} elsif (!defined $OOO_BUILD) {
- $OOO_BUILD = $a;
-} else {
- print Unknown argument '$a'\n;
- $usage = 1;
-}
-}
-
-if (!defined $OOO_BUILD defined $ENV{SRC_ROOT}) {
-$OOO_BUILD = $ENV{SRC_ROOT};
-}
-
-if ($usage || !defined $OOO_INSTALL || !defined $OOO_BUILD) {
-printf Usage: linkoo /path/to/ooo/install [/path/to/ooo/build/tree]
[--dry-run]\n;
-exit (1);
-}
-
-substr ($OOO_INSTALL, 0, 1) eq '/' || die linkoo requires absolute paths
($OOO_INSTALL does not qualify);
-substr ($OOO_BUILD, 0, 1) eq '/' || die linkoo requires absolute paths
($OOO_BUILD does not qualify);
-
--d $OOO_INSTALL || die No such directory $OOO_INSTALL;
--w $OOO_INSTALL || die You need write access to $OOO_INSTALL;
--d $OOO_BUILD || die No such directory $OOO_BUILD;
-
-($TARGET, $LIBVER, $LANG) = sniff_target ($OOO_BUILD);
-
evilness ('undo');
my $installed_files = build_installed_list ($OOO_INSTALL);
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
