[Libreoffice-commits] core.git: Repository.mk scp2/InstallModule_ooo.mk scp2/source

[David Ostrovsky]

 Repository.mk                  |    8 ++++++
 scp2/InstallModule_ooo.mk      |   10 --------
 scp2/source/ooo/file_ooo.scp   |   48 -----------------------------------------
 scp2/source/ooo/module_ooo.scp |    3 --
 4 files changed, 8 insertions(+), 61 deletions(-)

New commits:
commit 53f0eb12f0fdabc32fee523b0f63691b2342f3f4
Author: David Ostrovsky <david at ostrovsky.org>
Date:   Mon Feb 15 22:42:17 2016 +0100

    tdf#90753 Move Pyuno wizard packages to autoinstall
    
    Change-Id: I9dda8144e0cb3ff2ea80c65f210a9b94b88a0026
    Reviewed-on: https://gerrit.libreoffice.org/22379
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Michael Stahl <mstahl at redhat.com>

diff --git a/Repository.mk b/Repository.mk
index a99e8f5..acfd48f 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -814,6 +814,14 @@ $(eval $(call gb_Helper_register_packages_for_install,ooo,\
 		vcl_opengl_blacklist \
 	) \
 	$(if $(ENABLE_OPENGL_CANVAS),canvas_opengl_shader) \
+	$(if $(DISABLE_PYTHON),,$(if $(filter-out AIX,$(OS)), \
+		Pyuno/commonwizards \
+		Pyuno/fax \
+		Pyuno/letter \
+		Pyuno/agenda \
+		Pyuno/web \
+		Pyuno/mailmerge \
+	)) \
 ))
 
 $(eval $(call gb_Helper_register_packages_for_install,ogltrans,\
diff --git a/scp2/InstallModule_ooo.mk b/scp2/InstallModule_ooo.mk
index 2f4320b..d54ca2e 100644
--- a/scp2/InstallModule_ooo.mk
+++ b/scp2/InstallModule_ooo.mk
@@ -62,16 +62,6 @@ $(eval $(call gb_InstallModule_add_defs,scp2/ooo,\
 ))
 endif
 
-ifeq ($(DISABLE_PYTHON),TRUE)
-$(eval $(call gb_InstallModule_add_defs,scp2/ooo,\
-	-DDISABLE_PYUNO \
-))
-else ifneq ($(SYSTEM_PYTHON),)
-$(eval $(call gb_InstallModule_add_defs,scp2/ooo,\
-	-DSYSTEM_PYTHON \
-))
-endif
-
 $(eval $(call gb_InstallModule_add_defs,scp2/ooo,\
 	-DICU_MAJOR=$(ICU_MAJOR) \
 ))
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index ad78407..b98ed64 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -115,54 +115,6 @@ File gid_File_Help_Schart_Zip
 End
 #endif
 
-
-#ifndef AIX
-#ifndef DISABLE_PYUNO
-
-File gid_File_Wizards_Common
-    Dir = FILELIST_DIR;
-    TXT_FILE_BODY;
-    Styles = (FILELIST);
-    Name = "Pyuno/commonwizards.filelist";
-End
-
-File gid_File_Wizards_Fax
-    Dir = FILELIST_DIR;
-    TXT_FILE_BODY;
-    Styles = (FILELIST);
-    Name = "Pyuno/fax.filelist";
-End
-
-File gid_File_Wizards_Letter
-    Dir = FILELIST_DIR;
-    TXT_FILE_BODY;
-    Styles = (FILELIST);
-    Name = "Pyuno/letter.filelist";
-End
-
-File gid_File_Wizards_Agenda
-    Dir = FILELIST_DIR;
-    TXT_FILE_BODY;
-    Styles = (FILELIST);
-    Name = "Pyuno/agenda.filelist";
-End
-
-File gid_File_Wizards_Web
-    Dir = FILELIST_DIR;
-    TXT_FILE_BODY;
-    Styles = (FILELIST);
-    Name = "Pyuno/web.filelist";
-End
-
-File gid_File_Pymailmerge
-    Dir = FILELIST_DIR;
-    TXT_FILE_BODY;
-    Styles = (FILELIST);
-    Name = "Pyuno/mailmerge.filelist";
-End
-#endif
-#endif
-
 // mod files
 
 File gid_File_Share_Registry_Main_Xcd
diff --git a/scp2/source/ooo/module_ooo.scp b/scp2/source/ooo/module_ooo.scp
index 9acfbe8..e975fe8 100644
--- a/scp2/source/ooo/module_ooo.scp
+++ b/scp2/source/ooo/module_ooo.scp
@@ -32,8 +32,6 @@ Module gid_Module_Root
              gid_File_Txt_Pagein_Impress,
              gid_File_Txt_Pagein_Writer,
              gid_File_extras_newfiles,
-             gid_File_Wizards_Common,
-             gid_File_Wizards_Fax,
              gid_File_Rdb_Offapi,
              gid_Starregistry_Services_Rdb,
              auto_ooo_ALL,
@@ -130,7 +128,6 @@ Module gid_Module_Root
              gid_File_Share_Config_Sofficecfg_uiconfig_xmlsec,
              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);