diff options
| author | Oliver Bolte <obo@openoffice.org> | 2009-02-19 11:42:47 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2009-02-19 11:42:47 +0000 |
| commit | 2d23f56e6d8655aae664edf26e9c65e813d74735 (patch) | |
| tree | f4d068777a355a28f6e8fecc3d53d3c31ac7939f /testtools | |
| parent | 496932ac14ff86cd28dae1935f38df874d42cc53 (diff) | |
CWS-TOOLING: integrate CWS sb104
2009-01-27 13:09:06 +0100 sb r266986 : #i97992# cws rebase: merged cws/sb104/config_office/set_soenv.in with moved tags/DEV300_m40/set_soenv.in
2009-01-27 10:56:40 +0100 sb r266966 : CWS-TOOLING: rebase CWS sb104 to trunk@266944 (milestone: DEV300:m40)
2009-01-20 14:37:00 +0100 sb r266581 : #i97992# missing treatment of Solaris-only adjustvisibility as build-internal tool
2009-01-20 09:32:38 +0100 sb r266554 : CWS-TOOLING: rebase CWS sb104 to trunk@266428 (milestone: DEV300:m39)
2009-01-14 13:40:45 +0100 sb r266296 : #i97992# do not pass comment lines to shell
2009-01-14 12:50:34 +0100 sb r266290 : #i97992# avoid problems with checkdll not finding AWTLIB and its dependents
2009-01-14 12:49:20 +0100 sb r266289 : #i97992# on Linux and Solaris, regxpcom apparently needs to be called with the libxpcom.so directory on the LD_LIBRARY_PATH
2009-01-13 09:41:37 +0100 sb r266196 : #i97992# fixed AUGMENT_LIBRARY_PATH definitions
2009-01-12 18:02:03 +0100 sb r266177 : #i97992# get rid of LD_LIBRARY_PATH in build environment
Diffstat (limited to 'testtools')
| -rw-r--r-- | testtools/source/bridgetest/makefile.mk | 8 | ||||
| -rw-r--r-- | testtools/source/bridgetest/pyuno/makefile.mk | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/testtools/source/bridgetest/makefile.mk b/testtools/source/bridgetest/makefile.mk index 57e222dafe22..3cb5fc421d3b 100644 --- a/testtools/source/bridgetest/makefile.mk +++ b/testtools/source/bridgetest/makefile.mk @@ -192,16 +192,16 @@ $(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\ + cd $(DLLDEST) && $(REGCOMP) -register -br uno_types.rdb -r 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 bridgetest.uno$(DLLPOST) \ - -c cppobj.uno$(DLLPOST) \ + -c .$/bridgetest.uno$(DLLPOST) \ + -c .$/cppobj.uno$(DLLPOST) \ -c stocservices.uno$(DLLPOST) \ - -c $(SHL3TARGETN:f) + -c .$/$(SHL3TARGETN:f) .IF "$(SOLAR_JAVA)" != "" $(REGCOMP) -register -br $(DLLDEST)$/uno_types.rdb -r $@ \ -c javaloader.uno$(DLLPOST) -c javavm.uno$(DLLPOST) diff --git a/testtools/source/bridgetest/pyuno/makefile.mk b/testtools/source/bridgetest/pyuno/makefile.mk index a232a60a8c93..834e481900e3 100644 --- a/testtools/source/bridgetest/pyuno/makefile.mk +++ b/testtools/source/bridgetest/pyuno/makefile.mk @@ -106,7 +106,7 @@ $(DLLDEST)$/regcomp$(EXECPOST) : $(SOLARBINDIR)$/regcomp$(EXECPOST) $(DLLDEST)$/pyuno_regcomp.rdb: $(DLLDEST)$/uno_types.rdb $(SOLARBINDIR)$/pyuno_services.rdb -rm -f $@ - $(WRAPCMD) regmerge $(DLLDEST)$/pyuno_regcomp.rdb / $(DLLDEST)$/uno_types.rdb $(SOLARBINDIR)$/pyuno_services.rdb + $(WRAPCMD) $(REGMERGE) $(DLLDEST)$/pyuno_regcomp.rdb / $(DLLDEST)$/uno_types.rdb $(SOLARBINDIR)$/pyuno_services.rdb doc .PHONY: @echo start test with dmake runtest |