Stephan Bergmann
afe00aba4e
One of my builds using make-4.4-3.fc38.x86_64 started to consistently fail now with > [ZIP] autotext/user/mytexts.bau > S=... && I=$S/instdir && W=$S/workdir && cd $W/CustomTarget/extras/source/autotext/user/mytexts/ && zip -q0X --filesync --must-match $W/CustomTarget/extras/source/autotext/user/mytexts.bau mimetype && zip -qrX --must-match $W/CustomTarget/extras/source/autotext/user/mytexts.bau > > zip error: Nothing to do! (.../workdir/CustomTarget/extras/source/autotext/user/mytexts.bau) > make: *** [.../extras/CustomTarget_autotextshare.mk:3668: .../workdir/CustomTarget/extras/source/autotext/user/mytexts.bau] Error 12 > make: *** Deleting file '.../workdir/CustomTarget/extras/source/autotext/user/mytexts.bau' It turned out that this didn't use the expected > $(call gb_CustomTarget_get_workdir,extras/source/autotext/user)/%.bau rule in extras/CustomTarget_autotextuser.mk (with a stem of "mytexts"), but rather the > $(call gb_CustomTarget_get_workdir,extras/source/autotext)/%.bau rule in extras/CustomTarget_autotextshare.mk (with a stem of "user/mytexts"). But in that mismatched rule the part > $(call extras_AUTOTEXTSHARE_XMLFILES_RELATIVE,$*) then expanded to nothing, calling zip with an empty list of files, which makes zip fail. No idea why this apparently worked reliably in the past, and why it started to fail for just this one build scenario of mine (it still worked for other builds also using make-4.4-3.fc38.x86_64 now). Change-Id: I643fb0835313cacca5b64416006a3573e559ae78 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148946 Tested-by: Jenkins Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Extra Modules
Contains templates, clipart galleries, palettes, symbol font, autocorrections, autotexts etc.
-
How-to add a new gallery:
- create a directory
extras/source/gallery/foo/ - create a
.strfileextras/source/gallery/foo/foo.str - add a
foosection toextras/source/gallery/share/gallery_names.ulf - add a
Gallery_foo.mkat the top-level (and mention inModule_extra.mk) - add a new
GALLERY_FILELISTstatement inscp2/
- create a directory
-
How-to add a new autotext category
- create a directory
extras/source/autotext/lang/xx/foo/wherexxis your lang code.xxmust exactly fit with an UI lang code. - unzip your
foo.bauautotext file in this directory (excluding an empty mimetype file) - add
xx/foo.bauinextras/AllLangPackage_autotextshare.mk - in
extras/CustomTarget_autotextshare.mk:- add all files contained in
foo.bau(except mimetype) inextras_AUTOTEXTSHARE_XMLFILES
- add all files contained in
- create a directory
-
How-to add a new autotext to an existing category
- create a directory
extras/source/autotext/lang/xx/standard/FOO/to add it in category standard of langxx - add files of the autotext (at least
FOO.xmlfor an unformatted autotext) - add autotext name in
extras/source/autotext/lang/xx/standard/BlockList.xml - add all files of autotext in
extras/source/autotext/lang/xx/standard/META-INF/manifest.xml - in
extras/CustomTarget_autotextshare.mk:- add all files of autotext in
extras_AUTOTEXTSHARE_XMLFILES
- add all files of autotext in
- create a directory
-
How-to add a new template category
- add long category name in TEMPLATE_LONG_NAMES_ARY in sfx2/inc/doctempl.hrc
- add short category name in TEMPLATE_SHORT_NAMES_ARY in sfx2/source/doc/doctemplates.cxx
-
How-to add a new template to an existing category
- clean-up template file as indicated on wiki https://wiki.documentfoundation.org/Documentation/HowTo/Impress/Make_template_language_independent
- recommendation for settings.xml are given on wiki https://wiki.documentfoundation.org/Documentation/CompatibilityFlags#Settings_to_include_in_a_new_template
- add
<dc:title>Foo</dc:title>inmeta.xmlto make presentation name translatable - choose a template category
<Category> - unzip
Foo.ot?(? = p, t, s or g) inextras/source/templates/<Category>/Foo(no space allowed in any file names) - add
<Category>/Foo.ot? /inPackage_templates.mk(orPackage_tplpresnt.mkif it's a presentation) - in
template_files.mk:- add e.g.
<Category>/Foo/settings.xml(and all other files which are not automatically added) toextra_files_COMMON(orextra_files_PRESENTATIONSin case of a presentation template)
- add e.g.
- for translation of template name
- define a new STR_TEMPLATE_NAMExx in include/sfx2/strings.hrc
- define a new STR_TEMPLATE_NAMExx_DEF in sfx2/inc/strings.hxx
- in sfx2/source/doc/doctempl.cxx
- add STR_TEMPLATE_NAMExx_DEF to aTemplateNames
- add STR_TEMPLATE_NAMExx to STR_TEMPLATE_NAME