diff options
-rw-r--r-- | extras/Module_extras.mk | 16 | ||||
-rw-r--r-- | extras/Package_tpllayoutimpr.mk (renamed from extras/Zip_tpllayoutimpr.mk) | 6 | ||||
-rw-r--r-- | extras/Package_tplwizagenda.mk (renamed from extras/Zip_tplwizagenda.mk) | 6 | ||||
-rw-r--r-- | extras/Package_tplwizbitmap.mk (renamed from extras/Zip_tplwizbitmap.mk) | 6 | ||||
-rw-r--r-- | extras/Package_tplwizdesktop.mk (renamed from extras/Zip_tplwizdesktop.mk) | 6 | ||||
-rw-r--r-- | extras/Package_tplwizfax.mk (renamed from extras/Zip_tplwizfax.mk) | 6 | ||||
-rw-r--r-- | extras/Package_tplwizletter.mk (renamed from extras/Zip_tplwizletter.mk) | 6 | ||||
-rw-r--r-- | extras/Package_tplwizreport.mk (renamed from extras/Zip_tplwizreport.mk) | 6 | ||||
-rw-r--r-- | extras/Package_tplwizstyles.mk (renamed from extras/Zip_tplwizstyles.mk) | 6 | ||||
-rw-r--r-- | scp2/source/ooo/file_extra_ooo.scp | 55 |
10 files changed, 71 insertions, 48 deletions
diff --git a/extras/Module_extras.mk b/extras/Module_extras.mk index 348b62db8587..77223c3316cf 100644 --- a/extras/Module_extras.mk +++ b/extras/Module_extras.mk @@ -33,15 +33,15 @@ $(eval $(call gb_Module_add_targets,extras,\ Package_labels \ Package_newfiles \ Package_palettes \ + Package_tpllayoutimpr \ + Package_tplwizagenda \ + Package_tplwizbitmap \ + Package_tplwizdesktop \ + Package_tplwizfax \ + Package_tplwizletter \ + Package_tplwizreport \ + Package_tplwizstyles \ Package_wordbook \ - Zip_tpllayoutimpr \ - Zip_tplwizagenda \ - Zip_tplwizbitmap \ - Zip_tplwizdesktop \ - Zip_tplwizfax \ - Zip_tplwizletter \ - Zip_tplwizreport \ - Zip_tplwizstyles \ )) ifeq ($(WITH_EXTRA_EXTENSIONS),YES) diff --git a/extras/Zip_tpllayoutimpr.mk b/extras/Package_tpllayoutimpr.mk index c93fda42a158..b0664fd42c80 100644 --- a/extras/Zip_tpllayoutimpr.mk +++ b/extras/Package_tpllayoutimpr.mk @@ -7,9 +7,11 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_Zip_Zip,tpllayoutimpr,$(SRCDIR)/extras/source/templates/layout)) +$(eval $(call gb_Package_Package,extras_tpllayoutimpr,$(SRCDIR)/extras/source/templates/layout)) -$(eval $(call gb_Zip_add_files,tpllayoutimpr,\ +$(eval $(call gb_Package_set_outdir,extras_tpllayoutimpr,$(INSTDIR))) + +$(eval $(call gb_Package_add_files,extras_tpllayoutimpr,share/template/common/layout,\ AbstractGreen.otp \ AbstractRed.otp \ AbstractYellow.otp \ diff --git a/extras/Zip_tplwizagenda.mk b/extras/Package_tplwizagenda.mk index 8a368b811f21..d24a0da577a1 100644 --- a/extras/Zip_tplwizagenda.mk +++ b/extras/Package_tplwizagenda.mk @@ -7,9 +7,11 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_Zip_Zip,tplwizagenda,$(SRCDIR)/extras/source/templates/wizard/agenda)) +$(eval $(call gb_Package_Package,extras_tplwizagenda,$(SRCDIR)/extras/source/templates/wizard/agenda)) -$(eval $(call gb_Zip_add_files,tplwizagenda,\ +$(eval $(call gb_Package_set_outdir,extras_tplwizagenda,$(INSTDIR))) + +$(eval $(call gb_Package_add_files,extras_tplwizagenda,share/template/common/wizard/agenda,\ 10grey.ott \ 1simple.ott \ 2elegant.ott \ diff --git a/extras/Zip_tplwizbitmap.mk b/extras/Package_tplwizbitmap.mk index c63f1623100c..5213c87d096f 100644 --- a/extras/Zip_tplwizbitmap.mk +++ b/extras/Package_tplwizbitmap.mk @@ -7,9 +7,11 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_Zip_Zip,tplwizbitmap,$(SRCDIR)/extras/source/templates/wizard/bitmap)) +$(eval $(call gb_Package_Package,extras_tplwizbitmap,$(SRCDIR)/extras/source/templates/wizard/bitmap)) -$(eval $(call gb_Zip_add_files,tplwizbitmap,\ +$(eval $(call gb_Package_set_outdir,extras_tplwizbitmap,$(INSTDIR))) + +$(eval $(call gb_Package_add_files,extras_tplwizbitmap,share/template/wizard/bitmap,\ cancel_down.bmp \ cancel_up.bmp \ down.bmp \ diff --git a/extras/Zip_tplwizdesktop.mk b/extras/Package_tplwizdesktop.mk index d2fce5ddb438..4cf72de1cd0c 100644 --- a/extras/Zip_tplwizdesktop.mk +++ b/extras/Package_tplwizdesktop.mk @@ -7,9 +7,11 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_Zip_Zip,tplwizdesktop,$(SRCDIR)/extras/source/templates/wizard/desktop)) +$(eval $(call gb_Package_Package,extras_tplwizdesktop,$(SRCDIR)/extras/source/templates/wizard/desktop)) -$(eval $(call gb_Zip_add_files,tplwizdesktop,\ +$(eval $(call gb_Package_set_outdir,extras_tplwizdesktop,$(INSTDIR))) + +$(eval $(call gb_Package_add_files,tplwizdesktop,share/template/common/internal,\ html.stw \ idxexample.odt \ )) diff --git a/extras/Zip_tplwizfax.mk b/extras/Package_tplwizfax.mk index 119c68800f69..5076ee9bc606 100644 --- a/extras/Zip_tplwizfax.mk +++ b/extras/Package_tplwizfax.mk @@ -7,9 +7,11 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_Zip_Zip,tplwizfax,$(SRCDIR)/extras/source/templates/wizard/fax)) +$(eval $(call gb_Package_Package,extras_tplwizfax,$(SRCDIR)/extras/source/templates/wizard/fax)) -$(eval $(call gb_Zip_add_files,tplwizfax,\ +$(eval $(call gb_Package_set_outdir,extras_tplwizfax,$(INSTDIR))) + +$(eval $(call gb_Package_add_files,extras_tplwizfax,share/template/common/wizard/fax,\ bus-classic_f.ott \ bus-classic-pri_f.ott \ bus-modern_f.ott \ diff --git a/extras/Zip_tplwizletter.mk b/extras/Package_tplwizletter.mk index c1e1c3bd2e5e..0705475cd2fe 100644 --- a/extras/Zip_tplwizletter.mk +++ b/extras/Package_tplwizletter.mk @@ -7,9 +7,11 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_Zip_Zip,tplwizletter,$(SRCDIR)/extras/source/templates/wizard/letter)) +$(eval $(call gb_Package_Package,extras_tplwizletter,$(SRCDIR)/extras/source/templates/wizard/letter)) -$(eval $(call gb_Zip_add_files,tplwizletter,\ +$(eval $(call gb_Package_set_outdir,extras_tplwizletter,$(INSTDIR))) + +$(eval $(call gb_Package_add_files,extras_tplwizletter,share/template/common/wizard/letter,\ bus-elegant_l.ott \ bus-modern_l.ott \ bus-office_l.ott \ diff --git a/extras/Zip_tplwizreport.mk b/extras/Package_tplwizreport.mk index f29404b53864..3ec042ecc4c7 100644 --- a/extras/Zip_tplwizreport.mk +++ b/extras/Package_tplwizreport.mk @@ -7,9 +7,11 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_Zip_Zip,tplwizreport,$(SRCDIR)/extras/source/templates/wizard/report)) +$(eval $(call gb_Package_Package,extras_tplwizreport,$(SRCDIR)/extras/source/templates/wizard/report)) -$(eval $(call gb_Zip_add_files,tplwizreport,\ +$(eval $(call gb_Package_set_outdir,extras_tplwizreport,$(INSTDIR))) + +$(eval $(call gb_Package_add_files,extras_tplwizreport,share/template/common/wizard/report,\ cnt-011.ott \ cnt-012.ott \ cnt-01.ott \ diff --git a/extras/Zip_tplwizstyles.mk b/extras/Package_tplwizstyles.mk index 14054af5bf8c..1c9a70e870fe 100644 --- a/extras/Zip_tplwizstyles.mk +++ b/extras/Package_tplwizstyles.mk @@ -7,9 +7,11 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_Zip_Zip,tplwizstyles,$(SRCDIR)/extras/source/templates/wizard/styles)) +$(eval $(call gb_Package_Package,extras_tplwizstyles,$(SRCDIR)/extras/source/templates/wizard/styles)) -$(eval $(call gb_Zip_add_files,tplwizstyles,\ +$(eval $(call gb_Package_set_outdir,extras_tplwizstyles,$(INSTDIR))) + +$(eval $(call gb_Package_add_files,extras_tplwizstyles,share/template/common/wizard/styles,\ blackberry.ots \ black_white.ots \ default.ots \ diff --git a/scp2/source/ooo/file_extra_ooo.scp b/scp2/source/ooo/file_extra_ooo.scp index e7795241d51f..7809daba47c5 100644 --- a/scp2/source/ooo/file_extra_ooo.scp +++ b/scp2/source/ooo/file_extra_ooo.scp @@ -349,52 +349,59 @@ File gid_File_Extra_Show_Pl End File gid_File_Extra_Tpllayoutimpr - Dir = gid_Dir_Template_Common_Layout; - ARCHIVE_TXT_FILE_BODY; - Name = "tpllayoutimpr.zip"; + Dir = FILELIST_DIR; + TXT_FILE_BODY; + Styles = (FILELIST); + Name = "extras_tpllayoutimpr.filelist"; End File gid_File_Extra_Tplwizbitmap - Dir = gid_Dir_Share_Template_Wizard_Bitmap; - ARCHIVE_TXT_FILE_BODY; - Name = "tplwizbitmap.zip"; + Dir = FILELIST_DIR; + TXT_FILE_BODY; + Styles = (FILELIST); + Name = "extras_tplwizbitmap.filelist"; End File gid_File_Extra_Tplwizdesktop - Dir = gid_Dir_Template_Common_Internal; + Dir = FILELIST_DIR; TXT_FILE_BODY; - Styles = (ARCHIVE, DONT_OVERWRITE); - Name = "tplwizdesktop.zip"; + Styles = (FILELIST, DONT_OVERWRITE); + Name = "extras_tplwizdesktop.filelist"; End File gid_File_Extra_Tplwizletter - Dir = gid_Dir_Share_Template_Common_Wizard_Letter; - ARCHIVE_TXT_FILE_BODY; - Name = "tplwizletter.zip"; + Dir = FILELIST_DIR; + TXT_FILE_BODY; + Styles = (FILELIST); + Name = "extras_tplwizletter.filelist"; End File gid_File_Extra_Tplwizfax - Dir = gid_Dir_Share_Template_Common_Wizard_Fax; - ARCHIVE_TXT_FILE_BODY; - Name = "tplwizfax.zip"; + Dir = FILELIST_DIR; + TXT_FILE_BODY; + Styles = (FILELIST); + Name = "extras_tplwizfax.filelist"; End File gid_File_Extra_Tplwizagenda - Dir = gid_Dir_Share_Template_Common_Wizard_Agenda; - ARCHIVE_TXT_FILE_BODY; - Name = "tplwizagenda.zip"; + Dir = FILELIST_DIR; + TXT_FILE_BODY; + Styles = (FILELIST); + Name = "extras_tplwizagenda.filelist"; End File gid_File_Extra_Tplwizreport - Dir = gid_Dir_Share_Template_Common_Wizard_Report; - ARCHIVE_TXT_FILE_BODY; - Name ="tplwizreport.zip"; + Dir = FILELIST_DIR; + TXT_FILE_BODY; + Styles = (FILELIST); + Name ="extras_tplwizreport.filelist"; End File gid_File_Extra_Tplwizstyles - Dir = gid_Dir_Share_Template_Common_Wizard_Styles; - ARCHIVE_TXT_FILE_BODY; - Name = tplwizstyles.zip; + Dir = FILELIST_DIR; + TXT_FILE_BODY; + Styles = (FILELIST); + Name = "extra_tplwizstyles.filelist"; End File gid_File_Extra_Webcast_Asp |