Tag: cws_src680_execshellmacrogone
User: rene    
Date: 2007-10-24 08:32:53+0000
Modified:
   dba/dbaccess/qa/complex/dbaccess/makefile.mk

Log:
 RESYNC: (1.9-1.11); FILE MERGED

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.9.8.1&r2=1.9.8.2
Delta lines:  +6 -21
--------------------
--- makefile.mk 2007-10-24 06:35:38+0000        1.9.8.1
+++ makefile.mk 2007-10-24 08:32:22+0000        1.9.8.2
@@ -56,22 +56,7 @@
 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)
+RUNNER_ARGS = -cp $(CLASSPATH)$(PATH_SEPERATOR)$(SOLARBINDIR)$/OOoRunner.jar 
org.openoffice.Runner -TestBase java_complex 
 
 # --- Targets ------------------------------------------------------
 
@@ -85,7 +70,7 @@
 
 
 run: $(CLASSDIR)$/$(JARTARGET)
-    java $(RUNNER_ARGS) -sce dbaccess.sce
+    +java $(RUNNER_ARGS) -sce dbaccess.sce
 
 run_%: $(CLASSDIR)$/$(JARTARGET)
-    java $(RUNNER_ARGS) -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]

Reply via email to