mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

now that QADEVOOO build_type exist we need to use it...

Browse Source
This commit is contained in:
Norbert Thiebaud
2011-12-30 14:30:06 -06:00
parent 878828757a
commit 930f5f1729
2 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
connectivity/qa/connectivity/tools/makefile.mk
View File

@@ -38,6 +38,11 @@ all:
@echo "Java not available. Build skipped" @echo "Java not available. Build skipped"
.ELSE .ELSE
.IF "$(BUILD_TYPE)" == "$(BUILD_TYPE:s/QADEVOOO//)"
all:
@echo "QADEVOO not set. Build skipped"
.ELSE
#----- compile .java files ----------------------------------------- #----- compile .java files -----------------------------------------
JARFILES = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunnerLight.jar JARFILES = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunnerLight.jar
@@ -56,6 +61,8 @@ ALL : ALLTAR
ALL: ALLDEP ALL: ALLDEP
.ENDIF .ENDIF
.ENDIF # QADEVOOO option
.ENDIF # "$(SOLAR_JAVA)" == "" .ENDIF # "$(SOLAR_JAVA)" == ""
.INCLUDE : target.mk .INCLUDE : target.mk

6
connectivity/qa/makefile.mk
View File

@@ -33,6 +33,10 @@ PACKAGE = complex/connectivity
# --- Settings ----------------------------------------------------- # --- Settings -----------------------------------------------------
.INCLUDE: settings.mk .INCLUDE: settings.mk
.IF "$(BUILD_TYPE)" == "$(BUILD_TYPE:s/QADEVOOO//)"
all:
@echo "QADEVOO not set. Build skipped"
.ELSE
#----- 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
@@ -65,6 +69,7 @@ ALL : ALLTAR
.ELSE .ELSE
ALL: ALLDEP ALL: ALLDEP
.ENDIF .ENDIF
.ENDIF # QADEVOOO option
.INCLUDE : target.mk .INCLUDE : target.mk
@@ -76,3 +81,4 @@ run: $(CLASSDIR)$/$(JARTARGET)
run_%: $(CLASSDIR)$/$(JARTARGET) run_%: $(CLASSDIR)$/$(JARTARGET)
+$(AUGMENT_LIBRARY_PATH) java $(RUNNER_CLASSPATH) $(RUNNER_ARGS) -o complex.$(PRJNAME).$(@:s/run_//) +$(AUGMENT_LIBRARY_PATH) java $(RUNNER_CLASSPATH) $(RUNNER_ARGS) -o complex.$(PRJNAME).$(@:s/run_//)