diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-09-08 06:46:52 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-09-08 06:46:52 +0000 |
| commit | 0b5aa43693c860163c6c62035068e6ad39987ff7 (patch) | |
| tree | 3b93ba965a733e0c0490656bb7314c3aea1c5464 | |
| parent | b71eb99e66479730a4c333764957abd5a7a027ae (diff) | |
#i93073# Conditionalize building 'qa' subdirectory.Patch by dtardon.
| -rw-r--r-- | forms/prj/build.lst | 2 | ||||
| -rw-r--r-- | forms/qa/makefile.mk | 12 |
2 files changed, 12 insertions, 2 deletions
diff --git a/forms/prj/build.lst b/forms/prj/build.lst index 9ad4893e8..439340805 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 282db95c5..335bd4954 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 |