Bug 1800722: Let harfbuzz be vendored by moz.yaml harfbuzz r=jfkthame

This obsoletes update.sh so you now call
./mach vendor gfx/harfbuzz/moz.yaml

It is set to track new tags.

Differential Revision: https://phabricator.services.mozilla.com/D162145
This commit is contained in:
Tom Ritter 2022-11-21 15:27:50 +00:00
parent dc8db985d0
commit 809394580a
3 changed files with 31 additions and 51 deletions

View File

@ -1,17 +0,0 @@
This directory contains the HarfBuzz source from the upstream repo:
https://github.com/harfbuzz/harfbuzz
Current version: 5.3.1 [commit 970321db7bddbe8c579b73751fc655a924ea3ce6]
UPDATING:
Our in-tree copy of HarfBuzz does not depend on any generated files from the
upstream build system. Therefore, it should be sufficient to simply overwrite
the in-tree files one the updated ones from upstream to perform updates.
To simplify this, the in-tree copy can be updated by running
sh update.sh
from within the gfx/harfbuzz directory.
If the collection of source files changes, manual updates to moz.build may be
needed as we don't use the upstream makefiles.

View File

@ -20,11 +20,11 @@ origin:
# Human-readable identifier for this version/release
# Generally "version NNN", "tag SSS", "bookmark SSS"
release: 5.3.1 [commit 970321db7bddbe8c579b73751fc655a924ea3ce6]
release: 5.3.1 (2022-10-19T22:06:46+02:00).
# Revision to pull in
# Must be a long or short commit SHA (long preferred)
revision: 970321db7bddbe8c579b73751fc655a924ea3ce6
revision: 5.3.1
# The package's license, where possible using the mnemonic from
# https://spdx.org/licenses/
@ -32,3 +32,32 @@ origin:
# A "LICENSE" file must exist containing the full license text
license: MIT
license-file: COPYING
notes: >
To test the upstream's main branch tip, one can
run `./mach vendor --revision tip gfx/harfbuzz/moz.yaml`
vendoring:
url: https://github.com/harfbuzz/harfbuzz
source-hosting: github
tracking: tag
include:
- AUTHORS
- autogen.sh
- configure.ac
- COPYING
- git.mk
- harfbuzz.doap
- Makefile.am
- NEWS
- README.md
- src
- THANKS
exclude:
- "**"
- "**/.*"
- ".*"
- ".*/**"
- src/hb-ucdn

View File

@ -1,32 +0,0 @@
#!/bin/sh
# Script to update the mozilla in-tree copy of the HarfBuzz library.
# Run this within the /gfx/harfbuzz directory of the source tree.
MY_TEMP_DIR=`mktemp -d -t harfbuzz_update.XXXXXX` || exit 1
VERSION=5.3.1
git clone https://github.com/harfbuzz/harfbuzz ${MY_TEMP_DIR}/harfbuzz
git -C ${MY_TEMP_DIR}/harfbuzz checkout ${VERSION}
COMMIT=$(git -C ${MY_TEMP_DIR}/harfbuzz rev-parse HEAD)
perl -p -i -e "s/(\d+\.)(\d+\.)(\d+)/${VERSION}/" README-mozilla;
perl -p -i -e "s/\[commit [0-9a-f]{40}\]/[commit ${COMMIT}]/" README-mozilla;
FILES="AUTHORS autogen.sh configure.ac COPYING git.mk harfbuzz.doap Makefile.am NEWS README.md src THANKS"
for f in $FILES; do
rm -rf $f
mv ${MY_TEMP_DIR}/harfbuzz/$f $f
done
rm -rf src/hb-ucdn
rm -rf ${MY_TEMP_DIR}
hg revert -r . src/moz.build
hg addremove
echo "###"
echo "### Updated HarfBuzz to $COMMIT."
echo "### Remember to verify and commit the changes to source control!"
echo "###"