[ooo-build-commit] Branch 'ooo/master' - solenv/bin

[Jan Holesovsky]

 solenv/bin/checkapi         |    2 +-
 solenv/bin/cwstestresult.pl |    2 ++
 solenv/bin/soirpm.sh        |   35 +++++++++++++++++++++++++++++++++++
 3 files changed, 38 insertions(+), 1 deletion(-)

New commits:
commit a8feb9897203acb84677185f60a9d6e5aa99458a
Author: Jens-Heiner Rechtien <hr at openoffice.org>
Date:   Wed Jul 29 13:59:06 2009 +0000

    CWS-TOOLING: integrate CWS perftest09b
    2009-07-22 08:34:25 +0200 lla  r274216 : #i103694# use bash as shell
    2009-07-21 12:33:51 +0200 lla  r274178 : #160203#
    2009-07-20 13:42:20 +0200 lla  r274124 : #106358# add helper tool to get access to rpm in the environment for SOI
    2009-07-20 12:43:26 +0200 lla  r274119 : #i103656# compatiblity

diff --git a/solenv/bin/checkapi b/solenv/bin/checkapi
index 2a47bb8..f86fcef 100755
--- a/solenv/bin/checkapi
+++ b/solenv/bin/checkapi
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 PS=":"
 # cygwin:
diff --git a/solenv/bin/cwstestresult.pl b/solenv/bin/cwstestresult.pl
index 4c61d42..1a672c9 100644
--- a/solenv/bin/cwstestresult.pl
+++ b/solenv/bin/cwstestresult.pl
@@ -103,6 +103,7 @@ sub testresult
     my $result='';
 
     if ( defined($childws) ) {
+        $opt_resultPage=SOAP::Data->type(string => $opt_resultPage);
         my $id = $cws->eis_id();
         if ( is_valid_cws($cws) ) {
             $result=$eis->submitTestResult($id,$opt_testrunName,$opt_testrunPlatform, $opt_resultPage, $status);
@@ -110,6 +111,7 @@ sub testresult
          print STDERR "cws is not valid";
     }
     } else {
+        $opt_resultPage=SOAP::Data->type(string => $opt_resultPage);
         $result=$eis->submitTestResultMWS($masterws,$milestone,$opt_testrunName,$opt_testrunPlatform, $opt_resultPage, $status);
     }
         
diff --git a/solenv/bin/soirpm.sh b/solenv/bin/soirpm.sh
new file mode 100755
index 0000000..f886f0f
--- /dev/null
+++ b/solenv/bin/soirpm.sh
@@ -0,0 +1,35 @@
+#!/bin/bash
+#*************************************************************************
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2008 by Sun Microsystems, Inc.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# $RCSfile: makefile,v $
+#
+# $Revision: 1.4 $
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#***********************************************************************/
+
+LIBRPMBUILD=$(find ${COMPATH} -name 'librpmbuild-4.1*' -print)
+# echo $(dirname $LIBRPMBUILD)
+LD_LIBRARY_PATH=$(dirname ${LIBRPMBUILD}) ${BUILD_TOOLS?}/rpm "$@"
+# LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}${COMPATH?}/lib \
+# ${BUILD_TOOLS?}/rpm "$@"