summaryrefslogtreecommitdiffstats
path: root/modules/brotli/update.sh
diff options
context:
space:
mode:
authorwolfbeast <mcwerewolf@wolfbeast.com>2019-11-14 09:07:29 +0100
committerwolfbeast <mcwerewolf@wolfbeast.com>2019-11-14 09:07:29 +0100
commit56de283899bc91f7110aba58a3ca174c10852683 (patch)
tree779e6501bbbe4f015509c423ab44f2f40ea97cc8 /modules/brotli/update.sh
parentce0dd36a78814c59950fde6c19413c1f7ea85ee1 (diff)
downloadUXP-56de283899bc91f7110aba58a3ca174c10852683.tar
UXP-56de283899bc91f7110aba58a3ca174c10852683.tar.gz
UXP-56de283899bc91f7110aba58a3ca174c10852683.tar.lz
UXP-56de283899bc91f7110aba58a3ca174c10852683.tar.xz
UXP-56de283899bc91f7110aba58a3ca174c10852683.zip
Issue #1288 - Part 1a: Update brotli to 1.0.7
This also reorganizes the exports in the build system to use `brotli/` as include directory.
Diffstat (limited to 'modules/brotli/update.sh')
-rwxr-xr-xmodules/brotli/update.sh18
1 files changed, 11 insertions, 7 deletions
diff --git a/modules/brotli/update.sh b/modules/brotli/update.sh
index 285f7dd5d..4a98ce6a7 100755
--- a/modules/brotli/update.sh
+++ b/modules/brotli/update.sh
@@ -1,21 +1,25 @@
#!/bin/sh
-# Script to update the mozilla in-tree copy of the Brotli decompressor.
+# Script to update the mozilla in-tree copy of the Brotli library.
# Run this within the /modules/brotli directory of the source tree.
MY_TEMP_DIR=`mktemp -d -t brotli_update.XXXXXX` || exit 1
git clone https://github.com/google/brotli ${MY_TEMP_DIR}/brotli
+git -C ${MY_TEMP_DIR}/brotli checkout v1.0.7
-COMMIT=`(cd ${MY_TEMP_DIR}/brotli && git log | head -n 1)`
-perl -p -i -e "s/\[commit [0-9a-f]{40}\]/[${COMMIT}]/" README.mozilla;
+COMMIT=$(git -C ${MY_TEMP_DIR}/brotli rev-parse HEAD)
+perl -p -i -e "s/\[commit [0-9a-f]{40}\]/[commit ${COMMIT}]/" README.mozilla;
-rm -rf dec
-mv ${MY_TEMP_DIR}/brotli/dec dec
+DIRS="common dec enc include tools"
+
+for d in $DIRS; do
+ rm -rf $d
+ mv ${MY_TEMP_DIR}/brotli/c/$d $d
+done
rm -rf ${MY_TEMP_DIR}
-hg add dec
echo "###"
-echo "### Updated brotli/dec to $COMMIT."
+echo "### Updated brotli to $COMMIT."
echo "### Remember to verify and commit the changes to source control!"
echo "###"