Bug 1332797 - Adjust update.sh to work against tip double-conversion. r=froydnj
authorJeff Walden <jwalden@mit.edu>
Mon, 23 Jan 2017 15:13:21 -0800
changeset 331733 3862719c38c5af9014b317d38aea5ae9981d4634
parent 331732 89b895c219f2b97fc0ded8877b30c337e697bdaa
child 331734 95241d9562211604b5b55c16fcd2db10947e837c
push id86340
push userjwalden@mit.edu
push dateTue, 31 Jan 2017 00:13:34 +0000
treeherdermozilla-inbound@def2e655ff13 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersfroydnj
bugs1332797
milestone54.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1332797 - Adjust update.sh to work against tip double-conversion. r=froydnj
mfbt/double-conversion/update.sh
--- a/mfbt/double-conversion/update.sh
+++ b/mfbt/double-conversion/update.sh
@@ -1,26 +1,24 @@
 # Usage: ./update.sh [<git-rev-to-use>]
 #
 # Copies the needed files from a directory containing the original
 # double-conversion source that we need.  If no revision is specified, the tip
 # revision is used.
 
-# This was last updated with git rev 04cae7a8d5ef3d62ceffb03cdc3d38f258457a52.
+# This was last updated with git rev d8d4e668ee1e6e10b728f0671a89b07d7c4d45be.
 
 set -e
 
 LOCAL_PATCHES=""
 
 LOCAL_PATCHES="$LOCAL_PATCHES add-mfbt-api-markers.patch"
 LOCAL_PATCHES="$LOCAL_PATCHES use-StandardInteger.patch"
 LOCAL_PATCHES="$LOCAL_PATCHES use-mozilla-assertions.patch"
-LOCAL_PATCHES="$LOCAL_PATCHES use-static_assert.patch"
 LOCAL_PATCHES="$LOCAL_PATCHES ToPrecision-exponential.patch"
-LOCAL_PATCHES="$LOCAL_PATCHES fix-Wshadow-issues.patch"
 
 TMPDIR=`mktemp --directory`
 LOCAL_CLONE="$TMPDIR/double-conversion"
 
 git clone https://github.com/google/double-conversion.git "$LOCAL_CLONE"
 
 REV=""
 
@@ -30,25 +28,25 @@ fi
 
 # First clear out everything already present.
 DEST=./source
 rm -rf "$DEST"
 mkdir "$DEST"
 
 # Copy over critical files.
 cp "$LOCAL_CLONE/LICENSE" "$DEST/"
-cp "$LOCAL_CLONE/README" "$DEST/"
+cp "$LOCAL_CLONE/README.md" "$DEST/"
 
 # Includes
-for header in "$LOCAL_CLONE/src/"*.h; do
+for header in "$LOCAL_CLONE/double-conversion/"*.h; do
   cp "$header" "$DEST/"
 done
 
 # Source
-for ccfile in "$LOCAL_CLONE/src/"*.cc; do
+for ccfile in "$LOCAL_CLONE/double-conversion/"*.cc; do
   cp "$ccfile" "$DEST/"
 done
 
 # Now apply our local patches.
 for patch in $LOCAL_PATCHES; do
   patch --directory "$DEST" --strip 4 < "$patch"
 done