[ooo-build-commit] Branch 'ooo/master' - 3 commits - transex3/scripts

[Jan Holesovsky]

 transex3/scripts/localize    |   20 --------------------
 transex3/scripts/localize.pl |    8 +++++---
 2 files changed, 5 insertions(+), 23 deletions(-)

New commits:
commit dfe5229af096cb5ef3dd7bae287621fb9b0d61d0
Author: Ivo Hinkelmann <ihi at openoffice.org>
Date:   Wed Jul 1 15:49:06 2009 +0000

    #i10000# typo fix

diff --git a/transex3/scripts/localize.pl b/transex3/scripts/localize.pl
index 8851b10..a45f552 100755
--- a/transex3/scripts/localize.pl
+++ b/transex3/scripts/localize.pl
@@ -103,7 +103,7 @@ if ( defined $ENV{USE_SHELL} && $ENV{USE_SHELL} eq '4nt' ) {
    $DELIMITER = "/";
 }
 
-my $binpath = $ENV{SOLARVER}.$DELIMITER.$ENV{INPATH}.$DELIMITER."bin".$ENV{UPDMINROREXT}.$DELIMITER ;
+my $binpath = $ENV{SOLARVER}.$DELIMITER.$ENV{INPATH}.$DELIMITER."bin".$ENV{UPDMINOREXT}.$DELIMITER ;
 
 #%sl_modules = fetch_sourcelanguage_dirlist();
 
commit 05d52eeaa5495be048b0197ac00c64d6dd18d0f0
Author: Ivo Hinkelmann <ihi at openoffice.org>
Date:   Wed Jul 1 12:17:39 2009 +0000

    #i10000# to 'honor' the lost path variable ...

diff --git a/transex3/scripts/localize.pl b/transex3/scripts/localize.pl
index 5aad826..8851b10 100755
--- a/transex3/scripts/localize.pl
+++ b/transex3/scripts/localize.pl
@@ -103,6 +103,8 @@ if ( defined $ENV{USE_SHELL} && $ENV{USE_SHELL} eq '4nt' ) {
    $DELIMITER = "/";
 }
 
+my $binpath = $ENV{SOLARVER}.$DELIMITER.$ENV{INPATH}.$DELIMITER."bin".$ENV{UPDMINROREXT}.$DELIMITER ;
+
 #%sl_modules = fetch_sourcelanguage_dirlist();
 
 
@@ -494,11 +496,11 @@ sub collectfiles{
         my $args    = "";
         
         if( $ENV{WRAPCMD} ){
-            $command = "$ENV{WRAPCMD} localize_sl";
+            $command = $ENV{WRAPCMD}.$binpath."localize_sl";
         }else{
-            $command = "localize_sl";
+            $command = $binpath."localize_sl";
         }
-
+        print $command;
         # -e
         # if ( -x $command ){
         if( $command ){
commit ba639add4eb09ca46ea1f6f26d99915460da3776
Author: Ivo Hinkelmann <ihi at openoffice.org>
Date:   Wed Jul 1 12:16:44 2009 +0000

    #i10000# to 'honor' the lost path variable ...

diff --git a/transex3/scripts/localize b/transex3/scripts/localize
deleted file mode 100755
index 74a75ec..0000000
--- a/transex3/scripts/localize
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh
-if [ x${SOLARENV}x = xx ]; then
-    echo No environment found, please use 'setsolar'
-exit 1
-fi
-
-# localize.pl calls localize_sl in solver bin directory which depends on dynamic
-# libraries in solver lib directory but has no correct RPATH (or equivalent):
-if [ "${OS?}" = MACOSX ]; then
-    export DYLD_LIBRARY_PATH=${DYLD_LIBRARY_PATH+${DYLD_LIBRARY_PATH}:}${SOLARVERSION?}/${INPATH?}/lib${UPDMINOREXT}
-else
-    export LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}${SOLARVERSION?}/${INPATH?}/lib${UPDMINOREXT}
-fi
-
-if [ x${SOLARVER}x = xx -o x${UPDMINOR}x = xx  ]; then
-    exec perl -w $SOLARVERSION/$INPATH/bin/localize.pl "$@"
-else
-    exec perl -w $SOLARVERSION/$INPATH/bin.$UPDMINOR/localize.pl "$@"
-fi
-