ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

tdf#90753 Move Pyuno wizard packages to autoinstall

Browse Source 
Change-Id: I9dda8144e0cb3ff2ea80c65f210a9b94b88a0026
Reviewed-on: https://gerrit.libreoffice.org/22379
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
This commit is contained in:
David Ostrovsky
2016-02-17 10:01:41 +00:00
committed by Michael Stahl
parent 0bb0b5b0cf
commit 53f0eb12f0
4 changed files with 8 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Repository.mk
+8
View File
@@ -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,\
scp2/InstallModule_ooo.mk
-10
View File
@@ -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) \
))
scp2/source/ooo/file_ooo.scp
-48
View File
@@ -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
scp2/source/ooo/module_ooo.scp
-3
View File
@@ -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);