Bug 1844554 - Vendor double-conversion using mach vendor r=RyanVM

Differential Revision: https://phabricator.services.mozilla.com/D184091
This commit is contained in:
serge-sans-paille 2023-07-21 08:12:09 +00:00
parent 7d42b11c48
commit 4cb35b98e0
8 changed files with 66 additions and 99 deletions

View File

@ -1,5 +0,0 @@
commit 4f7a25d8ced8c7cf6eee6fd09d6788eaa23c9afe
Author: Florian Loitsch <florian@loitsch.com>
Date: Thu May 18 14:20:37 2023 +0200
Prepare v3.2.0 release. (#196)

View File

@ -1,6 +1,6 @@
diff --git a/mfbt/double-conversion/double-conversion/double-to-string.h b/mfbt/double-conversion/double-conversion/double-to-string.h
--- a/mfbt/double-conversion/double-conversion/double-to-string.h
+++ b/mfbt/double-conversion/double-conversion/double-to-string.h
diff --git a/double-conversion/double-to-string.h b/double-conversion/double-to-string.h
--- a/double-conversion/double-to-string.h
+++ b/double-conversion/double-to-string.h
@@ -23,16 +23,17 @@
// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
@ -145,9 +145,9 @@ diff --git a/mfbt/double-conversion/double-conversion/double-to-string.h b/mfbt/
const int flags_;
const char* const infinity_symbol_;
const char* const nan_symbol_;
diff --git a/mfbt/double-conversion/double-conversion/string-to-double.h b/mfbt/double-conversion/double-conversion/string-to-double.h
--- a/mfbt/double-conversion/double-conversion/string-to-double.h
+++ b/mfbt/double-conversion/double-conversion/string-to-double.h
diff --git a/double-conversion/string-to-double.h b/double-conversion/string-to-double.h
--- a/double-conversion/string-to-double.h
+++ b/double-conversion/string-to-double.h
@@ -23,16 +23,17 @@
// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

View File

@ -1,6 +1,6 @@
diff --git a/mfbt/double-conversion/double-conversion/strtod.cc b/mfbt/double-conversion/double-conversion/strtod.cc
--- a/mfbt/double-conversion/double-conversion/strtod.cc
+++ b/mfbt/double-conversion/double-conversion/strtod.cc
diff --git a/double-conversion/strtod.cc b/double-conversion/strtod.cc
--- a/double-conversion/strtod.cc
+++ b/double-conversion/strtod.cc
@@ -436,16 +436,17 @@ static bool ComputeGuess(Vector<const ch
return true;
}

View File

@ -0,0 +1,48 @@
schema: 1
bugzilla:
product: Core
component: "MFBT"
origin:
name: double-conversion
description: binary-decimal and decimal-binary routines for IEEE doubles
url: https://github.com/google/double-conversion
release: 4f7a25d8ced8c7cf6eee6fd09d6788eaa23c9afe (2023-05-18T12:20:37Z).
revision: 4f7a25d8ced8c7cf6eee6fd09d6788eaa23c9afe
license: BSD-3-Clause
license-file: LICENSE
vendoring:
url: https://github.com/google/double-conversion
source-hosting: github
tracking: commit
exclude:
- "*"
- "double-conversion/*"
- cmake
- msvc
- test
include:
- LICENSE
- README.md
- "double-conversion/*.h"
- "double-conversion/*.cc"
patches:
- add-mfbt-api-markers.patch
- use-mozilla-assertions.patch
- debug-only-functions.patch
- to-fixed-dbl-max.patch
update-actions:
- action: move-file
from: '{vendor_dir}/README.md'
to: '{vendor_dir}/double-conversion/README.md'
- action: delete-path
path: '{vendor_dir}/double-conversion/.gitignore'

View File

@ -1,6 +1,6 @@
diff --git a/mfbt/double-conversion/double-conversion/double-to-string.cc b/mfbt/double-conversion/double-conversion/double-to-string.cc
--- a/mfbt/double-conversion/double-conversion/double-to-string.cc
+++ b/mfbt/double-conversion/double-conversion/double-to-string.cc
diff --git a/double-conversion/double-to-string.cc b/double-conversion/double-to-string.cc
--- a/double-conversion/double-to-string.cc
+++ b/double-conversion/double-to-string.cc
@@ -207,25 +207,21 @@ bool DoubleToStringConverter::ToShortest
}
return true;
@ -27,9 +27,9 @@ diff --git a/mfbt/double-conversion/double-conversion/double-to-string.cc b/mfbt
const int kDecimalRepCapacity =
kMaxFixedDigitsBeforePoint + kMaxFixedDigitsAfterPoint + 1;
char decimal_rep[kDecimalRepCapacity];
diff --git a/mfbt/double-conversion/double-conversion/double-to-string.h b/mfbt/double-conversion/double-conversion/double-to-string.h
--- a/mfbt/double-conversion/double-conversion/double-to-string.h
+++ b/mfbt/double-conversion/double-conversion/double-to-string.h
diff --git a/double-conversion/double-to-string.h b/double-conversion/double-to-string.h
--- a/double-conversion/double-to-string.h
+++ b/double-conversion/double-to-string.h
@@ -33,17 +33,17 @@
namespace double_conversion {

View File

@ -1,76 +0,0 @@
#!/bin/bash
# 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. See GIT-INFO for the last revision used.
set -e
LOCAL_PATCHES=""
LOCAL_PATCHES="$LOCAL_PATCHES add-mfbt-api-markers.patch"
LOCAL_PATCHES="$LOCAL_PATCHES use-mozilla-assertions.patch"
LOCAL_PATCHES="$LOCAL_PATCHES debug-only-functions.patch"
LOCAL_PATCHES="$LOCAL_PATCHES to-fixed-dbl-max.patch"
TMPDIR=`mktemp -d`
LOCAL_CLONE="$TMPDIR/new-double-conversion"
git clone https://github.com/google/double-conversion.git "$LOCAL_CLONE"
# If a particular revision was requested, check it out.
if [ "$1" != "" ]; then
git -C "$LOCAL_CLONE" checkout "$1"
fi
# First clear out everything already present.
DEST=./double-conversion
mv "$DEST" "$TMPDIR"/old-double-conversion
mkdir "$DEST"
# Copy over critical files.
cp "$LOCAL_CLONE/LICENSE" "$DEST/"
cp "$LOCAL_CLONE/README.md" "$DEST/"
# Includes
for header in "$LOCAL_CLONE/double-conversion/"*.h; do
cp "$header" "$DEST/"
done
# Source
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"
# Out-of-date patches may spew *.{orig,rej} when applied. Report an error if
# any such file is found, and roll the source directory back to its previous
# state in such case.
detritus_files=`find "$DEST" -name '*.orig' -o -name '*.rej'`
if [ "$detritus_files" != "" ]; then
echo "ERROR: Local patch $patch created these detritus files when applied:"
echo ""
echo " $detritus_files"
echo ""
echo "Please fix $patch before running $0."
rm -rf "$DEST"
mv "$TMPDIR"/source "$DEST"
exit 1
fi
done
# Update Mercurial file status.
hg addremove "$DEST"
# Note the revision used in this update.
git -C "$LOCAL_CLONE" show -s > ./GIT-INFO
# Delete the tmpdir.
rm -rf "$TMPDIR"

View File

@ -1,6 +1,6 @@
diff --git a/mfbt/double-conversion/double-conversion/utils.h b/mfbt/double-conversion/double-conversion/utils.h
--- a/mfbt/double-conversion/double-conversion/utils.h
+++ b/mfbt/double-conversion/double-conversion/utils.h
diff --git a/double-conversion/utils.h b/double-conversion/utils.h
--- a/double-conversion/utils.h
+++ b/double-conversion/utils.h
@@ -36,27 +36,29 @@
// For pre-C++11 compatibility