diff options
| author | sb <sb@openoffice.org> | 2010-03-09 17:31:37 +0100 |
|---|---|---|
| committer | sb <sb@openoffice.org> | 2010-03-09 17:31:37 +0100 |
| commit | 4093882718bdd989f2f4d46f8565e3ec6d552af0 (patch) | |
| tree | 962b0b173593080d302c3fb390ac38082da2ddce /comphelper | |
| parent | merged in re/DEV300_next towards DEV300_m74 (diff) | |
| download | core-4093882718bdd989f2f4d46f8565e3ec6d552af0.tar.gz core-4093882718bdd989f2f4d46f8565e3ec6d552af0.zip | |
sb120: #i109978# removed --disable-qadevooo
Diffstat (limited to 'comphelper')
| -rw-r--r-- | comphelper/qa/complex/makefile.mk | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/comphelper/qa/complex/makefile.mk b/comphelper/qa/complex/makefile.mk index 341b6868e1ec..ec0efdd1188c 100644 --- a/comphelper/qa/complex/makefile.mk +++ b/comphelper/qa/complex/makefile.mk @@ -32,9 +32,6 @@ PRJNAME = comphelper # --- Settings ----------------------------------------------------- .INCLUDE: settings.mk - -.IF "$(BUILD_QADEVOOO)" == "YES" - #----- compile .java files ----------------------------------------- JARFILES := ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar @@ -63,8 +60,6 @@ RUNNER_APPEXECCOMMAND = -AppExecutionCommand "$(OFFICE)$/soffice -accept=socket, RUNNER_ARGS = org.openoffice.Runner -TestBase java_complex $(RUNNER_APPEXECCOMMAND) -.END # "$(BUILD_QADEVOOO)" == "YES" - # --- Targets ------------------------------------------------------ .IF "$(depend)" == "" @@ -78,7 +73,6 @@ ALL: ALLDEP .INCLUDE : target.mk -.IF "$(BUILD_QADEVOOO)" == "YES" show_targets: +@java $(RUNNER_CLASSPATH) complexlib.ShowTargets $(foreach,i,$(JAVAFILES) $(i:s#.java##:s#./#complex.#)) @@ -87,11 +81,3 @@ run: run_%: +java $(RUNNER_CLASSPATH) $(RUNNER_ARGS) -o complex.$(PRJNAME).$(@:s/run_//) - -.ELSE -run: show_targets - -show_targets: - +@echo "Built without qadevOOo, no QA tests" - -.ENDIF |