[ooo-build-commit] bin/localize-ooo

[Fridrich Strba]

 bin/localize-ooo |   12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

New commits:
commit a6eb3b38ad6fd2781c7a8dc56c66f0b5ca366f28
Author: Fridrich Strba <fridrich.strba at bluewin.ch>
Date:   Wed Dec 9 11:46:05 2009 +0100

    Fixing localize-ooo for windows build
    
    * bin/localize-ooo: Don't set WRAPCMD too early and set it to cygwin
      paths for windows.

diff --git a/bin/localize-ooo b/bin/localize-ooo
index 5203df2..4a6a77f 100755
--- a/bin/localize-ooo
+++ b/bin/localize-ooo
@@ -44,9 +44,6 @@ merge_localization()
     rm $sdf_file_filtered
 }
 
-# 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
     echo 'Building localize stuff at first...'
@@ -61,6 +58,15 @@ if test "$split_build" != "yes" && ! localize -h >/dev/null 2>&1 ; then
     fi
 fi
 
+if test "$split_build" != "yes"; then
+    # binaries in non-split build needs extra wrapper to find the stuff in the solver
+    if test "$BUILD_WIN32" != "yes"; then
+      export WRAPCMD="LD_LIBRARY_PATH=$SOLARVER/$INPATH/lib PATH=$PATH:$SOLARVER/$INPATH/bin"
+    else
+      export WRAPCMD="PATH=$PATH:$(cygpath $SOLARVER/$INPATH/bin)"
+    fi
+fi
+
 # stamp files
 if test "$split_build" = "yes" ; then
     stamp_dir=$OOBUILDDIR/ooo-build/stamp