[Libreoffice-commits] .: 6 commits - odk/configure.pl

[Jan Holesovsky]

 odk/configure.pl |   21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

New commits:
commit cacf9b7f82ab752d0642d4e9a530101d12dc9b66
Merge: 1baa1c1... dd27573...
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Fri Nov 12 14:38:00 2010 +0100

    Merge remote branch 'origin/libreoffice-3-3'

commit dd27573a0477b8ae97d3c0e15b7880e46582d58b
Merge: d0712bc... 31098e0...
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Thu Nov 11 18:25:35 2010 +0100

    Merge commit 'ooo/OOO330_m14' into libreoffice-3-3
    
    Conflicts:
    	odk/configure.pl

commit d0712bc10be5f34276f1cb6411efbdbcb4a716d7
Author: Petr Mladek <pmladek at suse.cz>
Date:   Thu Nov 11 13:25:09 2010 +0100

    Version 3.2.99.3, tag LIBREOFFICE_3_2_99_3 (3.3-beta3)
commit 2d12bb08ba409641ba901fc9d75d537a200763e7
Author: Giuseppe Castagno <giuseppe.castagno at acca-esse.eu>
Date:   Fri Nov 5 15:11:47 2010 +0100

    Adapt LibreOffice branding in LibO-SDK user installation script.
    
    This patch adapt the defaults presented when a user sdk environment is
    created in GNU/Linux and similar platforms.
    (cherry picked from commit 1baa1c1671f9396e0e8cb4bde7c62e509da1d548)

diff --git a/odk/configure.pl b/odk/configure.pl
index 85fae44..3353be6 100755
--- a/odk/configure.pl
+++ b/odk/configure.pl
@@ -636,9 +636,9 @@ sub searchMacOffice
 
 sub searchoffice
 {
-    my $offset = rindex($main::sdkpath, "/openoffice.org");
+    my $offset = rindex($main::sdkpath, "/libreoffice");
     my $tmpOffice = substr($main::sdkpath, 0, $offset);
-    my $officepath = "$tmpOffice/openoffice.org$main::OO_MAJORVERSION";
+    my $officepath = "$tmpOffice/libreoffice";
 
 #	if ( $main::OO_MINORVERSION > 0) {
 #		$officepath = "$officepath$main::OO_MINORVERSION";
diff --git a/odk/setsdkenv_unix b/odk/setsdkenv_unix
index 31e0200..6b0dd7c 100755
--- a/odk/setsdkenv_unix
+++ b/odk/setsdkenv_unix
@@ -10,7 +10,7 @@ if [ "$OSTYPE" = "Darwin" ]
 then
     OO_SDK_NAME=`basename $OO_SDK_HOME`
 else
-    OO_SDK_NAME=openoffice.org${OOVERSION}_sdk
+    OO_SDK_NAME=libreoffice${OOVERSION}_sdk
 fi
 
 export OO_SDK_HOME
commit 31098e06d089cd586a23a1e86df21fb9df9837d6
Merge: 036b114... 16518fa...
Author: Kurt Zenker <kz at openoffice.org>
Date:   Fri Nov 5 16:40:54 2010 +0100

    CWS-TOOLING: integrate CWS jsc331

commit 16518fa0b5a5024da53ce743c1a4d5f6af07867b
Author: Juergen Schmidt <jsc at openoffice.org>
Date:   Mon Nov 1 11:08:24 2010 +0100

    jsc331: i115310: correct resolveLink function

diff --git a/odk/configure.pl b/odk/configure.pl
index 8f3778e..a437ac0 100755
--- a/odk/configure.pl
+++ b/odk/configure.pl
@@ -5,6 +5,7 @@
 #
 
 use IO::File;
+use File::Basename;
 
 $main::hostname= $ARGV[0];
 $main::sdkpath= $ARGV[1];
@@ -35,7 +36,7 @@ if ( $main::operatingSystem =~ m/darwin/ )
 {
 #	$main::OO_SDK_URE_HOME = `cd $main::sdkpath/../ure-link && pwd`;
 } else {
-    $main::OO_SDK_URE_HOME = `cd $main::sdkpath/../../ure && pwd`;
+    $main::OO_SDK_URE_HOME = `cd $main::sdkpath/../ure-link && pwd`;
 }
 chomp($main::OO_SDK_URE_HOME);
 
@@ -554,15 +555,26 @@ sub resolveLink
 {
     my $base= shift;
     my $link= shift;
-    my $linktarget =  readlink "$base/$link"; 
+
+    my $resolvedpath = "$base/$link";
+    my $linktarget =  readlink "$resolvedpath"; 
     my $resolvedlink = "";
 
     while ( $linktarget ne "") {
-    $link = $linktarget;
-    $linktarget = readlink "$base/$link";
+
+    if ( $linktarget =~ m/^\/.*/ )
+    {
+        $resolvedpath = "$linktarget";
+    } else {
+        $resolvedpath = `cd $base/$linktarget; pwd`;
+        chop $resolvedpath;
     }
+    $base = dirname("$resolvedpath");
 
-    $resolvedlink = `cd $base/$link; pwd`;
+    $linktarget = readlink "$resolvedpath";
+    }
+
+    $resolvedlink = `cd $resolvedpath; pwd`;
     chop $resolvedlink;
     return $resolvedlink;
 }
@@ -578,6 +590,7 @@ sub searchprog
     {
         if ( $main::operatingSystem =~ m/darwin/ ) {
             $progDir = resolveLink("/System/Library/Frameworks/JavaVM.Framework/Versions", "CurrentJDK");
+
             if ( -e "$progDir/$main::OO_SDK_JAVA_BIN_DIR/javac" )
             {
                 return "$progDir/$main::OO_SDK_JAVA_BIN_DIR";