strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

for --without-templates still generate the template/common/presnt dir

Browse source 
but leave it empty

Change-Id: Ie7f95f6d01c669598305e24472c357c1b92ad1f5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/177353
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Rashesh Padia <rashesh.padia@collabora.com>
Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
(cherry picked from commit e393a739fa890aeb77f189b62de4356043211490)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/177392
Tested-by: Jenkins
This commit is contained in:
Caolán McNamara 2024-11-26 16:33:49 +00:00
parent 7dfa6d794d
commit 55baaa526c
3 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Repository.mk
View file

@ -981,10 +981,10 @@ $(eval $(call gb_Helper_register_packages_for_install,ooo,\
extras_persona_pink \ extras_persona_pink \
extras_persona_sand \ extras_persona_sand \
extras_persona_white \ extras_persona_white \
extras_tplpresnt \
extras_tplwizdesktop \ extras_tplwizdesktop \
$(if $(WITH_TEMPLATES),\ $(if $(WITH_TEMPLATES),\
extras_templates \ extras_templates \
extras_tplpresnt \
extras_tplwizbitmap \ extras_tplwizbitmap \
extras_tplwizard \ extras_tplwizard \
) \ ) \

2
extras/Module_extras.mk
View file

@ -32,6 +32,7 @@ $(eval $(call gb_Module_add_targets,extras,\
Package_labels \ Package_labels \
$(if $(filter WNT,$(OS)),Package_newfiles) \ $(if $(filter WNT,$(OS)),Package_newfiles) \
Package_palettes \ Package_palettes \
Package_tplpresnt \
Package_tplwizdesktop \ Package_tplwizdesktop \
Package_wordbook \ Package_wordbook \
)) ))
@ -51,7 +52,6 @@ endif
ifneq ($(WITH_TEMPLATES),) ifneq ($(WITH_TEMPLATES),)
$(eval $(call gb_Module_add_targets,extras,\ $(eval $(call gb_Module_add_targets,extras,\
Package_templates \ Package_templates \
Package_tplpresnt \
Package_tplwizard \ Package_tplwizard \
Package_tplwizbitmap \ Package_tplwizbitmap \
)) ))

9
extras/Package_tplpresnt.mk
View file

@ -9,6 +9,8 @@
$(eval $(call gb_Package_Package,extras_tplpresnt,$(gb_CustomTarget_workdir)/extras/source/templates/presnt)) $(eval $(call gb_Package_Package,extras_tplpresnt,$(gb_CustomTarget_workdir)/extras/source/templates/presnt))
ifneq ($(WITH_TEMPLATES),)
$(eval $(call gb_Package_add_files,extras_tplpresnt,$(LIBO_SHARE_FOLDER)/template/common/presnt,\ $(eval $(call gb_Package_add_files,extras_tplpresnt,$(LIBO_SHARE_FOLDER)/template/common/presnt,\
Candy.otp \ Candy.otp \
DNA.otp \ DNA.otp \
@ -35,4 +37,11 @@ $(eval $(call gb_Package_add_files,extras_tplpresnt,$(LIBO_SHARE_FOLDER)/templat
Yellow_Idea.otp \ Yellow_Idea.otp \
)) ))
else
# For without-templates, still include the empty directory
$(eval $(call gb_Package_add_empty_directory,extras_tplpresnt,$(LIBO_SHARE_FOLDER)/template/common/presnt))
endif
# vim: set noet sw=4 ts=4: # vim: set noet sw=4 ts=4: