[Libreoffice-commits] .: Branch 'libreoffice-3-4' - 2 commits - solenv/bin

[Fridrich Strba]

 solenv/bin/ooinstall |   13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

New commits:
commit be21c9c7ae338ccd42e35d625c3231a868e44999
Author: Andras Timar <atimar at suse.com>
Date:   Mon May 23 19:49:46 2011 +0200

    don't forget en-US when dev-installing ALL languages
    
    Signed-off-by: Fridrich Å trba <fridrich.strba at bluewin.ch>

diff --git a/solenv/bin/ooinstall b/solenv/bin/ooinstall
index ee77975..115a5f9 100755
--- a/solenv/bin/ooinstall
+++ b/solenv/bin/ooinstall
@@ -73,6 +73,7 @@ if ($langs eq 'ALL') {
     @larr = readdir(DIR);
     @larr = grep { $_ ne '.' } @larr;
     @larr = grep { $_ ne '..' } @larr;
+    @larr = (@larr,"en-US");
     closedir(DIR);
 }
 else {
commit f73330ec57f65e64a4fe700449f7b7c0b03d1ee6
Author: Andras Timar <atimar at suse.com>
Date:   Mon May 16 12:28:28 2011 +0200

    handle --with-lang=ALL case
    
    Signed-off-by: Fridrich Å trba <fridrich.strba at bluewin.ch>

diff --git a/solenv/bin/ooinstall b/solenv/bin/ooinstall
index 89aea81..ee77975 100755
--- a/solenv/bin/ooinstall
+++ b/solenv/bin/ooinstall
@@ -65,9 +65,19 @@ $ENV{LOCAL_COMMON_OUT} = $ENV{OUT};
 # the installer to use the English localization of the file instead.
 $ENV{DEFAULT_TO_ENGLISH_FOR_PACKING} = 1;
 
+my @larr;
 $langs=$ENV{WITH_LANG};
 $langs='en-US' if $langs eq '';
-my @larr = grep { $_ ne '' } split(/ /, $langs);
+if ($langs eq 'ALL') {
+    opendir(DIR,$ENV{L10N_MODULE} . "/source");
+    @larr = readdir(DIR);
+    @larr = grep { $_ ne '.' } @larr;
+    @larr = grep { $_ ne '..' } @larr;
+    closedir(DIR);
+}
+else {
+    @larr = grep { $_ ne '' } split(/ /, $langs);
+}
 $langs = join (",", @larr);
 
 $destdir='';