LibreLogo should be an optional module

On Windows it is installed by default, but can be disabled in
the installer easily.

Change-Id: Ic820f08b51edf71eb09fd3533dc42b82bd06bb38

6 files changed, 67 insertions, 10 deletions

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"