diff options
| author | Oliver Bolte <obo@openoffice.org> | 2006-03-22 09:43:02 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2006-03-22 09:43:02 +0000 |
| commit | 3e69e5d7268c2b59aed361408685ea2aaa0ccb17 (patch) | |
| tree | ac798964e5b9b2665212169a68fd1f9044080481 /testtools/source/bridgetest/pyuno | |
| parent | 5e3af5945413fc195117f1dd5df63e57cd7dc24d (diff) | |
INTEGRATION: CWS pyunofixes2 (1.2.24); FILE MERGED
2006/01/07 20:57:06 jbu 1.2.24.2: RESYNC: (1.2-1.3); FILE MERGED
2005/09/10 19:16:15 jbu 1.2.24.1: #i35473# now environmentvariables get used instead of explict parameter passing
Diffstat (limited to 'testtools/source/bridgetest/pyuno')
| -rw-r--r-- | testtools/source/bridgetest/pyuno/makefile.mk | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/testtools/source/bridgetest/pyuno/makefile.mk b/testtools/source/bridgetest/pyuno/makefile.mk index 34ffb9100e2f..7f740809929b 100644 --- a/testtools/source/bridgetest/pyuno/makefile.mk +++ b/testtools/source/bridgetest/pyuno/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.3 $ +# $Revision: 1.4 $ # -# last change: $Author: rt $ $Date: 2005-09-09 12:27:15 $ +# last change: $Author: obo $ $Date: 2006-03-22 10:43:02 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -60,8 +60,9 @@ REGCOMP=$(WRAPCMD) regcomp PYTHON=$(WRAPCMD) python .IF "$(GUI)"!="WNT" -REGCOMP_ENV=\ - setenv FOO file://$(shell pwd)$/$(DLLDEST) +TEST_ENV=\ + setenv FOO file://$(shell pwd)$/$(DLLDEST) && \ + setenv UNO_TYPES pyuno_regcomp.rdb && setenv UNO_SERVICES pyuno_regcomp.rdb .ELSE # "$(GUI)" != "WNT" # aaaaaa, how to get the current working directory on windows ??? .IF "$(USE_SHELL)" == "tcsh" @@ -71,10 +72,12 @@ REGCOMP_ENV=\ ##REGCOMP=guw.pl -env `which regcomp.exe` CWD_TMP=$(strip $(shell $(WRAPCMD) echo `pwd`)) -REGCOMP_ENV=setenv FOO file:///$(strip $(subst,\,/ $(CWD_TMP)/$(DLLDEST))) +TEST_ENV=setenv FOO file:///$(strip $(subst,\,/ $(CWD_TMP)/$(DLLDEST))) && \ + setenv UNO_TYPES pyuno_regcomp.rdb && setenv UNO_SERVICES pyuno_regcomp.rdb .ELSE CWD_TMP=$(strip $(shell echo import os;print os.getcwd() | $(PYTHON))) -REGCOMP_ENV=set FOO=file:///$(strip $(subst,\,/ $(CWD_TMP)$/$(DLLDEST))) +TEST_ENV=set FOO=file:///$(strip $(subst,\,/ $(CWD_TMP)$/$(DLLDEST))) && \ + set UNO_TYPES=pyuno_regcomp.rdb && set UNO_SERVICES=pyuno_regcomp.rdb .ENDIF "$(USE_SHELL)" == "tcsh" .ENDIF # "$(GUI)"!="WNT" @@ -114,9 +117,9 @@ doc .PHONY: @echo start test with dmake runtest runtest : ALL - +cd $(DLLDEST) && python main.py -env:UNO_TYPES=pyuno_regcomp.rdb -env:UNO_SERVICES=pyuno_regcomp.rdb - +cd $(DLLDEST) && $(REGCOMP) -register -br pyuno_regcomp.rdb -r dummy.rdb \ + +cd $(DLLDEST) && $(TEST_ENV) && python main.py + +cd $(DLLDEST) && $(TEST_ENV) && $(REGCOMP) -register -br pyuno_regcomp.rdb -r dummy.rdb \ -l com.sun.star.loader.Python $(foreach,i,$(PYCOMPONENTS) -c vnd.openoffice.pymodule:$(i)) - +cd $(DLLDEST) && $(REGCOMP_ENV) && $(REGCOMP) -register -br pyuno_regcomp.rdb -r dummy2.rdb \ + +cd $(DLLDEST) && $(TEST_ENV) && $(REGCOMP) -register -br pyuno_regcomp.rdb -r dummy2.rdb \ -l com.sun.star.loader.Python -c vnd.sun.star.expand:$(DOLLAR_SIGN)FOO/samplecomponent.py |