[ooo-build-commit] Branch 'ooo/master' - postprocess/rebase

[Jan Holesovsky]

 postprocess/rebase/rebase.pl |   10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

New commits:
commit 9b72f5c3339a0e06e8f29792388d06c9f81e5b84
Author: Ivo Hinkelmann <ihi at openoffice.org>
Date:   Wed Jul 15 16:00:45 2009 +0000

    CWS-TOOLING: integrate CWS ause105
    2009-07-08 17:57:23 +0200 hjs  r273843 : #i103418# add missing dependency on localized .hrc files
    2009-07-08 17:28:46 +0200 hjs  r273841 : #i103416# handle new solver subdir sdf
    2009-07-08 11:27:47 +0200 hjs  r273823 : #i103409# disable cmd.exe autorun
    2009-07-07 19:23:23 +0200 hjs  r273813 : #i103394# fix path handling of files failed in first run of rebase.exe

diff --git a/postprocess/rebase/rebase.pl b/postprocess/rebase/rebase.pl
index 3ddecb8..b37c857 100755
--- a/postprocess/rebase/rebase.pl
+++ b/postprocess/rebase/rebase.pl
@@ -196,6 +196,7 @@ sub rebase_again
     my $oldfiles_ref = shift;
     my $newfiles_ref = shift;
     my @grownfiles;
+    my $solarbin ="$ENV{SOLARVERSION}/$ENV{INPATH}/bin$ENV{UPDMINOREXT}";
     my $command = "rebase " . $options_string;
     if ( $ENV{WRAPCMD} ) {
         $command = $ENV{WRAPCMD} . " " . $command;
@@ -222,7 +223,14 @@ sub rebase_again
         print;
         # evaluate error messages
         if ( /REBASE: ([^\s]+).*Grew too large/ ) {
-            push @grownfiles, $1;
+            my $toobig_name = $1;
+            if ( -e "$solarbin/so/$toobig_name" ) {
+                push @grownfiles, "$solarbin/so/$toobig_name";
+                print "name was : $toobig_name\n";
+                print "push $solarbin/so/$toobig_name\n";
+            } else {
+                push @grownfiles, "$solarbin/$toobig_name";
+            }
         }
     }
     close( COMMAND );