[Libreoffice-commits] .: 2 commits - qadevOOo/build.xml smoketestdoc/data

[Caolán McNamara]

 qadevOOo/build.xml           |    4 ++--
 smoketestdoc/data/Global.xml |   17 +++++++++++++++--
 2 files changed, 17 insertions(+), 4 deletions(-)

New commits:
commit ee666191ab3f28bc7cb36b3678cad2b5f7eef588
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Apr 7 17:29:51 2011 +0100

    handle the --disable-binfilter variable throughout
    
    Seeing as I got real confused when I ran it manually with the binfilter
    disabled and had the OpenV5 available and various errors at runtime

diff --git a/smoketestdoc/data/Global.xml b/smoketestdoc/data/Global.xml
index 3991a36..ef178e1 100644
--- a/smoketestdoc/data/Global.xml
+++ b/smoketestdoc/data/Global.xml
@@ -532,6 +532,11 @@ Sub SetGlobalOptionsDialog ()
     REM create dialog control
     gOptionsDialog = CreateUnoDialog( oInputStreamProvider )
 
+    if Environ(&quot;WITH_BINFILTER&quot;) = &quot;NO&quot; then
+        oControl = gOptionsDialog.getControl(&quot;cbOpen50Test&quot;)
+        oControl.Model.setPropertyValue(&quot;Enabled&quot;, FALSE)
+    End If
+
 end Sub
 
 Sub ShowOptionsDlg
@@ -588,7 +593,11 @@ Sub GetOptions
     gOptionsDialog.getControl(&quot;cbDatabaseTest&quot;).setState( -( GetUserFieldState (cUserFieldTestDatabase, gOutputDoc)))
     gOptionsDialog.getControl(&quot;cbExtensionTest&quot;).setState( -( GetUserFieldState (cUserFieldTestExtension, gOutputDoc)))
     gOptionsDialog.getControl(&quot;cbSaveOpenXMLTest&quot;).setState( -( GetUserFieldState (cUserFieldTestOpenSaveXML, gOutputDoc)))
-    gOptionsDialog.getControl(&quot;cbOpen50Test&quot;).setState( -( GetUserFieldState (cUserFieldTestOpen50, gOutPutDoc)))
+    if Environ(&quot;WITH_BINFILTER&quot;) = &quot;NO&quot; then
+        gOptionsDialog.getControl(&quot;cbOpen50Test&quot;).setState(0)
+    else
+        gOptionsDialog.getControl(&quot;cbOpen50Test&quot;).setState( -( GetUserFieldState (cUserFieldTestOpen50, gOutPutDoc)))
+    End If
     gOptionsDialog.getControl(&quot;cbSaveOpen8Test&quot;).setState( -( GetUserFieldState (cUserFieldTestOpenSave8, gOutputDoc)))
     gOptionsDialog.getControl(&quot;cbTerminateAfterTest&quot;).setState( -( GetUserFieldState (cUserFieldTestTerminateAfterTest, gOutputDoc)))
 End Sub
@@ -606,7 +615,11 @@ Sub ReadOptions
     bMakeDBTest = GetUserFieldState (cUserFieldTestDatabase, gOutputDoc)
     bMakeExtensionTest = GetUserFieldState (cUserFieldTestExtension, gOutputDoc)
     bMakeSaveOpenXMLTest = GetUserFieldState (cUserFieldTestOpenSaveXML, gOutputDoc)
-    bMakeOpen50Test = GetUserFieldState (cUserFieldTestOpen50, gOutPutDoc)
+    if Environ(&quot;WITH_BINFILTER&quot;) = &quot;NO&quot; then
+        bMakeOpen50Test = false
+    else
+        bMakeOpen50Test = GetUserFieldState (cUserFieldTestOpen50, gOutPutDoc)
+    End If
     bMakeSaveOpen8Test = GetUserFieldState (cUserFieldTestOpenSave8, gOutputDoc)
     bMakeTerminateAfterTest = GetUserFieldState (cUserFieldTestTerminateAfterTest, gOutputDoc)
 end Sub
commit 3ec627ecdfcc8f96b70c15de059b40c2444e3d9a
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Apr 7 13:12:30 2011 +0100

    add includeantruntime=false

diff --git a/qadevOOo/build.xml b/qadevOOo/build.xml
index 280decf..375d617 100755
--- a/qadevOOo/build.xml
+++ b/qadevOOo/build.xml
@@ -19,7 +19,7 @@
 
   <!-- target for building the runner -->
   <target name="qadevOOo_runner_build">
-    <javac srcdir="${qadevOOo.runner}" destdir="${qadevOOo.class}" includes="**/*.java" debug="${debug}" source="${build.source}" encoding="utf-8" fork="true">
+    <javac srcdir="${qadevOOo.runner}" destdir="${qadevOOo.class}" includes="**/*.java" debug="${debug}" source="${build.source}" encoding="utf-8" fork="true" includeantruntime="false">
         <classpath>
             <pathelement location="${qadevOOo.class}"/>
             <fileset dir="${qadevOOo.office_jars}">
@@ -35,7 +35,7 @@
   
   <!-- target for building the tests -->
   <target name="qadevOOo_tests_build" depends="qadevOOo_runner_build">
-    <javac srcdir="${qadevOOo.tests}" destdir="${qadevOOo.class}" includes="**/*.java" debug="${debug}" source="${build.source}">
+    <javac srcdir="${qadevOOo.tests}" destdir="${qadevOOo.class}" includes="**/*.java" debug="${debug}" source="${build.source}" includeantruntime="false">
         <classpath>
             <pathelement location="${qadevOOo.class}"/>
             <fileset dir="${qadevOOo.office_jars}">