mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fdo#63197, Convert Zip_tpl*

Browse Source 
Change-Id: I0175c31865ca442ce57f688a642bbc7d726fab69
Reviewed-on: https://gerrit.libreoffice.org/3396
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
This commit is contained in:
Julien Nabet
2013-04-15 14:17:23 +02:00
committed by David Tardon
parent faaccdc269
commit 3c6b6ba5de
10 changed files with 71 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
extras/Module_extras.mk
View File

@@ -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)

6
extras/Zip_tpllayoutimpr.mk → extras/Package_tpllayoutimpr.mk
View File

@@ -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 \

6
extras/Zip_tplwizagenda.mk → extras/Package_tplwizagenda.mk
View File

@@ -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 \

6
extras/Zip_tplwizbitmap.mk → extras/Package_tplwizbitmap.mk
View File

@@ -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 \

6
extras/Zip_tplwizdesktop.mk → extras/Package_tplwizdesktop.mk
View File

@@ -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 \
))

6
extras/Zip_tplwizfax.mk → extras/Package_tplwizfax.mk
View File

@@ -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 \

6
extras/Zip_tplwizletter.mk → extras/Package_tplwizletter.mk
View File

@@ -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 \

6
extras/Zip_tplwizreport.mk → extras/Package_tplwizreport.mk
View File

@@ -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 \

6
extras/Zip_tplwizstyles.mk → extras/Package_tplwizstyles.mk
View File

@@ -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 \

55
scp2/source/ooo/file_extra_ooo.scp
View File

@@ -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