User: vg Date: 2007/01/15 06:29:49 Modified: dba/dbaccess/qa/complex/dbaccess/makefile.mk
Log: INTEGRATION: CWS dba22b (1.8.96); FILE MERGED 2007/01/04 10:48:46 fs 1.8.96.1: connection string settings from the environment File Changes: Directory: /dba/dbaccess/qa/complex/dbaccess/ ============================================= File [changed]: makefile.mk Url: http://dba.openoffice.org/source/browse/dba/dbaccess/qa/complex/dbaccess/makefile.mk?r1=1.8&r2=1.9 Delta lines: +19 -2 -------------------- --- makefile.mk 10 Jul 2006 15:00:10 -0000 1.8 +++ makefile.mk 15 Jan 2007 14:29:47 -0000 1.9 @@ -56,6 +56,23 @@ JARTARGET = $(TARGET).jar JARCOMPRESS = TRUE +# --- Runner Settings ---------------------------------------------- + +# create connection string for OOoRunner +.IF "$(RUNNER_CONNECTION_STRING)" == "" + .IF "$(OOO_RUNNER_PORT)" == "" + OOO_RUNNER_PORT=8100 + .ENDIF + .IF "$(OOO_RUNNER_HOST)" == "" + OOO_RUNNER_HOST=localhost + .ENDIF + RUNNER_CONNECTION_STRING=socket,host=$(OOO_RUNNER_HOST),port=$(OOO_RUNNER_PORT) +.ENDIF + +# classpath and argument list +RUNNER_CLASSPATH = -cp $(CLASSPATH)$(PATH_SEPERATOR)$(SOLARBINDIR)$/OOoRunner.jar +RUNNER_ARGS = $(RUNNER_CLASSPATH) org.openoffice.Runner -TestBase java_complex -cs $(RUNNER_CONNECTION_STRING) + # --- Targets ------------------------------------------------------ .IF "$(depend)" == "" @@ -68,7 +85,7 @@ run: $(CLASSDIR)$/$(JARTARGET) - java -cp $(CLASSPATH)$(PATH_SEPERATOR)$(SOLARBINDIR)$/OOoRunner.jar org.openoffice.Runner -TestBase java_complex -sce dbaccess.sce + java $(RUNNER_ARGS) -sce dbaccess.sce run_%: $(CLASSDIR)$/$(JARTARGET) - java -cp $(CLASSPATH)$(PATH_SEPERATOR)$(SOLARBINDIR)$/OOoRunner.jar org.openoffice.Runner -TestBase java_complex -o complex.dbaccess.$(@:s/run_//) + java $(RUNNER_ARGS) -o complex.dbaccess.$(@:s/run_//) --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
