[Libreoffice-commits] core.git: pyuno/CustomTarget_python_shell.mk pyuno/zipcore

[Matthew J. Francis]

 pyuno/CustomTarget_python_shell.mk |    1 -
 pyuno/zipcore/mac.sh               |    9 +++++++--
 pyuno/zipcore/nonmac.sh            |    4 ++++
 pyuno/zipcore/python.sh            |    5 -----
 4 files changed, 11 insertions(+), 8 deletions(-)

New commits:
commit 65809118914e84bf7cb355e2fd3bce75d7271778
Author: Matthew J. Francis <mjay.francis at gmail.com>
Date:   Sun Oct 26 11:34:43 2014 +0800

    Fix python wrapper script on OS X
    
    Change-Id: Icfac94022ee026ad8e9d9d5298e5cc7fbd7121be
    Signed-off-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/pyuno/CustomTarget_python_shell.mk b/pyuno/CustomTarget_python_shell.mk
index 4cf7f8b..bc6d355 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 9f04b99..830bcda 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 791a340..5e7cca1 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
old mode 100644
new mode 100755
index 89e73b7..bfe6785
--- 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
-