[Libreoffice] [PATCH] Enable testtool (and possibly other stuff) to run with LibO

Hi all,

the following patch should allow testtool to run with LibO.

The first patch (0001-Correct....) corrects a symlink created during 
installation, I tested it under universal LibO install (pull +r 
yesterday evening).
What it does should be reviewed by packager, since I don't know what it
does under another packaging but Debian/Ubuntu (Ubuntu 9.10 being my 
current working distro).

The remaining three patches assume meaning only if the first is applied.

The third patch (0003-Changed-symlink...) corrects the behavior of 
testtool, changing a very small part of the script.

I tested testtool on LibO, it started LibO that started the test and 
then it stopped because couldn't find smoketest (not analysed why).

The second (0002-Changed-symlink....) and the fourth 
(0004-Changed-symlink....) change Java and cpp search path function 
accordingly.
While about Java I'm certain of the use and/or behavior, I'm not so of 
cppuhelper, but the flowing pattern seems similar.

I have some test to do using the SDK and generating an application in Java.
For cpp should be someone else checking it.

Al the patches contributed according LGPLv3+.

All of the above only if you have done nothing on the matter yet :-).

beppec56.
--
Kind Regards,
Giuseppe Castagno
Acca Esse http://www.acca-esse.eu
giuseppe.castagno at acca-esse.eu
beppec56 at openoffice.org

From c8c010c7ee78bb6a9ca317b0ad91c125b7f0314f Mon Sep 17 00:00:00 2001
From: Giuseppe Castagno <giuseppe.castagno@acca-esse.eu>
Date: Fri, 15 Oct 2010 11:22:59 +0200
Subject: [PATCH] Correct symlink in order to be used in SDK and testtool,
 in order to recognize the application installation path;
 only for Linux and similar platforms.

---
 desktop/scripts/soffice.sh         |    2 +-
 sysui/desktop/share/create_tree.sh |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/desktop/scripts/soffice.sh b/desktop/scripts/soffice.sh
index 00c2b5c..5da4b9a 100644
--- a/desktop/scripts/soffice.sh
+++ b/desktop/scripts/soffice.sh
@@ -60,7 +60,7 @@ if [ -e ooenv ] ; then
     . ./ooenv
 fi
 
-sd_binary=`basename "$0"`.bin
+sd_binary=`basename "$0" | sed 's/libreoffice/soffice/g'`.bin 
 
 #collect all bootstrap variables specified on the command line
 #so that they can be passed as arguments to javaldx later on
diff --git a/sysui/desktop/share/create_tree.sh b/sysui/desktop/share/create_tree.sh
index 1ed7da9..d81abf5 100644
--- a/sysui/desktop/share/create_tree.sh
+++ b/sysui/desktop/share/create_tree.sh
@@ -98,7 +98,7 @@ cp openoffice.sh ${DESTDIR}/usr/bin/${PREFIX}
 cp printeradmin.sh ${DESTDIR}/usr/bin/${PREFIX}-printeradmin
 chmod 0755 ${DESTDIR}/usr/bin/${PREFIX} ${DESTDIR}/usr/bin/${PREFIX}-printeradmin
 
-ln -sf /usr/bin/${PREFIX} ${DESTDIR}/usr/bin/libreoffice
+ln -sf ${office_root}/program/soffice ${DESTDIR}/usr/bin/libreoffice
 ln -sf /usr/bin/${PREFIX}-printeradmin ${DESTDIR}/usr/bin/libreoffice-printeradmin
 
 mkdir -p ${DESTDIR}/usr/share/mime/packages
-- 
1.6.3.3

From 017b0bf9e2cdaa78375b8508a54d83593d984f11 Mon Sep 17 00:00:00 2001
From: Giuseppe Castagno <giuseppe.castagno@acca-esse.eu>
Date: Fri, 15 Oct 2010 19:25:09 +0200
Subject: [PATCH] Changed symlink processing to new application name.
 Now the function will try for libreoffice in the PATH, instead of soffice.

---
 .../sun/star/lib/loader/InstallationFinder.java    |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/odk/source/com/sun/star/lib/loader/InstallationFinder.java 
b/odk/source/com/sun/star/lib/loader/InstallationFinder.java
index da8117e..f528532 100644
--- a/odk/source/com/sun/star/lib/loader/InstallationFinder.java
+++ b/odk/source/com/sun/star/lib/loader/InstallationFinder.java
@@ -71,7 +71,7 @@ final class InstallationFinder {
     private static final String SYSPROP_NAME =
         "com.sun.star.lib.loader.unopath";
     private static final String ENVVAR_NAME = "UNO_PATH";
-    private static final String SOFFICE = "soffice"; // Unix/Linux only
+    private static final String SOFFICE = "libreoffice"; // Unix/Linux only
     
     private InstallationFinder() {} // do not instantiate
     
-- 
1.6.3.3

From 3ccccd3ccde3aedebab49b031fbf1126bda5d6c0 Mon Sep 17 00:00:00 2001
From: Giuseppe Castagno <giuseppe.castagno@acca-esse.eu>
Date: Fri, 15 Oct 2010 15:42:52 +0200
Subject: [PATCH] Changed symlink processing to new application name.

---
 testautomation/global/system/includes/iniinfo.inc |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/testautomation/global/system/includes/iniinfo.inc 
b/testautomation/global/system/includes/iniinfo.inc
index 0b83af4..a716a5d 100755
--- a/testautomation/global/system/includes/iniinfo.inc
+++ b/testautomation/global/system/includes/iniinfo.inc
@@ -772,8 +772,8 @@ function getSofficeNative() as string
     if ("unx" = gPlatGroup) then
         '/// on Linux/Unix systems we need to check/resolv 2 possible links which point to the 
directory with the 'soffice' executable ///'
         try
-            '/// created by an installation from the root user: //usr//bin//soffice ///'
-            sCandidates(1) = getLinkDestination("/usr/bin/soffice") ' command fails, if link 
doesn't exist
+            '/// created by an installation from the root user: //usr//bin//libreoffice ///'
+            sCandidates(1) = getLinkDestination("/usr/bin/libreoffice") ' command fails, if link 
doesn't exist
             if (left(sCandidates(1),2)="..") then
                 ' If the link is relative, make it absolute
                 sCandidates(1) = "/usr/bin/" + sCandidates(1)
@@ -782,28 +782,28 @@ function getSofficeNative() as string
             end if
             ' DEBUG: If you need more detailed information about the installation environment
             '        enable the next line.
-            ' printlog "getSofficeNative() - : /usr/bin/soffice: '" + sCandidates(1) + "' 
destination exists?: " +fileExists(sCandidates(1))
+            ' printlog "getSofficeNative() - : /usr/bin/libreoffice: '" + sCandidates(1) + "' 
destination exists?: " +fileExists(sCandidates(1))
         catch
             ' DEBUG: If you need more detailed information about the installation environment
             '        enable the next line.
-            ' printlog "getSofficeNative() - : /usr/bin/soffice: NOT AVAILABLE"
+            ' printlog "getSofficeNative() - : /usr/bin/libreoffice: NOT AVAILABLE"
             sCandidates(1) = ""
         endcatch
         try
-            '/// HAS TO GET created by installation from NON root user: $HOME/soffice ///'
+            '/// HAS TO GET created by installation from NON root user: $HOME/libreoffice ///'
             sTemp = Environ("HOME")
-            sCandidates(2) = getLinkDestination(sTemp+"/soffice")
+            sCandidates(2) = getLinkDestination(sTemp+"/libreoffice")
             if (left(sCandidates(2),1) <> "/") then
                 ' relative path in $HOME directory!
                 sCandidates(2) = sTemp + "/" + sCandidates(2)
             end if
             ' DEBUG: If you need more detailed information about the installation environment
             '        enable the next line.
-            ' printlog "getSofficeNative() - : $HOME/soffice   : '" + sCandidates(2) + "' 
destination exists?: " +fileExists(sCandidates(2))
+            ' printlog "getSofficeNative() - : $HOME/libreoffice   : '" + sCandidates(2) + "' 
destination exists?: " +fileExists(sCandidates(2))
         catch
             ' DEBUG: If you need more detailed information about the installation environment
             '        enable the next line.
-            ' printlog "getSofficeNative() - : $HOME/soffice   : NOT AVAILABLE"
+            ' printlog "getSofficeNative() - : $HOME/libreoffice   : NOT AVAILABLE"
             sCandidates(2) = ""
         endcatch
         for i = 1 to 2
-- 
1.6.3.3

From d98fb688d1bd9fbd9fb7bc6930eefd8f699e6ba7 Mon Sep 17 00:00:00 2001
From: Giuseppe Castagno <giuseppe.castagno@acca-esse.eu>
Date: Fri, 15 Oct 2010 19:19:51 +0200
Subject: [PATCH] Changed symlink processing to new application name.
 Now the function will try for libreoffice in the PATH, instead of soffice.

---
 cppuhelper/source/findsofficepath.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/cppuhelper/source/findsofficepath.c b/cppuhelper/source/findsofficepath.c
index c1aedf6..c4785cc 100644
--- a/cppuhelper/source/findsofficepath.c
+++ b/cppuhelper/source/findsofficepath.c
@@ -125,7 +125,7 @@ static char* platformSpecific()
     const int SEPARATOR = '/';
     const char* PATHSEPARATOR = ":";
     const char* PATHVARNAME = "PATH";
-    const char* APPENDIX = "/soffice";
+    const char* APPENDIX = "/libreoffice";
 
     char* path = NULL;
     char* env = NULL;
-- 
1.6.3.3