strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

scp2: move python librelogo packages to AutoInstall

Browse source 
Change-Id: Ib70d1510bac2eb6bd5491f3177191ad5a8aebe2d
This commit is contained in:
Michael Stahl 2015-02-28 21:17:04 +01:00
parent 62eb3bf472
commit dedaf74392
5 changed files with 12 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Repository.mk
View file

@ -876,10 +876,16 @@ $(eval $(call gb_Helper_register_packages_for_install,python, \
$(if $(SYSTEM_PYTHON),,$(if $(filter-out WNT,$(OS)),python_shell)) \ $(if $(SYSTEM_PYTHON),,$(if $(filter-out WNT,$(OS)),python_shell)) \
scripting_ScriptsPython \ scripting_ScriptsPython \
)) ))
$(eval $(call gb_Helper_register_packages_for_install,python_scriptprovider, \ $(eval $(call gb_Helper_register_packages_for_install,python_scriptprovider, \
scriptproviderforpython \ scriptproviderforpython \
)) ))
endif
$(eval $(call gb_Helper_register_packages_for_install,python_librelogo, \
librelogo \
librelogo_properties \
))
endif # DISABLE_PYTHON
# External executables # External executables
$(eval $(call gb_ExternalExecutable_register_executables,\ $(eval $(call gb_ExternalExecutable_register_executables,\

1
scp2/AutoInstall.mk
View file

@ -36,6 +36,7 @@ $(eval $(call gb_AutoInstall_add_module,ooo,LIBO_LIB_FILE,LIBO_EXECUTABLE,LIBO_J
$(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,LIBO_LIB_FILE,LIBO_EXECUTABLE)) $(eval $(call gb_AutoInstall_add_module,python,LIBO_LIB_FILE,LIBO_EXECUTABLE))
$(eval $(call gb_AutoInstall_add_module,python_scriptprovider,)) $(eval $(call gb_AutoInstall_add_module,python_scriptprovider,))
$(eval $(call gb_AutoInstall_add_module,python_librelogo,))
$(eval $(call gb_AutoInstall_add_module,postgresqlsdbc,LIBO_LIB_FILE)) $(eval $(call gb_AutoInstall_add_module,postgresqlsdbc,LIBO_LIB_FILE))
$(eval $(call gb_AutoInstall_add_module,pdfimport,LIBO_LIB_FILE,LIBO_EXECUTABLE)) $(eval $(call gb_AutoInstall_add_module,pdfimport,LIBO_LIB_FILE,LIBO_EXECUTABLE))
$(eval $(call gb_AutoInstall_add_module,quickstart,,LIBO_EXECUTABLE)) $(eval $(call gb_AutoInstall_add_module,quickstart,,LIBO_EXECUTABLE))

1
scp2/InstallModule_python.mk
View file

@ -12,6 +12,7 @@ $(eval $(call gb_InstallModule_InstallModule,scp2/python))
$(eval $(call gb_InstallModule_use_auto_install_libs,scp2/python,\ $(eval $(call gb_InstallModule_use_auto_install_libs,scp2/python,\
python \ python \
python_scriptprovider \ python_scriptprovider \
python_librelogo \
)) ))
ifeq ($(DISABLE_PYTHON),TRUE) ifeq ($(DISABLE_PYTHON),TRUE)

14
scp2/source/python/file_python_librelogo.scp
View file

@ -10,20 +10,6 @@
#ifndef AIX #ifndef AIX
#ifndef DISABLE_PYUNO #ifndef DISABLE_PYUNO
File gid_File_LibreLogo
TXT_FILE_BODY;
Styles = (FILELIST);
Dir = FILELIST_DIR;
Name = "librelogo.filelist";
End
File gid_File_LibreLogoProperties
TXT_FILE_BODY;
Styles = (FILELIST);
Dir = FILELIST_DIR;
Name = "librelogo_properties.filelist";
End
File gid_File_Share_Registry_LibreLogo_Xcd File gid_File_Share_Registry_LibreLogo_Xcd
TXT_FILE_BODY; TXT_FILE_BODY;
Styles = (PACKED); Styles = (PACKED);

5
scp2/source/python/module_python_librelogo.scp
View file

@ -8,6 +8,8 @@
#include "macros.inc" #include "macros.inc"
#include "AutoInstall/python_librelogo"
#ifndef AIX #ifndef AIX
#ifndef DISABLE_PYUNO #ifndef DISABLE_PYUNO
Module gid_Module_Optional_Pyuno_LibreLogo Module gid_Module_Optional_Pyuno_LibreLogo
@ -15,8 +17,7 @@ Module gid_Module_Optional_Pyuno_LibreLogo
MOD_NAME_DESC ( MODULE_OPTIONAL_PYTHON_LIBRELOGO ); MOD_NAME_DESC ( MODULE_OPTIONAL_PYTHON_LIBRELOGO );
ParentID = gid_Module_Optional; ParentID = gid_Module_Optional;
Sortkey = "810"; Sortkey = "810";
Files = (gid_File_LibreLogo, Files = (auto_python_librelogo_ALL,
gid_File_LibreLogoProperties,
gid_File_Share_Registry_LibreLogo_Xcd); gid_File_Share_Registry_LibreLogo_Xcd);
Default = YES; Default = YES;
Styles = ( ); Styles = ( );