CWS-TOOLING: integrate CWS perftest08

2009-07-02 10:03:16 +0200 lla  r273621 : #159516# support systems with no JAVA_HOME
2009-07-02 10:00:25 +0200 lla  r273620 : #159516# if path is null this not an error
2009-07-01 14:36:05 +0200 lla  r273583 : #159516# add check for wrong cygwin path
2009-06-22 13:18:14 +0200 lla  r273223 : #159516# add PipeConnectionString
2009-06-18 21:44:59 +0200 lla  r273137 : #159516# cleanups
2009-06-18 21:44:17 +0200 lla  r273136 : #159516# handle null
2009-06-18 21:42:56 +0200 lla  r273135 : #159516# add getElementCount() function
2009-06-15 10:40:05 +0200 lla  r272966 : CWS-TOOLING: rebase CWS perftest08 to trunk@272827 (milestone: DEV300:m50)
2009-06-02 09:06:22 +0200 lla  r272480 : CWS-TOOLING: rebase CWS perftest08 to trunk@272291 (milestone: DEV300:m49)
2009-05-08 11:40:22 +0200 mib  r271710 : #159717#: File name info for performance test (added void to hasLogFile() parameter list)
2009-05-05 14:14:25 +0200 mib  r271514 : #159717#: File name info for performance test
2009-05-04 15:23:01 +0200 mib  r271466 : #159717#: File name infor for performance test
2009-05-04 15:22:27 +0200 mib  r271465 : #159717#: File name infor for performance test
2009-05-04 15:21:56 +0200 mib  r271464 : #159717#: File name infor for performance test
2009-05-04 15:21:18 +0200 mib  r271462 : #159717#: File name infor for performance test
2009-04-29 16:23:40 +0200 lla  r271383 : #159516# cleanups
2009-04-29 16:23:20 +0200 lla  r271382 : #159516# cleanups
2009-04-08 12:23:01 +0200 lla  r270631 : #159516# typo
2009-04-07 10:30:35 +0200 lla  r270580 : #159516# add prototype
2009-04-07 10:21:15 +0200 lla  r270579 : #159516# cleanup
2009-04-03 09:05:26 +0200 lla  r270448 : #159516# small cleanups
2009-03-30 13:22:26 +0200 lla  r270221 : #159517# merge perftest07

6 files changed, 113 insertions, 32 deletions

diff --git a/solenv/bin/checkapi b/solenv/bin/checkapi
index 4725045c9583..6ddabfe9a46d 100755
--- a/solenv/bin/checkapi
+++ b/solenv/bin/checkapi
@@ -8,6 +8,7 @@ fi
 JARFOLDER=$SOLARVERSION/$INPATH/bin$UPDMINOREXT
 SOLVER_LIB=$SOLARVERSION/$INPATH/lib$UPDMINOREXT
 
+# it is possible to give an other OOoRunner.jar
 if [ -n "$RUNNERJAR" ]; then
     myCLASSPATH=$RUNNERJAR
 else 
@@ -26,8 +27,12 @@ elif [ -n "$JAVA_HOME" ]; then
         JAVABIN=$JAVA_HOME/bin/java
     fi
 else
-	echo "please set environment variable JAVA_HOME"
-	exit 1
+    # there seems to be some machines without real java
+    JAVABIN=$(which java)
+    if [ -z "$JAVABIN" ]; then 
+        echo "please set environment variable JAVA_HOME"
+        exit 1
+    fi
 fi
 
 if [ x${USER}x = xx ]; then
diff --git a/solenv/bin/install-sh b/solenv/bin/install-sh
new file mode 100755
index 000000000000..fb942ef71665
--- /dev/null
+++ b/solenv/bin/install-sh
@@ -0,0 +1,3 @@
+;; This file is automatically created by diff_all_filter.pl
+;; Fri Mar 27 08:02:00 2009
+
diff --git a/solenv/bin/installoffice b/solenv/bin/installoffice
index 602934958b53..29645688b56a 100755
--- a/solenv/bin/installoffice
+++ b/solenv/bin/installoffice
@@ -1,3 +1,4 @@
+#!/bin/bash
 #*************************************************************************
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
@@ -5,10 +6,6 @@
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: installoffice,v $
-#
-# $Revision: 1.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -27,7 +24,6 @@
 # for a copy of the LGPLv3 License.
 #***********************************************************************/
 
-#!/bin/bash
 EXIT_SUCCESS=0
 EXIT_FAILURE=1
 EXIT_ERROR=2
@@ -47,6 +43,8 @@ usage() {
         echo "[-d] installation with debug output" >&2
         echo "" >&2
         echo "[-a] the office will be patched to run without FirstStartWizard" >&2
+        echo "" >&2
+        echo "[-i] impress should open documents without autopilot" >&2
         exit $EXIT_FAILURE
 }
 
@@ -63,7 +61,7 @@ fi
 DESTPATH=/tmp/$USER
 PARAM=""
 
-while getopts ':mt:acdhot' OPTION ; do
+while getopts ':mt:aicdhot' OPTION ; do
         case $OPTION in
         d)        PARAM="$PARAM -debug true"
                 ;;
@@ -73,6 +71,8 @@ while getopts ':mt:acdhot' OPTION ; do
                 ;;
         a)        PARAM="$PARAM -autorun true"
                 ;;
+        i)        PARAM="$PARAM -autoimpress true"
+                ;;
         t)        DESTPATH="$OPTARG"
                 ;;
         h)        usage $EXIT_SUCCESS
@@ -93,7 +93,10 @@ LOCALUNPACKDIR=$DESTPATH/unpack
 
 export LOCALINSTALLDIR
 export LOCALUNPACKDIR
+echo "export LOCALINSTALLDIR"
+echo "export LOCALUNPACKDIR"
 
+unset LD_LIBRARY_PATH
 unset FORCE2ARCHIVE
 
 echo "### $SOLARENV/bin/installoffice.pl $PARAM -cleanup true $@"
diff --git a/solenv/bin/installoffice.btm b/solenv/bin/installoffice.btm
index 983ee9e3df02..ffd6633fafcd 100755
--- a/solenv/bin/installoffice.btm
+++ b/solenv/bin/installoffice.btm
@@ -28,6 +28,54 @@ REM * <http://www.openoffice.org/license.html>
 REM * for a copy of the LGPLv3 License.
 REM ************************************************************************/
 
+
+SET DESTPATH=%USERNAME%
+SET DEBUG=false
+SET OOO=false
+SET PARAM=
+
+for %opt in (%&%) DO (
+    iff "%opt%" == "-d" THEN 
+        SET PARAM=%PARAM% -debug true
+        shift
+
+    elseiff "%opt%" == "-o" THEN 
+        SET PARAM=%PARAM% -ooo true
+        shift
+
+    elseiff "%opt%" == "-c" THEN 
+        SET PARAM=%PARAM% -cwscheckapi true
+        shift
+
+    elseiff "%opt%" == "-a" THEN 
+        SET PARAM=%PARAM% -autorun true
+        shift
+
+    elseiff "%opt%" == "-i" THEN
+        SET PARAM=%PARAM% -autoimpress true
+        shift
+
+    elseiff "%opt%" == "-t" THEN 
+        SET DESTPATH=%2
+        shift
+        shift
+
+    elseiff "%opt%" == "-h" THEN 
+        goto usage
+
+    elseiff "%opt%" == "/h" THEN 
+        goto usage
+
+    elseiff "%opt%" == "%DESTPATH%" THEN
+        shift
+
+    else 
+        echo wrong param: %opt%
+        goto usage
+    endiff
+)
+
+iff "%DESTPATH%" == "%USERNAME%" THEN
 iff EXIST e:\  then
     iff EXIST e:\temp then
         set temppath=e:\temp
@@ -44,25 +92,15 @@ elseiff EXIST c:\temp then
 else
     set temppath=%TMP%
 endiff
-
-SET DESTPATH=%temppath%\%USERNAME%
-SET DEBUG=false
-SET OOO=false
-SET PARAM=
-
-for %opt in (%&%) DO (
-    if "%opt%" == "-d" (SET PARAM=%PARAM% -debug true ^ shift)
-    if "%opt%" == "-o" (SET PARAM=%PARAM% -ooo true ^ shift)
-    if "%opt%" == "-c" (SET PARAM=%PARAM% -cwscheckapi true ^ shift)
-    if "%opt%" == "-a" (SET PARAM=%PARAM% -autorun true ^ shift)
-    if "%opt%" == "-t" (SET DESTPATH=%2  ^ shift ^ shift)
-    if "%opt%" == "-h" goto usage
-    if "%opt%" == "/h" goto usage
-)
+    DESTPATH=%temppath%\%USERNAME%
+endiff
 
 SET LOCALINSTALLDIR=%DESTPATH%\office
 SET LOCALUNPACKDIR=%DESTPATH%\unpack
+echo LOCALINSTALLDIR=%LOCALINSTALLDIR%
+echo LOCALUNPACKDIR=%LOCALUNPACKDIR%
 
+echo call perl5 %SOLARENV%\bin\installoffice.pl -dest %LOCALINSTALLDIR% %PARAM% -cleanup true %&
 call perl5 %SOLARENV%\bin\installoffice.pl -dest %LOCALINSTALLDIR% %PARAM% -cleanup true %&
 
 quit %?
@@ -75,8 +113,10 @@ quit %?
     echo. 
     echo [-o] force OpenOffice.org installation instead of StarOffice>&2
     echo. 
-    echo [-t] target path: path wehre tho office should installed to. The default is '%DESTPATH%'>&2
+    echo [-t] target path: path where the office should installed to. The default is '%DESTPATH%'>&2
     echo.
     echo [-a] the office will be patched to run without FirstStartWizard >&2
    echo. 
+    echo [-i] impress should open documents without autopilot
+    echo.
     quit 1
diff --git a/solenv/bin/installoffice.pl b/solenv/bin/installoffice.pl
index a8ef48e53df6..4a50eb891636 100755
--- a/solenv/bin/installoffice.pl
+++ b/solenv/bin/installoffice.pl
@@ -39,6 +39,9 @@ my $script = $0;
 ( our $script_name = $script ) =~ s/^.*\b(\w+)\.pl$/$1/;
 ( our $script_path = $script ) =~ s/$script_name.*//;
 
+# Prototypes
+sub installOffice();
+
 our $debug = 0;           # run without executing commands
 
 our $is_command_infos = 1;   # print command details before exec
@@ -54,6 +57,9 @@ our $cleanup = 0;
 # should the office be startable without user interaction
 our $autorun = 0;
 
+# should impress open documents without autopilot
+our $autoimpress = 0;
+
 # force openOffice.org installation if StarOffice is available
 our $is_ooo = 0;
 
@@ -292,18 +298,31 @@ sub installOffice(){
         makeAutoRun($destinationPath);
     }
 
+    if ($autoimpress) {
+        makeAutoImpress($destinationPath);
+    }
+
     return $success;
 }
 
+sub makeAutoImpress(){
+    my $destinationPath = shift;
+
+    if (patchXCU ($destinationPath, $script_path.$script_name."_impress.oxt") != 0) {
+        print_error("could not register ".$script_path.$script_name."_impress.oxt", "1");
+    }
+    return 0;
+}
+
+
 sub makeAutoRun(){
 
     my $destinationPath = shift;
 
     patchBootstraprc($destinationPath);
 
-
-    if (patchXCU ($destinationPath) != 0) {
-        print_error("could not patch XCU files", "1");
+    if (patchXCU ($destinationPath, $script_path.$script_name.".oxt") != 0) {
+        print_error("could not register ".$script_path.$script_name.".oxt", "1");
     }
     return 0;
 }
@@ -340,6 +359,7 @@ sub patchBootstraprc(){
 
 sub patchXCU(){
     my $destinationPath = shift;
+    my $oxt = shift;
     my $unopkg="";
 
     find sub { $unopkg=$File::Find::name if -e _ && /$UNOPKGBIN$/ }, $destinationPath;
@@ -351,8 +371,8 @@ sub patchXCU(){
         $unopkg = "\"$unopkg\"";
     }
 
-    my $unopkgCommand = "$unopkg add $script_path".$script_name.".oxt";
-    print "patch xcu files for automatic office start...\n" if $debug;
+    my $unopkgCommand = "$unopkg add $oxt";
+    print "register oxt file ...\n" if $debug;
     print "call $unopkgCommand\n" if $debug;
     my $success=0;
     $success = system($unopkgCommand);
@@ -471,12 +491,17 @@ sub getInstsetUtilFolder(){
     my $instsetFolder = $RootDir.$PS.$instset;
     my $utilFolder="";
 
-    if(-w $instsetFolder) {
+    if( open(DATEI, ">$instsetFolder".$PS."touch"))
+    {
+        close(DATEI);
+        unlink($instsetFolder.$PS."touch");
         print "$instsetFolder is writable \n" if $debug;
         $utilFolder = $RootDir.$PS.$instset.$PS."util";
-    } else {
+    }
+    else
+    {
         print "$instsetFolder is NOT writable \n" if $debug;
-        print "copy $instset to $destPath$PS..n" if $debug;
+        print "copy $instset to $destPath$PS..\n" if $debug;
         my $prjPath=$destPath.$PS."..";
 
         my $command = "$ENV{COPYPRJ} -x $instset $prjPath";
@@ -874,6 +899,11 @@ sub parseArgs
             if ($value =~ /^true$/ || ($value =~ /^1$/ )) { $autorun = 1 };
         }
 
+        if ( $ARGV[$i] =~ /^-autoimpress$/ ) {
+            my $value = $ARGV[++$i];
+            if ($value =~ /^true$/ || ($value =~ /^1$/ )) { $autoimpress = 1 };
+        }
+
         if ( $ARGV[$i] =~ /^-debug$/ ) {
             my $value = $ARGV[++$i];
             if ($value =~ /^true$/ || ($value =~ /^1$/ )) { $debug = 1 };
diff --git a/solenv/bin/installoffice_impress.oxt b/solenv/bin/installoffice_impress.oxt
new file mode 100755
index 000000000000..31c7bfa45c06
--- /dev/null
+++ b/solenv/bin/installoffice_impress.oxt