Author: damjan
Date: Wed Mar 30 17:49:51 2016
New Revision: 1737135
URL: http://svn.apache.org/viewvc?rev=1737135&view=rev
Log:
Some fixes to build.xml for qa tests:
* Fix the default ${openoffice.home} for *nix (the final "program" directory
is wrong).
* Windows uses the "OpenOffice 4" directory instead of "openoffice4".
Patch by: me
Modified:
openoffice/trunk/test/build.xml
Modified: openoffice/trunk/test/build.xml
URL:
http://svn.apache.org/viewvc/openoffice/trunk/test/build.xml?rev=1737135&r1=1737134&r2=1737135&view=diff
==============================================================================
--- openoffice/trunk/test/build.xml (original)
+++ openoffice/trunk/test/build.xml Wed Mar 30 17:49:51 2016
@@ -145,10 +145,15 @@
</condition>
<!-- Next try the internal install path that the
with-package-format=installed option to configure uses -->
- <available type="dir"
file="${env.SRC_ROOT}/instsetoo_native/${env.INPATH}/Apache_OpenOffice/installed/install/en-US/openoffice4/program"
- property="internalInstalledDir"
value="${env.SRC_ROOT}/instsetoo_native/${env.INPATH}/Apache_OpenOffice/installed/install/en-US/openoffice4/program"/>
- <condition property="test.arg0"
value="-Dopenoffice.home=${internalInstalledDir}">
- <isset property="internalInstalledDir" />
+ <available type="dir"
file="${env.SRC_ROOT}/instsetoo_native/${env.INPATH}/Apache_OpenOffice/installed/install/en-US/openoffice4"
+ property="internalInstalledDirNix"
value="${env.SRC_ROOT}/instsetoo_native/${env.INPATH}/Apache_OpenOffice/installed/install/en-US/openoffice4"/>
+ <condition property="test.arg0"
value="-Dopenoffice.home=${internalInstalledDirNix}">
+ <isset property="internalInstalledDirNix" />
+ </condition>
+ <available type="dir"
file="${env.SRC_ROOT}/instsetoo_native/${env.INPATH}/Apache_OpenOffice/installed/install/en-US/OpenOffice
4"
+ property="internalInstalledDirWin"
value="${env.SRC_ROOT}/instsetoo_native/${env.INPATH}/Apache_OpenOffice/installed/install/en-US/OpenOffice
4"/>
+ <condition property="test.arg0"
value="-Dopenoffice.home=${internalInstalledDirWin}">
+ <isset property="internalInstalledDirWin" />
</condition>
<!-- Finally try the tar.gz and zip archives which build by
default -->
