CWS-TOOLING: integrate CWS sb109

2009-04-21 13:42:45 +0200 sb  r271035 : removed obsolete psprint dependency
2009-04-21 10:33:31 +0200 sb  r271024 : changes to previous -c270971 so that build does not break for USE_SHELL!=bash (but instead resulting bridgetest_xxx scripts are nonfunctional)
2009-04-21 08:56:48 +0200 sb  r271017 : merged in cws/sb107 -c 268250 (avoid warnings about format specifier and argument mismatch (on 64bit debug builds))
2009-04-20 16:42:27 +0200 sb  r270995 : #i98625# add make_xxx functions for C++ representations of UNO polystructs; fixed and adapted tests (patch by thb, slightly adapted)
2009-04-20 14:23:45 +0200 sb  r270981 : #i84751# selective performance improvements (patch by mmeeks, slightly adapted)
2009-04-20 13:39:50 +0200 sb  r270978 : #i99711# removed dead code (patch by cmc, slightly modified)
2009-04-20 11:59:39 +0200 sb  r270972 : #i97975# avoid crashes during shutdown (patch by cmc, slightly modified)
2009-04-20 11:57:52 +0200 sb  r270971 : made tests work again after LD_LIBRARY_PATH clean up
2009-04-20 09:49:32 +0200 sb  r270963 : #i95593# made tests work again after LD_LIBRARY_PATH cleanup
2009-04-17 13:52:33 +0200 sb  r270941 : merged in cws/sb107 -c 270023 (added svn:ignore)
2009-04-15 13:46:24 +0200 sb  r270841 : #i92131# dead code elimination (based on a patch by cmc)
2009-04-15 13:29:27 +0200 sb  r270839 : #i100743# use a FastLess for the Data map (based on a patch my mmeeks)
2009-04-15 13:12:11 +0200 sb  r270837 : #i100583# dead code elimination (patch by cmc)
2009-04-15 13:02:19 +0200 sb  r270835 : avoid bogus Solaris C++ compiler warning when building with debug=x
2009-04-15 11:49:46 +0200 sb  r270828 : adapted to cleared LD_LIBRARY_PATH
2009-04-15 10:49:48 +0200 sb  r270826 : #i101101# for performance reasons, do not put ComponentContext in unsafe appartment
2009-04-15 10:08:20 +0200 sb  r270824 : #i99113# removed duplicated stocservices.uno lib from basis layer

4 files changed, 40 insertions, 14 deletions

diff --git a/testtools/source/bridgetest/bridgetest_client b/testtools/source/bridgetest/bridgetest_client
deleted file mode 100644
index a36bb31deee8..000000000000
--- a/testtools/source/bridgetest/bridgetest_client
+++ /dev/null
@@ -1 +0,0 @@
-uno -ro uno_services.rdb -ro uno_types.rdb -s com.sun.star.test.bridge.BridgeTest -- -u "uno:socket,host=127.0.0.1,port=2002;urp;test"
diff --git a/testtools/source/bridgetest/bridgetest_inprocess b/testtools/source/bridgetest/bridgetest_inprocess
deleted file mode 100644
index 7d812a5cb0a3..000000000000
--- a/testtools/source/bridgetest/bridgetest_inprocess
+++ /dev/null
@@ -1 +0,0 @@
-uno -ro uno_services.rdb -ro uno_types.rdb -s com.sun.star.test.bridge.BridgeTest -- com.sun.star.test.bridge.CppTestObject
\ No newline at end of file
diff --git a/testtools/source/bridgetest/bridgetest_server b/testtools/source/bridgetest/bridgetest_server
deleted file mode 100644
index 565513ff9c48..000000000000
--- a/testtools/source/bridgetest/bridgetest_server
+++ /dev/null
@@ -1 +0,0 @@
-uno -ro uno_services.rdb -ro uno_types.rdb -s com.sun.star.test.bridge.CppTestObject -u "uno:socket,host=127.0.0.1,port=2002;urp;test" --singleaccept
diff --git a/testtools/source/bridgetest/makefile.mk b/testtools/source/bridgetest/makefile.mk
index 3cb5fc421d3b..10200dabaf33 100644
--- a/testtools/source/bridgetest/makefile.mk
+++ b/testtools/source/bridgetest/makefile.mk
@@ -151,16 +151,38 @@ $(DLLDEST)$/uno_types.rdb : $(SOLARBINDIR)$/udkapi.rdb
     $(GNUCOPY) $? $@
     $(REGMERGE) $@ / $(BIN)$/bridgetest.rdb
 
-$(DLLDEST)$/bridgetest_inprocess$(BATCH_SUFFIX) : bridgetest_inprocess
-    $(GNUCOPY) $? $@
+$(DLLDEST)$/bridgetest_inprocess$(BATCH_SUFFIX) .ERRREMOVE: makefile.mk
+.IF "$(USE_SHELL)" == "bash"
+    echo '$(AUGMENT_LIBRARY_PATH)' uno -ro uno_services.rdb -ro uno_types.rdb \
+        -s com.sun.star.test.bridge.BridgeTest -- \
+        com.sun.star.test.bridge.CppTestObject > $@
+.ELSE
+    echo echo ERROR: this script can only be created properly for \
+        USE_SHELL=bash > $@
+.ENDIF
     $(GIVE_EXEC_RIGHTS) $@
 
-$(DLLDEST)$/bridgetest_client$(BATCH_SUFFIX) : bridgetest_client
-    $(GNUCOPY) $? $@
+$(DLLDEST)$/bridgetest_client$(BATCH_SUFFIX) .ERRREMOVE: makefile.mk
+.IF "$(USE_SHELL)" == "bash"
+    echo '$(AUGMENT_LIBRARY_PATH)' uno -ro uno_services.rdb -ro uno_types.rdb \
+        -s com.sun.star.test.bridge.BridgeTest -- \
+        -u \''uno:socket,host=127.0.0.1,port=2002;urp;test'\' > $@
+.ELSE
+    echo echo ERROR: this script can only be created properly for \
+        USE_SHELL=bash > $@
+.ENDIF
     $(GIVE_EXEC_RIGHTS) $@
 
-$(DLLDEST)$/bridgetest_server$(BATCH_SUFFIX) : bridgetest_server
-    $(GNUCOPY) $? $@
+$(DLLDEST)$/bridgetest_server$(BATCH_SUFFIX) .ERRREMOVE: makefile.mk
+.IF "$(USE_SHELL)" == "bash"
+    echo '$(AUGMENT_LIBRARY_PATH)' uno -ro uno_services.rdb -ro uno_types.rdb \
+        -s com.sun.star.test.bridge.CppTestObject \
+        -u \''uno:socket,host=127.0.0.1,port=2002;urp;test'\' --singleaccept \
+        > $@
+.ELSE
+    echo echo ERROR: this script can only be created properly for \
+        USE_SHELL=bash > $@
+.ENDIF
     $(GIVE_EXEC_RIGHTS) $@
 
 
@@ -179,12 +201,16 @@ $(DLLDEST)$/bridgetest_javaserver$(BATCH_SUFFIX) : makefile.mk
         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)$/uno_services.rdb
-    -rm -f $@
-    echo uno -ro uno_services.rdb -ro uno_types.rdb \
+$(DLLDEST)$/bridgetest_inprocess_java$(BATCH_SUFFIX) .ERRREMOVE: makefile.mk
+.IF "$(USE_SHELL)" == "bash"
+    echo '$(AUGMENT_LIBRARY_PATH)' uno -ro uno_services.rdb -ro uno_types.rdb \
         -s com.sun.star.test.bridge.BridgeTest \
         -env:URE_INTERNAL_JAVA_DIR=$(MY_URE_INTERNAL_JAVA_DIR) \
         -- com.sun.star.test.bridge.JavaTestObject noCurrentContext > $@
+.ELSE
+    echo echo ERROR: this script can only be created properly for \
+        USE_SHELL=bash > $@
+.ENDIF
     $(GIVE_EXEC_RIGHTS) $@
 .ENDIF
 
@@ -192,15 +218,18 @@ $(DLLDEST)$/uno_services.rdb .ERRREMOVE: $(DLLDEST)$/uno_types.rdb \
         $(DLLDEST)$/bridgetest.uno$(DLLPOST) $(DLLDEST)$/cppobj.uno$(DLLPOST) \
         $(MISC)$/$(TARGET)$/bootstrap.rdb $(SHL3TARGETN)
     - $(MKDIR) $(@:d)
-    cd $(DLLDEST) && $(REGCOMP) -register -br uno_types.rdb -r uno_services.rdb -wop \
+    $(REGCOMP) -register -br $(DLLDEST)$/uno_types.rdb \
+        -r $(DLLDEST)$/uno_services.rdb -wop \
         -c acceptor.uno$(DLLPOST) \
         -c bridgefac.uno$(DLLPOST) \
         -c connector.uno$(DLLPOST) \
         -c remotebridge.uno$(DLLPOST) \
         -c uuresolver.uno$(DLLPOST) \
+        -c stocservices.uno$(DLLPOST)
+    cd $(DLLDEST) && $(REGCOMP) -register -br uno_types.rdb \
+        -r uno_services.rdb -wop=./ \
         -c .$/bridgetest.uno$(DLLPOST) \
         -c .$/cppobj.uno$(DLLPOST) \
-        -c stocservices.uno$(DLLPOST) \
         -c .$/$(SHL3TARGETN:f)
 .IF "$(SOLAR_JAVA)" != ""
     $(REGCOMP) -register -br $(DLLDEST)$/uno_types.rdb -r $@ \