diff options
| author | Michael Stahl <mstahl@redhat.com> | 2012-11-17 00:35:35 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-11-27 12:45:23 +0100 |
| commit | 38a22a9026a3d8a67f3e16ec650960a10b527d25 (patch) | |
| tree | f60bdd178a59fa4e59813e19083702f447613e8d /pyuno | |
| parent | 6f8f95fed7a4bd741bf035f53a758ac0c6da66b2 (diff) | |
Switch from python to python3
Mac specific parts of patch by:
Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Change-Id: I90ef17c6f5a678230539a80ab999fa5344e4fc8f
Diffstat (limited to 'pyuno')
| -rw-r--r-- | pyuno/Library_pyuno_wrapper.mk | 4 | ||||
| -rw-r--r-- | pyuno/prj/build.lst | 2 | ||||
| -rw-r--r-- | pyuno/zipcore/python.sh | 4 |
3 files changed, 6 insertions, 4 deletions
diff --git a/pyuno/Library_pyuno_wrapper.mk b/pyuno/Library_pyuno_wrapper.mk index 2c44a6fa4760..5e06ad4306ef 100644 --- a/pyuno/Library_pyuno_wrapper.mk +++ b/pyuno/Library_pyuno_wrapper.mk @@ -48,7 +48,9 @@ $(eval $(call gb_Library_set_include,pyuno_wrapper,\ )) else $(eval $(call gb_Library_set_include,pyuno_wrapper,\ - -I$(OUTDIR)/inc/python \ + -I$(call gb_UnpackedTarball_get_dir,python3) \ + -I$(call gb_UnpackedTarball_get_dir,python3)/PC \ + -I$(call gb_UnpackedTarball_get_dir,python3)/Include \ $$(INCLUDE) \ )) endif diff --git a/pyuno/prj/build.lst b/pyuno/prj/build.lst index ca0bce936b8b..863fca645a4c 100644 --- a/pyuno/prj/build.lst +++ b/pyuno/prj/build.lst @@ -1,3 +1,3 @@ -bgpu pyuno : salhelper stoc cpputools cppuhelper bridges tools PYTHON:python LIBXSLT:libxslt NULL +bgpu pyuno : salhelper stoc cpputools cppuhelper bridges tools PYTHON:python3 LIBXSLT:libxslt NULL pu pyuno usr1 - all br_mkout NULL pu pyuno\prj nmake - all pu_prj NULL diff --git a/pyuno/zipcore/python.sh b/pyuno/zipcore/python.sh index 5bb9886bce68..c232c997ac19 100644 --- a/pyuno/zipcore/python.sh +++ b/pyuno/zipcore/python.sh @@ -57,7 +57,7 @@ export PYTHONHOME # execute binary exec "$sd_prog/python.bin" "$@" MACSECTION -PYTHONHOME=$sd_prog/OOoPython.framework +PYTHONHOME=$sd_prog/LibreOfficePython.framework export PYTHONHOME pybasislibdir=$PYTHONHOME/Versions/%%PYVERSION%%/lib/python%%PYVERSION%% @@ -65,4 +65,4 @@ PYTHONPATH=$sd_prog:$pybasislibdir:$pybasislibdir/lib-dynload:$pybasislibdir/lib export PYTHONPATH # execute binary -exec "$PYTHONHOME/Versions/%%PYVERSION%%/Resources/Python.app/Contents/MacOS/OOoPython" "$@" +exec "$PYTHONHOME/Versions/%%PYVERSION%%/Resources/Python.app/Contents/MacOS/LibreOfficePython" "$@" |