Hi, I have submitted a patch for review:
https://gerrit.libreoffice.org/3382 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/82/3382/1 fdo#63197: Convert list below: Zip_gallbullets, Zip_gallhtmlexpo, Zip_gallroot, Zip_gallsound Zip_gallsounds, Zip_gallsystem, Zip_gallwwwback, Zip_gallwwwgraf Change-Id: Ic326d83ad69968a4871518065277e863eb8815a8 --- M extras/Module_extras.mk R extras/Package_gallbullets.mk R extras/Package_gallhtmlexpo.mk R extras/Package_gallroot.mk R extras/Package_gallsound.mk R extras/Package_gallsounds.mk R extras/Package_gallsystem.mk R extras/Package_gallwwwback.mk R extras/Package_gallwwwgraf.mk M scp2/source/ooo/file_extra_ooo.scp 10 files changed, 71 insertions(+), 48 deletions(-) diff --git a/extras/Module_extras.mk b/extras/Module_extras.mk index 8df931c..348b62d 100644 --- a/extras/Module_extras.mk +++ b/extras/Module_extras.mk @@ -21,19 +21,19 @@ Package_database \ Package_databasebiblio \ Package_fonts \ + Package_gallbullets \ + Package_gallhtmlexpo \ + Package_gallroot \ + Package_gallsound \ + Package_gallsounds \ + Package_gallsystem \ + Package_gallwwwback \ + Package_gallwwwgraf \ Package_glade \ Package_labels \ Package_newfiles \ Package_palettes \ Package_wordbook \ - Zip_gallbullets \ - Zip_gallhtmlexpo \ - Zip_gallroot \ - Zip_gallsound \ - Zip_gallsounds \ - Zip_gallsystem \ - Zip_gallwwwback \ - Zip_gallwwwgraf \ Zip_tpllayoutimpr \ Zip_tplwizagenda \ Zip_tplwizbitmap \ diff --git a/extras/Zip_gallbullets.mk b/extras/Package_gallbullets.mk similarity index 84% rename from extras/Zip_gallbullets.mk rename to extras/Package_gallbullets.mk index 81fcc75..c5d903f 100644 --- a/extras/Zip_gallbullets.mk +++ b/extras/Package_gallbullets.mk @@ -7,9 +7,11 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_Zip_Zip,gallbullets,$(SRCDIR)/extras/source/gallery/bullets)) +$(eval $(call gb_Package_Package,extras_gallbullets,$(SRCDIR)/extras/source/gallery/bullets)) -$(eval $(call gb_Zip_add_files,gallbullets,\ +$(eval $(call gb_Package_set_outdir,extras_gallbullets,$(INSTDIR))) + +$(eval $(call gb_Package_add_files,extras_gallbullets,share/gallery/bullets,\ blkpearl.gif \ bluarrow.gif \ bluball.gif \ diff --git a/extras/Zip_gallhtmlexpo.mk b/extras/Package_gallhtmlexpo.mk similarity index 81% rename from extras/Zip_gallhtmlexpo.mk rename to extras/Package_gallhtmlexpo.mk index ad2ff41..f0531c5 100644 --- a/extras/Zip_gallhtmlexpo.mk +++ b/extras/Package_gallhtmlexpo.mk @@ -7,9 +7,11 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_Zip_Zip,gallhtmlexpo,$(SRCDIR)/extras/source/gallery/htmlexpo)) +$(eval $(call gb_Package_Package,extras_gallhtmlexpo,$(SRCDIR)/extras/source/gallery/htmlexpo)) -$(eval $(call gb_Zip_add_files,gallhtmlexpo,\ +$(eval $(call gb_Package_set_outdir,extras_gallhtmlexpo,$(INSTDIR))) + +$(eval $(call gb_Package_add_files,extras_gallhtmlexpo,share/gallery/htmlexpo,\ bludown.gif \ blufirs_.gif \ blufirs.gif \ diff --git a/extras/Zip_gallroot.mk b/extras/Package_gallroot.mk similarity index 66% rename from extras/Zip_gallroot.mk rename to extras/Package_gallroot.mk index c5f21bf..cb1ae1b 100644 --- a/extras/Zip_gallroot.mk +++ b/extras/Package_gallroot.mk @@ -7,9 +7,11 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_Zip_Zip,gallroot,$(SRCDIR)/extras/source/gallery)) +$(eval $(call gb_Package_Package,extras_gallroot,$(SRCDIR)/extras/source/gallery)) -$(eval $(call gb_Zip_add_files,gallroot,\ +$(eval $(call gb_Package_set_outdir,extras_gallroot,$(INSTDIR))) + +$(eval $(call gb_Package_add_files,extras_gallroot,share/gallery,\ apples.gif \ bigapple.gif \ flower.gif \ diff --git a/extras/Zip_gallsound.mk b/extras/Package_gallsound.mk similarity index 63% rename from extras/Zip_gallsound.mk rename to extras/Package_gallsound.mk index 0129923..b535eda 100644 --- a/extras/Zip_gallsound.mk +++ b/extras/Package_gallsound.mk @@ -7,9 +7,11 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_Zip_Zip,gallsound,$(SRCDIR)/extras/source/gallery/gallery_sound)) +$(eval $(call gb_Package_Package,extras_gallsound,$(SRCDIR)/extras/source/gallery/gallery_sound)) -$(eval $(call gb_Zip_add_files,gallsound,\ +$(eval $(call gb_Package_set_outdir,extras_gallsound,$(INSTDIR))) + +$(eval $(call gb_Package_add_files,extras_gallsound,presets/gallery,\ sg100.sdv \ sg100.thm \ sg30.sdv \ diff --git a/extras/Zip_gallsounds.mk b/extras/Package_gallsounds.mk similarity index 77% rename from extras/Zip_gallsounds.mk rename to extras/Package_gallsounds.mk index 3021c79..94799ed 100644 --- a/extras/Zip_gallsounds.mk +++ b/extras/Package_gallsounds.mk @@ -7,9 +7,11 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_Zip_Zip,gallsounds,$(SRCDIR)/extras/source/gallery/sounds)) +$(eval $(call gb_Package_Package,extras_gallsounds,$(SRCDIR)/extras/source/gallery/sounds)) -$(eval $(call gb_Zip_add_files,gallsounds,\ +$(eval $(call gb_Package_set_outdir,extras_gallsounds,$(INSTDIR))) + +$(eval $(call gb_Package_add_files,extras_gallsounds,share/gallery/sounds\ apert2.wav \ apert.wav \ applause.wav \ diff --git a/extras/Zip_gallsystem.mk b/extras/Package_gallsystem.mk similarity index 71% rename from extras/Zip_gallsystem.mk rename to extras/Package_gallsystem.mk index bb55713..21771d4 100644 --- a/extras/Zip_gallsystem.mk +++ b/extras/Package_gallsystem.mk @@ -7,9 +7,11 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_Zip_Zip,gallsystem,$(SRCDIR)/extras/source/gallery/gallery_system)) +$(eval $(call gb_Package_Package,extras_gallsystem,$(SRCDIR)/extras/source/gallery/gallery_system)) -$(eval $(call gb_Zip_add_files,gallsystem,\ +$(eval $(call gb_Package_set_outdir,extras_gallsystem,$(INSTDIR))) + +$(eval $(call gb_Package_add_files,extras_gallsystem,share/gallery,\ sg1.sdg \ sg1.sdv \ sg1.thm \ diff --git a/extras/Zip_gallwwwback.mk b/extras/Package_gallwwwback.mk similarity index 85% rename from extras/Zip_gallwwwback.mk rename to extras/Package_gallwwwback.mk index 3507272..c842431 100644 --- a/extras/Zip_gallwwwback.mk +++ b/extras/Package_gallwwwback.mk @@ -7,9 +7,11 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_Zip_Zip,gallwwwback,$(SRCDIR)/extras/source/gallery/www-back)) +$(eval $(call gb_Package_Package,extras_gallwwwback,$(SRCDIR)/extras/source/gallery/www-back)) -$(eval $(call gb_Zip_add_files,gallwwwback,\ +$(eval $(call gb_Package_set_outdir,extras_gallwwwback,$(INSTDIR))) + +$(eval $(call gb_Package_add_files,extras_gallwwwback,share/gallery/www-back,\ aqua.jpg \ bathroom.jpg \ blocks.jpg \ diff --git a/extras/Zip_gallwwwgraf.mk b/extras/Package_gallwwwgraf.mk similarity index 87% rename from extras/Zip_gallwwwgraf.mk rename to extras/Package_gallwwwgraf.mk index 488e180..7285592 100644 --- a/extras/Zip_gallwwwgraf.mk +++ b/extras/Package_gallwwwgraf.mk @@ -7,9 +7,11 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_Zip_Zip,gallwwwgraf,$(SRCDIR)/extras/source/gallery/www-graf)) +$(eval $(call gb_Package_Package,extras_gallwwwgraf,$(SRCDIR)/extras/source/gallery/www-graf)) -$(eval $(call gb_Zip_add_files,gallwwwgraf,\ +$(eval $(call gb_Package_set_outdir,extras_gallwwwgraf,$(INSTDIR))) + +$(eval $(call gb_Package_add_files,extras_gallwwwgraf,share/gallery/www-graf,\ bluat.gif \ bluback.gif \ bludisk.gif \ diff --git a/scp2/source/ooo/file_extra_ooo.scp b/scp2/source/ooo/file_extra_ooo.scp index bb33bd2..2d702b6 100644 --- a/scp2/source/ooo/file_extra_ooo.scp +++ b/scp2/source/ooo/file_extra_ooo.scp @@ -242,53 +242,60 @@ #endif File gid_File_Extra_Gallbullets - Dir = gid_Dir_Gallery_Bullets; - ARCHIVE_TXT_FILE_BODY; - Name = "gallbullets.zip"; + Dir = FILELIST_DIR; + TXT_FILE_BODY; + Styles = (FILELIST) + Name = "extras_gallbullets.filelist"; End File gid_File_Extra_Gallhtmlexpo - Dir = gid_Dir_Gallery_Htmlexpo; - ARCHIVE_TXT_FILE_BODY; - Name = "gallhtmlexpo.zip"; + Dir = FILELIST_DIR; + TXT_FILE_BODY; + Styles = (FILELIST) + Name = "extras_gallhtmlexpo.filelist"; End File gid_File_Extra_Gallroot - Dir = gid_Dir_Gallery; - ARCHIVE_TXT_FILE_BODY; - Name = "gallroot.zip"; + Dir = FILELIST_DIR; + TXT_FILE_BODY; + Styles = (FILELIST) + Name = "extras_gallroot.filelist"; End File gid_File_Extra_Gallsound - Dir = gid_Dir_User_Gallery; + Dir = FILELIST_DIR; USER_FILE_BODY; - Styles = (ARCHIVE, WORKSTATION, DONT_OVERWRITE); - Name = "gallsound.zip"; + Styles = (FILELIST, WORKSTATION, DONT_OVERWRITE); + Name = "extras_gallsound.filelist"; End File gid_File_Extra_Gallsounds - Dir = gid_Dir_Gallery_Sounds; - ARCHIVE_TXT_FILE_BODY; - Name = "gallsounds.zip"; + Dir = FILELIST_DIR; + TXT_FILE_BODY; + Styles = (FILELIST) + Name = "extras_gallsounds.filelist"; End File gid_File_Extra_Gallsystem - Dir = gid_Dir_Gallery; - ARCHIVE_TXT_FILE_BODY; - Name = "gallsystem.zip"; + Dir = FILELIST_DIR; + TXT_FILE_BODY; + Styles = (FILELIST) + Name = "extras_gallsystem.filelist"; Patchfiles = (); End File gid_File_Extra_Gallwwwback - Dir = gid_Dir_Gallery_Wwwback; - ARCHIVE_TXT_FILE_BODY; - Name = "gallwwwback.zip"; + Dir = FILELIST_DIR; + TXT_FILE_BODY; + Styles = (FILELIST) + Name = "extras_gallwwwback.filelist"; End File gid_File_Extra_Gallwwwgraf - Dir = gid_Dir_Gallery_Wwwgraf; - ARCHIVE_TXT_FILE_BODY; - Name = "gallwwwgraf.zip"; + Dir = FILELIST_DIR; + TXT_FILE_BODY; + Styles = (FILELIST) + Name = "extras_gallwwwgraf.filelist"; End File gid_File_Extra_Index_Pl -- To view, visit https://gerrit.libreoffice.org/3382 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic326d83ad69968a4871518065277e863eb8815a8 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Julien Nabet <serval2...@yahoo.fr> _______________________________________________ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice