From c3532457d457e868afb8506e047ab353f2651bc0 Mon Sep 17 00:00:00 2001 From: Tom Anderson Date: Tue, 19 Dec 2017 23:07:45 +0000 Subject: Fix use_system_freetype=true build when third_party/freetype is missing BUG=pdfium:733 R=thestig@chromium.org Change-Id: I6beab792c0b8cb0d0e4f5ea8c6e6c3138ccade5f Reviewed-on: https://pdfium-review.googlesource.com/21470 Commit-Queue: Lei Zhang Reviewed-by: Lei Zhang --- third_party/freetype/roll-freetype.sh | 33 ++++++++++++++++++++++++++------- 1 file changed, 26 insertions(+), 7 deletions(-) (limited to 'third_party/freetype/roll-freetype.sh') diff --git a/third_party/freetype/roll-freetype.sh b/third_party/freetype/roll-freetype.sh index 12c656de28..0930a64847 100755 --- a/third_party/freetype/roll-freetype.sh +++ b/third_party/freetype/roll-freetype.sh @@ -1,7 +1,26 @@ -REVIEWERS=`paste -s -d, third_party/freetype/OWNERS` && -roll-dep -r "${REVIEWERS}" "$@" pdfium/third_party/freetype/src/ && -FTVERSION=`git -C third_party/freetype/src/ describe --long` && -FTCOMMIT=`git -C third_party/freetype/src/ rev-parse HEAD` && -sed -i "s/^Version: .*\$/Version: ${FTVERSION%-*}/" third_party/freetype/README.pdfium && -sed -i "s/^Revision: .*\$/Revision: ${FTCOMMIT}/" third_party/freetype/README.pdfium && -git add third_party/freetype/README.pdfium && git commit --quiet --amend --no-edit +#!/bin/bash +# +# Copyright 2017 The PDFium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +set -e +set -o pipefail +set -u + +REVIEWERS=`paste -s -d, third_party/freetype/OWNERS` +roll-dep -r "${REVIEWERS}" "$@" pdfium/third_party/freetype/src/ +FTVERSION=`git -C third_party/freetype/src/ describe --long` +FTCOMMIT=`git -C third_party/freetype/src/ rev-parse HEAD` + +# Make sure our copy of pstables.h matches the one in freetype/src. +cmp third_party/freetype/src/src/psnames/pstables.h \ + third_party/freetype/include/pstables.h + +sed -i "s/^Version: .*\$/Version: ${FTVERSION%-*}/" \ + third_party/freetype/README.pdfium +sed -i "s/^Revision: .*\$/Revision: ${FTCOMMIT}/" \ + third_party/freetype/README.pdfium + +git add third_party/freetype/README.pdfium +git commit --quiet --amend --no-edit -- cgit v1.2.3