[Libreoffice-commits] .: Branch 'libreoffice-3-5' - connectivity/qa

[René Engelhard]

 connectivity/qa/connectivity/tools/makefile.mk |    7 +++++++
 connectivity/qa/makefile.mk                    |    6 ++++++
 2 files changed, 13 insertions(+)

New commits:
commit 7731d8146ac7d26869dce7656c24c4e431938c5c
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Fri Dec 30 14:30:06 2011 -0600

    now that QADEVOOO build_type exist we need to use it...

diff --git a/connectivity/qa/connectivity/tools/makefile.mk b/connectivity/qa/connectivity/tools/makefile.mk
index d77da7f..897a85f 100755
--- a/connectivity/qa/connectivity/tools/makefile.mk
+++ b/connectivity/qa/connectivity/tools/makefile.mk
@@ -38,6 +38,11 @@ all:
     @echo "Java not available. Build skipped"
 .ELSE
 
+.IF "$(BUILD_TYPE)" == "$(BUILD_TYPE:s/QADEVOOO//)"
+all:
+    @echo "QADEVOO not set. Build skipped"
+.ELSE
+
 #----- compile .java files -----------------------------------------
 
 JARFILES        = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunnerLight.jar
@@ -56,6 +61,8 @@ ALL :   ALLTAR
 ALL: 	ALLDEP
 .ENDIF
 
+.ENDIF # QADEVOOO option
 .ENDIF # "$(SOLAR_JAVA)" == ""
 
 .INCLUDE :  target.mk
+
diff --git a/connectivity/qa/makefile.mk b/connectivity/qa/makefile.mk
index 3081a75..76028ad 100755
--- a/connectivity/qa/makefile.mk
+++ b/connectivity/qa/makefile.mk
@@ -33,6 +33,10 @@ PACKAGE = complex/connectivity
 # --- Settings -----------------------------------------------------
 .INCLUDE: settings.mk
 
+.IF "$(BUILD_TYPE)" == "$(BUILD_TYPE:s/QADEVOOO//)"
+all:
+    @echo "QADEVOO not set. Build skipped"
+.ELSE
 #----- compile .java files -----------------------------------------
 
 JARFILES        = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar
@@ -65,6 +69,7 @@ ALL :   ALLTAR
 .ELSE
 ALL: 	ALLDEP
 .ENDIF
+.ENDIF # QADEVOOO option
 
 .INCLUDE :  target.mk
 
@@ -76,3 +81,4 @@ run: $(CLASSDIR)$/$(JARTARGET)
 
 run_%: $(CLASSDIR)$/$(JARTARGET)
     +$(AUGMENT_LIBRARY_PATH) java $(RUNNER_CLASSPATH) $(RUNNER_ARGS) -o complex.$(PRJNAME).$(@:s/run_//)
+