mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Extract python-only pythonloader.uno ini-file into its own Package

Browse Source 
Change-Id: Ifa9d12fa190f929807dc0dc7342e162aeb9a0576
This commit is contained in:
Stephan Bergmann
2014-11-26 17:01:27 +01:00
parent da6ea10cd4
commit 004e515ba6
5 changed files with 53 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
instsetoo_native/CustomTarget_setup.mk
View File

@@ -13,7 +13,6 @@ $(eval $(call gb_CustomTarget_register_targets,instsetoo_native/setup,\
$(call gb_Helper_get_rcfile,bootstrap) \
$(call gb_Helper_get_rcfile,fundamental) \
$(call gb_Helper_get_rcfile,louno) \
$(if $(filter TRUE,$(DISABLE_PYTHON)),,$(call gb_Helper_get_rcfile,pythonloader.uno)) \
$(if $(filter DESKTOP,$(BUILD_TYPE)),$(if $(filter-out MACOSX,$(OS)), \
$(call gb_Helper_get_rcfile,redirect))) \
$(call gb_Helper_get_rcfile,setup) \
@@ -25,7 +24,6 @@ $(eval $(call gb_CustomTarget_register_targets,instsetoo_native/setup,\
$(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_rcfile,bootstrap) \
$(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_rcfile,fundamental) \
$(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_rcfile,louno) \
$(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_rcfile,pythonloader.uno) \
$(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_rcfile,uno) \
: $(SRCDIR)/instsetoo_native/CustomTarget_setup.mk
@@ -87,25 +85,6 @@ $(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_
&& echo 'UNO_USER_PACKAGES_CACHE=$$UNO_USER_PACKAGES/cache' \
) > $@
$(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_rcfile,pythonloader.uno) :
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
( \
printf '[Bootstrap]\n' && \
$(if $(SYSTEM_PYTHON),, \
printf 'PYUNO_LOADER_PYTHONHOME=%s\n' \
$(if $(filter MACOSX,$(OS)), \
'$$ORIGIN/../Frameworks/LibreOfficePython.framework', \
'$$ORIGIN/python-core-$(PYTHON_VERSION)') &&) \
printf 'PYUNO_LOADER_PYTHONPATH=%s$$ORIGIN\n' \
$(if $(SYSTEM_PYTHON), \
'', \
$(if $(filter MACOSX,$(OS)), \
'$(foreach dir,/ /lib-dynload /lib-tk /site-packages,$(patsubst %/,%,$$ORIGIN/../Frameworks/LibreOfficePython.framework/Versions/Current/lib/python$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)$(dir))) ', \
$(if $(filter WNTMSC,$(OS)$(COM)), \
'$(foreach dir,/ /site-packages,$(patsubst %/,%,$$ORIGIN/python-core-$(PYTHON_VERSION)/lib$(dir))) ', \
'$(foreach dir,/ /lib-dynload /lib-tk /site-packages,$(patsubst %/,%,$$ORIGIN/python-core-$(PYTHON_VERSION)/lib$(dir))) '))) \
) > $@
$(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_rcfile,redirect) :
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
( \

1
instsetoo_native/Package_setup.mk
View File

@@ -12,7 +12,6 @@ $(eval $(call gb_Package_Package,instsetoo_native_setup,$(call gb_CustomTarget_g
$(eval $(call gb_Package_add_files,instsetoo_native_setup,$(LIBO_ETC_FOLDER),\
$(call gb_Helper_get_rcfile,bootstrap) \
$(call gb_Helper_get_rcfile,fundamental) \
$(if $(filter TRUE,$(DISABLE_PYTHON)),,$(call gb_Helper_get_rcfile,pythonloader.uno)) \
$(if $(filter DESKTOP,$(BUILD_TYPE)),$(if $(filter-out MACOSX,$(OS)), \
$(call gb_Helper_get_rcfile,redirect))) \
$(call gb_Helper_get_rcfile,setup) \

35
pyuno/CustomTarget_pyuno_pythonloader_ini.mk Normal file
View File

@@ -0,0 +1,35 @@
# -*- 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_CustomTarget_CustomTarget,pyuno/pythonloader_ini))
$(eval $(call gb_CustomTarget_register_targets,pyuno/pythonloader_ini, \
$(call gb_Helper_get_rcfile,pythonloader.uno) \
))
$(call gb_CustomTarget_get_workdir,pyuno/pythonloader_ini)/$(call gb_Helper_get_rcfile,pythonloader.uno): \
$(SRCDIR)/pyuno/CustomTarget_pyuno_pythonloader_ini.mk
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
( printf '[Bootstrap]\n' && \
$(if $(SYSTEM_PYTHON),, \
printf 'PYUNO_LOADER_PYTHONHOME=%s\n' \
$(if $(filter MACOSX,$(OS)), \
'$$ORIGIN/../Frameworks/LibreOfficePython.framework', \
'$$ORIGIN/python-core-$(PYTHON_VERSION)') &&) \
printf 'PYUNO_LOADER_PYTHONPATH=%s$$ORIGIN\n' \
$(if $(SYSTEM_PYTHON), \
'', \
$(if $(filter MACOSX,$(OS)), \
'$(foreach dir,/ /lib-dynload /lib-tk /site-packages,$(patsubst %/,%,$$ORIGIN/../Frameworks/LibreOfficePython.framework/Versions/Current/lib/python$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)$(dir))) ', \
$(if $(filter WNTMSC,$(OS)$(COM)), \
'$(foreach dir,/ /site-packages,$(patsubst %/,%,$$ORIGIN/python-core-$(PYTHON_VERSION)/lib$(dir))) ', \
'$(foreach dir,/ /lib-dynload /lib-tk /site-packages,$(patsubst %/,%,$$ORIGIN/python-core-$(PYTHON_VERSION)/lib$(dir))) '))) \
) > $@
# vim: set noet sw=4 ts=4:

2
pyuno/Module_pyuno.mk
View File

@@ -12,9 +12,11 @@ $(eval $(call gb_Module_Module,pyuno))
ifneq ($(DISABLE_PYTHON),TRUE)
$(eval $(call gb_Module_add_targets,pyuno,\
CustomTarget_pyuno_pythonloader_ini \
Library_pyuno \
Library_pythonloader \
Package_python_scripts \
Package_pyuno_pythonloader_ini \
Rdb_pyuno \
))

16
pyuno/Package_pyuno_pythonloader_ini.mk Normal file
View File

@@ -0,0 +1,16 @@
# -*- 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_Package_Package,pyuno_pythonloader_ini,$(call gb_CustomTarget_get_workdir,pyuno/pythonloader_ini)))
$(eval $(call gb_Package_add_files,pyuno_pythonloader_ini,$(LIBO_ETC_FOLDER), \
$(call gb_Helper_get_rcfile,pythonloader.uno) \
))
# vim: set noet sw=4 ts=4: