[ooo-build-commit] Branch 'ooo/master' - 4 commits - instsetoo_native/inc_ooolangpack instsetoo_native/util scp2/source solenv/bin solenv/config
Jan Holesovsky
kendy at kemper.freedesktop.org
Mon Jul 6 17:06:06 PDT 2009
instsetoo_native/inc_ooolangpack/windows/msi_templates/bro_patchcodes.txt | 3
instsetoo_native/inc_ooolangpack/windows/msi_templates/brodev_patchcodes.txt | 3
instsetoo_native/util/openoffice.lst | 8
scp2/source/templates/makefile.mk | 43 -
solenv/bin/checkapi | 23
solenv/bin/checkapi.btm | 8
solenv/bin/cwscheckapi | 252 +++++++---
solenv/bin/cwscheckapi.btm | 50 +
solenv/bin/cwstouched | 2
solenv/bin/cwstouched.pl | 51 +-
solenv/bin/modules/installer/download.pm | 5
solenv/bin/reportErrorCheckAPI.btm | 17
solenv/config/sdev300.ini | 30 -
13 files changed, 328 insertions(+), 167 deletions(-)
New commits:
commit 5b015fd2f8438b84fdd307e69b2b3ba4bf5d4be3
Author: Vladimir Glazounov <vg at openoffice.org>
Date: Mon Jul 6 14:40:18 2009 +0000
CWS-TOOLING: integrate CWS sdk311_DEV300
2009-06-09 10:22:56 +0200 jsc r272754 : #i101883# adapt number
2009-06-03 13:25:57 +0200 jsc r272559 : #i101883# ensure correct archive name for sdk, adapt resolve_variables_in_downloadname to exchange packageversion
2009-06-03 13:20:14 +0200 jsc r272558 : #i101883# ensure correct archive or package name
2009-06-02 14:56:40 +0200 jsc r272506 : #i101883# ensure correct archive or package name
2009-05-27 11:26:35 +0200 jsc r272337 : CWS-TOOLING: rebase CWS sdk311 to branches/OOO310 at 272261 (milestone: OOO310:m12)
2009-05-26 15:15:13 +0200 jsc r272305 : #i101883# ifdef links to URE libs for MacOSX and adapt compiler settings
diff --git a/instsetoo_native/util/openoffice.lst b/instsetoo_native/util/openoffice.lst
index 23fa322..a9b9080 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -284,7 +284,7 @@ OpenOffice_SDK
{
Settings
{
- downloadname OOo-SDK_{productversion}_{os}_install_{languages}
+ downloadname OOo-SDK_{packageversion}_{os}_install_{languages}
variables
{
PRODUCTNAME OpenOffice.org
diff --git a/solenv/bin/modules/installer/download.pm b/solenv/bin/modules/installer/download.pm
index 36b9a0f..9b182dc 100644
--- a/solenv/bin/modules/installer/download.pm
+++ b/solenv/bin/modules/installer/download.pm
@@ -576,6 +576,7 @@ sub set_download_filename
my $type = get_installation_type();
my $language = get_downloadname_language($languagestringref);
my $addon = get_downloadname_addon();
+
if ( $installer::globals::product =~ /_Dev\s*$/ )
{
my $localminor = "";
@@ -659,6 +660,10 @@ sub resolve_variables_in_downloadname
if ( $allvariables->{'PRODUCTVERSION'} ) { $productversion = $allvariables->{'PRODUCTVERSION'}; }
$downloadname =~ s/\{productversion\}/$productversion/;
+ my $ppackageversion = "";
+ if ( $allvariables->{'PACKAGEVERSION'} ) { $packageversion = $allvariables->{'PACKAGEVERSION'}; }
+ $downloadname =~ s/\{packageversion\}/$packageversion/;
+
my $extension = "";
if ( $allvariables->{'SHORT_PRODUCTEXTENSION'} ) { $extension = $allvariables->{'SHORT_PRODUCTEXTENSION'}; }
$extension = lc($extension);
commit 89559ed6a6384486a060698a0305c5f46990abb5
Author: Vladimir Glazounov <vg at openoffice.org>
Date: Mon Jul 6 11:31:40 2009 +0000
CWS-TOOLING: integrate CWS native251
2009-06-23 17:59:51 +0200 is r273302 : #i93770# BrOffice Langpack for Windows finds BrOffice
2009-06-23 17:57:02 +0200 is r273301 : #i94580# improved dependencies for scp templates
diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/bro_patchcodes.txt b/instsetoo_native/inc_ooolangpack/windows/msi_templates/bro_patchcodes.txt
new file mode 100644
index 0000000..cc1c303
--- /dev/null
+++ b/instsetoo_native/inc_ooolangpack/windows/msi_templates/bro_patchcodes.txt
@@ -0,0 +1,3 @@
+# OpenOffice 2 UpgradeCodes
+
+{1552EC17-8CE9-4E58-A009-991468B8E806} # OOo UpgradeCode
\ No newline at end of file
diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/brodev_patchcodes.txt b/instsetoo_native/inc_ooolangpack/windows/msi_templates/brodev_patchcodes.txt
new file mode 100644
index 0000000..daf4927
--- /dev/null
+++ b/instsetoo_native/inc_ooolangpack/windows/msi_templates/brodev_patchcodes.txt
@@ -0,0 +1,3 @@
+# OpenOffice 2 UpgradeCodes
+
+{D8B206B8-6822-48C2-A799-E35BFD585035} # OOo UpgradeCode
\ No newline at end of file
diff --git a/instsetoo_native/util/openoffice.lst b/instsetoo_native/util/openoffice.lst
index 514de56..23fa322 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -370,7 +370,7 @@ BrOffice
USE_FILEVERSION 1
LIBRARYVERSION 9.2.0
CODEFILENAME codes_broo.txt
- PATCHCODEFILE ooo_patchcodes.txt
+ PATCHCODEFILE bro_patchcodes.txt
DOWNLOADBANNER brobanner.bmp
DOWNLOADBITMAP brobitmap.bmp
DOWNLOADSETUPICO ooosetup.ico
@@ -437,7 +437,7 @@ BrOffice_wJRE
USE_FILEVERSION 1
LIBRARYVERSION 9.2.0
CODEFILENAME codes_broo.txt
- PATCHCODEFILE ooo_patchcodes.txt
+ PATCHCODEFILE bro_patchcodes.txt
JAVAPRODUCT 1
DOWNLOADBANNER brobanner.bmp
DOWNLOADBITMAP brobitmap.bmp
@@ -510,7 +510,7 @@ BrOffice_Dev
USE_FILEVERSION 1
JAVAPRODUCT 1
LIBRARYVERSION 9.2.0
- PATCHCODEFILE ooo_patchcodes.txt
+ PATCHCODEFILE brodev_patchcodes.txt
CODEFILENAME codes_broodev.txt
DOWNLOADBANNER brobanner.bmp
DOWNLOADBITMAP brobitmap.bmp
diff --git a/scp2/source/templates/makefile.mk b/scp2/source/templates/makefile.mk
index 5478738..03b3590 100755
--- a/scp2/source/templates/makefile.mk
+++ b/scp2/source/templates/makefile.mk
@@ -46,38 +46,11 @@ COMPLETELANGISO_VAR:=$(uniq $(completelangiso) $(alllangiso))
ALLTAR : $(INCCOM)$/alllangmodules.inc $(INCCOM)$/alllangmodules_root.inc $(INCCOM)$/alllangmodules_base.inc $(INCCOM)$/alllangmodules_calc.inc $(INCCOM)$/alllangmodules_draw.inc $(INCCOM)$/alllangmodules_impress.inc $(INCCOM)$/alllangmodules_math.inc $(INCCOM)$/alllangmodules_writer.inc $(INCCOM)$/alllangmodules_binfilter.inc
-.PHONY $(INCCOM)$/alllangmodules.inc:
- @@-$(RENAME) $@ $@.tmp
- $(PERL) -w modules.pl -i $(PRJ)$/source$/templates$/module_langpack.sct -o $@.tmp && $(RENAME:s/+//) $@.tmp $@
-
-.PHONY $(INCCOM)$/alllangmodules_root.inc:
- @@-$(RENAME) $@ $@.tmp
- $(PERL) -w modules.pl -i $(PRJ)$/source$/templates$/module_langpack_root.sct -o $@.tmp && $(RENAME:s/+//) $@.tmp $@
-
-.PHONY $(INCCOM)$/alllangmodules_base.inc:
- @@-$(RENAME) $@ $@.tmp
- $(PERL) -w modules.pl -i $(PRJ)$/source$/templates$/module_langpack_base.sct -o $@.tmp && $(RENAME:s/+//) $@.tmp $@
-
-.PHONY $(INCCOM)$/alllangmodules_calc.inc:
- @@-$(RENAME) $@ $@.tmp
- $(PERL) -w modules.pl -i $(PRJ)$/source$/templates$/module_langpack_calc.sct -o $@.tmp && $(RENAME:s/+//) $@.tmp $@
-
-.PHONY $(INCCOM)$/alllangmodules_draw.inc:
- @@-$(RENAME) $@ $@.tmp
- $(PERL) -w modules.pl -i $(PRJ)$/source$/templates$/module_langpack_draw.sct -o $@.tmp && $(RENAME:s/+//) $@.tmp $@
-
-.PHONY $(INCCOM)$/alllangmodules_impress.inc:
- @@-$(RENAME) $@ $@.tmp
- $(PERL) -w modules.pl -i $(PRJ)$/source$/templates$/module_langpack_impress.sct -o $@.tmp && $(RENAME:s/+//) $@.tmp $@
-
-.PHONY $(INCCOM)$/alllangmodules_math.inc:
- @@-$(RENAME) $@ $@.tmp
- $(PERL) -w modules.pl -i $(PRJ)$/source$/templates$/module_langpack_math.sct -o $@.tmp && $(RENAME:s/+//) $@.tmp $@
-
-.PHONY $(INCCOM)$/alllangmodules_writer.inc:
- @@-$(RENAME) $@ $@.tmp
- $(PERL) -w modules.pl -i $(PRJ)$/source$/templates$/module_langpack_writer.sct -o $@.tmp && $(RENAME:s/+//) $@.tmp $@
-
-.PHONY $(INCCOM)$/alllangmodules_binfilter.inc:
- @@-$(RENAME) $@ $@.tmp
- $(PERL) -w modules.pl -i $(PRJ)$/source$/templates$/module_langpack_binfilter.sct -o $@.tmp && $(RENAME:s/+//) $@.tmp $@
+.INCLUDE .IGNORE : $(MISC)$/$(TARGET)_lang_track.mk
+.IF "$(LAST_COMPLETELANGISO_VAR)"!="$(COMPLETELANGISO_VAR)"
+PHONYTEMPL=.PHONY
+.ENDIF # "$(LAST_COMPLETELANGISO_VAR)"!="$(COMPLETELANGISO_VAR)"
+$(INCCOM)$/alllangmodules%.inc $(PHONYTEMPL) : module_langpack%.sct
+ @@-$(RENAME) $@ $@.tmp
+ $(PERL) -w modules.pl -i $< -o $@.tmp && $(RENAME:s/+//) $@.tmp $@
+ @echo LAST_COMPLETELANGISO_VAR=$(COMPLETELANGISO_VAR) > $(MISC)$/$(TARGET)_lang_track.mk
commit 8bfa24821cc3b5b73995c45e64a304a62ea17e6a
Author: Vladimir Glazounov <vg at openoffice.org>
Date: Mon Jul 6 10:30:52 2009 +0000
CWS-TOOLING: integrate CWS unoapi04
2009-06-26 14:00:27 +0200 lla r273410 : #i102248# cleanups
2009-06-26 13:36:44 +0200 lla r273407 : #i102248# fix problem with too long sleeps and waits
2009-06-26 08:34:17 +0200 lla r273393 : #i102248# cleanups
2009-06-26 08:28:43 +0200 lla r273392 : #i102248# cleanups
2009-06-25 13:17:19 +0200 lla r273379 : #i102248# add prototypes
2009-06-25 11:31:02 +0200 lla r273371 : #i102248# cleanups
2009-06-25 11:15:18 +0200 lla r273370 : #i102248# add a selftest for demonstration.
2009-06-25 10:53:35 +0200 lla r273369 : #i102248# add a selftest for demonstration.
2009-06-25 10:38:10 +0200 lla r273368 : #i102248# add a selftest for demonstration.
2009-06-23 11:09:35 +0200 lla r273266 : #i102248# cleanup
2009-06-23 11:00:15 +0200 lla r273265 : #i10i108248# add cwstestresult to cwscheckapi
2009-06-23 10:59:50 +0200 lla r273264 : #i10i108248# add cwstestresult to cwscheckapi
2009-06-23 10:58:47 +0200 lla r273263 : #i102248# add selftest
diff --git a/solenv/bin/checkapi b/solenv/bin/checkapi
index 6ddabfe..2a47bb8 100755
--- a/solenv/bin/checkapi
+++ b/solenv/bin/checkapi
@@ -1,4 +1,5 @@
#!/bin/sh
+
PS=":"
# cygwin:
if [ "$GUI" = "WNT" ]; then
@@ -15,8 +16,15 @@ else
myCLASSPATH=$JARFOLDER/OOoRunner.jar
fi
-myCLASSPATH=$myCLASSPATH${PS}${JARFOLDER}/ridl.jar${PS}${JARFOLDER}/unoil.jar${PS}${JARFOLDER}/jurt.jar${PS}${JARFOLDER}/juh.jar${PS}${JARFOLDER}/java_uno.jar
-myCLASSPATH=$myCLASSPATH${PS}/net/unoapi/export/unoapi/bin/mysql.jar${PS}$SOLVER_LIB
+myCLASSPATH=$myCLASSPATH${PS}${JARFOLDER}/ridl.jar${PS}\
+${JARFOLDER}/unoil.jar${PS}\
+${JARFOLDER}/jurt.jar${PS}\
+${JARFOLDER}/juh.jar${PS}\
+${JARFOLDER}/java_uno.jar
+
+myCLASSPATH=$myCLASSPATH${PS}\
+/net/unoapi/export/unoapi/bin/mysql.jar${PS}\
+$SOLVER_LIB
if [ -n "$JAVAI" ]; then
JAVABIN=$JAVAI
@@ -51,12 +59,13 @@ if [ -n "$RUNNERPROPS" ]; then
PARAM="$PARAM -runnerini $RUNNERPROPS"
fi
-MYXDEBUG=""
-if [ -n "$XDEBUG" ]; then
- # export XDEBUG="-Xdebug -Xrunjdwp:transport=dt_socket,server=y,address=8001"
- MYXDEBUG=$XDEBUG
+DEBUG_THE_API=""
+if [ -n "$DEBUGAPI" ]; then
+ export DEBUGAPI="-Xdebug -Xrunjdwp:transport=dt_socket,server=y,address=9002,suspend=y"
+ DEBUG_THE_API=$DEBUGAPI
fi
-COMMAND="$JAVABIN -Xmx120m $MYXDEBUG -cp $myCLASSPATH org.openoffice.Runner $PARAM $*"
+COMMAND="$JAVABIN -Xmx120m $DEBUG_THE_API -cp $myCLASSPATH org.openoffice.Runner $PARAM $*"
echo $COMMAND
$COMMAND
+# if COMMAND fails, it returns also the exitcode
diff --git a/solenv/bin/checkapi.btm b/solenv/bin/checkapi.btm
index fde6802..7af444e 100644
--- a/solenv/bin/checkapi.btm
+++ b/solenv/bin/checkapi.btm
@@ -1,4 +1,4 @@
-rem @echo off
+ at echo off
setlocal
@@ -27,13 +27,13 @@ IFF "%RUNNERPROPS%" != "" THEN
SET PARAM=%PARAM% -runnerini %RUNNERPROPS%
ENDIFF
-SET MYXDEBUG
+rem SET MYXDEBUG=""
IFF "%XDEBUG%" != "" THEN
REM SET XDEBUG=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,address=8001
- SET MYXDEBUG=%XDEBUG
+ SET MYXDEBUG=%XDEBUG%
ENDIFF
-set COMMAND=%JAVABIN% -Xmx120m %MYXDEBUG -cp %APICLASSPATH% org.openoffice.Runner %PARAM% %&
+set COMMAND=%JAVABIN% -Xmx120m %MYXDEBUG% -cp %APICLASSPATH% org.openoffice.Runner %PARAM% %&
echo %COMMAND
diff --git a/solenv/bin/cwscheckapi b/solenv/bin/cwscheckapi
index 357a40a..ddb56fd 100755
--- a/solenv/bin/cwscheckapi
+++ b/solenv/bin/cwscheckapi
@@ -34,80 +34,136 @@ EXIT_FAILURE=1
EXIT_ERROR=2
EXIT_BUG=10
+# report the given error parameter to cwstestresult if the is one.
+# 0: no error send ok or parameter $2
+# 1: failure
+# 2...: incomplete
+function reportError()
+{
+ ERRORCODE=$1
+ if [ -e $SOLARENV/bin/cwstestresult.pl ]; then
+ if [ $ERRORCODE -eq 0 ]; then
+ PT_STATUS=${2:-ok} # use default 'ok' or $2
+ elif [ $ERRORCODE -eq 1 ]; then
+ PT_STATUS=failed
+ else
+ PT_STATUS=incomplete
+ fi
+
+ if [ "$OSTYPE" == "cygwin" ]; then
+ CWSENV=Windows
+ elif [ "$OSTYPE" == "linux" ]; then
+ CWSENV=Linux
+ elif [ "$OSTYPE" == "solaris" ]; then
+ CWSENV=SolarisX86
+ else
+ CWSENV=Unknown
+ fi
+ perl $SOLARENV/bin/cwstestresult.pl -c $CWS_WORK_STAMP -n CWSCheckAPI -p $CWSENV $PT_STATUS
+ else
+ echo "No cwstestresult.pl found."
+ fi
+}
+
usage() {
- echo "Usage: $SCRIPTNAME [-m MODULE1[,MODULEn]] [-k] [-o] [-h] [-d] [-i] [-t] [-s] [-a]" >&2
- echo "" >&2
- echo "[-m] list of modules to test like: '-m sw,sc,sd' or '-m all' for all modules" >&2
- echo "" >&2
- echo "[-k] keep Office installation, otherwise it will be removed after test" >&2
- echo "" >&2
- echo "[-o] force OpenOffice.org installation instead of StarOffice" >&2
- echo "" >&2
- echo "[-d] debug installation and UnoAPI-Tests" >&2
- echo "" >&2
- echo "[-i] debug installation" >&2
- echo "" >&2
- echo "[-t] debug UnoAPI-Tests" >&2
- echo "" >&2
- echo "[-s] skip installation of Office" >&2
- echo "" >&2
- echo "[-a] NoCwsAttach: do not attach UnoAPI-Test result to EIS database" >&2
- echo "" >&2
- echo "further informations: http://wiki.services.openoffice.org/wiki/Cwscheckapi" >&2
- echo "" >&2
- exit $EXIT_FAILURE
+ echo "Usage: $SCRIPTNAME [-m MODULE1[,MODULEn]] [-k] [-o] [-h] [-d] [-u] [-t] [-s] [-a]" >&2
+ echo "" >&2
+ echo "[-m] list of modules to test like: '-m sw,sc,sd' or '-m all' for all modules" >&2
+ echo "" >&2
+ echo "[-k] keep Office installation, otherwise it will be removed after test" >&2
+ echo "" >&2
+ echo "[-o] force OpenOffice.org installation instead of StarOffice" >&2
+ echo "" >&2
+ echo "[-d] debug installation and UnoAPI-Tests" >&2
+ # echo "" >&2
+ # echo "[-i] debug installation" >&2
+ echo "" >&2
+ echo "[-t] debug UnoAPI-Tests" >&2
+ echo "" >&2
+ echo "[-s] skip installation of Office" >&2
+ echo "" >&2
+ echo "[-a] NoCwsAttach: do not attach UnoAPI-Test result to EIS database" >&2
+ echo "" >&2
+ echo "[-u] UseInstalledOffice: do not install an office" >&2
+ echo "" >&2
+ echo "further informations: http://wiki.services.openoffice.org/wiki/Cwscheckapi" >&2
+ echo "" >&2
+ exit $EXIT_FAILURE
}
+# we start cwscheckapi
+reportError 0 running
+
if [ "$PROEXT" != ".pro" ]; then
echo "ERROR: cwscheckapi works only on pro-versions" >&2
+ reportError 2
exit $EXIT_FAILURE
fi
if [ x${USER}x = xx ]; then
if [ x${LOGNAME}x = xx ]; then
echo "ERROR: could not determine username. Please export variable USER" >&2
+ reportError 2
exit $EXIT_FAILURE
else
USER=$LOGNAME
export USER
fi
fi
-
-DEBUG_I=false
+
+#DEBUG_I=false
DEBUG_T=false
INSTALL=true
-ATTACH=ture
+ATTACH=true
MODULES="auto"
OOO=false
KEEPOFFICE=false
+USE_INSTALLED_OFFICE=false
-while getopts ':m:dkitsaho' OPTION ; do
+while getopts ':m:dkutsaho' OPTION ; do
case $OPTION in
- d) DEBUG_I=true
- DEBUG_T=true
+ d)
+# DEBUG_I=true
+ DEBUG_T=true
;;
- m) MODULES="$OPTARG"
+ m)
+ MODULES="$OPTARG"
;;
- k) KEEPOFFICE=true
+ k)
+ KEEPOFFICE=true
;;
- o) OOO=true
+ o)
+ OOO=true
;;
- i) DEBUG_I=true
+# i)
+# DEBUG_I=true
+# ;;
+ t)
+ DEBUG_T=true
;;
- t) DEBUG_T=true
+ s)
+ INSTALL=false
;;
- s) INSTALL=false
+ a)
+ ATTACH=false
;;
- a) ATTACH=false
+ u)
+ USE_INSTALLED_OFFICE=true
+ INSTALL=false
+ KEEPOFFICE=true
+ echo "make sure your office is started with parameter -accept=pipe,name=$USER;urp;"
;;
- h) usage $EXIT_SUCCESS
+ h)
+ usage $EXIT_SUCCESS
;;
- \?) echo "unkown option \"-$OPTARG\"." >&2
- usage $EXIT_ERROR
- ;;
- *) echo "this is not possible...">&2
+ \?)
+ echo "unkown option \"-$OPTARG\"." >&2
+ usage $EXIT_ERROR
+ ;;
+ *)
+ echo "this is not possible...">&2
usage $EXIT_BUG
;;
esac
@@ -140,24 +196,24 @@ export LOCALUNPACKDIR
unset FORCE2ARCHIVE
-date 2>&1
-
if [ $INSTALL = true ]; then
-
- if [ $DEBUG_I = true ]; then
- echo "start installation: `date`"
- echo call "$SOLARENV/bin/installoffice.pl -cwscheckapi true -dest $LOCALINSTALLDIR -debug $DEBUG_I"
- fi
+ date 2>&1
+
+# if [ $DEBUG_I = true ]; then
+# echo "start installation: `date`"
+# echo call "$SOLARENV/bin/installoffice.pl -cwscheckapi true -dest $LOCALINSTALLDIR -debug $DEBUG_I"
+# fi
perl -w $SOLARENV/bin/installoffice.pl -cwscheckapi true -dest $LOCALINSTALLDIR -ooo $OOO -debug $DEBUG_I
-
+
EXITVAL=$?
if [ $EXITVAL -ne 0 ]; then
echo "ERROR: could not install office"
+ reportError 2
exit $EXITVAL
fi
- echo "`date` installation successfull, start testing...."
+ echo "`date` installation successfull, start testing...."
fi
SOFFICE="soffice"
@@ -170,38 +226,57 @@ if [ "$GUI" = "WNT" ]; then
SOFFICE="soffice.exe"
PS=";"
CYGWIN="-Cygwin true"
- SHELL=`which bash`
- SHELL=`cygpath -w $SHELL`
+ SHELL=$(which bash)
+ SHELL=$(cygpath -w $SHELL)
if [ ! -f $SHELL ]; then
echo "could not determine bash shell"
+ reportError 2
exit 1
fi
fi
-if [ $DEBUG_T = true ]; then
- echo find $LOCALINSTALLDIR -name $SOFFICE
-fi
+# if [ $DEBUG_T = true ]; then
+# echo find $LOCALINSTALLDIR -name $SOFFICE
+# fi
-OFFICEBIN=`find $LOCALINSTALLDIR -name $SOFFICE`
+if [ $USE_INSTALLED_OFFICE = false ]; then
-if [ ! -f "$OFFICEBIN" ]; then
- echo "could not find 'soffice' in subfolders of $LOCALINSTALLDIR"
- exit 1
-fi
+ OFFICEBIN=`find $LOCALINSTALLDIR -name $SOFFICE`
-if [ "$GUI" = "WNT" ]; then
+ if [ ! -f "$OFFICEBIN" ]; then
+ echo "could not find 'soffice' in subfolders of $LOCALINSTALLDIR"
+ reportError 2
+ exit 1
+ fi
+
+ if [ "$GUI" = "WNT" ]; then
# transform /tmp/... -> c:\tmp\...
- OFFICEBIN=`cygpath -w $OFFICEBIN`
+ OFFICEBIN=`cygpath -w $OFFICEBIN`
+ fi
+else
+ OFFICEBIN=$SOFFICE
+ echo "Use already installed and running office."
fi
JARFOLDER=$SOLARVERSION/$INPATH/bin$UPDMINOREXT
SOLVER_LIB=$SOLARVERSION/$INPATH/lib$UPDMINOREXT
-myCLASSPATH=${PS}${JARFOLDER}/ridl.jar${PS}${JARFOLDER}/unoil.jar${PS}${JARFOLDER}/jurt.jar${PS}${JARFOLDER}/juh.jar${PS}${JARFOLDER}/java_uno.jar
-myCLASSPATH=$myCLASSPATH${PS}${JARFOLDER}/OOoRunner.jar
-myCLASSPATH=$myCLASSPATH${PS}/net/unoapi/export/unoapi/bin/mysql.jar${PS}$SOLVER_LIB
+
+myCLASSPATH=${PS}${JARFOLDER}/ridl.jar${PS}\
+${JARFOLDER}/unoil.jar${PS}\
+${JARFOLDER}/jurt.jar${PS}\
+${JARFOLDER}/juh.jar${PS}\
+${JARFOLDER}/java_uno.jar
+
+myCLASSPATH=$myCLASSPATH${PS}\
+${JARFOLDER}/OOoRunner.jar
+
+myCLASSPATH=$myCLASSPATH${PS}\
+/net/unoapi/export/unoapi/bin/mysql.jar${PS}\
+$SOLVER_LIB
+
PARAM=""
if [ -n "$JAVAI" ]; then
- JAVABIN=$JAVAI
+ JAVABIN=$JAVAI
elif [ -n "$JAVA_HOME" ]; then
if [ "$OS$CPUNAME$CPU" = SOLARISSPARCU ]; then
JAVABIN=$JAVA_HOME/bin/sparcv9/java
@@ -209,19 +284,20 @@ elif [ -n "$JAVA_HOME" ]; then
JAVABIN=$JAVA_HOME/bin/java
fi
else
- echo "please set environment variable JAVA_HOME"
- exit 1
+ echo "please set environment variable JAVA_HOME"
+ reportError 2
+ exit 1
fi
if [ -n "$WORK_STAMP" ]; then
- if [ -n "$CWS_WORK_STAMP" ]; then
+ if [ -n "$CWS_WORK_STAMP" ]; then
PARAM="$PARAM -Version cws_${CWS_WORK_STAMP}"
- else
- echo "######"
- echo CAUTION! You are working on the MWS
- echo "######"
+ else
+ echo "######"
+ echo CAUTION! You are working on the MWS
+ echo "######"
PARAM="$PARAM -Version ${WORK_STAMP}_${UPDMINOR}"
- fi
+ fi
fi
PARAM="$PARAM -cmd '$OFFICEBIN -nofirststartwizard -accept=pipe,name=$USER;urp; -norestore -nocrashreport -nolockcheck -enableautomation'"
@@ -241,12 +317,33 @@ if [ $DEBUG_T = true ]; then
PARAM="$PARAM -debug true -log true"
fi
-#XDEBUG=" -Xdebug -Xrunjdwp:transport=dt_socket,server=y,address=8001 "
+# Sample command
+# /so/env/Linux_JDK_1.5.0_06/bin/java
+# -Xmx120m $XDEBUG
+# -cp :/net/so-cwsserv02/export/cws/unoapi04/DEV300/unxlngi6.pro/bin.m50/ridl.jar:/net/so-cwsserv02/export/cws/unoapi04/DEV300/unxlngi6.pro/bin.m50/unoil.jar:/net/so-cwsserv02/export/cws/unoapi04/DEV300/unxlngi6.pro/bin.m50/jurt.jar:/net/so-cwsserv02/export/cws/unoapi04/DEV300/unxlngi6.pro/bin.m50/juh.jar:/net/so-cwsserv02/export/cws/unoapi04/DEV300/unxlngi6.pro/bin.m50/java_uno.jar:/net/so-cwsserv02/export/cws/unoapi04/DEV300/unxlngi6.pro/bin.m50/OOoRunner.jar:/net/unoapi/export/unoapi/bin/mysql.jar:/net/so-cwsserv02/export/cws/unoapi04/DEV300/unxlngi6.pro/lib.m50
+# org.openoffice.Runner
+# -Version cws_unoapi04
+# -cmd '/tmp/ll93751/cwscheckapi/office/staroffice9/program/soffice -nofirststartwizard -accept=pipe,name=ll93751;urp; -norestore -nocrashreport -nolockcheck -enableautomation'
+# -cs pipe,name=ll93751
+# -NoOffice true
+# -SRC_ROOT /net/so-cwsserv02/export/cws/unoapi04/DEV300/src.m50
+# -COMP_ENV unxlngi6
+# -Shell /bin/bash
+# -tb java_complex
+# -TimeOut 90000
+# -o 'complex.unoapi.CheckModuleAPI::module(auto)'
+
+# XDEBUG=" -Xdebug -Xrunjdwp:transport=dt_socket,server=y,address=9003,suspend=y "
+
+# set DEBUGAPI if you want to debug the checkapi
+# DEBUGAPI=t
+
COMMAND="$JAVABIN -Xmx120m $XDEBUG -cp $myCLASSPATH org.openoffice.Runner $PARAM $*"
echo "$COMMAND"
LOGFILE=$CWSCHECKAPIPATH/cwscheckapi.log
$COMMAND | tee $LOGFILE
+EXITVAL=$?
if [ $KEEPOFFICE = false ]; then
echo "remove office instrallation in $LOCALINSTALLDIR..."
@@ -256,4 +353,11 @@ fi
echo
echo A logfile could be found here: $LOGFILE
-date 2>&1
\ No newline at end of file
+date 2>&1
+
+# send the results via cwstestresult.pl to EIS
+if [ $EXITVAL -eq 0 ]; then
+ reportError 0 ok
+else
+ reportError 1
+fi
diff --git a/solenv/bin/cwscheckapi.btm b/solenv/bin/cwscheckapi.btm
index 96e2dd7..64c624d 100755
--- a/solenv/bin/cwscheckapi.btm
+++ b/solenv/bin/cwscheckapi.btm
@@ -28,10 +28,13 @@ REM * <http://www.openoffice.org/license.html>
REM * for a copy of the LGPLv3 License.
REM ************************************************************************/
-echo off
+rem echo on
+
+call reportErrorCheckAPI.btm 0 running
iff "%PROEXT" != ".pro" THEN
echo ERROR: cwscheckapi works only on pro-versions >&2
+ call reportErrorCheckAPI.btm 2
quit 1
endiff
@@ -42,6 +45,7 @@ SET ATTACH=true
SET MODULES=auto
SET OOO=false
SET KEEPOFFICE=false
+SET USE_INSTALLED_OFFICE=false
for %opt in (%&%) DO (
if "%opt%" == "-d" (SET DEBUG_I=true ^ SET DEBUG_T=true ^ shift)
@@ -51,6 +55,7 @@ for %opt in (%&%) DO (
if "%opt%" == "-m" (SET MODULES=%2 ^ shift ^ shift)
if "%opt%" == "-t" (SET DEBUG_T=true ^ shift)
if "%opt%" == "-s" (SET INSTALL=false ^ shift)
+ if "%opt%" == "-u" (SET USE_INSTALLED_OFFICE=true ^ SET INSTALL=false ^ SET KEEPOFFICE=true ^ shift)
if "%opt%" == "-a" (SET attach=false ^ shift)
if "%opt%" == "-h" goto usage
if "%opt%" == "/h" goto usage
@@ -81,25 +86,33 @@ iff "%INSTALL%" == "true" THEN
IFF %? NE 0 THEN
echo ERROR: coud not install office >&2
+ call reportErrorCheckAPI.btm 2
quit %?
ENDIFF
ENDIFF
setlocal
-SET CWD=%_CWD%
-cdd %LOCALINSTALLDIR%
-SET ffindtxt="ffind.txt"
-ffind /s /f /m soffice.exe > %ffindtxt
-SET FindFile=%@FILEOPEN[%ffindtxt%, READ]
-SET OfficeBin=%@FILEREAD[%FindFile]
-set dummy=%@FILECLOSE[%FindFile]
-DEL /q %ffindtxt
-cdd %CWD
-
-IFF NOT EXIST %OFFICEBIN% THEN
- echo could not find 'soffice.exe' in subfolders of %OFFICEBIN% >&2
- quit 1
+IFF %USE_INSTALLED_OFFICE% == "false" then
+
+ SET CWD=%_CWD%
+ cdd %LOCALINSTALLDIR%
+ SET ffindtxt="ffind.txt"
+ ffind /s /f /m soffice.exe > %ffindtxt
+ SET FindFile=%@FILEOPEN[%ffindtxt%, READ]
+ SET OfficeBin=%@FILEREAD[%FindFile]
+ set dummy=%@FILECLOSE[%FindFile]
+ DEL /q %ffindtxt
+ cdd %CWD
+
+ IFF NOT EXIST %OFFICEBIN% THEN
+ echo could not find 'soffice.exe' in subfolders of %OFFICEBIN% >&2
+ call reportErrorCheckAPI.btm 2
+ quit 1
+ ENDIFF
+ELSE
+ SET OFFICEBIN=soffice.exe
+ echo "Use already installed office."
ENDIFF
SET JARFOLDER=%SOLARVERSION%\%INPATH%\bin%UPDMINOREXT%
@@ -111,6 +124,7 @@ ELSEIFF "%JAVA_HOME%" != "" THEN
SET JAVABIN=%JAVA_HOME%\bin\java
ELSE
echo please set environment variable JAVA_HOME >&2
+ call reportErrorCheckAPI.btm 2
quit 1
ENDIFF
@@ -125,6 +139,7 @@ ELSE
echo ###### >&2
echo ERROR: could not determine your CWS or MWS version >&2
echo ###### >&2
+ call reportErrorCheckAPI.btm 2
quit 1
ENDIFF
@@ -148,6 +163,7 @@ set COMMANDO=%JAVABIN% -Xmx120m -cp %MYCLASSPATH% org.openoffice.Runner %PARAM%
echo %COMMANDO
SET LOGFILE=%CWSCHECKAPIPATH%\cwscheckapi.log
%COMMANDO |& tee %LOGFILE%
+set EXITVAL=%?
IFF %KEEPOFFICE% == "false" THEN
echo remove office instrallation in %LOCALINSTALLDIR%...
@@ -157,6 +173,12 @@ fi
echo .
echo A logfile could be found here: %LOGFILE%
+IFF %EXITVAL% NE 0 THEN
+ call reportErrorCheckAPI.btm 1
+ELSE
+ call reportErrorCheckAPI.btm 0 ok
+ENDIFF
+
endlocal
quit 0
diff --git a/solenv/bin/cwstouched b/solenv/bin/cwstouched
index 1847ce3..dac08c0 100755
--- a/solenv/bin/cwstouched
+++ b/solenv/bin/cwstouched
@@ -3,4 +3,4 @@ if [ x${SOLARENV}x = xx ]; then
echo No environment found, please use 'configure' or 'setsolar'
exit 1
fi
-exec perl -w $SOLARENV/bin/cwstouched.pl
\ No newline at end of file
+exec perl -w $SOLARENV/bin/cwstouched.pl
diff --git a/solenv/bin/cwstouched.pl b/solenv/bin/cwstouched.pl
index 0adf497..4b2f09f 100755
--- a/solenv/bin/cwstouched.pl
+++ b/solenv/bin/cwstouched.pl
@@ -42,6 +42,10 @@ use lib (@lib_dirs);
use Cws;
+# Prototypes
+sub getMinor($);
+sub getCwsWorkStamp();
+
my $workstamp = $ENV{'WORK_STAMP'};
my $solenv= $ENV{'SOLARENV'};
my $cwsWorkStamp = getCwsWorkStamp();
@@ -53,12 +57,16 @@ my $svndiff="svn diff --summarize --old=svn://svn.services.openoffice.org/ooo/ta
my @diff = `$svndiff`;
my @modules;
-foreach(@diff){
- if (/.*svn:\/\/svn.services.openoffice.org.*/){
+foreach(@diff)
+{
+ if (/.*svn:\/\/svn.services.openoffice.org.*/)
+ {
$_ =~ /.*$oldWorkStamp\/(\w*)/;
my $newModule=$1;
- if (defined($newModule)){
- if ( ! grep(/$newModule/, at modules)){
+ if (defined($newModule))
+ {
+ if ( ! grep(/$newModule/, at modules))
+ {
push(@modules, $newModule);
}
@@ -66,17 +74,20 @@ foreach(@diff){
}
}
-foreach(@modules){
+foreach(@modules)
+{
print "$_\n";
}
exit(0);
-sub getMinor{
+sub getMinor($)
+{
my $workst = shift;
my $min="";
- if ( ! defined($ENV{'UPDMINOR'})){
+ if ( ! defined($ENV{'UPDMINOR'}))
+ {
my $cws = Cws->new();
$cws->child($workst);
$cws->master($ENV{'WORK_STAMP'});
@@ -85,18 +96,22 @@ sub getMinor{
# check if we got a valid child workspace
my $id = $cws->eis_id();
- if ( !$id ) {
+ if ( !$id )
+ {
print("Child workspace '$childws' for master workspace '$masterws' not found in EIS database.\n");
exit(1);
}
my @milestones = $cws->milestone();
foreach (@milestones) {
- if ( defined($_) ) {
+ if ( defined($_) )
+ {
$min=$_;
}
}
- } else {
+ }
+ else
+ {
$min = $ENV{'UPDMINOR'};
}
@@ -104,25 +119,31 @@ sub getMinor{
return $min;
}
-sub getCwsWorkStamp {
+sub getCwsWorkStamp()
+{
my $cwsWorkSt="";
- if ( ! defined($ENV{'CWS_WORK_STAMP'})){
+ if ( ! defined($ENV{'CWS_WORK_STAMP'}))
+ {
my $currPath= cwd;
chdir($ENV{'SOLARENV'});
my @info = `svn info`;
- foreach(@info) {
- if ( /URL:.*/ ){
+ foreach(@info)
+ {
+ if ( /URL:.*/ )
+ {
# URL: svn+ssh://svn@svn.services.openoffice.org/ooo/cws/qadev37/solenv
$_ =
~ /.*svn.services.openoffice.org(.*\/(.*))\/\w*/;
$cwsWorkSt=$2; #qadev37
}
}
- } else {
+ }
+ else
+ {
$cwsWorkSt = $ENV{'CWS_WORK_STAMP'};
}
return $cwsWorkSt
diff --git a/solenv/bin/reportErrorCheckAPI.btm b/solenv/bin/reportErrorCheckAPI.btm
new file mode 100755
index 0000000..4340ad3
--- /dev/null
+++ b/solenv/bin/reportErrorCheckAPI.btm
@@ -0,0 +1,17 @@
+set ERRORCODE=%1%
+iff exist %SOLARENV%/bin/cwstestresult.pl then
+ iff %ERRORCODE% EQ 0 then
+ set PT_STATUS=%2%
+ else
+ iff %ERRORCODE% EQ 1 then
+ set PT_STATUS=failed
+ else
+ set PT_STATUS=incomplete
+ endiff
+ endiff
+
+ set CWSENV=Windows
+ call perl5 %SOLARENV%/bin/cwstestresult.pl -c %CWS_WORK_STAMP% -n CWSCheckAPI -p %CWSENV% %PT_STATUS%
+else
+ echo "No cwstestresult.pl found."
+endiff
commit 8cf5c48972cb5b0818319f975a3002bd6aa7bec7
Author: Vladimir Glazounov <vg at openoffice.org>
Date: Mon Jul 6 10:25:59 2009 +0000
CWS-TOOLING: integrate CWS ause104
2009-06-24 15:58:35 +0200 hjs r273351 : #i103061# dicard HOMEPATH and HOMEDIR; use matching perl
2009-06-24 13:57:45 +0200 hjs r273342 : #i103062# - use according dmake var
diff --git a/solenv/config/sdev300.ini b/solenv/config/sdev300.ini
index 041b224..e2c3784 100644
--- a/solenv/config/sdev300.ini
+++ b/solenv/config/sdev300.ini
@@ -132,9 +132,9 @@ common
SOLARSRC
SOLAR_JAVA
SPEW
- STLPORT4
- WITH_FONTOOO
- WITH_LANG
+ STLPORT4
+ WITH_FONTOOO
+ WITH_LANG
}
restore
{
@@ -3484,7 +3484,11 @@ wntmsci12
SOLAR_SOURCE_ROOT o:
USE_SHELL 4nt
BTOOLDIR %WORK_STAMP%
- PERLDIR btw\perl\bin\perl
+ PERLDIR btw\%WORK_STAMP%\perl\bin\perl
+ }
+ common02:0 IF %OSTYPE% == cygwin
+ {
+ PERL perl
}
common1
{
@@ -3562,8 +3566,8 @@ wntmsci12
}
jdk13
{
- HOMEDRIVE %DEVROOT%
- HOMEPATH $/jdk131
+# HOMEDRIVE %DEVROOT%
+# HOMEPATH $/jdk131
JAVAHOME %JDK13PATH%
JAVA_HOME %JDK13PATH%
JDKINC %JDK13PATH%$/include;%JDK13PATH%$/include$/win32
@@ -3581,8 +3585,8 @@ wntmsci12
}
jdk14
{
- HOMEDRIVE %DEVROOT%
- HOMEPATH $/jdk141
+# HOMEDRIVE %DEVROOT%
+# HOMEPATH $/jdk141
JAVAHOME %JDK14PATH%
JAVA_HOME %JDK14PATH%
JDKINC %JDK14PATH%$/include$/win32;%JDK14PATH%$/include
@@ -3600,8 +3604,8 @@ wntmsci12
}
jdk15
{
- HOMEDRIVE %DEVROOT%
- HOMEPATH $/jdk151
+# HOMEDRIVE %DEVROOT%
+# HOMEPATH $/jdk151
JAVAHOME %JDK15PATH%
JAVA_HOME %JDK15PATH%
JDKINC %JDK15PATH%$/include$/win32;%JDK15PATH%$/include
@@ -3623,8 +3627,8 @@ wntmsci12
}
ojdk16
{
- HOMEDRIVE %DEVROOT%
- HOMEPATH $/openjdk-6-b08-windows-i586
+# HOMEDRIVE %DEVROOT%
+# HOMEPATH $/openjdk-6-b08-windows-i586
JAVA_HOME %OJDK16PATH%
JDKINC %OJDK16PATH%$/include$/win32;%OJDK16PATH%$/include
JDKINCS -I%OJDK16PATH%$/include -I%OJDK16PATH%$/include$/win32
@@ -3685,7 +3689,7 @@ wntmsci12
$dp(TMP)
$dp(TEMP)
}
- order nojava common0:0 common01:0 bs_sourceroot tmp envroot:0 sourceroot:0 pro common1 distroot:0 ca cap cax psdk compath common2 common:3 jdk13path:0 jdk14path:0 jdk15path:0 ojdk16path:0 stl:1 stl:0 common jdk13 jdk14 jdk15 ojdk16 pre
+ order nojava common0:0 common01:0 bs_sourceroot tmp envroot:0 sourceroot:0 pro common1 distroot:0 ca cap cax common02:0 psdk compath common2 common:3 jdk13path:0 jdk14path:0 jdk15path:0 ojdk16path:0 stl:1 stl:0 common jdk13 jdk14 jdk15 ojdk16 pre
reset
{
COPYALL
More information about the ooo-build-commit
mailing list