diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2016-06-24 01:33:49 +0200 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2016-06-24 00:11:23 +0000 |
| commit | f2d5afcaaf43e359e9a01387293b4cf2b2dc0dab (patch) | |
| tree | 61ff48461961cce9c767b08764fda16472f47c5e | |
| parent | e36a3a4ef429036b580a6ae53902d8426073d9b6 (diff) | |
uitest: the correct python executable for windows is in instdir
Change-Id: Ica1efa92d6b3b26b3d138763c8f548c59d53e346
Reviewed-on: https://gerrit.libreoffice.org/26622
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
| -rw-r--r-- | solenv/gbuild/platform/com_MSC_class.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/solenv/gbuild/platform/com_MSC_class.mk b/solenv/gbuild/platform/com_MSC_class.mk index c757f9a51f5f..f55559c71e66 100644 --- a/solenv/gbuild/platform/com_MSC_class.mk +++ b/solenv/gbuild/platform/com_MSC_class.mk @@ -597,7 +597,7 @@ gb_UIMenubarTarget_UIMenubarTarget_platform := # Python gb_Python_PRECOMMAND := PATH="$(shell cygpath -w $(INSTDIR)/program)" PYTHONHOME="$(INSTDIR)/program/python-core-$(PYTHON_VERSION)" PYTHONPATH="$(INSTDIR)/program/python-core-$(PYTHON_VERSION)/lib;$(INSTDIR)/program/python-core-$(PYTHON_VERSION)/lib/lib-dynload:$(INSTDIR)/program" -gb_Python_INSTALLED_EXECUTABLE := $(INSTROOT)/$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/bin/python.exe +gb_Python_INSTALLED_EXECUTABLE := $(INSTROOT)/$(LIBO_BIN_FOLDER)/python.exe gb_ICU_PRECOMMAND := PATH="$(shell cygpath -w $(WORKDIR_FOR_BUILD)/UnpackedTarball/icu/source/lib)" |