[Libreoffice-commits] core.git: solenv/gbuild

Markus Mohrhard markus.mohrhard at googlemail.com
Fri Jun 24 00:11:47 UTC 2016


 solenv/gbuild/platform/com_MSC_class.mk |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit f2d5afcaaf43e359e9a01387293b4cf2b2dc0dab
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Fri Jun 24 01:33:49 2016 +0200

    uitest: the correct python executable for windows is in instdir
    
    Change-Id: Ica1efa92d6b3b26b3d138763c8f548c59d53e346
    Reviewed-on: https://gerrit.libreoffice.org/26622
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>

diff --git a/solenv/gbuild/platform/com_MSC_class.mk b/solenv/gbuild/platform/com_MSC_class.mk
index c757f9a..f55559c 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)"
 


More information about the Libreoffice-commits mailing list