diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2011-12-30 14:30:06 -0600 |
|---|---|---|
| committer | Rene Engelhard <rene@debian.org> | 2011-12-31 00:31:19 +0100 |
| commit | 7731d8146ac7d26869dce7656c24c4e431938c5c (patch) | |
| tree | 6d023e671a8d1751dec0550c46086585ef0c154b /connectivity | |
| parent | 9c0643eb010dc5685cd97cb54a7a1ac1fa32f68f (diff) | |
now that QADEVOOO build_type exist we need to use it...
Diffstat (limited to 'connectivity')
| -rwxr-xr-x | connectivity/qa/connectivity/tools/makefile.mk | 7 | ||||
| -rwxr-xr-x | connectivity/qa/makefile.mk | 6 |
2 files changed, 13 insertions, 0 deletions
diff --git a/connectivity/qa/connectivity/tools/makefile.mk b/connectivity/qa/connectivity/tools/makefile.mk index d77da7f1b945..897a85f9d3bd 100755 --- a/connectivity/qa/connectivity/tools/makefile.mk +++ b/connectivity/qa/connectivity/tools/makefile.mk @@ -38,6 +38,11 @@ all: @echo "Java not available. Build skipped" .ELSE +.IF "$(BUILD_TYPE)" == "$(BUILD_TYPE:s/QADEVOOO//)" +all: + @echo "QADEVOO not set. Build skipped" +.ELSE + #----- compile .java files ----------------------------------------- JARFILES = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunnerLight.jar @@ -56,6 +61,8 @@ ALL : ALLTAR ALL: ALLDEP .ENDIF +.ENDIF # QADEVOOO option .ENDIF # "$(SOLAR_JAVA)" == "" .INCLUDE : target.mk + diff --git a/connectivity/qa/makefile.mk b/connectivity/qa/makefile.mk index 3081a751f07b..76028ad4c5e6 100755 --- a/connectivity/qa/makefile.mk +++ b/connectivity/qa/makefile.mk @@ -33,6 +33,10 @@ PACKAGE = complex/connectivity # --- Settings ----------------------------------------------------- .INCLUDE: settings.mk +.IF "$(BUILD_TYPE)" == "$(BUILD_TYPE:s/QADEVOOO//)" +all: + @echo "QADEVOO not set. Build skipped" +.ELSE #----- compile .java files ----------------------------------------- JARFILES = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar @@ -65,6 +69,7 @@ ALL : ALLTAR .ELSE ALL: ALLDEP .ENDIF +.ENDIF # QADEVOOO option .INCLUDE : target.mk @@ -76,3 +81,4 @@ run: $(CLASSDIR)$/$(JARTARGET) run_%: $(CLASSDIR)$/$(JARTARGET) +$(AUGMENT_LIBRARY_PATH) java $(RUNNER_CLASSPATH) $(RUNNER_ARGS) -o complex.$(PRJNAME).$(@:s/run_//) + |