diff options
| author | René Engelhard <rene@openoffice.org> | 2008-12-04 16:54:58 +0000 |
|---|---|---|
| committer | René Engelhard <rene@openoffice.org> | 2008-12-04 16:54:58 +0000 |
| commit | c55a920a1132ec1fe9f1cce68c560c104896d366 (patch) | |
| tree | c2303b49cd8c0ed76a790e59a72773cfd7641590 | |
| parent | 5a9add7821adfa30a7e403247bc9fc77b6b3af83 (diff) | |
#i96896# another one
| -rw-r--r-- | dbaccess/prj/build.lst | 2 | ||||
| -rwxr-xr-x | dbaccess/qa/complex/dbaccess/makefile.mk | 13 |
2 files changed, 14 insertions, 1 deletions
diff --git a/dbaccess/prj/build.lst b/dbaccess/prj/build.lst index 756e48e3c4f3..f89f7fef47e9 100644 --- a/dbaccess/prj/build.lst +++ b/dbaccess/prj/build.lst @@ -1,4 +1,4 @@ -ba dbaccess : BOOST:boost connectivity svx stoc uui NULL +ba dbaccess : BOOST:boost connectivity svx stoc uui QADEVOOO:qadevOOo NULL ba dbaccess usr1 - all ba_mkout NULL ba dbaccess\inc nmake - all ba_inc NULL ba dbaccess\source\ui\inc nmake - all ba_uiinc ba_inc NULL diff --git a/dbaccess/qa/complex/dbaccess/makefile.mk b/dbaccess/qa/complex/dbaccess/makefile.mk index 7ce8fc260c8d..fa820f3dbeb3 100755 --- a/dbaccess/qa/complex/dbaccess/makefile.mk +++ b/dbaccess/qa/complex/dbaccess/makefile.mk @@ -37,7 +37,14 @@ PACKAGE = complex$/dbaccess # --- Settings ----------------------------------------------------- .INCLUDE: settings.mk +.IF "$(SOLAR_JAVA)" == "" +all: + @echo "Java not available. Build skipped" +.INCLUDE : target.mk +.ELSE + +.IF "$(BUILD_QADEVOOO)" == "YES" #----- compile .java files ----------------------------------------- JARFILES = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar ConnectivityTools.jar @@ -70,3 +77,9 @@ run: $(CLASSDIR)$/$(JARTARGET) run_%: $(CLASSDIR)$/$(JARTARGET) +java $(RUNNER_ARGS) -o complex.dbaccess.$(@:s/run_//) + +.ELSE +.INCLUDE : target.mk +.ENDIF # "$(BUILD_QADEVOOO)" == "YES" + +.ENDIF # "$(SOLAR_JAVA)" == "" |