[Libreoffice-commits] .: Branch 'libreoffice-4-0' - officecfg/Configuration_officecfg.mk officecfg/registry postprocess/packregistry scp2/InstallModule_python.mk scp2/source setup_native/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Tue Dec 11 15:07:57 PST 2012
officecfg/Configuration_officecfg.mk | 2
officecfg/registry/data/org/openoffice/Office/Addons.xcu | 4 -
officecfg/registry/data/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(-)
New commits:
commit 63f68ccd72d9d6dc847f1b6ebf19ee2f8019f548
Author: Andras Timar <atimar at suse.com>
Date: Wed Dec 12 00:02:36 2012 +0100
LibreLogo should be an optional module
On Windows it is installed by default, but can be disabled in
the installer easily.
Change-Id: Ic820f08b51edf71eb09fd3533dc42b82bd06bb38
diff --git a/officecfg/Configuration_officecfg.mk b/officecfg/Configuration_officecfg.mk
index 8fbd846..cbcaaff 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 bd13263..8c08f53 100644
--- a/officecfg/registry/data/org/openoffice/Office/Addons.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Addons.xcu
@@ -9,8 +9,8 @@
*
-->
-<oor:component-data xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" oor:name="Addons" oor:package="org.openoffice.Office">
- <node oor:name="AddonUI">
+<oor:component-data oor:name="Addons" oor:package="org.openoffice.Office" xmlns:install="http://openoffice.org/2004/installation" xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <node oor:name="AddonUI" install:module="librelogo">
<node oor:name="OfficeToolBar">
<node oor:name="LibreLogo.OfficeToolBar" oor:op="replace">
<node oor:name="m01" oor:op="replace">
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu
index da2fe9e..e3b16c6 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 @@
<value>true</value>
</prop>
</node>
- <node oor:name="private:resource/toolbar/addon_LibreLogo.OfficeToolBar" oor:op="replace">
+ <node oor:name="private:resource/toolbar/addon_LibreLogo.OfficeToolBar" oor:op="replace" install:module="librelogo">
<prop oor:name="UIName" oor:type="xs:string">
<value xml:lang="en-US">Logo</value>
</prop>
diff --git a/postprocess/packregistry/makefile.mk b/postprocess/packregistry/makefile.mk
index 952c1cc..3150607 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 42f80c5..eedc2cb 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 3b05cfe..fc4db23 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 0000000..a089262
--- /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 b563058..629a864 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 0000000..63982cb
--- /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 0000000..db5d265
--- /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 25fd9c5..5ace658 100644
--- a/setup_native/source/packinfo/packinfo_office.txt
+++ b/setup_native/source/packinfo/packinfo_office.txt
@@ -312,6 +312,21 @@ 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"
solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-pyuno"
More information about the Libreoffice-commits
mailing list