copy pyuno files to instdir

Change-Id: I62fa315b942c5b2383ee83c644ecbcbca3d6c40f

4 files changed, 39 insertions, 0 deletions

diff --git a/instsetoo_native/CustomTarget_setup.mk b/instsetoo_native/CustomTarget_setup.mk
index 366f1a91691a..a669fd594e15 100644
--- a/instsetoo_native/CustomTarget_setup.mk
+++ b/instsetoo_native/CustomTarget_setup.mk
@@ -11,6 +11,7 @@ $(eval $(call gb_CustomTarget_CustomTarget,instsetoo_native/setup))
 
 $(eval $(call gb_CustomTarget_register_targets,instsetoo_native/setup,\
 	ooenv \
+	$(if $(filter TRUE,$(DISABLE_PYTHON)),,pythonloader.unorc) \
 	ure-link \
 	versionrc \
 ))
@@ -31,6 +32,17 @@ $(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/ooenv :
 		echo 'export OOO_DISABLE_RECOVERY=1' \
 	) > $@
 
+$(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/pythonloader.unorc :
+	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
+	( \
+		echo '[Bootstrap]' && \
+		$(if $(filter YES,$(SYSTEM_PYTHON)),\
+			echo PYUNO_LOADER_PYTHONPATH='$$ORIGIN',\
+			echo PYUNO_LOADER_PYTHONHOME='$$ORIGIN/python-core-$(PYTHON_VERSION)' && \
+			echo PYUNO_LOADER_PYTHONPATH='$(foreach dir,lib lib/lib-dynload lib/lib-tk lib/site-packages,$$ORIGIN/python-core-$(PYTHON_VERSION)/$(dir)) $$ORIGIN' \
+		) \
+	) > $@
+
 $(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/ure-link :
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),LN ,1)
 	rm -f $@ && \
diff --git a/instsetoo_native/Package_setup.mk b/instsetoo_native/Package_setup.mk
index 9f8ca3072463..aaba1e51963d 100644
--- a/instsetoo_native/Package_setup.mk
+++ b/instsetoo_native/Package_setup.mk
@@ -13,6 +13,7 @@ $(eval $(call gb_Package_set_outdir,instsetoo_native_setup,$(INSTDIR)))
 
 $(eval $(call gb_Package_add_files,instsetoo_native_setup,program,\
 	ooenv \
+	$(if $(filter TRUE,$(DISABLE_PYTHON)),,pythonloader.unorc) \
 	versionrc \
 ))
 
diff --git a/pyuno/Module_pyuno.mk b/pyuno/Module_pyuno.mk
index 536ba40ab463..05aefa6f9da1 100644
--- a/pyuno/Module_pyuno.mk
+++ b/pyuno/Module_pyuno.mk
@@ -60,6 +60,12 @@ endif
 
 endif # SYSTEM_PYTHON
 
+ifneq ($(gb_RUNNABLE_INSTDIR),)
+$(eval $(call gb_Module_add_targets,pyuno,\
+	Package_python_scripts_install \
+))
+endif
+
 endif # DISABLE_PYTHON
 
 # vim:set noet sw=4 ts=4:
diff --git a/pyuno/Package_python_scripts_install.mk b/pyuno/Package_python_scripts_install.mk
new file mode 100644
index 000000000000..dc2f08e3fe45
--- /dev/null
+++ b/pyuno/Package_python_scripts_install.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_Package_Package,pyuno_python_scripts_install,$(SRCDIR)/pyuno/source))
+
+$(eval $(call gb_Package_set_outdir,pyuno_python_scripts_install,$(INSTDIR)))
+
+$(eval $(call gb_Package_add_files,pyuno_python_scripts_install,program,\
+	loader/pythonloader.py \
+	module/uno.py \
+	module/unohelper.py \
+))
+
+# vim: set noet sw=4 ts=4: