[ooo-build-commit] .: Branch 'ooo-build-3-2' - bin/localize-ooo patches/dev300

[Petr Mladek]

 bin/localize-ooo                   |    9 ---------
 patches/dev300/apply               |    5 +++--
 patches/dev300/localizefix.diff    |   16 ----------------
 patches/dev300/piece-transex3.diff |   11 +++++++++++
 4 files changed, 14 insertions(+), 27 deletions(-)

New commits:
commit 0e63da21a30a288a2f3f1ceb79c83360d1e1eb5e
Author: Petr Mladek <pmladek at suse.cz>
Date:   Wed Feb 17 18:55:35 2010 +0100

    find gsicheck in the solver; idea by KAMI (i#109378)
    
    * patches/dev300/transex3-localize-gsicheck-path.diff: set aboslute
      path to gsicheck as used in other tools; idea by KAMI (i#109378)
    * patches/dev300/localizefix.diff: bin obsolete KAMIs version; I think
      that I did it slightly cleaner
    * patches/dev300/piece-transex3.diff: heh, remove the absolute path
      in the split build
    * patches/dev300/apply: update for the above
    * bin/localize-ooo: bin the obsolete hack with WRAPCMD variable;
      the paths were not in quotation marks and broke on some windows systems;
      also, I think that this variable has another purpose; it is used before
      objdump and other tools on other locations

diff --git a/bin/localize-ooo b/bin/localize-ooo
index c90bafe..9227e54 100755
--- a/bin/localize-ooo
+++ b/bin/localize-ooo
@@ -58,15 +58,6 @@ 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
diff --git a/patches/dev300/apply b/patches/dev300/apply
index c165e4e..d7c99ba 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1194,6 +1194,9 @@ dmake-space-in-envvar-name.diff, i#101786, jholesov
 # support db4.8
 db4.8.diff, rengelha
 
+# find gsicheck in the solver
+transex3-localize-gsicheck-path.diff, i#109378, pmladek
+
 [ BuildBits < dev300-m66 ]
 armeabi-softfp-buildfix.diff, i#105302, doko
 
@@ -2755,8 +2758,6 @@ toolbars_sw.diff
 always_default_iconset.diff
 #Always create backup files
 always-create-backups.diff
-#I had problem with localize under Windows maybe it fixes it
-localizefix.diff
 
 [ OxygenOfficeExtras ]
 # Adding new items to extras module
diff --git a/patches/dev300/localizefix.diff b/patches/dev300/localizefix.diff
deleted file mode 100644
index 8bbc7f5..0000000
--- a/patches/dev300/localizefix.diff
+++ /dev/null
@@ -1,16 +0,0 @@
---- transex3/scripts/localize.pl.old	2010-01-29 18:34:30.000000000 +0100
-+++ transex3/scripts/localize.pl	2010-01-30 14:02:06.558804800 +0100
-@@ -401,12 +401,7 @@
-     my $command = '';
-     my ( $TMPHANDLE , $tmpfile ) = File::Temp::tempfile();
-     close ( $TMPHANDLE );
--
--    if( $ENV{WRAPCMD} ){
--        $command = "$ENV{WRAPCMD} gsicheck";
--    }else{
--        $command = "gsicheck";
--    }
-+    $command = "$ENV{SOLARVER}/$ENV{INPATH}/bin/gsicheck";
-     my $errfile = $sdffile.".err";
-     $command .= " -k -c -wcf $tmpfile -wef ".fix_cygwin_path($errfile)." -l \"\" ".fix_cygwin_path($sdffile);
-     #my $rc = system( $command );
diff --git a/patches/dev300/piece-transex3.diff b/patches/dev300/piece-transex3.diff
index 761d865..ea9165c 100644
--- a/patches/dev300/piece-transex3.diff
+++ b/patches/dev300/piece-transex3.diff
@@ -16,3 +16,14 @@
 +else
 +    exec perl -w $SOLARPIECE/$INPATH/$bindir/localize.pl "$@"
 +fi
+--- transex3/scripts/localize.pl.old1	2010-02-17 18:05:32.000000000 +0100
++++ transex3/scripts/localize.pl	2010-02-17 18:06:53.000000000 +0100
+@@ -403,7 +403,7 @@ sub merge_gsicheck{
+     close ( $TMPHANDLE );
+     
+     $command = "$ENV{WRAPCMD} " if( $ENV{WRAPCMD} );
+-    $command .= fix_cygwin_path("$ENV{SOLARVER}/$ENV{INPATH}/bin/gsicheck");
++    $command .= "gsicheck";
+ 
+     my $errfile = $sdffile.".err";
+     $command .= " -k -c -wcf $tmpfile -wef ".fix_cygwin_path($errfile)." -l \"\" ".fix_cygwin_path($sdffile);