diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2009-04-22 14:05:37 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2009-04-22 14:05:37 +0000 |
| commit | c4a5e50129ceca1d122baa0516781c0dca07f697 (patch) | |
| tree | f40afb38c6d04cc04c8bdab4a5ffb881138c0073 /testtools | |
| parent | 5f7e91ac4c3c0ecbd8d0b55cb92b83040fa08d3e (diff) | |
CWS-TOOLING: integrate CWS python26
2009-04-22 11:57:41 +0200 obo r271091 : #i101079# mingw port (by tono)
2009-04-22 11:56:37 +0200 obo r271090 : #i101079# mingw port (by tono)
2009-04-22 11:55:55 +0200 obo r271089 : #i101079# mingw port (by tono)
2009-04-22 11:26:00 +0200 obo r271084 : #i100492# Patch for FreeBSD (by maho)
2009-04-21 10:19:01 +0200 obo r271020 : #i92413# make python buildable in Hamburg RE environment
2009-04-17 15:52:57 +0200 obo r270952 : #i10000# fix for 4NT shell support
2009-04-17 15:16:39 +0200 hjs r270951 : #i92413# - remove gcc warnings about new struct member. fetched fomr DEV300
2009-04-17 10:30:28 +0200 sb r270927 : #i92413# adaptions for Solaris and/or bash
2009-04-16 00:36:32 +0200 jbu r270861 : #i101080# patch for bash environment provided by tono
2009-04-15 13:50:01 +0200 rene r270842 : #i100997# allow also python < 2.6 again
2009-03-12 14:23:32 +0100 rene r269410 : cleanup: remove Python 2.3.4 - not referenced anymore
2009-03-11 21:48:58 +0100 jbu r269356 : native python modules pyuno.dll -> pyuno.pyd (required by 2.6 python runtime)
2009-03-11 11:11:43 +0100 rene r269307 : fix typo; regen configure
2009-03-10 11:44:54 +0100 rene r269262 : update _AM_PYTHON_INTERPRETER_LIST
2009-03-10 00:30:09 +0100 jbu r269233 : python26 now builds on windows (installation set not built yet)
2009-03-06 21:45:20 +0100 jbu r269050 : python 2.6.1-linuxx86: PYTHONHOME variable removed from set_soenv.in (is now unecessary), added new and removed old python blob, linux x86 builds without patches, windows build still needs to be done and is now broken
2009-03-06 14:08:33 +0100 rene r269004 : #i92413#
Diffstat (limited to 'testtools')
| -rw-r--r-- | testtools/source/bridgetest/pyuno/makefile.mk | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/testtools/source/bridgetest/pyuno/makefile.mk b/testtools/source/bridgetest/pyuno/makefile.mk index 834e481900e3..83ea7b829094 100644 --- a/testtools/source/bridgetest/pyuno/makefile.mk +++ b/testtools/source/bridgetest/pyuno/makefile.mk @@ -55,24 +55,23 @@ REGCOMP=$(WRAPCMD) regcomp PYTHON=$(WRAPCMD) python .IF "$(GUI)"!="WNT" && "$(GUI)"!="OS2" +.IF "$(USE_SHELL)"=="bash" +TEST_ENV=export FOO=file://$(shell @pwd)$/$(DLLDEST) \ + UNO_TYPES=pyuno_regcomp.rdb UNO_SERVICES=pyuno_regcomp.rdb +.ELSE TEST_ENV=\ setenv FOO file://$(shell @pwd)$/$(DLLDEST) && \ setenv UNO_TYPES pyuno_regcomp.rdb && setenv UNO_SERVICES pyuno_regcomp.rdb +.ENDIF .ELSE # "$(GUI)" != "WNT" # aaaaaa, how to get the current working directory on windows ??? +CWD_TMP=$(strip $(shell @echo "import os;print os.getcwd()" | $(PYTHON))) .IF "$(USE_SHELL)" == "tcsh" - -# these are temporary (should go into the global env script) -##PYTHON=guw.pl -env $(SOLARVER)/$(UPD)/$(INPATH)/bin/python.exe -##REGCOMP=guw.pl -env `which regcomp.exe` - -CWD_TMP=$(strip $(shell @$(WRAPCMD) echo `pwd`)) 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))) -TEST_ENV=set FOO=file:///$(strip $(subst,\,/ $(CWD_TMP)$/$(DLLDEST))) && \ - set UNO_TYPES=pyuno_regcomp.rdb && set UNO_SERVICES=pyuno_regcomp.rdb +TEST_ENV=export FOO=file:///$(strip $(subst,\,/ $(CWD_TMP)$/$(DLLDEST))) && \ + export UNO_TYPES=pyuno_regcomp.rdb && export UNO_SERVICES=pyuno_regcomp.rdb .ENDIF "$(USE_SHELL)" == "tcsh" .ENDIF # "$(GUI)"!="WNT" |