for reproducible builds, the timestams of zip members must not depend on
checkout date or file creation dates, the metadata should be clear of
those effects.
Only timestamps are rewritten since we want custom order/storage options
for open document files / our make rules should already have
deterministic order (or that determinism is just one additional $(sort…)
call away)
Change-Id: I49341cf3252d5ef5c092508c789fd188f21dc8df
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/207142
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Tested-by: Jenkins
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>
…by a simple/static $(gb_CustomTarget_workdir)/foo
The build system has a lot of overly complicated leftovers from when it
was introduced and had not only deal with split repositories but also
had to coexist with another buildsystem. Along with lots of copy'n'paste
along the years the makefiles became hard to grasp for newcomers with
all our calls and evals.
As a first step to streamline that, the macros from TargetLocations that
simply prefix a static path to the argument (and similar of the same
kind) are a natural pick before simplifying the rules themselves/getting
rid of a bunch of eval statements.
Change-Id: Ia06dbbcd5d1994755a2ff05b84f72ccbc4e3cab5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167005
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
The multiple indirections/complex nested constructs don't really provide
any benefit here, they certainly don't make the makefile easier to read.
It was building the autotext .bau files for all languages, despite being
packaged only for the requested UI langauges (via AllLagPackage) and the
long list of autotext files was duplicated (even if all .bau files
should be built, the list could be reused from the other makefile)
Also remove the empty mimetype files and just touch them instead of
copying them.
The xml, mimetype and other files are now intermediates and are removed by
make once the .bau is built. (if that's not desired, they can be flagged as
.SECONDARY)
The list of individual files (3.6k lines) could also be cut down if
using e.g. make's wildcard function
Change-Id: I223a49d26d1de1435d62a68a04b3713278a8320c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129696
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
I kept this separate to simplify spotting errors.
There were about 130 unique md5sum hashes, and all were
roughly the same size. I spot checked a few with "meld"
and didn't see anything that seemed valuable.
find . -name meta.xml -exec rm {} \;
git grep -l \/meta.xml *.xml | xargs sed -i /\/meta.xml/d
git grep -l \/meta.xml ../CustomTarget_autotextshare.mk \
| xargs sed -i "/\/meta.xml/d"
Change-Id: Id11ec9973a8764ffbc809f9161868d6cacb80a85
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121606
Tested-by: Jenkins
Reviewed-by: Justin Luth <justin_luth@sil.org>
Reviewed-by: Laurent Balland-Poirier <laurent.balland-poirier@laposte.net>
I don't think that anyone wants their document settings adjusted
just by entering some autotext.
[Now, it didn't seem to be doing that because I suppose that since
the value already exists, the import won't overwrite it.]
find extras/source -name settings.xml | md5sum | sort
//shows only a few unique entries. Visual comparing with "Meld"
//didn't reveal any reason why the files are useful.
I also removed ./autotext/lang/bg/standard/FN/Obj0012D655/settings.xml
based on Laurent's advice, even though it contains
<config:config-item config:name="Formula" E=mc^2
Otherwise, the other 7 versions were almost identical, differening
only in OOo version .9, or 1.1 and show redline changes on/off.
cd exttras/source
find . -name settings.xml -exec rm {} \;
git grep -l \/settings.xml *.xml | xargs sed -i /\/settings.xml/d
git grep -l \/settings.xml ../CustomTarget_autotextshare.mk \
| xargs sed -i "/\/settings.xml/d"
Change-Id: I9c148bdff55e6757e6fa98401486bc7c41ebf25d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121605
Tested-by: Jenkins
Reviewed-by: Justin Luth <justin_luth@sil.org>
See instructions in solenv/gbuild/Trace.mk . This generates a file than
can be viewed e.g. in the Chromium tracing view.
Change-Id: I5f90647c58ca729375525b6daed2d4918adc8188
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88754
Tested-by: Jenkins
Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
Change lang code to AutoText to fit UI languages:
replace sr-CS, sr-ME, sr-RS and sr-Latn-CS, sr-Latn-ME, sr-Latn-RS
with sr and sr-Latn
Change-Id: I68b437c8a93c8ecf926d0169b3bee93145375e0b
Reviewed-on: https://gerrit.libreoffice.org/78805
Tested-by: Jenkins
Reviewed-by: Laurent BP <laurent.balland-poirier@laposte.net>
As no UI available in these languages, autotext were removed for:
ab af-ZA (af is used) an az en-AU ga-IE (ga is used) jv kl ky lb-LU (lb is used) nl-BE (nl is used) sah ti ur
Change-Id: If048baec9821dde3bbd60de202d6b8e0b188fc5d
Reviewed-on: https://gerrit.libreoffice.org/78839
Tested-by: Jenkins
Reviewed-by: Laurent BP <laurent.balland-poirier@laposte.net>
Christian Lohmaier