[ooo-build-commit] 2 commits - bin/fast_merge.pl bin/localize-ooo bin/Makefile.am bin/piece bin/setup.in bin/unpack patches/apply.pl.in patches/dev300 src/sdf
Petr Mladek
pmladek at kemper.freedesktop.org
Wed Dec 2 08:50:01 PST 2009
bin/Makefile.am | 1
bin/fast_merge.pl | 348 -----------------------------------
bin/localize-ooo | 6
bin/piece/build-bootstrap | 5
bin/piece/build-generic | 27 +-
bin/setup.in | 5
bin/unpack | 22 --
patches/apply.pl.in | 6
patches/dev300/piece-l10n.diff | 38 ---
src/sdf/calc-formula-option-tree.sdf | 10 -
10 files changed, 43 insertions(+), 425 deletions(-)
New commits:
commit f4e53c18e2686a283f9143e4f63d93651f3f9668
Author: Petr Mladek <pmladek at suse.cz>
Date: Wed Dec 2 17:47:18 2009 +0100
Renamed kn-IN to kn as done upstream
* src/sdf/calc-formula-option-tree.sdf:
diff --git a/src/sdf/calc-formula-option-tree.sdf b/src/sdf/calc-formula-option-tree.sdf
index b24aa01..e905a86 100644
--- a/src/sdf/calc-formula-option-tree.sdf
+++ b/src/sdf/calc-formula-option-tree.sdf
@@ -38,7 +38,7 @@ svx source\dialog\treeopt.src 0 itemlist RID_OFADLG_OPTIONS_TREE_PAGES.SID_SC_ED
svx source\dialog\treeopt.src 0 itemlist RID_OFADLG_OPTIONS_TREE_PAGES.SID_SC_EDITOPTIONS 6 0 ka Formula 2009-05-27 21:46:35
svx source\dialog\treeopt.src 0 itemlist RID_OFADLG_OPTIONS_TREE_PAGES.SID_SC_EDITOPTIONS 6 0 kk Formula 2009-05-27 21:46:35
svx source\dialog\treeopt.src 0 itemlist RID_OFADLG_OPTIONS_TREE_PAGES.SID_SC_EDITOPTIONS 6 0 km Formula 2009-05-27 21:46:35
-svx source\dialog\treeopt.src 0 itemlist RID_OFADLG_OPTIONS_TREE_PAGES.SID_SC_EDITOPTIONS 6 0 kn-IN Formula 2009-05-27 21:46:35
+svx source\dialog\treeopt.src 0 itemlist RID_OFADLG_OPTIONS_TREE_PAGES.SID_SC_EDITOPTIONS 6 0 kn Formula 2009-05-27 21:46:35
svx source\dialog\treeopt.src 0 itemlist RID_OFADLG_OPTIONS_TREE_PAGES.SID_SC_EDITOPTIONS 6 0 ko Formula 2009-05-27 21:46:35
svx source\dialog\treeopt.src 0 itemlist RID_OFADLG_OPTIONS_TREE_PAGES.SID_SC_EDITOPTIONS 6 0 kok Formula 2009-05-27 21:46:35
svx source\dialog\treeopt.src 0 itemlist RID_OFADLG_OPTIONS_TREE_PAGES.SID_SC_EDITOPTIONS 6 0 ks Formula 2009-05-27 21:46:35
@@ -132,7 +132,7 @@ svx source\dialog\treeopt.src 0 itemlist RID_OFADLG_OPTIONS_TREE_PAGES.SID_SC_ED
svx source\dialog\treeopt.src 0 itemlist RID_OFADLG_OPTIONS_TREE_PAGES.SID_SC_EDITOPTIONS 7 0 ka სიის სáƒáƒ ტირებრ2009-05-27 21:46:35
svx source\dialog\treeopt.src 0 itemlist RID_OFADLG_OPTIONS_TREE_PAGES.SID_SC_EDITOPTIONS 7 0 kk Сұрыптау тiзiмi 2009-05-27 21:46:35
svx source\dialog\treeopt.src 0 itemlist RID_OFADLG_OPTIONS_TREE_PAGES.SID_SC_EDITOPTIONS 7 0 km បញ្ជី​ážáž˜áŸ’រៀប 2009-05-27 21:46:35
-svx source\dialog\treeopt.src 0 itemlist RID_OFADLG_OPTIONS_TREE_PAGES.SID_SC_EDITOPTIONS 7 0 kn-IN ವಿಂಗಡನಾ ಪಟà³à²Ÿà²¿à²—ಳೠ2009-05-27 21:46:35
+svx source\dialog\treeopt.src 0 itemlist RID_OFADLG_OPTIONS_TREE_PAGES.SID_SC_EDITOPTIONS 7 0 kn ವಿಂಗಡನಾ ಪಟà³à²Ÿà²¿à²—ಳೠ2009-05-27 21:46:35
svx source\dialog\treeopt.src 0 itemlist RID_OFADLG_OPTIONS_TREE_PAGES.SID_SC_EDITOPTIONS 7 0 ko ì •ë ¬ ëª©ë¡ 2009-05-27 21:46:35
svx source\dialog\treeopt.src 0 itemlist RID_OFADLG_OPTIONS_TREE_PAGES.SID_SC_EDITOPTIONS 7 0 kok वळेरींचे वरà¥à¤—ीकरण 2009-05-27 21:46:35
svx source\dialog\treeopt.src 0 itemlist RID_OFADLG_OPTIONS_TREE_PAGES.SID_SC_EDITOPTIONS 7 0 ks ÙÛرست كریو سارٹ 2009-05-27 21:46:35
@@ -225,7 +225,7 @@ svx source\dialog\treeopt.src 0 itemlist RID_OFADLG_OPTIONS_TREE_PAGES.SID_SC_ED
svx source\dialog\treeopt.src 0 itemlist RID_OFADLG_OPTIONS_TREE_PAGES.SID_SC_EDITOPTIONS 8 0 ja 変更 2009-05-27 21:46:35
svx source\dialog\treeopt.src 0 itemlist RID_OFADLG_OPTIONS_TREE_PAGES.SID_SC_EDITOPTIONS 8 0 ka ცვლილებები 2009-05-27 21:46:35
svx source\dialog\treeopt.src 0 itemlist RID_OFADLG_OPTIONS_TREE_PAGES.SID_SC_EDITOPTIONS 8 0 km ​ភាព​​ផ្លាស់ប្ážáž¼ážš 2009-05-27 21:46:35
-svx source\dialog\treeopt.src 0 itemlist RID_OFADLG_OPTIONS_TREE_PAGES.SID_SC_EDITOPTIONS 8 0 kn-IN ಬದಲಾವಣೆಗಳೠ2009-05-27 21:46:35
+svx source\dialog\treeopt.src 0 itemlist RID_OFADLG_OPTIONS_TREE_PAGES.SID_SC_EDITOPTIONS 8 0 kn ಬದಲಾವಣೆಗಳೠ2009-05-27 21:46:35
svx source\dialog\treeopt.src 0 itemlist RID_OFADLG_OPTIONS_TREE_PAGES.SID_SC_EDITOPTIONS 8 0 ko 변경 ì‚¬í• 2009-05-27 21:46:35
svx source\dialog\treeopt.src 0 itemlist RID_OFADLG_OPTIONS_TREE_PAGES.SID_SC_EDITOPTIONS 8 0 kok बदल 2009-05-27 21:46:35
svx source\dialog\treeopt.src 0 itemlist RID_OFADLG_OPTIONS_TREE_PAGES.SID_SC_EDITOPTIONS 8 0 ks تبدیلی 2009-05-27 21:46:35
@@ -318,7 +318,7 @@ svx source\dialog\treeopt.src 0 itemlist RID_OFADLG_OPTIONS_TREE_PAGES.SID_SC_ED
svx source\dialog\treeopt.src 0 itemlist RID_OFADLG_OPTIONS_TREE_PAGES.SID_SC_EDITOPTIONS 9 0 ja グリッド線 2009-05-27 21:46:35
svx source\dialog\treeopt.src 0 itemlist RID_OFADLG_OPTIONS_TREE_PAGES.SID_SC_EDITOPTIONS 9 0 ka ბáƒáƒ“ე 2009-05-27 21:46:35
svx source\dialog\treeopt.src 0 itemlist RID_OFADLG_OPTIONS_TREE_PAGES.SID_SC_EDITOPTIONS 9 0 km ក្រឡា​​​​ចážáŸ’រង្គ 2009-05-27 21:46:35
-svx source\dialog\treeopt.src 0 itemlist RID_OFADLG_OPTIONS_TREE_PAGES.SID_SC_EDITOPTIONS 9 0 kn-IN ಚೌಕಜಾಲ 2009-05-27 21:46:35
+svx source\dialog\treeopt.src 0 itemlist RID_OFADLG_OPTIONS_TREE_PAGES.SID_SC_EDITOPTIONS 9 0 kn ಚೌಕಜಾಲ 2009-05-27 21:46:35
svx source\dialog\treeopt.src 0 itemlist RID_OFADLG_OPTIONS_TREE_PAGES.SID_SC_EDITOPTIONS 9 0 ko 그리드 2009-05-27 21:46:35
svx source\dialog\treeopt.src 0 itemlist RID_OFADLG_OPTIONS_TREE_PAGES.SID_SC_EDITOPTIONS 9 0 kok गà¥à¤°à¤¿à¤¡ 2009-05-27 21:46:35
svx source\dialog\treeopt.src 0 itemlist RID_OFADLG_OPTIONS_TREE_PAGES.SID_SC_EDITOPTIONS 9 0 ks گریڈ 2009-05-27 21:46:35
@@ -411,7 +411,7 @@ svx source\dialog\treeopt.src 0 itemlist RID_OFADLG_OPTIONS_TREE_PAGES.SID_SC_ED
svx source\dialog\treeopt.src 0 itemlist RID_OFADLG_OPTIONS_TREE_PAGES.SID_SC_EDITOPTIONS 10 0 ja å°åˆ· 2009-05-27 21:46:35
svx source\dialog\treeopt.src 0 itemlist RID_OFADLG_OPTIONS_TREE_PAGES.SID_SC_EDITOPTIONS 10 0 ka ბეáƒáƒ“ვრ2009-05-27 21:46:35
svx source\dialog\treeopt.src 0 itemlist RID_OFADLG_OPTIONS_TREE_PAGES.SID_SC_EDITOPTIONS 10 0 km បោះ​​ពុម្ព​ 2009-05-27 21:46:35
-svx source\dialog\treeopt.src 0 itemlist RID_OFADLG_OPTIONS_TREE_PAGES.SID_SC_EDITOPTIONS 10 0 kn-IN ಮà³à²¦à³à²°à²¿à²¸à³ 2009-05-27 21:46:35
+svx source\dialog\treeopt.src 0 itemlist RID_OFADLG_OPTIONS_TREE_PAGES.SID_SC_EDITOPTIONS 10 0 kn ಮà³à²¦à³à²°à²¿à²¸à³ 2009-05-27 21:46:35
svx source\dialog\treeopt.src 0 itemlist RID_OFADLG_OPTIONS_TREE_PAGES.SID_SC_EDITOPTIONS 10 0 ko ì¸ì‡„ 2009-05-27 21:46:35
svx source\dialog\treeopt.src 0 itemlist RID_OFADLG_OPTIONS_TREE_PAGES.SID_SC_EDITOPTIONS 10 0 kok छापात 2009-05-27 21:46:35
svx source\dialog\treeopt.src 0 itemlist RID_OFADLG_OPTIONS_TREE_PAGES.SID_SC_EDITOPTIONS 10 0 ks چھپئویو 2009-05-27 21:46:35
commit b2604f0b3a30b3073a5484f89bf94368626622df
Author: Petr Mladek <pmladek at suse.cz>
Date: Wed Dec 2 17:20:13 2009 +0100
More l10n stuff fixes to get it working in the split build
* bin/unpack, bin/piece/build-bootstrap: do not build l10n stuff in the
bootstrap piece;
* patches/dev300/piece-l10n.diff: fix build in libs-gui
* bin/fast_merge.pl, bin/Makefile.am: bin obsolete fast_merge.pl; l10n module
will be build in libs-gui, ...
* bin/localize-ooo: reuse the ALL_LANGS check from setup; do not set WRAPCMD
in the split build; it breaks it and is not needed
* bin/setup.in: find solenv correctly in the split build
* bin/piece/build-generic: build transex3 before the modules depending on l10n;
call localize-ooo only in libs-gui (need to localize only the l10n module);
use apply.pl with --additional-sections rather than --distro; do not
explicitely apply the Localize sections
* patches/apply.pl.in: allow to use the option --additional-sections several
times
diff --git a/bin/Makefile.am b/bin/Makefile.am
index fd4a1ac..251732b 100644
--- a/bin/Makefile.am
+++ b/bin/Makefile.am
@@ -12,7 +12,6 @@ script_files = \
defuzzpatch \
extract-gsi \
extract-new-strings \
- fast_merge.pl \
font-munge \
fix-deps \
generate-bash-completion \
diff --git a/bin/fast_merge.pl b/bin/fast_merge.pl
deleted file mode 100755
index 8c99f81..0000000
--- a/bin/fast_merge.pl
+++ /dev/null
@@ -1,348 +0,0 @@
-:
-eval 'exec perl -wS $0 ${1+"$@"}'
- if 0;
-#*************************************************************************
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: fast_merge.pl,v $
-#
-# $Revision: 1.1.2.2 $
-#
-# last change: $Author: ihi $ $Date: 2007/07/20 10:37:53 $
-#
-# The Contents of this file are made available subject to
-# the terms of GNU Lesser General Public License Version 2.1.
-#
-#
-# GNU Lesser General Public License Version 2.1
-# =============================================
-# Copyright 2005 by Sun Microsystems, Inc.
-# 901 San Antonio Road, Palo Alto, CA 94303, USA
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License version 2.1, as published by the Free Software Foundation.
-#
-# This library 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 for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-# MA 02111-1307 USA
-#
-#*************************************************************************
-
-use strict;
-use Class::Struct;
-use Getopt::Long;
-use File::Temp;
-use File::Path;
-
-my @files;
-my @file_names;
-my $module_name = '';
-my @current;
-my @buffer;
-my $last_file;
-my $last_path;
-my $last_localize_file;
-my $first_run = "1";
-my $sdf_filename;
-my $merge_dir;
-my $WIN;
-my $state = "none";
-
-if ( defined $ENV{USE_SHELL} && $ENV{USE_SHELL} eq '4nt' ) { $WIN = 'TRUE'; }
-else { $WIN = ''; }
-
-$SIG{INT} = 'inthandler';
-$SIG{QUIT} = 'quithandler';
-
-struct ( sdf_obj =>
-{
- module => '$',
- file => '$',
- dir => '$',
- FILEHANDLE => '$',
- line => '$',
- endoffile => '$'
-}
-);
-
-parse_options();
-my $lock_file = $merge_dir."/lock.mk";
-$lock_file =~ s/\//\\/g , if ( $WIN ) ;
-acquire_lock();
-read_sdf_file_names();
-init();
-my $reference;
-my $path ;
-my $localize_file;
-while( hasLines() )
-{
- @current = ();
- foreach ( @files )
- {
- push @current , $_;
- }
-
- $reference = getNextIdentifier( );
-
- @current = ();
- foreach ( @files )
- {
- if( $_->module eq $reference->module && $_->dir eq $reference->dir )
- {
- push @current , $_ ;
- }
- }
- write_lines();
-}
-if( $#current+1 ne 0 )
-{
- ( $path , $localize_file ) = make_paths();
- add_to_buffer();
- write_buffer( $path , $localize_file );
-}
-release_lock();
-exit( 0 );
-
-##########################################################################################
-sub acquire_lock
-{
- if( -e $lock_file ){
- $state = "blocked";
- print "WARNING: Lock file '$lock_file' 'found, waiting ....\n";
- my $cnt = 0;
- sleep 10 , while( -e $lock_file && $cnt++ < 180 );
- exit( 0 );
- }else
- {
- $state = "locked";
- print "Writing lock file '$lock_file'\n";
- open FILE, ">$lock_file" or die "Can't create lock file '$lock_file'";
- print FILE "L10N_LOCK=YES" ;
- close ( FILE );
- }
-}
-sub release_lock
-{
- print "Deleting lock file '$lock_file'\n";
- unlink $lock_file, if( -e $lock_file );
- $state = "none";
-}
-sub inthandler
-{
- release_lock() , if( $state eq "locked" );
- exit( -1 );
-}
-sub quithandler
-{
- release_lock() , if( $state eq "locked" );
- exit( 0 );
-}
-
-sub init
-{
- foreach my $file ( @file_names )
- {
- my $obj = new sdf_obj;
- open my $FILEHANDLE , "<$file" or die "Can't open file '$file'";
- $obj->FILEHANDLE ( $FILEHANDLE ) ;
- getNextSdfObj( $obj );
- push @files, $obj ;
- print "Open file '$file'\n";
- }
-}
-
-# get the next module/file
-sub getNextIdentifier
-{
- my @sorted = sort {
- return $a->module.$a->dir cmp $b->module.$b->dir;
- } @current ;
- return shift @sorted;
-}
-
-# update the obj with the next line
-sub getNextSdfObj
-{
- my $obj = shift;
- my $line = readline ( $obj->FILEHANDLE );
- if ( $line eq undef )
- {
- $obj->endoffile( "true" );
- }
- else
- {
- $line =~ /^(([^\t]*)\t([^\t]*).*)/o ;
- if( defined $1 && defined $2 && defined $3 )
- {
- $obj->line ( $1 );
- $obj->module( $2 );
- $obj->file ( $3 );
- $obj->dir ( getDir( $3 ) );
- }
- else
- {
- $obj->line ( "" );
- $obj->module( "" );
- $obj->file ( "" );
- $obj->dir ( "" );
- }
- }
- return $obj;
-}
-sub getNextSdfObjModule
-{
- my $obj = shift;
- while( !$obj->endoffile )
- {
- my $line = readline ( $obj->FILEHANDLE );
- if ( $line eq undef )
- {
- $obj->endoffile( "true" );
- }
- else
- {
- $line =~ /^(([^\t]*)\t([^\t]*).*)/o ;
- if( defined $1 && defined $2 && defined $3 )
- {
- $obj->line ( $1 );
- $obj->module( $2 );
- $obj->file ( $3 );
- $obj->dir ( getDir( $3 ) );
- }
- else
- {
- $obj->line ( "" );
- $obj->module( "" );
- $obj->file ( "" );
- $obj->dir ( "" );
- }
- return $obj , if( $obj->module eq $module_name )
- }
- }
- #return $obj;
-}
-sub getDir
-{
- my $path = shift ;
- $path =~ s/\//\\/g;
- my @tmp_path = split /\\/ , $path;
- pop @tmp_path;
- $path = join '\\' , @tmp_path;
- return $path;
-}
-
-sub hasLines
-{
- my $hasLines = "";
- my @tmpfiles;
- foreach ( @files )
- {
- push @tmpfiles , $_, if( !$_->endoffile );
- }
- @files = @tmpfiles;
- return $#files+1;
-}
-
-sub make_paths
-{
- my $localizeFile = $merge_dir."\\".$current[ 0 ]->module."\\".$current[ 0 ]->file;
- my $path = getDir( $localizeFile );
- if ( !$WIN ) { $path =~ s/\\/\//g; }
-
- $localizeFile = $path."\\localize.sdf";
- if ( !$WIN ) { $localizeFile =~ s/\\/\//g; }
-
- return ( $path , $localizeFile );
-}
-sub write_lines
-{
- if( $first_run ){
- add_to_buffer();
- my( $path , $localize_file ) = make_paths();
- $last_path = $path;
- $last_localize_file = $localize_file;
- mkpath $path;
- write_buffer( $path , $localize_file );
- $first_run = '';
- }
- else
- {
- return , if ( $#current+1 eq 0 );
- my( $path , $localize_file ) = make_paths();
- if( $path eq $last_path )
- {
- add_to_buffer();
- }
- else
- {
- mkpath $path;
- write_buffer( $last_path , $last_localize_file );
- add_to_buffer();
- $last_path = $path;
- $last_localize_file = $localize_file;
- }
- }
-}
-sub add_to_buffer
-{
- my $plainline;
- my $afile;
- my $amodule;
- foreach my $elem ( @current )
- {
- do {
- $amodule=$elem->module;
- $afile=$elem->file;
- $plainline=$elem->line;
- push @buffer, $plainline;
- getNextSdfObj( $elem );
- } while ( !$elem->endoffile && $amodule eq $elem->module && $afile eq $elem->file );
- }
-}
-sub write_buffer
-{
- my $path = shift;
- my $localize_file = shift;
- my $cnt = $#buffer+1;
- print "Write to $path $cnt lines\n";
- open FILE , ">>$localize_file" or die "Can't open file '$localize_file'\n";
- foreach ( @buffer )
- {
- print FILE $_."\n";
- }
- @buffer = ();
-}
-sub parse_options
-{
- my $success = GetOptions( 'sdf_files=s' => \$sdf_filename , 'merge_dir=s' => \$merge_dir ); #, 'module=s' => \$module_name );
- if( ! ( $sdf_filename && $merge_dir && $success ) )
- {
- usage();
- exit( -1 );
- }
-}
-
-sub usage
-{
- print "Usage: fast_merge -sdf_files <file containing sdf file names> -merge_dir <directory>\n" ;
-}
-
-sub read_sdf_file_names
-{
- open FILE , "<$sdf_filename" or die "Can't open file '$sdf_filename'\n";
- while ( <FILE> )
- {
- push @file_names , split " " , $_ ;
- }
- close ( FILE );
-}
-
-
diff --git a/bin/localize-ooo b/bin/localize-ooo
index 17cd038..5203df2 100755
--- a/bin/localize-ooo
+++ b/bin/localize-ooo
@@ -11,8 +11,7 @@ if test -n "$OO_TOOLSDIR" ; then
SRCDIR=$OO_TOOLSDIR/../src
SRCDIR_PIECE=$OOBUILDDIR/ooo-build/sdf
TOOLSDIR=$OO_TOOLSDIR/..
- OOO_LANGS_LIST="$OO_LANGS"
- ALL_LANGS=`sed -n -e "s|^[[:space:]]*completelangiso=\(.*\)\(en-US \)\(.*\)$|\2\1\3|p" $SOLARENV/inc/postset.mk`
+ OOO_LANGS_LIST=`echo $OO_LANGS | sed -e "s|ALL|$ALL_LANGS|g"`
split_build=yes
else
. ./setup
@@ -45,7 +44,8 @@ merge_localization()
rm $sdf_file_filtered
}
-export WRAPCMD="LD_LIBRARY_PATH=$SOLARVER/$INPATH/lib PATH=$PATH:$SOLARVER/$INPATH/bin"
+# binaries in non-split build needs extra wrapper to find the stuff in the solver
+test "$split_build" = "yes" || export WRAPCMD="LD_LIBRARY_PATH=$SOLARVER/$INPATH/lib PATH=$PATH:$SOLARVER/$INPATH/bin"
# build the localize tool if needed (only in the non-split build)
if test "$split_build" != "yes" && ! localize -h >/dev/null 2>&1 ; then
diff --git a/bin/piece/build-bootstrap b/bin/piece/build-bootstrap
index 66549a2..b222ed5 100755
--- a/bin/piece/build-bootstrap
+++ b/bin/piece/build-bootstrap
@@ -4,7 +4,4 @@
export ULFEX=$TOOLSDIR/bin/piece/noulf
export ULFCONV=$TOOLSDIR/bin/piece/noulfconv
-# check for optional l10n module
-test -d l10n && l10n=":l10n" || l10n=
-
-perl $SOLARENV/bin/build.pl --subdirs:soltools:scp2$l10n $EXTRA_BUILD_FLAGS $EXTRA_DMAKE_FLAGS || exit 1;
+perl $SOLARENV/bin/build.pl --subdirs:soltools:scp2 $EXTRA_BUILD_FLAGS $EXTRA_DMAKE_FLAGS || exit 1;
diff --git a/bin/piece/build-generic b/bin/piece/build-generic
index 52e986f..0fb98cb 100755
--- a/bin/piece/build-generic
+++ b/bin/piece/build-generic
@@ -27,14 +27,14 @@ test "$piece" = "filters" && mkdir -p lotuswordpro
# apply flags
builddir=`pwd`
FLAGS=`$OO_TOOLSDIR/applyflags $OO_TOOLSDIR $builddir`
-# explicitely add --distro=Localize --distro=System
-# they can't be detected easily
-FLAGS="$FLAGS --distro=Localize --distro=System"
+# explicitely add --distro=System
+# it can't be detected easily
+FLAGS="$FLAGS --additional-sections=System"
# additional piece-specific sections added in the package sources (special build)
additional_sections_file="$builddir/ooo-build/apply-additional-sections"
if test -f "$additional_sections_file" ; then
for section in `sed "s|,| |g" $additional_sections_file` ; do
- FLAGS="$FLAGS --distro=$section"
+ FLAGS="$FLAGS --additional-sections=$section"
done
fi
# additional piece specifix hotfixes added in the package sources (special build)
@@ -57,14 +57,21 @@ if test ! -d solver; then
export nodep=1
fi
-# might need to build localize tool first
+# apply extra localization fixes in the libs-gui piece
if test "$piece" = "libs-gui" -o "$piece" = "libs_gui" ; then
- perl $SOLARENV/bin/build.pl --subdirs:$dirs $EXTRA_BUILD_FLAGS $EXTRA_DMAKE_FLAGS || exit 1;
+ # do not build modules depending on transex3,l10n,vcl now
+ for dir in * ; do
+ test -f $dir/prj/build.lst && \
+ head -n 1 $dir/prj/build.lst | grep -q -e transex3 -e l10n -e vcl && \
+ omit_dirs="$omit_dirs -e ^$dir\$"
+ transex3_dirs=`/bin/ls | grep -v $omit_dirs | tr '\n' ':'`
+ # actually build the transex3 module
+ transex3_dirs="transex3:$transex3_dirs"
+ done
+ # build the localize tool
+ perl $SOLARENV/bin/build.pl --subdirs:$transex3_dirs $EXTRA_BUILD_FLAGS $EXTRA_DMAKE_FLAGS || exit 1;
unset nodep
-fi
-
-# localize
-if which localize >/dev/null 2>&1 ; then
+ # apply sdf files
$OO_TOOLSDIR/localize-ooo || exit 1;
fi
diff --git a/bin/setup.in b/bin/setup.in
index 9fa2cda..843c578 100755
--- a/bin/setup.in
+++ b/bin/setup.in
@@ -157,7 +157,8 @@ TCSH=/bin/tcsh
LIB=`echo $LIBDIRBASE|sed 's|.*/||'`
# substitute ALL to the list of languages if possible
-if test -f $OOBUILDDIR/solenv/inc/postset.mk ; then
+test -n "$OO_TOOLSDIR" && solenv_dir=$SOLARENV || solenv_dir=$OOBUILDDIR/solenv
+if test -f $solenv_dir/inc/postset.mk ; then
# generate shell variable from completelangiso= from solenv/inc/postset.mk
# the sed command does the following:
# + adds " on the beginning of the value (after =)
@@ -165,7 +166,7 @@ if test -f $OOBUILDDIR/solenv/inc/postset.mk ; then
# + removes backslashes
# + removes en-US; we want to put it on the beginning
# + prints just the section starting with 'completelangiso=' and ending with the " at the end of line
- eval $(sed -n 's/=/="/;s/\([^\\]\)$/\1"/;s/\\//;s/en-US//;/^completelangiso=/,/"$/p' $OOBUILDDIR/solenv/inc/postset.mk)
+ eval $(sed -n 's/=/="/;s/\([^\\]\)$/\1"/;s/\\//;s/en-US//;/^completelangiso=/,/"$/p' $solenv_dir/inc/postset.mk)
ALL_LANGS="en-US $completelangiso"
OOO_LANGS_LIST=`echo $OOO_LANGS | sed -e "s|ALL|$ALL_LANGS|g"`
fi
diff --git a/bin/unpack b/bin/unpack
index 0d464e5..b83961d 100755
--- a/bin/unpack
+++ b/bin/unpack
@@ -80,10 +80,8 @@ if test "z$OOO_GIT" = "z" ; then
else
CORE_PKGS=$ALL_CORE_PKGS
fi
- if test "z$OOO_LANGS" != "z" -a "z$OOO_LANGS" != "zen-US"; then
- if test "z$PIECE" = "z" -o "z$PIECE" = "zbootstrap" ; then
- CORE_PKGS="$CORE_PKGS l10n"
- fi
+ if test "z$OOO_LANGS" != "z" -a "z$OOO_LANGS" != "zen-US" -a "z$PIECE" = "z" ; then
+ CORE_PKGS="$CORE_PKGS l10n"
fi
for pkg in $CORE_PKGS; do
check_tarball "$OOO_SPLIT_PREFIX$pkg.tar.bz2"
@@ -99,10 +97,8 @@ else
else
CORE_PKGS=$ALL_CORE_PKGS
fi
- if test \( "z$OOO_LANGS" != "z" -a "z$OOO_LANGS" != "zen-US" \) -o "z$BUILD_WIN32" != "z"; then
- if test "z$PIECE" = "z" -o "z$PIECE" = "zbootstrap" ; then
- CORE_PKGS="$CORE_PKGS l10n"
- fi
+ if test \( "z$OOO_LANGS" != "z" -a "z$OOO_LANGS" != "zen-US" -a "z$PIECE" = "z" \) -o "z$BUILD_WIN32" != "z"; then
+ CORE_PKGS="$CORE_PKGS l10n"
fi
for pkg in $CORE_PKGS ; do
check_git_repo $pkg
@@ -246,15 +242,7 @@ if test "z$OOO_GIT" = "z" ; then
if test "$SOURCE_TYPE" = "CGIT" ; then
if test $pkg = l10n ; then
- if test "z$PIECE" != "z" ; then
- # we are interested only into the l10n directory;
- # the rest seems to be useless anyway (i#105973)
- mv $GITTAG/l10n $OOBUILDDIR
- # FIXME: this is taken from the transex3 module
- cp $TOOLSDIR/bin/fast_merge.pl $OOBUILDDIR/l10n/source/
- else
- (cd $GITTAG && $GNUTAR cf - .) | (cd $OOBUILDDIR && $GNUTAR xpf -)
- fi
+ (cd $GITTAG && $GNUTAR cf - .) | (cd $OOBUILDDIR && $GNUTAR xpf -)
else
mv $GITTAG/* $OOBUILDDIR
fi
diff --git a/patches/apply.pl.in b/patches/apply.pl.in
index 5b8c8e4..4400a3f 100755
--- a/patches/apply.pl.in
+++ b/patches/apply.pl.in
@@ -1207,7 +1207,11 @@ foreach $a (@ARGV) {
} elsif ($a =~ m/--distro=(.*)/) {
push @distros, $1;
} elsif ($a =~ m/--additional-sections=(.*)/) {
- $additional_sections="$1";
+ if ($additional_sections) {
+ $additional_sections .= ",$1";
+ } else {
+ $additional_sections="$1";
+ }
} elsif ($a =~ m/--hotfixes=(.*)/) {
$extra_hotfixes_dir="$1";
} elsif ($a =~ m/--add-developer/) {
diff --git a/patches/dev300/piece-l10n.diff b/patches/dev300/piece-l10n.diff
index dd57318..5ef3c57 100644
--- a/patches/dev300/piece-l10n.diff
+++ b/patches/dev300/piece-l10n.diff
@@ -1,40 +1,10 @@
---- l10n/prj/build.lst.old 2009-10-08 08:11:52.000000000 +0200
-+++ l10n/prj/build.lst 2009-10-16 19:29:55.000000000 +0200
-@@ -1,3 +1,3 @@
--l10n l10n : transex3 NULL
-+l10n l10n : solenv NULL
- l10n l10n\source nmake - all l10n_source NULL
- l10n l10n\util nmake - all l10n_util l10n_source NULL
---- l10n/source/makefile.mk.old 2009-10-08 08:11:52.000000000 +0200
-+++ l10n/source/makefile.mk 2009-10-19 16:57:24.000000000 +0200
-@@ -93,6 +93,6 @@ $(COMMONMISC)$/merge.done : $(all_sdfs)
+--- l10n/source/makefile.mk.old 2009-12-01 17:12:34.000000000 +0100
++++ l10n/source/makefile.mk 2009-12-01 17:12:01.000000000 +0100
+@@ -107,6 +107,6 @@ $(COMMONMISC)$/merge.done : $(all_sdfs)
-rm -rf $(COMMONMISC)$/sdf$(INPATH)_begone
-$(MKDIRHIER) $(COMMONMISC)$/sdf
.ENDIF # "$(L10n_LOCK)" != "YES"
- $(PERL) $(SOLARVER)$/$(INPATH)$/bin$(UPDMINOREXT)$/fast_merge.pl -sdf_files $(mktmp $<) -merge_dir $(COMMONMISC)$/sdf && echo $< >$@
-+ $(PERL) fast_merge.pl -sdf_files $(mktmp $<) -merge_dir $(COMMONMISC)$/sdf && echo $< >$@
++ $(PERL) $(SOLARPIECE)$/$(INPATH)$/bin$(UPDMINOREXT)$/fast_merge.pl -sdf_files $(mktmp $<) -merge_dir $(COMMONMISC)$/sdf && echo $< >$@
.ENDIF
---- solenv/inc/target.mk.old 2009-10-20 16:25:25.000000000 +0200
-+++ solenv/inc/target.mk 2009-10-22 11:55:59.000000000 +0200
-@@ -1394,12 +1394,20 @@ $(UNIXTEXT) : $(UNIXTEXT:f)
- .IF "$(WITH_LANG)"!=""
- .IF "$(LOCALIZATION_FOUND)"==""
- .IF "$(LOCALIZESDF)"!=""
-+
-+# check whether zip file with sdf files exists for this project
-+TRYSDFZIP=$(SOLARCOMMONSDFDIR)/$(PRJNAME).zip
-+HAVE_LOCALIZESDFZIP:=$(strip $(shell @+$(IFEXIST) $(TRYSDFZIP) $(THEN) echo 'TRUE' $(FI)))
-+
-+.IF "$(HAVE_LOCALIZESDFZIP)"=="TRUE"
- "$(LOCALIZESDF)" : $(SOLARCOMMONSDFDIR)/$(PRJNAME).zip
- @@-$(MKDIRHIER) $(@:d)
- @@-$(MKDIRHIER) $(COMMONMISC)/$(PRJNAME)_$(TARGET)
- @@$(IFNOTEXIST) $(LOCALIZESDF) $(THEN) unzip -o -d $(COMMONMISC)/$(PRJNAME)_$(TARGET) $(SOLARCOMMONSDFDIR)/$(PRJNAME).zip $(FI)
- @@-cp -r $(COMMONMISC)/$(PRJNAME)_$(TARGET)/* $(COMMONMISC)/$(PRJNAME)
- @@-$(RM) -rf $(COMMONMISC)/$(PRJNAME)_$(TARGET)
-+.ENDIF # "$(HAVE_LOCALIZESDFZIP)"=="YES"
-+
- .ENDIF # "$(LOCALIZESDF)"!=""
- .ENDIF # "$(LOCALIZATION_FOUND)"==""
- .ENDIF # "$(WITH_LANG)"!=""
More information about the ooo-build-commit
mailing list