summaryrefslogtreecommitdiff
path: root/forms
diff options
context:
space:
mode:
authorRĂ¼diger Timm <rt@openoffice.org>2008-09-08 06:46:52 +0000
committerRĂ¼diger Timm <rt@openoffice.org>2008-09-08 06:46:52 +0000
commit0bddfab0dc2af6df8e3aada430f674314969c3f9 (patch)
tree0c230290bb0d1821186527db87e90b7c6eb6f3d6 /forms
parent793f4bc5d8cf37fa33da2e6118009ffae425fb37 (diff)
#i93073# Conditionalize building 'qa' subdirectory.Patch by dtardon.
Diffstat (limited to 'forms')
-rw-r--r--forms/prj/build.lst2
-rw-r--r--forms/qa/makefile.mk12
2 files changed, 12 insertions, 2 deletions
diff --git a/forms/prj/build.lst b/forms/prj/build.lst
index 9ad4893e8d92..4393408051d7 100644
--- a/forms/prj/build.lst
+++ b/forms/prj/build.lst
@@ -1,4 +1,4 @@
-fm forms : svx sfx2 ucb configmgr fileaccess qadevOOo NULL
+fm forms : svx sfx2 ucb configmgr fileaccess QADEVOOO:qadevOOo NULL
fm forms usr1 - all fm_mkofrm NULL
fm forms\inc nmake - all fm_inc NULL
fm forms\source\inc get - all fm_sinc NULL
diff --git a/forms/qa/makefile.mk b/forms/qa/makefile.mk
index 282db95c5352..335bd4954d53 100644
--- a/forms/qa/makefile.mk
+++ b/forms/qa/makefile.mk
@@ -8,7 +8,7 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.2 $
+# $Revision: 1.3 $
#
# This file is part of OpenOffice.org.
#
@@ -37,6 +37,7 @@ PRJNAME = forms
.INCLUDE: settings.mk
+.IF "$(BUILD_QADEVOOO)" == "YES"
#----- compile .java files -----------------------------------------
JARFILES = ridl.jar unoil.jar jurt.jar juh.jar jut.jar java_uno.jar OOoRunner.jar ConnectivityTools.jar
@@ -68,6 +69,7 @@ JARCOMPRESS = TRUE
# classpath and argument list
RUNNER_CLASSPATH = -cp $(CLASSPATH)$(PATH_SEPERATOR)$(SOLARBINDIR)$/OOoRunner.jar$(PATH_SEPERATOR)$(CLASSPATH)$(PATH_SEPERATOR)$(SOLARBINDIR)$/ConnectivityTools.jar
RUNNER_ARGS = org.openoffice.Runner -TestBase java_complex -cs $(RUNNER_CONNECTION_STRING)
+.END
# --- Targets ------------------------------------------------------
@@ -82,6 +84,7 @@ ALL: ALLDEP
.INCLUDE : target.mk
+.IF "$(BUILD_QADEVOOO)" == "YES"
show_targets:
+@java $(RUNNER_CLASSPATH) integration.forms.ShowTargets $(foreach,i,$(JAVAFILES) $(i:s/.\$///:s/.java//))
@@ -91,3 +94,10 @@ run:
run_%:
+$(COPY) integration$/forms$/*.props $(CLASSDIR)$/$(PACKAGE) && java $(RUNNER_CLASSPATH) $(RUNNER_ARGS) -o integration.$(PRJNAME).$(@:s/run_//)
+.ELSE
+run: show_targets
+
+show_targets:
+ +@echo "Built without qadevOOo, no QA tests"
+
+.ENDIF