diff options
| author | Oliver Bolte <obo@openoffice.org> | 2008-10-15 08:43:33 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2008-10-15 08:43:33 +0000 |
| commit | eadd952a783ee6397ff71bd876a36a81e3152ed8 (patch) | |
| tree | ea5c665f749782ba3af43e1113973be42881686c /testtools | |
| parent | 36c69b96500419a9a3ef35868a5ee990695b15f0 (diff) | |
CWS-TOOLING: integrate CWS ause098
Diffstat (limited to 'testtools')
| -rw-r--r-- | testtools/source/bridgetest/makefile.mk | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/testtools/source/bridgetest/makefile.mk b/testtools/source/bridgetest/makefile.mk index b8e178c0158f..fe2d0540e292 100644 --- a/testtools/source/bridgetest/makefile.mk +++ b/testtools/source/bridgetest/makefile.mk @@ -129,9 +129,11 @@ JAVATARGETS=\ .ENDIF # --- Targets ------------------------------------------------------ -ALL : \ + +.INCLUDE : target.mk + +ALLTAR: \ test \ - ALLTAR \ $(DLLDEST)$/uno_types.rdb \ $(DLLDEST)$/uno_services.rdb \ $(DLLDEST)$/bridgetest_inprocess$(BATCH_SUFFIX) \ @@ -139,8 +141,6 @@ ALL : \ $(DLLDEST)$/bridgetest_client$(BATCH_SUFFIX) \ $(JAVATARGETS) -.INCLUDE : target.mk - ################################################################# test: @@ -160,12 +160,11 @@ $(DLLDEST)$/bridgetest_client$(BATCH_SUFFIX) : bridgetest_client $(GIVE_EXEC_RIGHTS) $@ $(DLLDEST)$/bridgetest_server$(BATCH_SUFFIX) : bridgetest_server - $(GNUCOPY) -p $? $@ + $(GNUCOPY) $? $@ $(GIVE_EXEC_RIGHTS) $@ .IF "$(SOLAR_JAVA)" != "" -NULLSTR= # jar-files, which regcomp needs so that it can use java MY_JARS=java_uno.jar ridl.jar jurt.jar juh.jar @@ -176,11 +175,11 @@ MY_CLASSPATH=$(strip $(subst,!,$(PATH_SEPERATOR) $(MY_CLASSPATH_TMP:s/ /!/)))$(P # Use "127.0.0.1" instead of "localhost", see #i32281#: $(DLLDEST)$/bridgetest_javaserver$(BATCH_SUFFIX) : makefile.mk -rm -f $@ - $(WRAPCMD) echo java -classpath "$(MY_CLASSPATH)$(PATH_SEPERATOR)..$/class$/testComponent.jar" \ + echo java -classpath "$(MY_CLASSPATH)$(PATH_SEPERATOR)..$/class$/testComponent.jar" \ com.sun.star.comp.bridge.TestComponentMain \""uno:socket,host=127.0.0.1,port=2002;urp;test"\" singleaccept > $@ $(GIVE_EXEC_RIGHTS) $@ -$(DLLDEST)$/bridgetest_inprocess_java$(BATCH_SUFFIX) : makefile.mk +$(DLLDEST)$/bridgetest_inprocess_java$(BATCH_SUFFIX) : makefile.mk $(DLLDEST)$/uno_services.rdb -rm -f $@ echo uno -ro uno_services.rdb -ro uno_types.rdb \ -s com.sun.star.test.bridge.BridgeTest \ |