Commit 75f3d97f authored by Dominik Röttsches's avatar Dominik Röttsches Committed by Commit Bot

Roll src/third_party/harfbuzz-ng/src/ 574d888c8..e0307de81 (13 commits)

Also add new third_party/harfbuzz-ng/src/roll-harfbuzz.sh roll script.

https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git/+log/574d888c8a40..e0307de818ad

$ git log 574d888c8..e0307de81 --date=short --no-merges --format='%ad %ae %s'
2018-11-29 ebrahim [test][aat.kern] More (#1427)
2018-11-28 mbutterick update simple shaping example (closes #298)
2018-11-29 ebrahim [test][aat] Update expectency
2018-11-29 ebrahim [test] Add test for format2 kern (#1423)
2018-11-28 behdad [kerx] Fix Format2 index calc again
2018-11-28 behdad [kern] Fix kern table Format2 offsetToIndex
2018-11-28 behdad [kerx] Fix ClassTable implementation for 'kern' table Format 2
2018-11-28 behdad [aat] Towards adding two ClassTable's
2018-11-28 ebrahim [test][aat] Add a test and make macOS runners faster (#1422)
2018-11-27 behdad Comment
2018-11-20 adenilson.cavalcanti Optimize harfbuzz big integer conversions
2018-11-26 ebrahim [ci] Add .codecov.yml
2018-11-26 ebrahim [test][aat] Enable Tamil MN test (#1414)

Created with:
  roll-dep src/third_party/harfbuzz-ng/src
R=bashi@chromium.org,behdad@chromium.org,behdad@google.com,drott@chromium.org,eae@chromium.org,jshin@chromium.org

Bug: 909875
Change-Id: I89f631b6c2655e0b8777820a45b0018b89ab67fa
Reviewed-on: https://chromium-review.googlesource.com/c/1354451Reviewed-by: default avatarBen Wagner <bungeman@chromium.org>
Commit-Queue: Ben Wagner <bungeman@chromium.org>
Commit-Queue: Dominik Röttsches <drott@chromium.org>
Cr-Commit-Position: refs/heads/master@{#612201}
parent 9565c97b
...@@ -168,7 +168,7 @@ vars = { ...@@ -168,7 +168,7 @@ vars = {
# Three lines of non-changing comments so that # Three lines of non-changing comments so that
# the commit queue can handle CLs rolling HarfBuzz # the commit queue can handle CLs rolling HarfBuzz
# and whatever else without interference from each other. # and whatever else without interference from each other.
'harfbuzz_revision': '574d888c8a409295a952361a39c8e83a52a0fc3d', 'harfbuzz_revision': 'e0307de818ad1f70ef96938642bda61d7a62532a',
# Three lines of non-changing comments so that # Three lines of non-changing comments so that
# the commit queue can handle CLs rolling catapult # the commit queue can handle CLs rolling catapult
# and whatever else without interference from each other. # and whatever else without interference from each other.
......
Name: harfbuzz-ng Name: harfbuzz-ng
Short Name: harfbuzz-ng Short Name: harfbuzz-ng
URL: http://harfbuzz.org URL: http://harfbuzz.org
Version: 2.1.1 Version: 2.1.3-182
Date: 20181126 Date: 20181129
Revision: 574d888c8a409295a952361a39c8e83a52a0fc3d Revision: e0307de818ad1f70ef96938642bda61d7a62532a
Security Critical: yes Security Critical: yes
License: MIT License: MIT
License File: src/COPYING License File: src/COPYING
...@@ -12,18 +12,14 @@ Description: ...@@ -12,18 +12,14 @@ Description:
This is harfbuzz-ng, a new implementation of harfbuzz with a different This is harfbuzz-ng, a new implementation of harfbuzz with a different
API from the old one. API from the old one.
This copy of harfbuzz is updated by putting the new commit hash matching one in This copy of harfbuzz is usually updated by running
https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz/ to the $ third_party/harfbuzz-ng/roll-harfbuzz.sh
top level DEPS file. When upgrading, check in ther HarfBuzz repository whether from your Chromium ./src directory.
files have been added or removed in upstream and whether the BUILD.gn file needs
to be updated to reflect that or whether the files can be added to the exception
lis below.
Example: This should update your checkout by putting the new upstream HarfBuzz ToT commit
$ cd ~/dev/harfbuzz/ hash top level DEPS file. In cases added or deleted files have been detected in
$ git diff --diff-filter=A --stat 1.8.3..1.8.7 HarfBuzz' src directory, a step in the script will fail and you should edit the
BUILD.gn file accordingly and continue the roll manually.
Replace 1.8.3 and 1.8.7 with the respective revision hashes for your roll CL.
Chromium-local cherry picks or patches can be done by pushing new branches to Chromium-local cherry picks or patches can be done by pushing new branches to
refs/heads/chromium/ of [1]. The set of HarfBuzz OWNERS has write rights to this refs/heads/chromium/ of [1]. The set of HarfBuzz OWNERS has write rights to this
......
#!/bin/bash
rolldeps() {
STEP="roll-deps" &&
REVIEWERS=$(grep -E -v "^$|#" third_party/harfbuzz-ng/OWNERS | paste -s -d,) &&
roll-dep -r "${REVIEWERS}" --roll-to origin/upstream/master "$@" src/third_party/harfbuzz-ng/src/
}
updatereadme() {
STEP="update README.chromium" &&
HBVERSION=$(git -C third_party/harfbuzz-ng/src/ describe --long) &&
HBCOMMIT=$(git -C third_party/harfbuzz-ng/src/ rev-parse HEAD) &&
HBDATE=$(date "+%Y%m%d")
sed -i'' -e "s/^Version: .*\$/Version: ${HBVERSION%-*}/" third_party/harfbuzz-ng/README.chromium &&
sed -i'' -e "s/^Revision: .*\$/Revision: ${HBCOMMIT}/" third_party/harfbuzz-ng/README.chromium &&
sed -i'' -e "s/^Date: .*\$/Date: ${HBDATE}/" third_party/harfbuzz-ng/README.chromium &&
git add third_party/harfbuzz-ng/README.chromium
}
previousrev() {
STEP="original revision" &&
PREVIOUS_HARFBUZZ_REV=$(git grep "'harfbuzz_revision':" HEAD~1 -- DEPS | grep -Eho "[0-9a-fA-F]{32}")
}
check_added_deleted_files() {
STEP="Check for added or deleted files since last HarfBuzz revision" &&
previousrev &&
ADDED_FILES=$(git -C third_party/harfbuzz-ng/src/ diff --diff-filter=A --name-only ${PREVIOUS_HARFBUZZ_REV} -- src/ | paste -s -d,) &&
DELETED_FILES=$(git -C third_party/harfbuzz-ng/src/ diff --diff-filter=D --name-only ${PREVIOUS_HARFBUZZ_REV} -- src/ | paste -s -d,) &&
if [ -n "$ADDED_FILES" ]; then echo "Added files detected: " $ADDED_FILES; fi &&
if [ -n "$DELETED_FILES" ]; then echo "Deleted files detected" $DELETED_FILES; fi &&
if [ -n "$ADDED_FILES" ] || [ -n "$DELETED_FILES" ]; then echo -e "\nPlease update src/third_party/harfbuzz-ng/BUILD.gn before continuing."; fi
}
commit() {
STEP="commit" &&
git commit --quiet --amend --no-edit
}
rolldeps "$@" &&
updatereadme &&
check_added_deleted_files &&
commit ||
{ echo "Failed step ${STEP}"; exit 1; }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment