Kaydet (Commit) 40938827 authored tarafından sb's avatar sb

sb120: #i109978# removed --disable-qadevooo

üst 04055605
...@@ -32,9 +32,6 @@ PRJNAME = comphelper ...@@ -32,9 +32,6 @@ PRJNAME = comphelper
# --- Settings ----------------------------------------------------- # --- Settings -----------------------------------------------------
.INCLUDE: settings.mk .INCLUDE: settings.mk
.IF "$(BUILD_QADEVOOO)" == "YES"
#----- compile .java files ----------------------------------------- #----- compile .java files -----------------------------------------
JARFILES := ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar 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, ...@@ -63,8 +60,6 @@ RUNNER_APPEXECCOMMAND = -AppExecutionCommand "$(OFFICE)$/soffice -accept=socket,
RUNNER_ARGS = org.openoffice.Runner -TestBase java_complex $(RUNNER_APPEXECCOMMAND) RUNNER_ARGS = org.openoffice.Runner -TestBase java_complex $(RUNNER_APPEXECCOMMAND)
.END # "$(BUILD_QADEVOOO)" == "YES"
# --- Targets ------------------------------------------------------ # --- Targets ------------------------------------------------------
.IF "$(depend)" == "" .IF "$(depend)" == ""
...@@ -78,7 +73,6 @@ ALL: ALLDEP ...@@ -78,7 +73,6 @@ ALL: ALLDEP
.INCLUDE : target.mk .INCLUDE : target.mk
.IF "$(BUILD_QADEVOOO)" == "YES"
show_targets: show_targets:
+@java $(RUNNER_CLASSPATH) complexlib.ShowTargets $(foreach,i,$(JAVAFILES) $(i:s#.java##:s#./#complex.#)) +@java $(RUNNER_CLASSPATH) complexlib.ShowTargets $(foreach,i,$(JAVAFILES) $(i:s#.java##:s#./#complex.#))
...@@ -87,11 +81,3 @@ run: ...@@ -87,11 +81,3 @@ run:
run_%: run_%:
+java $(RUNNER_CLASSPATH) $(RUNNER_ARGS) -o complex.$(PRJNAME).$(@:s/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
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment