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

scp2: move python3 to AutoInstall

Browse Source 
Change-Id: I6ca298bb51fd707bcda7eabc607307701a0722ac
This commit is contained in:
Michael Stahl
2014-03-18 18:24:15 +01:00
parent 589d63451c
commit 720ca8e1a9
5 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
RepositoryExternal.mk
View File

@@ -2794,6 +2794,10 @@ endef
else # !SYSTEM_PYTHON else # !SYSTEM_PYTHON
$(eval $(call gb_Helper_register_packages_for_install,python,\
python3 \
))
# depend on external project because on MACOSX the Package is disabled... # depend on external project because on MACOSX the Package is disabled...
define gb_LinkTarget__use_python_headers define gb_LinkTarget__use_python_headers
$(call gb_LinkTarget_use_external_project,$(1),python3) $(call gb_LinkTarget_use_external_project,$(1),python3)

1
scp2/AutoInstall.mk
View File

@@ -20,6 +20,7 @@ $(eval $(call gb_AutoInstall_add_module,math,LIBO_LIB_FILE))
$(eval $(call gb_AutoInstall_add_module,onlineupdate,LIBO_LIB_FILE_COMPONENTCONDITION,,,"ISCHECKFORPRODUCTUPDATES=1")) $(eval $(call gb_AutoInstall_add_module,onlineupdate,LIBO_LIB_FILE_COMPONENTCONDITION,,,"ISCHECKFORPRODUCTUPDATES=1"))
$(eval $(call gb_AutoInstall_add_module,ooo,LIBO_LIB_FILE,LIBO_EXECUTABLE)) $(eval $(call gb_AutoInstall_add_module,ooo,LIBO_LIB_FILE,LIBO_EXECUTABLE))
$(eval $(call gb_AutoInstall_add_module,ooobinarytable,LIBO_LIB_FILE_BINARYTABLE)) $(eval $(call gb_AutoInstall_add_module,ooobinarytable,LIBO_LIB_FILE_BINARYTABLE))
$(eval $(call gb_AutoInstall_add_module,python))
$(eval $(call gb_AutoInstall_add_module,sdk,,SDK_EXECUTABLE)) $(eval $(call gb_AutoInstall_add_module,sdk,,SDK_EXECUTABLE))
$(eval $(call gb_AutoInstall_add_module,tde,LIBO_LIB_FILE)) $(eval $(call gb_AutoInstall_add_module,tde,LIBO_LIB_FILE))
$(eval $(call gb_AutoInstall_add_module,ure,URE_PRIVATE_LIB,URE_EXECUTABLE,URE_JAR_FILE)) $(eval $(call gb_AutoInstall_add_module,ure,URE_PRIVATE_LIB,URE_EXECUTABLE,URE_JAR_FILE))

2
scp2/InstallModule_python.mk
View File

@@ -9,6 +9,8 @@
$(eval $(call gb_InstallModule_InstallModule,scp2/python)) $(eval $(call gb_InstallModule_InstallModule,scp2/python))
$(eval $(call gb_InstallModule_use_auto_install_libs,scp2/python,python))
ifeq ($(DISABLE_PYTHON),TRUE) ifeq ($(DISABLE_PYTHON),TRUE)
$(eval $(call gb_InstallModule_add_defs,scp2/python,\ $(eval $(call gb_InstallModule_add_defs,scp2/python,\
-DDISABLE_PYUNO \ -DDISABLE_PYUNO \

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

@@ -82,13 +82,6 @@ Directory gid_Dir_Py_PythonCore_Lib
End End
#endif #endif
File gid_File_Py_Python_Core
TXT_FILE_BODY;
Dir = FILELIST_DIR;
Name = "python3.filelist";
Styles = (FILELIST,USE_INTERNAL_RIGHTS);
End
#ifdef WNT #ifdef WNT
Directory gid_Dir_Py_PythonCore_Bin Directory gid_Dir_Py_PythonCore_Bin
ParentID = gid_Dir_Py_PythonCore; ParentID = gid_Dir_Py_PythonCore;

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

@@ -18,6 +18,8 @@
#include "macros.inc" #include "macros.inc"
#include "AutoInstall/python"
#ifndef DISABLE_PYUNO #ifndef DISABLE_PYUNO
Module gid_Module_Pyuno Module gid_Module_Pyuno
@@ -36,7 +38,8 @@ Module gid_Module_Pyuno
gid_Dir_Py_PythonCore, gid_Dir_Py_PythonCore,
gid_Dir_Py_PythonCore_Bin, gid_Dir_Py_PythonCore_Bin,
gid_Dir_Py_PythonCore_Lib); gid_Dir_Py_PythonCore_Lib);
Files = (gid_File_Pyuno, Files = (auto_python_ALL,
gid_File_Pyuno,
gid_File_Pyuno_Rdb, gid_File_Pyuno_Rdb,
gid_File_Lib_Pyuno, gid_File_Lib_Pyuno,
gid_File_Lib_Pythonloader, gid_File_Lib_Pythonloader,