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

pyuno: install python scripts using filelists

Browse Source 
Change-Id: Ic7515acd14916cc36b59749059ed623cda906c23
This commit is contained in:
Matúš Kukan
2013-06-17 15:26:52 +02:00
committed by Michael Stahl
parent 4cb5f23b23
commit 031fd222ac
5 changed files with 15 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pyuno/Module_pyuno.mk
View File

@@ -61,12 +61,6 @@ endif
endif # SYSTEM_PYTHON endif # SYSTEM_PYTHON
ifneq ($(gb_RUNNABLE_INSTDIR),)
$(eval $(call gb_Module_add_targets,pyuno,\
Package_python_scripts_install \
))
endif
endif # DISABLE_PYTHON endif # DISABLE_PYTHON
# vim:set noet sw=4 ts=4: # vim:set noet sw=4 ts=4:

16
pyuno/Package_python_scripts.mk
View File

@@ -7,16 +7,14 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/. # 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) $(eval $(call gb_Package_set_outdir,pyuno_python_scripts,$(INSTDIR)))
pyuno_PYTHON_SCRIPT_DIR=bin
else
pyuno_PYTHON_SCRIPT_DIR=lib
endif
$(eval $(call gb_Package_add_file,pyuno_python,$(pyuno_PYTHON_SCRIPT_DIR)/pyuno/unohelper.py,module/unohelper.py)) $(eval $(call gb_Package_add_files,pyuno_python_scripts,$(LIBO_LIB_PYUNO_FOLDER),\
$(eval $(call gb_Package_add_file,pyuno_python,$(pyuno_PYTHON_SCRIPT_DIR)/pyuno/uno.py,module/uno.py)) loader/pythonloader.py \
$(eval $(call gb_Package_add_file,pyuno_python,$(pyuno_PYTHON_SCRIPT_DIR)/pyuno/pythonloader.py,loader/pythonloader.py)) module/uno.py \
module/unohelper.py \
))
# vim: set noet sw=4 ts=4: # vim: set noet sw=4 ts=4:

20
pyuno/Package_python_scripts_install.mk
View File

@@ -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:

11
scp2/source/python/file_python.scp
View File

@@ -27,6 +27,13 @@ File gid_File_scriptproviderforpython
Styles = (FILELIST, PACKED); Styles = (FILELIST, PACKED);
End 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 File gid_File_Lib_Pyuno
PACKED_LIB_FILE_BODY; PACKED_LIB_FILE_BODY;
#ifdef UNX #ifdef UNX
@@ -49,10 +56,6 @@ File gid_File_Pyuno_Rdb
Styles = (PACKED); Styles = (PACKED);
End 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 #ifndef SYSTEM_PYTHON
File gid_File_Py_Bin_Python File gid_File_Py_Bin_Python
BIN_FILE_BODY; BIN_FILE_BODY;

4
scp2/source/python/module_python.scp
View File

@@ -39,14 +39,12 @@ Module gid_Module_Pyuno
gid_File_Lib_Pyuno, gid_File_Lib_Pyuno,
gid_File_Lib_Pythonloader, gid_File_Lib_Pythonloader,
gid_File_Py_Bin_Python, 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_Core,
gid_File_Py_Python_Bin, gid_File_Py_Python_Bin,
gid_File_Lib_Python_So, gid_File_Lib_Python_So,
gid_File_Lib_Python3_So, gid_File_Lib_Python3_So,
gid_File_Scripts_Python, gid_File_Scripts_Python,
gid_File_pyuno_python_scripts,
gid_File_Share_Registry_Pyuno_Xcd); gid_File_Share_Registry_Pyuno_Xcd);
Unixlinks = (gid_Unixlink_Python_Headers, Unixlinks = (gid_Unixlink_Python_Headers,
gid_Unixlink_Python_LibreOfficePython, gid_Unixlink_Python_LibreOfficePython,