From 31f1a12ca545a0cafcf855346c77752ee17d0efe Mon Sep 17 00:00:00 2001 From: Andras Timar Date: Wed, 12 Dec 2012 00:02:36 +0100 Subject: LibreLogo should be an optional module On Windows it is installed by default, but can be disabled in the installer easily. Change-Id: Ic820f08b51edf71eb09fd3533dc42b82bd06bb38 --- officecfg/Configuration_officecfg.mk | 2 ++ .../registry/data/org/openoffice/Office/Addons.xcu | 4 ++-- .../org/openoffice/Office/UI/WriterWindowState.xcu | 2 +- postprocess/packregistry/makefile.mk | 7 +++++- scp2/InstallModule_python.mk | 2 ++ scp2/source/python/file_python.scp | 9 -------- scp2/source/python/file_python_librelogo.scp | 27 ++++++++++++++++++++++ scp2/source/python/module_python.scp | 1 - scp2/source/python/module_python_librelogo.scp | 25 ++++++++++++++++++++ scp2/source/python/module_python_librelogo.ulf | 13 +++++++++++ setup_native/source/packinfo/packinfo_office.txt | 15 ++++++++++++ 11 files changed, 93 insertions(+), 14 deletions(-) create mode 100644 scp2/source/python/file_python_librelogo.scp create mode 100644 scp2/source/python/module_python_librelogo.scp create mode 100644 scp2/source/python/module_python_librelogo.ulf diff --git a/officecfg/Configuration_officecfg.mk b/officecfg/Configuration_officecfg.mk index 8fbd8469e852..cbcaaff01e13 100644 --- a/officecfg/Configuration_officecfg.mk +++ b/officecfg/Configuration_officecfg.mk @@ -70,6 +70,7 @@ $(eval $(call gb_Configuration_add_spool_modules,registry,officecfg/registry/dat org/openoffice/VCL-unixdesktop.xcu \ org/openoffice/Office/Accelerators-macosx.xcu \ org/openoffice/Office/Accelerators-unxwnt.xcu \ + org/openoffice/Office/Addons-librelogo.xcu \ org/openoffice/Office/Common-writer.xcu \ org/openoffice/Office/Common-calc.xcu \ org/openoffice/Office/Common-draw.xcu \ @@ -106,6 +107,7 @@ $(eval $(call gb_Configuration_add_spool_modules,registry,officecfg/registry/dat org/openoffice/Office/Embedding-base.xcu \ org/openoffice/Office/Embedding-writer.xcu \ org/openoffice/Office/Recovery-gconflockdown.xcu \ + org/openoffice/Office/UI/WriterWindowState-librelogo.xcu \ org/openoffice/TypeDetection/UISort-writer.xcu \ org/openoffice/TypeDetection/UISort-calc.xcu \ org/openoffice/TypeDetection/UISort-draw.xcu \ diff --git a/officecfg/registry/data/org/openoffice/Office/Addons.xcu b/officecfg/registry/data/org/openoffice/Office/Addons.xcu index bd1326362736..8c08f53ed6c8 100644 --- a/officecfg/registry/data/org/openoffice/Office/Addons.xcu +++ b/officecfg/registry/data/org/openoffice/Office/Addons.xcu @@ -9,8 +9,8 @@ * --> - - + + diff --git a/officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu index da2fe9e52e12..e3b16c61d99c 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu @@ -720,7 +720,7 @@ true - + Logo diff --git a/postprocess/packregistry/makefile.mk b/postprocess/packregistry/makefile.mk index 952c1cc01f60..3150607ca353 100644 --- a/postprocess/packregistry/makefile.mk +++ b/postprocess/packregistry/makefile.mk @@ -34,6 +34,7 @@ MY_XCDS = \ $(MISC)/draw.xcd \ $(MISC)/graphicfilter.xcd \ $(MISC)/impress.xcd \ + $(MISC)/librelogo.xcd \ $(MISC)/korea.xcd \ $(MISC)/lingucomponent.xcd \ $(MISC)/main.xcd \ @@ -113,6 +114,11 @@ MY_FILES_impress = \ $(MY_MOD)/org/openoffice/Office/ProtocolHandler-impress.xcu \ $(MY_MOD)/org/openoffice/Setup-impress.xcu +MY_DEPS_librelogo = main +MY_FILES_librelogo = \ + $(MY_MOD)/org/openoffice/Office/Addons-librelogo.xcu \ + $(MY_MOD)/org/openoffice/Office/UI/WriterWindowState-librelogo.xcu + MY_DEPS_korea = main MY_FILES_korea = \ $(MY_MOD)/org/openoffice/Office/Common-korea.xcu @@ -213,7 +219,6 @@ MY_FILES_main = \ $(MY_XCU)/Inet.xcu \ $(MY_XCU)/Interaction.xcu \ $(MY_XCU)/Office/Accelerators.xcu \ - $(MY_XCU)/Office/Addons.xcu \ $(MY_XCU)/Office/Calc.xcu \ $(MY_XCU)/Office/Canvas.xcu \ $(MY_XCU)/Office/Common.xcu \ diff --git a/scp2/InstallModule_python.mk b/scp2/InstallModule_python.mk index 42f80c5fba10..eedc2cb4de50 100644 --- a/scp2/InstallModule_python.mk +++ b/scp2/InstallModule_python.mk @@ -55,11 +55,13 @@ endif $(eval $(call gb_InstallModule_add_scpfiles,scp2/python,\ scp2/source/python/file_python \ + scp2/source/python/file_python_librelogo \ scp2/source/python/profileitem_python \ )) $(eval $(call gb_InstallModule_add_localized_scpfiles,scp2/python,\ scp2/source/python/module_python \ + scp2/source/python/module_python_librelogo \ scp2/source/python/module_python_mailmerge \ )) diff --git a/scp2/source/python/file_python.scp b/scp2/source/python/file_python.scp index 3b05cfe1d398..fc4db23883c1 100644 --- a/scp2/source/python/file_python.scp +++ b/scp2/source/python/file_python.scp @@ -136,15 +136,6 @@ File gid_File_Scripts_Python Name = "ScriptsPython.zip"; End -//LibreLogo turtle graphics - -File gid_File_LibreLogo - TXT_FILE_BODY; - Styles = (ARCHIVE); - Dir = gid_Dir_Share_Scripts; - Name = "LibreLogo.zip"; -End - // Scripting Framework Python configuration settings File gid_File_Share_Registry_Pyuno_Xcd diff --git a/scp2/source/python/file_python_librelogo.scp b/scp2/source/python/file_python_librelogo.scp new file mode 100644 index 000000000000..a089262fb999 --- /dev/null +++ b/scp2/source/python/file_python_librelogo.scp @@ -0,0 +1,27 @@ +/* + * 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" + +#ifndef AIX +#ifndef DISABLE_PYUNO +File gid_File_LibreLogo + TXT_FILE_BODY; + Styles = (ARCHIVE); + Dir = gid_Dir_Share_Scripts; + Name = "LibreLogo.zip"; +End + +File gid_File_Share_Registry_LibreLogo_Xcd + TXT_FILE_BODY; + Styles = (PACKED); + Dir = gid_Brand_Dir_Share_Registry; + Name = "librelogo.xcd"; +End +#endif +#endif diff --git a/scp2/source/python/module_python.scp b/scp2/source/python/module_python.scp index b56305825c41..629a864ad82a 100644 --- a/scp2/source/python/module_python.scp +++ b/scp2/source/python/module_python.scp @@ -57,7 +57,6 @@ Module gid_Module_Optional_Pyuno gid_File_Lib_Python_So, gid_File_Lib_Python3_So, gid_File_Scripts_Python, - gid_File_LibreLogo, gid_File_Share_Registry_Pyuno_Xcd); Unixlinks = (gid_Unixlink_Python_Headers, gid_Unixlink_Python_LibreOfficePython, diff --git a/scp2/source/python/module_python_librelogo.scp b/scp2/source/python/module_python_librelogo.scp new file mode 100644 index 000000000000..63982cbdf150 --- /dev/null +++ b/scp2/source/python/module_python_librelogo.scp @@ -0,0 +1,25 @@ +/* + * 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" + +#ifndef AIX +#ifndef DISABLE_PYUNO +Module gid_Module_Optional_Pyuno_LibreLogo + PackageInfo = "packinfo_office.txt"; + MOD_NAME_DESC ( MODULE_OPTIONAL_PYTHON_LIBRELOGO ); + ParentID = gid_Module_Optional_Pyuno; + Sortkey = "100"; + Files = (gid_File_LibreLogo, + gid_File_Share_Registry_LibreLogo_Xcd); + Minimal = NO; + Default = YES; + Styles = ( ); +End +#endif +#endif diff --git a/scp2/source/python/module_python_librelogo.ulf b/scp2/source/python/module_python_librelogo.ulf new file mode 100644 index 000000000000..db5d265b5f8d --- /dev/null +++ b/scp2/source/python/module_python_librelogo.ulf @@ -0,0 +1,13 @@ +/* + * 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/. + */ + +[STR_NAME_MODULE_OPTIONAL_PYTHON_LIBRELOGO] +en-US = "LibreLogo" + +[STR_DESC_MODULE_OPTIONAL_PYTHON_LIBRELOGO] +en-US = "Logo (turtle graphics) toolbar for Writer" diff --git a/setup_native/source/packinfo/packinfo_office.txt b/setup_native/source/packinfo/packinfo_office.txt index 25fd9c580961..5ace658400be 100644 --- a/setup_native/source/packinfo/packinfo_office.txt +++ b/setup_native/source/packinfo/packinfo_office.txt @@ -311,6 +311,21 @@ destpath = "/opt" packageversion = "%ABOUTBOXPRODUCTVERSION" End +Start +module = "gid_Module_Optional_Pyuno_LibreLogo" +solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-librelogo" +solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core01, SUNWPython" +packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-librelogo" +freebsdrequires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core01" +requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core01" +copyright = "2012 The Document Foundation" +solariscopyright = "solariscopyrightfile" +vendor = "The Document Foundation" +description = "LibreLogo toolbar for %PRODUCTNAME %PRODUCTVERSION Writer" +destpath = "/opt" +packageversion = "%ABOUTBOXPRODUCTVERSION" +End + Start module = "gid_Module_Optional_Pymailmerge" solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-emailmerge" -- cgit v1.2.3