diff options
| author | Matthew J. Francis <mjay.francis@gmail.com> | 2014-10-26 11:34:43 +0800 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-10-28 11:15:21 +0100 |
| commit | 65809118914e84bf7cb355e2fd3bce75d7271778 (patch) | |
| tree | bd716051de69205f14ebd224f55013a5d8e0d10d /pyuno | |
| parent | 10727e53f718086e8b26ded1b904cb4f11501e34 (diff) | |
Fix python wrapper script on OS X
Change-Id: Icfac94022ee026ad8e9d9d5298e5cc7fbd7121be
Signed-off-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'pyuno')
| -rw-r--r-- | pyuno/CustomTarget_python_shell.mk | 1 | ||||
| -rw-r--r-- | pyuno/zipcore/mac.sh | 9 | ||||
| -rw-r--r-- | pyuno/zipcore/nonmac.sh | 4 | ||||
| -rwxr-xr-x[-rw-r--r--] | pyuno/zipcore/python.sh | 5 |
4 files changed, 11 insertions, 8 deletions
diff --git a/pyuno/CustomTarget_python_shell.mk b/pyuno/CustomTarget_python_shell.mk index 4cf7f8b6067e..bc6d355f7907 100644 --- a/pyuno/CustomTarget_python_shell.mk +++ b/pyuno/CustomTarget_python_shell.mk @@ -30,7 +30,6 @@ $(call gb_CustomTarget_get_workdir,pyuno/python_shell)/os.sh : \ $(SRCDIR)/pyuno/zipcore/$(if $(filter MACOSX,$(OS)),mac,nonmac).sh $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),SED,1) sed -e "s/%%PYVERSION%%/$(pyuno_PYTHON_SHELL_VERSION)/g" \ - -e "s,%%PYTHON_FRAMEWORK_RELATIVE_PATH%%,$(if $(filter MACOSX,$(OS)),../Frameworks/),g" \ $< > $@ # vim: set noet sw=4 ts=4: diff --git a/pyuno/zipcore/mac.sh b/pyuno/zipcore/mac.sh index 9f04b99a3157..830bcdaa10b2 100644 --- a/pyuno/zipcore/mac.sh +++ b/pyuno/zipcore/mac.sh @@ -1,8 +1,13 @@ -PYTHONHOME=$sd_prog/%%PYTHON_FRAMEWORK_RELATIVE_PATH%%LibreOfficePython.framework +# Set URE_BOOTSTRAP so that "uno.getComponentContext()" bootstraps a complete +# OOo UNO environment: +: ${URE_BOOTSTRAP=vnd.sun.star.pathname:$sd_prog/../Resources/fundamentalrc} +export URE_BOOTSTRAP + +PYTHONHOME=$sd_prog/../Frameworks/LibreOfficePython.framework export PYTHONHOME pybasislibdir=$PYTHONHOME/Versions/%%PYVERSION%%/lib/python%%PYVERSION%% -PYTHONPATH=$sd_prog:$pybasislibdir:$pybasislibdir/lib-dynload:$pybasislibdir/lib-tk:$pybasislibdir/site-packages${PYTHONPATH+:$PYTHONPATH} +PYTHONPATH=$sd_prog/../Resources:$sd_prog/../Frameworks:$pybasislibdir:$pybasislibdir/lib-dynload:$pybasislibdir/lib-tk:$pybasislibdir/site-packages${PYTHONPATH+:$PYTHONPATH} export PYTHONPATH # execute binary diff --git a/pyuno/zipcore/nonmac.sh b/pyuno/zipcore/nonmac.sh index 791a3404282a..5e7cca14d063 100644 --- a/pyuno/zipcore/nonmac.sh +++ b/pyuno/zipcore/nonmac.sh @@ -1,3 +1,7 @@ +# Set URE_BOOTSTRAP so that "uno.getComponentContext()" bootstraps a complete +# OOo UNO environment: +: ${URE_BOOTSTRAP=vnd.sun.star.pathname:$sd_prog/fundamentalrc} +export URE_BOOTSTRAP PYTHONPATH=$sd_prog:$sd_prog/python-core-%%PYVERSION%%/lib:$sd_prog/python-core-%%PYVERSION%%/lib/lib-dynload:$sd_prog/python-core-%%PYVERSION%%/lib/lib-tk:$sd_prog/python-core-%%PYVERSION%%/lib/site-packages${PYTHONPATH+:$PYTHONPATH} export PYTHONPATH diff --git a/pyuno/zipcore/python.sh b/pyuno/zipcore/python.sh index 89e73b7a6d27..bfe6785bd6f0 100644..100755 --- a/pyuno/zipcore/python.sh +++ b/pyuno/zipcore/python.sh @@ -38,8 +38,3 @@ export PATH : ${UNO_PATH=$sd_prog} export UNO_PATH -# Set URE_BOOTSTRAP so that "uno.getComponentContext()" bootstraps a complete -# OOo UNO environment: -: ${URE_BOOTSTRAP=vnd.sun.star.pathname:$sd_prog/fundamentalrc} -export URE_BOOTSTRAP - |