Repository.mk | 72 ++++++ scp2/AutoInstall.mk | 4 scp2/InstallModule_accessories.mk | 8 scp2/InstallModule_ooo.mk | 1 scp2/InstallModule_python.mk | 6 scp2/InstallModule_xsltfilter.mk | 4 scp2/source/accessories/file_gallery_accessories.scp | 136 ------------- scp2/source/accessories/module_gallery_accessories.scp | 21 -- scp2/source/mkopenwith.btm | 52 ----- scp2/source/ooo/file_ooo.scp | 176 ----------------- scp2/source/ooo/module_ooo.scp | 24 -- scp2/source/ooo/module_reportbuilder.scp | 10 scp2/source/python/file_python.scp | 32 --- scp2/source/python/file_python_librelogo.scp | 14 - scp2/source/python/module_python.scp | 5 scp2/source/python/module_python_librelogo.scp | 5 scp2/source/supported_extensions.txt | 97 --------- scp2/source/xsltfilter/file_xsltfilter.scp | 20 - scp2/source/xsltfilter/module_xsltfilter.scp | 5 19 files changed, 100 insertions(+), 592 deletions(-)
New commits: commit a98d3240a2d44a428852fee1d8a622b0780d687e Author: Michael Stahl <[email protected]> Date: Sat Feb 28 22:23:18 2015 +0100 scp2: remove now unused variable Change-Id: I85c0db36709f545bf2d4eaba9b458e4741b7879b diff --git a/scp2/InstallModule_ooo.mk b/scp2/InstallModule_ooo.mk index d2ef3f5..b74dad3 100644 --- a/scp2/InstallModule_ooo.mk +++ b/scp2/InstallModule_ooo.mk @@ -26,7 +26,6 @@ $(eval $(call gb_InstallModule_define_if_set,scp2/ooo,\ ENABLE_TDE \ SYSTEM_CURL \ SYSTEM_HSQLDB \ - SYSTEM_LIBEXTTEXTCAT \ SYSTEM_LIBXSLT \ SYSTEM_REDLAND \ WITH_GALLERY_BUILD \ commit 9978e4c10f3eb9b9cd0f2d192e0f4ff53b9aafca Author: Michael Stahl <[email protected]> Date: Sat Feb 28 22:00:24 2015 +0100 scp2: move some ooo packages to AutoInstall Change-Id: I1c99cd2c8a392bf2a775eeb2c3acd4474aa2b0fb diff --git a/Repository.mk b/Repository.mk index 10cfdced..1dda9f4 100644 --- a/Repository.mk +++ b/Repository.mk @@ -833,6 +833,31 @@ $(eval $(call gb_Helper_register_packages_for_install,ure,\ )) $(eval $(call gb_Helper_register_packages_for_install,ooo,\ + $(if $(SYSTEM_LIBEXTTEXTCAT),,libexttextcat_fingerprint) \ + officecfg_misc \ + extras_glade \ + extras_labels \ + framework_dtd \ + package_dtd \ + xmloff_dtd \ + xmlscript_dtd \ + xmlhelp_helpxsl \ + $(if $(ENABLE_JAVA),\ + scripting_java \ + scripting_java_jars \ + $(if $(ENABLE_SCRIPTING_BEANSHELL),scripting_ScriptsBeanShell) \ + $(if $(ENABLE_SCRIPTING_JAVASCRIPT),scripting_ScriptsJavaScript) \ + ) \ + $(if $(DISABLE_SCRIPTING),,scripting_scriptbindinglib) \ + wizards_basicsrvaccess2base \ + wizards_basicsrvdepot \ + wizards_basicsrveuro \ + wizards_basicsrvgimmicks \ + wizards_basicsrvimport \ + wizards_basicsrvform \ + wizards_basicsrvtemplate \ + wizards_basicsrvtools \ + wizards_basicsrvtutorials \ xmlsec \ chart2_opengl_shader \ vcl_opengl_shader \ diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp index 5f31ae4..5427fe7 100644 --- a/scp2/source/ooo/file_ooo.scp +++ b/scp2/source/ooo/file_ooo.scp @@ -27,73 +27,6 @@ #include "macros.inc" -File gid_File_Basic_Access2Base - Dir = FILELIST_DIR; - TXT_FILE_BODY; - Styles = (FILELIST); - Name = "wizards_basicsrvaccess2base.filelist"; -End - -File gid_File_Basic_Depot - Dir = FILELIST_DIR; - TXT_FILE_BODY; - Styles = (FILELIST); - Name = "wizards_basicsrvdepot.filelist"; -End - -File gid_File_Basic_Euro - Dir = FILELIST_DIR; - TXT_FILE_BODY; - Styles = (FILELIST); - Name = "wizards_basicsrveuro.filelist"; -End - -File gid_File_Basic_Gimmicks - Dir = FILELIST_DIR; - TXT_FILE_BODY; - Styles = (FILELIST); - Name = "wizards_basicsrvgimmicks.filelist"; -End - -File gid_File_Basic_Importwiz - Dir = FILELIST_DIR; - TXT_FILE_BODY; - Styles = (FILELIST); - Name = "wizards_basicsrvimport.filelist"; -End - -File gid_File_Basic_Formwiz - Dir = FILELIST_DIR; - TXT_FILE_BODY; - Styles = (FILELIST); - Name = "wizards_basicsrvform.filelist"; -End - -#ifndef DISABLE_SCRIPTING - -File gid_File_Basic_Scriptbindinglib - Dir = FILELIST_DIR; - TXT_FILE_BODY; - Styles = (FILELIST); - Name = "scripting_scriptbindinglib.filelist"; -End - -#endif - -File gid_File_Basic_Template - Dir = FILELIST_DIR; - TXT_FILE_BODY; - Styles = (FILELIST); - Name = "wizards_basicsrvtemplate.filelist"; -End - -File gid_File_Basic_Tools - Dir = FILELIST_DIR; - TXT_FILE_BODY; - Styles = (FILELIST); - Name = "wizards_basicsrvtools.filelist"; -End - File gid_File_Basic_User Dir = FILELIST_DIR; USER_FILE_BODY; @@ -115,13 +48,6 @@ File gid_File_Basic_User_Standard Name = "wizards_basicsrvstandard.filelist"; End -File gid_File_Basic_Tutorials - Dir = FILELIST_DIR; - TXT_FILE_BODY; - Styles = (FILELIST); - Name = "wizards_basicsrvtutorials.filelist"; -End - #if defined UNX File gid_File_Script_Gengal @@ -167,36 +93,8 @@ File gid_File_Bin_Senddoc End #endif -File gid_File_framework_dtd - TXT_FILE_BODY; - Styles = (FILELIST, PACKED); - Dir = FILELIST_DIR; - Name = "framework_dtd.filelist"; -End - -File gid_File_xmlscript_dtd - TXT_FILE_BODY; - Styles = (FILELIST, PACKED); - Dir = FILELIST_DIR; - Name = "xmlscript_dtd.filelist"; -End - -File gid_File_Dtd_Manifest - TXT_FILE_BODY; - Styles = (FILELIST, PACKED); - Dir = FILELIST_DIR; - Name = "package_dtd.filelist"; -End - STD_RES_FILE( gid_File_Res_Eps, eps ) -File gid_File_Help_Help_Zip - Dir = FILELIST_DIR; - TXT_FILE_BODY; - Styles = (FILELIST); - Name = "xmlhelp_helpxsl.filelist"; -End - #if defined WITH_HELP File gid_File_Help_Common_Zip Dir = FILELIST_DIR; @@ -265,41 +163,8 @@ End #endif #endif -#ifndef SYSTEM_LIBEXTTEXTCAT -// fingerprint files (lm) - -File gid_File_Share_Fingerprint - Dir = FILELIST_DIR; - TXT_FILE_BODY; - Styles = (FILELIST); - Name = "libexttextcat_fingerprint.filelist"; -End - -#endif - // mod files -File gid_File_xmloff_dtd - TXT_FILE_BODY; - Styles = (FILELIST, PACKED); - Dir = FILELIST_DIR; - Name = "xmloff_dtd.filelist"; -End - -File gid_File_Share_Labels_Xml - TXT_FILE_BODY; - Styles = (FILELIST, PACKED); - Dir = FILELIST_DIR; - Name = "extras_labels.filelist"; -End - -File gid_File_Share_Glade_Xml - TXT_FILE_BODY; - Styles = (FILELIST, PACKED); - Dir = FILELIST_DIR; - Name = "extras_glade.filelist"; -End - File gid_File_Share_Registry_Main_Xcd TXT_FILE_BODY; Styles = (PACKED, SCPZIP_REPLACE); @@ -318,13 +183,6 @@ End #endif -File gid_File_officecfg_misc - TXT_FILE_BODY; - Styles = (FILELIST, PACKED); - Dir = FILELIST_DIR; - Name = "officecfg_misc.filelist"; -End - File gid_File_Rdb_Offapi TXT_FILE_BODY; Dir = gid_Brand_Dir_Program_Types; @@ -389,40 +247,6 @@ File gid_File_Share_Registry_Ctlseqcheck_Xcd Name (th) = "ctlseqcheck.xcd"; End -#ifdef ENABLE_JAVA -File gid_File_Scripts_Java - Dir = FILELIST_DIR; - TXT_FILE_BODY; - Styles = (FILELIST); - Name = "scripting_java.filelist"; -End - -File gid_File_Scripts_Java_jars - Dir = FILELIST_DIR; - TXT_FILE_BODY; - Styles = (FILELIST); - Name = "scripting_java_jars.filelist"; -End - -#ifndef WITHOUT_SCRIPTING_BEANSHELL -File gid_File_Scripts_Beanshell - Dir = FILELIST_DIR; - TXT_FILE_BODY; - Styles = (FILELIST); - Name = "scripting_ScriptsBeanShell.filelist"; -End -#endif - -#ifndef WITHOUT_SCRIPTING_JAVASCRIPT -File gid_File_Scripts_Javascript - Dir = FILELIST_DIR; - TXT_FILE_BODY; - Styles = (FILELIST); - Name = "scripting_ScriptsJavaScript.filelist"; -End -#endif -#endif - // user interface configuration files UI_FILELIST(basicide, "UIConfig/modules/BasicIDE.filelist") UI_FILELIST(cui, "UIConfig/cui.filelist") diff --git a/scp2/source/ooo/module_ooo.scp b/scp2/source/ooo/module_ooo.scp index a8d10c2..09dcd34 100644 --- a/scp2/source/ooo/module_ooo.scp +++ b/scp2/source/ooo/module_ooo.scp @@ -97,21 +97,7 @@ Module gid_Module_Root gid_File_Extra_Tplpersonal, gid_File_Extra_Tplwizbitmap, gid_File_Extra_Tplwizletter, - gid_File_Scripts_Beanshell, - gid_File_Scripts_Java, - gid_File_Scripts_Java_jars, - gid_File_Scripts_Javascript, - gid_File_Basic_Access2Base, - gid_File_Basic_Depot, - gid_File_Basic_Euro, gid_File_Basic_Form, - gid_File_Basic_Gimmicks, - gid_File_Basic_Importwiz, - gid_File_Basic_Formwiz, - gid_File_Basic_Scriptbindinglib, - gid_File_Basic_Template, - gid_File_Basic_Tools, - gid_File_Basic_Tutorials, gid_File_Extra_Cfgsrv, gid_File_sd_web, gid_File_Share_Config_Sofficecfg_uiconfig_basicide, @@ -154,20 +140,12 @@ Module gid_Module_Root gid_File_Share_Config_Sofficecfg_uiconfig_uui, gid_File_Share_Config_Sofficecfg_uiconfig_vcl, gid_File_Share_Config_Sofficecfg_uiconfig_xmlsec, - gid_File_framework_dtd, - gid_File_xmlscript_dtd, - gid_File_Dtd_Manifest, - gid_File_xmloff_dtd, - gid_File_officecfg_misc, - gid_File_Share_Glade_Xml, - gid_File_Share_Labels_Xml, gid_File_Share_Registry_Main_Xcd, gid_File_Share_Registry_Forcedefault_Xcd, gid_File_Pymailmerge, gid_File_Extra_Fontunxpsprint, gid_File_Extra_Fontunxppds, - gid_File_Extra_Fontunxafm, - gid_File_Help_Help_Zip); + gid_File_Extra_Fontunxafm); Unixlinks = (gid_Unixlink_File_Lib_Curl, gid_Unixlink_File_Lib_Raptor, gid_Unixlink_File_Lib_Rasqal, commit 4de54e51c4f2c4c06d877e5df4f0ae58ebcc0f39 Author: Michael Stahl <[email protected]> Date: Sat Feb 28 21:34:51 2015 +0100 scp2: move reportbuilder packages to AutoInstall Change-Id: I81778d452b548a0205db2e8bd30bcfed37becfcd diff --git a/Repository.mk b/Repository.mk index ba09b77..10cfdced 100644 --- a/Repository.mk +++ b/Repository.mk @@ -843,6 +843,10 @@ $(eval $(call gb_Helper_register_packages_for_install,ogltrans,\ slideshow_opengl_shader \ )) +$(eval $(call gb_Helper_register_packages_for_install,reportbuilder,\ + reportbuilder-templates \ +)) + $(eval $(call gb_Helper_register_packages_for_install,xsltfilter,\ filter_docbook \ filter_xhtml \ diff --git a/scp2/source/ooo/module_reportbuilder.scp b/scp2/source/ooo/module_reportbuilder.scp index 4c211b7..4b6c026 100644 --- a/scp2/source/ooo/module_reportbuilder.scp +++ b/scp2/source/ooo/module_reportbuilder.scp @@ -19,8 +19,7 @@ Module gid_Module_Reportbuilder Default = YES; Dirs = (gid_Dir_Share_Reportbuilder); Files = (auto_reportbuilder_ALL, - gid_File_Xcd_Reportbuilder, - gid_Filelist_ReportbuilderTemplates); + gid_File_Xcd_Reportbuilder); End Directory gid_Dir_Share_Reportbuilder @@ -35,11 +34,4 @@ File gid_File_Xcd_Reportbuilder Styles = (PACKED); End -File gid_Filelist_ReportbuilderTemplates - TXT_FILE_BODY; - Dir = FILELIST_DIR; - Name = "reportbuilder-templates.filelist"; - Styles = (FILELIST); -End - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ commit e0aaa830fc6633a2ab5614eec4f4b88279dca908 Author: Michael Stahl <[email protected]> Date: Sat Feb 28 21:29:27 2015 +0100 scp2: move xsltfilter packages to AutoInstall Change-Id: I2ae844d43a875ea0b4eb9dd445e483a36a90f73d diff --git a/Repository.mk b/Repository.mk index 02bf16e..ba09b77 100644 --- a/Repository.mk +++ b/Repository.mk @@ -843,6 +843,12 @@ $(eval $(call gb_Helper_register_packages_for_install,ogltrans,\ slideshow_opengl_shader \ )) +$(eval $(call gb_Helper_register_packages_for_install,xsltfilter,\ + filter_docbook \ + filter_xhtml \ + filter_xslt \ +)) + ifeq ($(GUIBASE),unx) $(eval $(call gb_Helper_register_packages_for_install,base_brand,\ desktop_sbase_sh \ diff --git a/scp2/AutoInstall.mk b/scp2/AutoInstall.mk index e271be8..5a7c4f9 100644 --- a/scp2/AutoInstall.mk +++ b/scp2/AutoInstall.mk @@ -53,5 +53,6 @@ $(eval $(call gb_AutoInstall_add_module,winexplorerextwin64nt6,SHLXTHDL_LIB_FILE endif $(eval $(call gb_AutoInstall_add_module,writer,LIBO_LIB_FILE)) $(eval $(call gb_AutoInstall_add_module,writer_brand,,LIBO_EXECUTABLE)) +$(eval $(call gb_AutoInstall_add_module,xsltfilter,)) # vim: set noet sw=4 ts=4: diff --git a/scp2/InstallModule_xsltfilter.mk b/scp2/InstallModule_xsltfilter.mk index 3723280..7835254 100644 --- a/scp2/InstallModule_xsltfilter.mk +++ b/scp2/InstallModule_xsltfilter.mk @@ -9,6 +9,10 @@ $(eval $(call gb_InstallModule_InstallModule,scp2/xsltfilter)) +$(eval $(call gb_InstallModule_use_auto_install_libs,scp2/xsltfilter,\ + xsltfilter \ +)) + $(eval $(call gb_InstallModule_add_scpfiles,scp2/xsltfilter,\ scp2/source/xsltfilter/file_xsltfilter \ )) diff --git a/scp2/source/xsltfilter/file_xsltfilter.scp b/scp2/source/xsltfilter/file_xsltfilter.scp index 36ba626..04ad0b1 100644 --- a/scp2/source/xsltfilter/file_xsltfilter.scp +++ b/scp2/source/xsltfilter/file_xsltfilter.scp @@ -25,23 +25,3 @@ File gid_File_Share_Registry_Xsltfilter_Xcd Name = "xsltfilter.xcd"; End -File gid_File_filter_docbook - TXT_FILE_BODY; - Styles = (FILELIST, PACKED); - Dir = FILELIST_DIR; - Name = "filter_docbook.filelist"; -End - -File gid_File_filter_xhtml - TXT_FILE_BODY; - Styles = (FILELIST, PACKED); - Dir = FILELIST_DIR; - Name = "filter_xhtml.filelist"; -End - -File gid_File_filter_xslt - TXT_FILE_BODY; - Styles = (FILELIST, PACKED); - Dir = FILELIST_DIR; - Name = "filter_xslt.filelist"; -End diff --git a/scp2/source/xsltfilter/module_xsltfilter.scp b/scp2/source/xsltfilter/module_xsltfilter.scp index 0bb6776..b4f5b93 100644 --- a/scp2/source/xsltfilter/module_xsltfilter.scp +++ b/scp2/source/xsltfilter/module_xsltfilter.scp @@ -18,15 +18,14 @@ #include "macros.inc" +#include "AutoInstall/xsltfilter" Module gid_Module_Optional_Xsltfiltersamples PackageInfo = "packinfo_office.txt"; MOD_NAME_DESC(MODULE_OPTIONAL_XSLTFILTERSAMPLES); Sortkey = "700"; ParentID = gid_Module_Optional; - Files = ( gid_File_filter_docbook, - gid_File_filter_xhtml, - gid_File_filter_xslt, + Files = (auto_xsltfilter_ALL, gid_File_Share_Registry_Xsltfilter_Xcd ); Default = YES; Styles = ( ); commit dedaf74392cbf09e165bd8164a905e146a2961fe Author: Michael Stahl <[email protected]> Date: Sat Feb 28 21:17:04 2015 +0100 scp2: move python librelogo packages to AutoInstall Change-Id: Ib70d1510bac2eb6bd5491f3177191ad5a8aebe2d diff --git a/Repository.mk b/Repository.mk index a15c1d3..02bf16e 100644 --- a/Repository.mk +++ b/Repository.mk @@ -876,10 +876,16 @@ $(eval $(call gb_Helper_register_packages_for_install,python, \ $(if $(SYSTEM_PYTHON),,$(if $(filter-out WNT,$(OS)),python_shell)) \ scripting_ScriptsPython \ )) + $(eval $(call gb_Helper_register_packages_for_install,python_scriptprovider, \ scriptproviderforpython \ )) -endif + +$(eval $(call gb_Helper_register_packages_for_install,python_librelogo, \ + librelogo \ + librelogo_properties \ +)) +endif # DISABLE_PYTHON # External executables $(eval $(call gb_ExternalExecutable_register_executables,\ diff --git a/scp2/AutoInstall.mk b/scp2/AutoInstall.mk index 621629c..e271be8 100644 --- a/scp2/AutoInstall.mk +++ b/scp2/AutoInstall.mk @@ -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,python,LIBO_LIB_FILE,LIBO_EXECUTABLE)) $(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,pdfimport,LIBO_LIB_FILE,LIBO_EXECUTABLE)) $(eval $(call gb_AutoInstall_add_module,quickstart,,LIBO_EXECUTABLE)) diff --git a/scp2/InstallModule_python.mk b/scp2/InstallModule_python.mk index 92f52a8..965781c 100644 --- a/scp2/InstallModule_python.mk +++ b/scp2/InstallModule_python.mk @@ -12,6 +12,7 @@ $(eval $(call gb_InstallModule_InstallModule,scp2/python)) $(eval $(call gb_InstallModule_use_auto_install_libs,scp2/python,\ python \ python_scriptprovider \ + python_librelogo \ )) ifeq ($(DISABLE_PYTHON),TRUE) diff --git a/scp2/source/python/file_python_librelogo.scp b/scp2/source/python/file_python_librelogo.scp index d78bdd2..67f789f 100644 --- a/scp2/source/python/file_python_librelogo.scp +++ b/scp2/source/python/file_python_librelogo.scp @@ -10,20 +10,6 @@ #ifndef AIX #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 TXT_FILE_BODY; Styles = (PACKED); diff --git a/scp2/source/python/module_python_librelogo.scp b/scp2/source/python/module_python_librelogo.scp index de72516..1102b87 100644 --- a/scp2/source/python/module_python_librelogo.scp +++ b/scp2/source/python/module_python_librelogo.scp @@ -8,6 +8,8 @@ #include "macros.inc" +#include "AutoInstall/python_librelogo" + #ifndef AIX #ifndef DISABLE_PYUNO Module gid_Module_Optional_Pyuno_LibreLogo @@ -15,8 +17,7 @@ Module gid_Module_Optional_Pyuno_LibreLogo MOD_NAME_DESC ( MODULE_OPTIONAL_PYTHON_LIBRELOGO ); ParentID = gid_Module_Optional; Sortkey = "810"; - Files = (gid_File_LibreLogo, - gid_File_LibreLogoProperties, + Files = (auto_python_librelogo_ALL, gid_File_Share_Registry_LibreLogo_Xcd); Default = YES; Styles = ( ); commit 62eb3bf472975e9af4d12e0e4fea5d9c419694b9 Author: Michael Stahl <[email protected]> Date: Sat Feb 28 21:10:20 2015 +0100 scp2: move python packages to AutoInstall Change-Id: I1444e114e5cdbe794d79f40edebc32cb0229a4b5 diff --git a/Repository.mk b/Repository.mk index 5441a82..a15c1d3 100644 --- a/Repository.mk +++ b/Repository.mk @@ -872,6 +872,9 @@ endif # GUIBASE=unx ifneq ($(DISABLE_PYTHON),TRUE) $(eval $(call gb_Helper_register_packages_for_install,python, \ pyuno_pythonloader_ini \ + pyuno_python_scripts \ + $(if $(SYSTEM_PYTHON),,$(if $(filter-out WNT,$(OS)),python_shell)) \ + scripting_ScriptsPython \ )) $(eval $(call gb_Helper_register_packages_for_install,python_scriptprovider, \ scriptproviderforpython \ diff --git a/scp2/source/python/file_python.scp b/scp2/source/python/file_python.scp index 4076972..10599cc 100644 --- a/scp2/source/python/file_python.scp +++ b/scp2/source/python/file_python.scp @@ -20,13 +20,6 @@ #ifndef DISABLE_PYUNO -File gid_File_pyuno_python_scripts - TXT_FILE_BODY; - Dir = FILELIST_DIR; - Name = "pyuno_python_scripts.filelist"; - Styles = (FILELIST, PACKED); -End - File gid_File_Pyuno_Rdb TXT_FILE_BODY; Dir = gid_Brand_Dir_Program_Services; @@ -36,15 +29,6 @@ End #ifndef SYSTEM_PYTHON -#if !defined WNT -File gid_File_Py_Bin_Python - BIN_FILE_BODY; - Name = "python_shell.filelist"; - Dir = FILELIST_DIR; - Styles = (FILELIST, PACKED); -End -#endif - #ifndef MACOSX Directory gid_Dir_Py_PythonCore ParentID = gid_Brand_Dir_Program; @@ -66,15 +50,6 @@ End #endif // SYSTEM_PYTHON -//Scripting Framework Python example scripts - -File gid_File_Scripts_Python - Dir = FILELIST_DIR; - TXT_FILE_BODY; - Styles = (FILELIST); - Name = "scripting_ScriptsPython.filelist"; -End - // Scripting Framework Python configuration settings File gid_File_Share_Registry_Pyuno_Xcd diff --git a/scp2/source/python/module_python.scp b/scp2/source/python/module_python.scp index bafd190..c4a2915 100644 --- a/scp2/source/python/module_python.scp +++ b/scp2/source/python/module_python.scp @@ -46,8 +46,6 @@ Module gid_Module_Pyuno 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, commit 8c53af6fb868ab1aa31e76350ced9bc0e41d816a Author: Michael Stahl <[email protected]> Date: Sat Feb 28 21:02:04 2015 +0100 scp2: move python scriptprovider package to AutoInstall Change-Id: I7e7f74ffbfd9edc4d8d4b3ca13d9a2f0d97dcbf4 diff --git a/Repository.mk b/Repository.mk index 48a623a..5441a82 100644 --- a/Repository.mk +++ b/Repository.mk @@ -873,6 +873,9 @@ ifneq ($(DISABLE_PYTHON),TRUE) $(eval $(call gb_Helper_register_packages_for_install,python, \ pyuno_pythonloader_ini \ )) +$(eval $(call gb_Helper_register_packages_for_install,python_scriptprovider, \ + scriptproviderforpython \ +)) endif # External executables diff --git a/scp2/AutoInstall.mk b/scp2/AutoInstall.mk index c4f4fd0..621629c 100644 --- a/scp2/AutoInstall.mk +++ b/scp2/AutoInstall.mk @@ -35,6 +35,7 @@ $(eval $(call gb_AutoInstall_add_module,onlineupdate,LIBO_LIB_FILE_COMPONENTCOND $(eval $(call gb_AutoInstall_add_module,ooo,LIBO_LIB_FILE,LIBO_EXECUTABLE,LIBO_JAR_FILE)) $(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_scriptprovider,)) $(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,quickstart,,LIBO_EXECUTABLE)) diff --git a/scp2/InstallModule_python.mk b/scp2/InstallModule_python.mk index 7074a82..92f52a8 100644 --- a/scp2/InstallModule_python.mk +++ b/scp2/InstallModule_python.mk @@ -9,7 +9,10 @@ $(eval $(call gb_InstallModule_InstallModule,scp2/python)) -$(eval $(call gb_InstallModule_use_auto_install_libs,scp2/python,python)) +$(eval $(call gb_InstallModule_use_auto_install_libs,scp2/python,\ + python \ + python_scriptprovider \ +)) ifeq ($(DISABLE_PYTHON),TRUE) $(eval $(call gb_InstallModule_add_defs,scp2/python,\ diff --git a/scp2/source/python/file_python.scp b/scp2/source/python/file_python.scp index 4ffee8f..4076972 100644 --- a/scp2/source/python/file_python.scp +++ b/scp2/source/python/file_python.scp @@ -20,13 +20,6 @@ #ifndef DISABLE_PYUNO -File gid_File_scriptproviderforpython - TXT_FILE_BODY; - Dir = FILELIST_DIR; - Name = "scriptproviderforpython.filelist"; - Styles = (FILELIST, PACKED); -End - File gid_File_pyuno_python_scripts TXT_FILE_BODY; Dir = FILELIST_DIR; diff --git a/scp2/source/python/module_python.scp b/scp2/source/python/module_python.scp index d9cf73c..bafd190 100644 --- a/scp2/source/python/module_python.scp +++ b/scp2/source/python/module_python.scp @@ -19,6 +19,7 @@ #include "macros.inc" #include "AutoInstall/python" +#include "AutoInstall/python_scriptprovider" #ifndef DISABLE_PYUNO @@ -75,7 +76,7 @@ Module gid_Module_Script_Provider_For_Python Description = "Script Provider For Python"; PackageInfo = "packinfo_office.txt"; ParentID = gid_Module_Root_Brand; - Files = ( gid_File_scriptproviderforpython ); + Files = (auto_python_scriptprovider_ALL); Default = YES; Styles = (HIDDEN_ROOT); End commit 855d4c5c122e833df1f3b1c88fa312f9f7bc6df1 Author: Michael Stahl <[email protected]> Date: Sat Feb 28 20:46:37 2015 +0100 scp2: move gallery packages to AutoInstall Change-Id: I56a89b8785d7ac9f959ed43be26302540332e7ee diff --git a/Repository.mk b/Repository.mk index 095dfba..48a623a 100644 --- a/Repository.mk +++ b/Repository.mk @@ -765,6 +765,29 @@ $(eval $(call gb_Helper_register_jars_for_install,OOO,extensions_rhino, \ )) endif +ifneq ($(WITH_EXTRA_GALLERY),) +$(eval $(call gb_Helper_register_packages_for_install,accessories_gallery,\ + accessories_accessoriesgallery \ + accessories_accessoriesgallerydrawspeople \ + accessories_accessoriesgalleryphotosplants \ + accessories_accessoriesgalleryphotoscelebration \ + accessories_accessoriesgalleryphotosfauna \ + accessories_accessoriesgalleryphotosflowers \ + accessories_accessoriesgalleryphotosfoodsanddrinks \ + accessories_accessoriesgalleryphotoshumans \ + accessories_accessoriesgalleryphotoslandscapes \ + accessories_accessoriesgalleryphotosbuildings \ + accessories_accessoriesgalleryphotoscities \ + accessories_accessoriesgalleryphotosobjects \ + accessories_accessoriesgalleryphotosspace \ + accessories_accessoriesgalleryphotosstatues \ + accessories_accessoriesgalleryphotostravel \ + accessories_accessoriesgalleryelementsbullets2 \ + accessories_accessoriesgallerynonfree \ +)) + +endif + ifeq (CT2N,$(filter CT2N,$(BUILD_TYPE))) $(eval $(call gb_Helper_register_packages_for_install,extensions_ct2n,\ ct2n \ diff --git a/scp2/AutoInstall.mk b/scp2/AutoInstall.mk index 4983fc7..c4f4fd0 100644 --- a/scp2/AutoInstall.mk +++ b/scp2/AutoInstall.mk @@ -9,6 +9,7 @@ $(eval $(call gb_AutoInstall_AutoInstall)) +$(eval $(call gb_AutoInstall_add_module,accessories_gallery,)) $(eval $(call gb_AutoInstall_add_module,activexbinarytable,LIBO_LIB_FILE_BINARYTABLE)) $(eval $(call gb_AutoInstall_add_module,activex,LIBO_LIB_FILE)) $(eval $(call gb_AutoInstall_add_module,activexwin64,LIBO_LIB_FILE_COMPONENTCONDITION,,,"VersionNT64")) diff --git a/scp2/InstallModule_accessories.mk b/scp2/InstallModule_accessories.mk index fb639fa..3aca746 100644 --- a/scp2/InstallModule_accessories.mk +++ b/scp2/InstallModule_accessories.mk @@ -9,6 +9,10 @@ $(eval $(call gb_InstallModule_InstallModule,scp2/accessories)) +$(eval $(call gb_InstallModule_use_auto_install_libs,scp2/accessories,\ + accessories_gallery \ +)) + $(eval $(call gb_InstallModule_add_localized_scpfiles,scp2/accessories,\ scp2/source/accessories/module_accessories \ )) @@ -24,10 +28,6 @@ $(eval $(call gb_InstallModule_add_localized_scpfiles,scp2/accessories,\ endif ifneq ($(WITH_EXTRA_GALLERY),) -$(eval $(call gb_InstallModule_add_scpfiles,scp2/accessories,\ - scp2/source/accessories/file_gallery_accessories \ -)) - $(eval $(call gb_InstallModule_add_localized_scpfiles,scp2/accessories,\ scp2/source/accessories/module_gallery_accessories \ )) diff --git a/scp2/source/accessories/file_gallery_accessories.scp b/scp2/source/accessories/file_gallery_accessories.scp deleted file mode 100644 index 953fa53..0000000 --- a/scp2/source/accessories/file_gallery_accessories.scp +++ /dev/null @@ -1,136 +0,0 @@ -/* - * 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/. - */ - -#include "macros.inc" - -/* *** Accessories Extras *** */ - -/* ** Gallery ** */ - -#ifdef WITH_EXTRA_GALLERY - -File gid_File_Extra_Gallery_Accessories - Dir = FILELIST_DIR; - TXT_FILE_BODY; - Styles = (FILELIST); - Name = "accessories_accessoriesgallery.filelist"; -End - -File gid_File_Extra_Gallery_Draws_People_Accessories - Dir = FILELIST_DIR; - TXT_FILE_BODY; - Styles = (FILELIST); - Name = "accessories_accessoriesgallerydrawspeople.filelist"; -End - -File gid_File_Extra_Gallery_Photos_Plants_Accessories - Dir = FILELIST_DIR; - TXT_FILE_BODY; - Styles = (FILELIST); - Name = "accessories_accessoriesgalleryphotosplants.filelist"; -End - -File gid_File_Extra_Gallery_Photos_Celebration_Accessories - Dir = FILELIST_DIR; - TXT_FILE_BODY; - Styles = (FILELIST); - Name = "accessories_accessoriesgalleryphotoscelebration.filelist"; -End - -File gid_File_Extra_Gallery_Photos_Fauna_Accessories - Dir = FILELIST_DIR; - TXT_FILE_BODY; - Styles = (FILELIST); - Name = "accessories_accessoriesgalleryphotosfauna.filelist"; -End - -File gid_File_Extra_Gallery_Photos_Flowers_Accessories - Dir = FILELIST_DIR; - TXT_FILE_BODY; - Styles = (FILELIST); - Name = "accessories_accessoriesgalleryphotosflowers.filelist"; -End - -File gid_File_Extra_Gallery_Photos_FoodsandDrinks_Accessories - Dir = FILELIST_DIR; - TXT_FILE_BODY; - Styles = (FILELIST); - Name = "accessories_accessoriesgalleryphotosfoodsanddrinks.filelist"; -End - -File gid_File_Extra_Gallery_Photos_Humans_Accessories - Dir = FILELIST_DIR; - TXT_FILE_BODY; - Styles = (FILELIST); - Name = "accessories_accessoriesgalleryphotoshumans.filelist"; -End - -File gid_File_Extra_Gallery_Photos_Landscapes_Accessories - Dir = FILELIST_DIR; - TXT_FILE_BODY; - Styles = (FILELIST); - Name = "accessories_accessoriesgalleryphotoslandscapes.filelist"; -End - -File gid_File_Extra_Gallery_Photos_Buildings_Accessories - Dir = FILELIST_DIR; - TXT_FILE_BODY; - Styles = (FILELIST); - Name = "accessories_accessoriesgalleryphotosbuildings.filelist"; -End - -File gid_File_Extra_Gallery_Photos_Objects_Accessories - Dir = FILELIST_DIR; - TXT_FILE_BODY; - Styles = (FILELIST); - Name = "accessories_accessoriesgalleryphotosobjects.filelist"; -End - -File gid_File_Extra_Gallery_Photos_Cities_Accessories - Dir = FILELIST_DIR; - TXT_FILE_BODY; - Styles = (FILELIST); - Name = "accessories_accessoriesgalleryphotoscities.filelist"; -End - -File gid_File_Extra_Gallery_Photos_Space_Accessories - Dir = FILELIST_DIR; - TXT_FILE_BODY; - Styles = (FILELIST); - Name = "accessories_accessoriesgalleryphotosspace.filelist"; -End - -File gid_File_Extra_Gallery_Photos_Statues_Accessories - Dir = FILELIST_DIR; - TXT_FILE_BODY; - Styles = (FILELIST); - Name = "accessories_accessoriesgalleryphotosstatues.filelist"; -End - -File gid_File_Extra_Gallery_Photos_Travel_Accessories - Dir = FILELIST_DIR; - TXT_FILE_BODY; - Styles = (FILELIST); - Name = "accessories_accessoriesgalleryphotostravel.filelist"; -End - -File gid_File_Extra_Gallery_Elements_Bullets2_Accessories - Dir = FILELIST_DIR; - TXT_FILE_BODY; - Styles = (FILELIST); - Name = "accessories_accessoriesgalleryelementsbullets2.filelist"; -End - -File gid_File_Extra_Gallery_NONFREE_Accessories - Dir = FILELIST_DIR; - TXT_FILE_BODY; - Styles = (FILELIST); - Name = "accessories_accessoriesgallerynonfree.filelist"; -End - -#endif diff --git a/scp2/source/accessories/module_gallery_accessories.scp b/scp2/source/accessories/module_gallery_accessories.scp index 46dab54..15af621 100644 --- a/scp2/source/accessories/module_gallery_accessories.scp +++ b/scp2/source/accessories/module_gallery_accessories.scp @@ -8,30 +8,15 @@ #include "macros.inc" +#include "AutoInstall/accessories_gallery" + #ifdef WITH_EXTRA_GALLERY Module gid_Module_Optional_Accessories_Gallery PackageInfo = "packinfo_accessories.txt"; MOD_NAME_DESC(MODULE_OPTIONAL_ACCESSORIES_GALLERY); ParentID = gid_Module_Optional_Accessories; - Files = ( - gid_File_Extra_Gallery_Accessories, - gid_File_Extra_Gallery_Draws_People_Accessories, - gid_File_Extra_Gallery_Photos_Plants_Accessories, - gid_File_Extra_Gallery_Photos_Celebration_Accessories, - gid_File_Extra_Gallery_Photos_Fauna_Accessories, - gid_File_Extra_Gallery_Photos_Flowers_Accessories, - gid_File_Extra_Gallery_Photos_FoodsandDrinks_Accessories, - gid_File_Extra_Gallery_Photos_Humans_Accessories, - gid_File_Extra_Gallery_Photos_Landscapes_Accessories, - gid_File_Extra_Gallery_Photos_Objects_Accessories, - gid_File_Extra_Gallery_Photos_Buildings_Accessories, - gid_File_Extra_Gallery_Photos_Cities_Accessories, - gid_File_Extra_Gallery_Photos_Space_Accessories, - gid_File_Extra_Gallery_Photos_Statues_Accessories, - gid_File_Extra_Gallery_Photos_Travel_Accessories, - gid_File_Extra_Gallery_Elements_Bullets2_Accessories, - gid_File_Extra_Gallery_NONFREE_Accessories ); + Files = (auto_accessories_gallery_ALL); Default = YES; Styles = ( ); End commit 081a3ea796856e25e7f91728792111e258e80f2d Author: Michael Stahl <[email protected]> Date: Sat Feb 28 19:22:06 2015 +0100 scp2: remove obsolete mkopenwith.btm Change-Id: I409a505ad61f99e56081a9a05ec49284564fd568 diff --git a/scp2/source/mkopenwith.btm b/scp2/source/mkopenwith.btm deleted file mode 100755 index 0c09f3b..0000000 --- a/scp2/source/mkopenwith.btm +++ /dev/null @@ -1,52 +0,0 @@ -@ECHO OFF -IF '%1'==' GOTO End -IF NOT EXIST %1\. GOTO Module_Error - -SET OUTPUT=%1\OpenWith.SCP - -SET FILE=%@FILEOPEN[supported_extensions.txt,read,t] - -ECHO // "OpenWith" Windows Registry keys for extensions supported by %1 > %OUTPUT% -ECHO. >> %OUTPUT% - -:While_Read_File -SET LINE=%@FILEREAD[%FILE%] -IF '%LINE%'=='' GOTO While_Read_File -IF '%@LEFT[1,%LINE%]'==';' GOTO While_Read_File -IF '%LINE%'=='**EOF**' GOTO End_Read_File - -IF NOT '%@LEFT[1,%LINE%]'=='[' GOTO Register_Extension - -SET MODULE=%@UPPER[%@WORD["[]",0,%LINE%]] -GOTO While_Read_File - -:Register_Extension -IF NOT '%MODULE%'=='%@UPPER[%1]' GOTO While_Read_File - -ECHO // .%LINE% >> %OUTPUT% -ECHO RegistryItem gid_Regitem_OpenOffice_%LINE%_OpenWith_%1 >> %OUTPUT% -ECHO ParentID = PREDEFINED_HKEY_CLASSES_ROOT; >> %OUTPUT% -ECHO Subkey = ".%LINE%\OpenWithProgIDs"; >> %OUTPUT% -ECHO ModuleID = gid_Module_Prg_%1_Bin; >> %OUTPUT% -ECHO Name = "opendocument.%1Document.1"; >> %OUTPUT% -ECHO Value = "%PRODUCTNAME %PRODUCTVERSION"; >> %OUTPUT% -ECHO End >> %OUTPUT% -ECHO. >> %OUTPUT% - -REM GOTO End_Read_File -GOTO While_Read_File - -:End_Read_File -SET ERROR=%@FILECLOSE[%FILE%] -GOTO End - -:Help -ECHO Usage: %0 Module -ECHO Example: %0 Calc -GOTO End - -:Module_Error -ECHO Module %1 not found ! -GOTO End - -:End diff --git a/scp2/source/supported_extensions.txt b/scp2/source/supported_extensions.txt deleted file mode 100644 index 72e9125..0000000 --- a/scp2/source/supported_extensions.txt +++ /dev/null @@ -1,97 +0,0 @@ -# -# 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/. -# -# This file incorporates work covered by the following license notice: -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed -# with this work for additional information regarding copyright -# ownership. The ASF licenses this file to you under the Apache -# License, Version 2.0 (the "License"); you may not use this file -# except in compliance with the License. You may obtain a copy of -# the License at http://www.apache.org/licenses/LICENSE-2.0 . -# -[Calc] -ODS -OTS -SXC -STC -DIF -DBF -XLS -XLW -XLT -RTF -SDC -VOR -SLK -CSV -TXT -HTM -HTML -WK1 -WKS -123 -XML - -[Writer] -ODT -OTT -SXW -STW -DOC -DOT -RTF -SDW -VOR -TXT -HTM -HTML -XML -WPD -WPS -JTD -JTT -HWP -OTH -ODM -SXG -SGL - -[Impress] -ODP -OTP -SXI -STI -PPT -PPS -POT -SXD -SDA -SDD -SDP -VOR -ODG - -[Draw] -ODG -OTG -SXD -STD -SDA -SDD -VOR - -;[Database] -[OOo] -ODB - -[Math] -ODF -SXM -SMF -MML _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
