Commits

Anonymous committed 4dc9297

#i93073# Conditionalize building 'qa' subdirectory.Patch by dtardon.

Comments (0)

Files changed (2)

-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
 #
 # $RCSfile: makefile.mk,v $
 #
-# $Revision: 1.2 $
+# $Revision: 1.3 $
 #
 # This file is part of OpenOffice.org.
 #
 .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
 # 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 ------------------------------------------------------
 
 
 .INCLUDE :  target.mk
 
+.IF "$(BUILD_QADEVOOO)" == "YES"
 show_targets:
     +@java $(RUNNER_CLASSPATH) integration.forms.ShowTargets $(foreach,i,$(JAVAFILES) $(i:s/.\$///:s/.java//))
 
 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