diff options
| author | David Tardon <dtardon@redhat.com> | 2016-06-01 14:46:38 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2016-06-01 14:55:27 +0200 |
| commit | 9b01428b1f448e6b7d5a72f18c1a7d86e11ba4f9 (patch) | |
| tree | f8915f28602feadb3ea33d16ec722d78ce3f46ed /pyuno | |
| parent | c5c2181a14c6ca9ed47729e6d8dbda2cc3552221 (diff) | |
final solution of the ARCHIVE question
Change-Id: I70da65e08c75cd732000597a09ed113b3075c5a8
Diffstat (limited to 'pyuno')
| -rw-r--r-- | pyuno/GeneratedPackage_python-core.mk | 20 | ||||
| -rw-r--r-- | pyuno/Module_pyuno.mk | 7 |
2 files changed, 23 insertions, 4 deletions
diff --git a/pyuno/GeneratedPackage_python-core.mk b/pyuno/GeneratedPackage_python-core.mk new file mode 100644 index 000000000000..88cd9b9898d2 --- /dev/null +++ b/pyuno/GeneratedPackage_python-core.mk @@ -0,0 +1,20 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_GeneratedPackage_GeneratedPackage,python-core,$(MINGW_SYSROOT)/lib)) + +# NOTE: The original code excluded *.pyc, *.py~, *.orig and *_failed . I +# assume it was just a size optimization. If their presence actually +# causes a problem, an extension of GeneratedPackage is is left as an +# excercise for the poor misguided person who wants to cross-compile +# with mingw and system python and actually use the results for +# something. +$(eval $(call gb_GeneratedPackage_add_dir,python-core,$(INSTDIR)/program/python-core-$(PYTHON_VERSION)/lib,python$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR))) + +# vim: set noet sw=4 ts=4: diff --git a/pyuno/Module_pyuno.mk b/pyuno/Module_pyuno.mk index 4179a7318add..9d38455c69f2 100644 --- a/pyuno/Module_pyuno.mk +++ b/pyuno/Module_pyuno.mk @@ -32,7 +32,7 @@ endif # that why it makes sense to handle the next 3 targets # with SYSTEM_PYTHON=TRUE and SYSTEM_PYTHON= -# zipcore: pyuno/python.exe on Windows +# python-core: pyuno/python.exe on Windows ifeq ($(OS),WNT) $(eval $(call gb_Module_add_targets,pyuno,\ Executable_python \ @@ -41,7 +41,7 @@ endif ifeq ($(SYSTEM_PYTHON),) -# zipcore: python.sh on Unix +# python-core: python.sh on Unix ifneq ($(OS),WNT) $(eval $(call gb_Module_add_targets,pyuno,\ CustomTarget_python_shell \ @@ -55,8 +55,7 @@ else # SYSTEM_PYTHON # FIXME remove this ifeq ($(OS)$(COM),WNTGCC) $(eval $(call gb_Module_add_targets,pyuno,\ - CustomTarget_zipcore \ - Package_zipcore \ + GeneratedPackage_python-core \ )) endif |