diff options
author | Matúš Kukan <matus.kukan@gmail.com> | 2013-06-17 15:26:52 +0200 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2013-09-09 22:08:59 +0200 |
commit | 031fd222ac94ab30c8e17f96263934bd5e148dd7 (patch) | |
tree | 26f78d989b63cc64588852c30aef367098df3e06 | |
parent | odk: make error reporting less mysterious (diff) | |
download | core-031fd222ac94ab30c8e17f96263934bd5e148dd7.tar.gz core-031fd222ac94ab30c8e17f96263934bd5e148dd7.zip |
pyuno: install python scripts using filelists
Change-Id: Ic7515acd14916cc36b59749059ed623cda906c23
-rw-r--r-- | pyuno/Module_pyuno.mk | 6 | ||||
-rw-r--r-- | pyuno/Package_python_scripts.mk | 16 | ||||
-rw-r--r-- | pyuno/Package_python_scripts_install.mk | 20 | ||||
-rw-r--r-- | scp2/source/python/file_python.scp | 11 | ||||
-rw-r--r-- | scp2/source/python/module_python.scp | 4 |
5 files changed, 15 insertions, 42 deletions
diff --git a/pyuno/Module_pyuno.mk b/pyuno/Module_pyuno.mk index de42e49f5dfb..8a6667bf6eae 100644 --- a/pyuno/Module_pyuno.mk +++ b/pyuno/Module_pyuno.mk @@ -61,12 +61,6 @@ 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.mk b/pyuno/Package_python_scripts.mk index 639240a68bb7..9afe7f5739d4 100644 --- a/pyuno/Package_python_scripts.mk +++ b/pyuno/Package_python_scripts.mk @@ -7,16 +7,14 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_Package_Package,pyuno_python,$(SRCDIR)/pyuno/source)) +$(eval $(call gb_Package_Package,pyuno_python_scripts,$(SRCDIR)/pyuno/source)) -ifeq ($(OS),WNT) -pyuno_PYTHON_SCRIPT_DIR=bin -else -pyuno_PYTHON_SCRIPT_DIR=lib -endif +$(eval $(call gb_Package_set_outdir,pyuno_python_scripts,$(INSTDIR))) -$(eval $(call gb_Package_add_file,pyuno_python,$(pyuno_PYTHON_SCRIPT_DIR)/pyuno/unohelper.py,module/unohelper.py)) -$(eval $(call gb_Package_add_file,pyuno_python,$(pyuno_PYTHON_SCRIPT_DIR)/pyuno/uno.py,module/uno.py)) -$(eval $(call gb_Package_add_file,pyuno_python,$(pyuno_PYTHON_SCRIPT_DIR)/pyuno/pythonloader.py,loader/pythonloader.py)) +$(eval $(call gb_Package_add_files,pyuno_python_scripts,$(LIBO_LIB_PYUNO_FOLDER),\ + loader/pythonloader.py \ + module/uno.py \ + module/unohelper.py \ +)) # vim: set noet sw=4 ts=4: diff --git a/pyuno/Package_python_scripts_install.mk b/pyuno/Package_python_scripts_install.mk deleted file mode 100644 index 6a68a3b6437f..000000000000 --- a/pyuno/Package_python_scripts_install.mk +++ /dev/null @@ -1,20 +0,0 @@ -# -*- 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,$(LIBO_LIB_PYUNO_FOLDER),\ - loader/pythonloader.py \ - module/uno.py \ - module/unohelper.py \ -)) - -# vim: set noet sw=4 ts=4: diff --git a/scp2/source/python/file_python.scp b/scp2/source/python/file_python.scp index e53763f89795..fee4cdf4ecb8 100644 --- a/scp2/source/python/file_python.scp +++ b/scp2/source/python/file_python.scp @@ -27,6 +27,13 @@ File gid_File_scriptproviderforpython Styles = (FILELIST, PACKED); End +File gid_File_pyuno_python_scripts + TXT_FILE_BODY; + Dir = FILELIST_DIR; + Name = "pyuno_python_scripts.filelist"; + Styles = (FILELIST, PACKED); +End + File gid_File_Lib_Pyuno PACKED_LIB_FILE_BODY; #ifdef UNX @@ -49,10 +56,6 @@ File gid_File_Pyuno_Rdb Styles = (PACKED); End -STD_PY_FILE(gid_File_Py_Unohelper, "pyuno/unohelper.py") -STD_PY_FILE(gid_File_Py_Uno, "pyuno/uno.py") -STD_PY_FILE(gid_File_Py_Pythonloader, "pyuno/pythonloader.py") - #ifndef SYSTEM_PYTHON File gid_File_Py_Bin_Python BIN_FILE_BODY; diff --git a/scp2/source/python/module_python.scp b/scp2/source/python/module_python.scp index 985dc318d1c3..6be3239e63ac 100644 --- a/scp2/source/python/module_python.scp +++ b/scp2/source/python/module_python.scp @@ -39,14 +39,12 @@ Module gid_Module_Pyuno gid_File_Lib_Pyuno, gid_File_Lib_Pythonloader, gid_File_Py_Bin_Python, - gid_File_Py_Unohelper, - gid_File_Py_Uno, - gid_File_Py_Pythonloader, gid_File_Py_Python_Core, gid_File_Py_Python_Bin, gid_File_Lib_Python_So, gid_File_Lib_Python3_So, gid_File_Scripts_Python, + gid_File_pyuno_python_scripts, gid_File_Share_Registry_Pyuno_Xcd); Unixlinks = (gid_Unixlink_Python_Headers, gid_Unixlink_Python_LibreOfficePython, |