summaryrefslogtreecommitdiff
path: root/testautomation/global/tools/includes/optional
diff options
context:
space:
mode:
authorIvo Hinkelmann <ihi@openoffice.org>2009-07-16 13:36:50 +0000
committerIvo Hinkelmann <ihi@openoffice.org>2009-07-16 13:36:50 +0000
commit172ad8fa2d6fa3ec927db1b4948d634ccda63f17 (patch)
treeef5628c6a2d7be88abbf11918a23327a1a773bad /testautomation/global/tools/includes/optional
parente796d331e88d4dbb1442a49905c054b52a66987e (diff)
CWS-TOOLING: integrate CWS tbo07
2009-07-15 12:50:18 +0200 tbo r274002 : #ii97838# fine tuning of text 2009-07-09 11:58:53 +0200 tbo r273855 : #i102592# add configur switch --enable-hids 2009-07-07 18:37:46 +0200 tbo r273812 : last fixes 2009-06-30 17:44:03 +0200 tbo r273527 : #i97838# dynamik hid.lst found 2009-06-30 12:53:57 +0200 tbo r273503 : #i100285# use other name of dialog 2009-06-25 18:56:33 +0200 tbo r273390 : CWS-TOOLING: rebase CWS tbo07 to trunk@272827 (milestone: DEV300:m50) 2009-06-25 15:31:23 +0200 tbo r273383 : #i100285# use other name of dialog 2009-06-25 14:15:33 +0200 tbo r273381 : #i100285# use other name of dialog + context problem with macos 2009-05-20 16:36:54 +0200 tbo r272140 : readme.txt fot the lost hid.lst file 2009-05-20 16:30:31 +0200 tbo r272139 : removal of hid.lst file 2009-05-20 16:28:26 +0200 tbo r272138 : corrections 2009-05-16 19:27:00 +0200 tbo r271982 : #i# copy hid.lst from OOo installation to global/hid 2009-04-21 13:36:36 +0200 tbo r271034 : #i101044# 2009-04-20 18:49:50 +0200 tbo r271009 : #i101044# 2009-04-20 18:47:35 +0200 tbo r271008 : #i100909#
Diffstat (limited to 'testautomation/global/tools/includes/optional')
-rwxr-xr-xtestautomation/global/tools/includes/optional/t_extension_manager_tools.inc23
1 files changed, 20 insertions, 3 deletions
diff --git a/testautomation/global/tools/includes/optional/t_extension_manager_tools.inc b/testautomation/global/tools/includes/optional/t_extension_manager_tools.inc
index e0b2eac27cdf..f207ede20952 100755
--- a/testautomation/global/tools/includes/optional/t_extension_manager_tools.inc
+++ b/testautomation/global/tools/includes/optional/t_extension_manager_tools.inc
@@ -374,6 +374,10 @@ function sExtensionCLI(sCommand as string, sExtensionName as string, optional sE
dim sUnoPkg as string
dim i, a, b as integer
dim args as string
+ Dim sFile as string
+ Dim sEnv as string
+ Dim sContent(5) as string
+ Dim sPlatformProgramPath as string
if isMissing(sExtensionPath) then
sLokalExtensionPath = ""
@@ -388,14 +392,27 @@ function sExtensionCLI(sCommand as string, sExtensionName as string, optional sE
b = inStr(a-12, sAppExe, "soffice")
sUnoPkg = left(sAppExe, b-1) + "unopkg" + mid(sAppExe, b+len("soffice"))
'printlog sUnoPkg
- sUnoPkg = convertToUrl(sUnoPkg)
- 'printlog sUnoPkg
+ 'sUnoPkg = convertToUrl(sUnoPkg)
else
qaErrorLog ("Need to think about another solution..." + sAppExe)
endif
args = sCommand+" "+sLokalExtensionPath + sExtensionName
printlog "Executing: "+sUnopkg+" "+args
- shell(sUnoPkg,2,args)
+ if gPlatGroup <> "unx" then
+ shell(sUnoPkg,2,args)
+ else
+ sFile = ConvertPath (gOfficePath + "user/work/uno.sh")
+ if gPlatform = lcase("osx") then
+ sPlatformProgramPath = "MacOS"
+ else
+ sPlatformProgramPath = "program"
+ end if
+ sEnv = convertToURL(convertPath(gNetzOfficePath + sPlatformProgramPath + "/fundamentalrc")
+ listAppend(sContent(), "export URE_BOOTSTRAP=" + sEnv)
+ listAppend(sContent(), sUnoPkg + " " + args)
+ listWrite(sContent(), sFile)
+ shell("bash",1,sFile)
+ endif
end function
'*******************************************************************************