From ec15fbf11207cdfb2781d138e0aa1b766b78d03e Mon Sep 17 00:00:00 2001 From: Jeff Walden Date: Mon, 23 Jan 2017 15:11:50 -0800 Subject: [PATCH] Bug 1332797 - Move mfbt/double-conversion source files into a new source/ subdirectory, to segregate upstream files from update.sh and our local patches. r=froydnj --- .clang-format-ignore | 2 +- mfbt/STYLE | 4 ++-- mfbt/decimal/moz-decimal-utils.h | 2 +- .../ToPrecision-exponential.patch | 12 +++++------ .../add-mfbt-api-markers.patch | 6 +++--- .../fix-Wshadow-issues.patch | 12 +++++------ mfbt/double-conversion/{ => source}/LICENSE | 0 mfbt/double-conversion/{ => source}/README | 0 .../{ => source}/bignum-dtoa.cc | 0 .../{ => source}/bignum-dtoa.h | 0 mfbt/double-conversion/{ => source}/bignum.cc | 0 mfbt/double-conversion/{ => source}/bignum.h | 0 .../{ => source}/cached-powers.cc | 0 .../{ => source}/cached-powers.h | 0 mfbt/double-conversion/{ => source}/diy-fp.cc | 0 mfbt/double-conversion/{ => source}/diy-fp.h | 0 .../{ => source}/double-conversion.cc | 0 .../{ => source}/double-conversion.h | 0 .../{ => source}/fast-dtoa.cc | 0 .../{ => source}/fast-dtoa.h | 0 .../{ => source}/fixed-dtoa.cc | 0 .../{ => source}/fixed-dtoa.h | 0 mfbt/double-conversion/{ => source}/ieee.h | 0 mfbt/double-conversion/{ => source}/strtod.cc | 0 mfbt/double-conversion/{ => source}/strtod.h | 0 mfbt/double-conversion/{ => source}/utils.h | 0 mfbt/double-conversion/update.sh | 21 ++++++++++--------- .../use-StandardInteger.patch | 6 +++--- .../use-mozilla-assertions.patch | 6 +++--- .../double-conversion/use-static_assert.patch | 6 +++--- mfbt/moz.build | 4 ++-- mfbt/objs.mozbuild | 16 +++++++------- tools/rewriting/ThirdPartyPaths.txt | 2 +- 33 files changed, 50 insertions(+), 49 deletions(-) rename mfbt/double-conversion/{ => source}/LICENSE (100%) rename mfbt/double-conversion/{ => source}/README (100%) rename mfbt/double-conversion/{ => source}/bignum-dtoa.cc (100%) rename mfbt/double-conversion/{ => source}/bignum-dtoa.h (100%) rename mfbt/double-conversion/{ => source}/bignum.cc (100%) rename mfbt/double-conversion/{ => source}/bignum.h (100%) rename mfbt/double-conversion/{ => source}/cached-powers.cc (100%) rename mfbt/double-conversion/{ => source}/cached-powers.h (100%) rename mfbt/double-conversion/{ => source}/diy-fp.cc (100%) rename mfbt/double-conversion/{ => source}/diy-fp.h (100%) rename mfbt/double-conversion/{ => source}/double-conversion.cc (100%) rename mfbt/double-conversion/{ => source}/double-conversion.h (100%) rename mfbt/double-conversion/{ => source}/fast-dtoa.cc (100%) rename mfbt/double-conversion/{ => source}/fast-dtoa.h (100%) rename mfbt/double-conversion/{ => source}/fixed-dtoa.cc (100%) rename mfbt/double-conversion/{ => source}/fixed-dtoa.h (100%) rename mfbt/double-conversion/{ => source}/ieee.h (100%) rename mfbt/double-conversion/{ => source}/strtod.cc (100%) rename mfbt/double-conversion/{ => source}/strtod.h (100%) rename mfbt/double-conversion/{ => source}/utils.h (100%) diff --git a/.clang-format-ignore b/.clang-format-ignore index a89a60c8fa047..16a1b73cbe911 100644 --- a/.clang-format-ignore +++ b/.clang-format-ignore @@ -51,7 +51,7 @@ ^media/webrtc/trunk/.* ^memory/jemalloc/src/.* ^mfbt/decimal/.* -^mfbt/double-conversion/.* +^mfbt/double-conversion/source/.* ^mfbt/lz4.* ^mobile/android/thirdparty/.* ^modules/brotli/.* diff --git a/mfbt/STYLE b/mfbt/STYLE index d16be6109a2ae..c0d62dffed6bc 100644 --- a/mfbt/STYLE +++ b/mfbt/STYLE @@ -7,5 +7,5 @@ MFBT uses standard Mozilla style, with the following exceptions. codebase. However, new files should follow standard Mozilla style and use an upper-case letter at the start of function names. -- Imported third-party code (such as decimal/*, double-conversion/*, and lz4*) - remains in its original style. +- Imported third-party code (such as decimal/*, double-conversion/source/*, and + lz4*) remains in its original style. diff --git a/mfbt/decimal/moz-decimal-utils.h b/mfbt/decimal/moz-decimal-utils.h index f2a9f4f07c50e..cd2289b6a36d0 100644 --- a/mfbt/decimal/moz-decimal-utils.h +++ b/mfbt/decimal/moz-decimal-utils.h @@ -10,7 +10,7 @@ // of Decimal.cpp under the Mozilla source without blink core dependencies. Do // not include it into any file other than Decimal.cpp. -#include "../double-conversion/double-conversion.h" +#include "../double-conversion/source/double-conversion.h" #include "mozilla/ArrayUtils.h" #include "mozilla/Casting.h" #include "mozilla/FloatingPoint.h" diff --git a/mfbt/double-conversion/ToPrecision-exponential.patch b/mfbt/double-conversion/ToPrecision-exponential.patch index 202b29b1ba3b6..01f7a4fad04a0 100644 --- a/mfbt/double-conversion/ToPrecision-exponential.patch +++ b/mfbt/double-conversion/ToPrecision-exponential.patch @@ -1,8 +1,8 @@ 1e7bf0c636b8cca54dd83456a0f8fa219343e2a1 Bug 608195 - part 2 - extend ToPrecision to tell use whether exponential notation was used -diff --git a/mfbt/double-conversion/double-conversion.cc b/mfbt/double-conversion/double-conversion.cc +diff --git a/mfbt/double-conversion/source/double-conversion.cc b/mfbt/double-conversion/source/double-conversion.cc index febba6c..394b6a0 100644 ---- a/mfbt/double-conversion/double-conversion.cc -+++ b/mfbt/double-conversion/double-conversion.cc +--- a/mfbt/double-conversion/source/double-conversion.cc ++++ b/mfbt/double-conversion/source/double-conversion.cc @@ -283,7 +283,9 @@ bool DoubleToStringConverter::ToExponential( bool DoubleToStringConverter::ToPrecision(double value, @@ -21,10 +21,10 @@ index febba6c..394b6a0 100644 CreateExponentialRepresentation(decimal_rep, precision, exponent, -diff --git a/mfbt/double-conversion/double-conversion.h b/mfbt/double-conversion/double-conversion.h +diff --git a/mfbt/double-conversion/source/double-conversion.h b/mfbt/double-conversion/source/double-conversion.h index 0900ba0..957575c 100644 ---- a/mfbt/double-conversion/double-conversion.h -+++ b/mfbt/double-conversion/double-conversion.h +--- a/mfbt/double-conversion/source/double-conversion.h ++++ b/mfbt/double-conversion/source/double-conversion.h @@ -270,6 +270,7 @@ class DoubleToStringConverter { // exponent character, the exponent's sign, and at most 3 exponent digits). MFBT_API bool ToPrecision(double value, diff --git a/mfbt/double-conversion/add-mfbt-api-markers.patch b/mfbt/double-conversion/add-mfbt-api-markers.patch index bbb50f6f537ac..082a601d3a965 100644 --- a/mfbt/double-conversion/add-mfbt-api-markers.patch +++ b/mfbt/double-conversion/add-mfbt-api-markers.patch @@ -1,7 +1,7 @@ -diff --git a/mfbt/double-conversion/double-conversion.h b/mfbt/double-conversion/double-conversion.h +diff --git a/mfbt/double-conversion/source/double-conversion.h b/mfbt/double-conversion/source/double-conversion.h index f98edae..c62b16b 100644 ---- a/mfbt/double-conversion/double-conversion.h -+++ b/mfbt/double-conversion/double-conversion.h +--- a/mfbt/double-conversion/source/double-conversion.h ++++ b/mfbt/double-conversion/source/double-conversion.h @@ -28,6 +28,7 @@ #ifndef DOUBLE_CONVERSION_DOUBLE_CONVERSION_H_ #define DOUBLE_CONVERSION_DOUBLE_CONVERSION_H_ diff --git a/mfbt/double-conversion/fix-Wshadow-issues.patch b/mfbt/double-conversion/fix-Wshadow-issues.patch index 6b6185da846b4..821e54633a238 100644 --- a/mfbt/double-conversion/fix-Wshadow-issues.patch +++ b/mfbt/double-conversion/fix-Wshadow-issues.patch @@ -1,6 +1,6 @@ -diff --git a/mfbt/double-conversion/strtod.cc b/mfbt/double-conversion/strtod.cc ---- a/mfbt/double-conversion/strtod.cc -+++ b/mfbt/double-conversion/strtod.cc +diff --git a/mfbt/double-conversion/source/strtod.cc b/mfbt/double-conversion/source/strtod.cc +--- a/mfbt/double-conversion/source/strtod.cc ++++ b/mfbt/double-conversion/source/strtod.cc @@ -510,16 +510,17 @@ float Strtof(Vector buffer, float f3 = static_cast(double_next); float f4; @@ -19,9 +19,9 @@ diff --git a/mfbt/double-conversion/strtod.cc b/mfbt/double-conversion/strtod.cc return float_guess; } -diff --git a/mfbt/double-conversion/utils.h b/mfbt/double-conversion/utils.h ---- a/mfbt/double-conversion/utils.h -+++ b/mfbt/double-conversion/utils.h +diff --git a/mfbt/double-conversion/source/utils.h b/mfbt/double-conversion/source/utils.h +--- a/mfbt/double-conversion/source/utils.h ++++ b/mfbt/double-conversion/source/utils.h @@ -55,17 +55,17 @@ #if defined(_M_X64) || defined(__x86_64__) || \ defined(__ARMEL__) || defined(__avr32__) || \ diff --git a/mfbt/double-conversion/LICENSE b/mfbt/double-conversion/source/LICENSE similarity index 100% rename from mfbt/double-conversion/LICENSE rename to mfbt/double-conversion/source/LICENSE diff --git a/mfbt/double-conversion/README b/mfbt/double-conversion/source/README similarity index 100% rename from mfbt/double-conversion/README rename to mfbt/double-conversion/source/README diff --git a/mfbt/double-conversion/bignum-dtoa.cc b/mfbt/double-conversion/source/bignum-dtoa.cc similarity index 100% rename from mfbt/double-conversion/bignum-dtoa.cc rename to mfbt/double-conversion/source/bignum-dtoa.cc diff --git a/mfbt/double-conversion/bignum-dtoa.h b/mfbt/double-conversion/source/bignum-dtoa.h similarity index 100% rename from mfbt/double-conversion/bignum-dtoa.h rename to mfbt/double-conversion/source/bignum-dtoa.h diff --git a/mfbt/double-conversion/bignum.cc b/mfbt/double-conversion/source/bignum.cc similarity index 100% rename from mfbt/double-conversion/bignum.cc rename to mfbt/double-conversion/source/bignum.cc diff --git a/mfbt/double-conversion/bignum.h b/mfbt/double-conversion/source/bignum.h similarity index 100% rename from mfbt/double-conversion/bignum.h rename to mfbt/double-conversion/source/bignum.h diff --git a/mfbt/double-conversion/cached-powers.cc b/mfbt/double-conversion/source/cached-powers.cc similarity index 100% rename from mfbt/double-conversion/cached-powers.cc rename to mfbt/double-conversion/source/cached-powers.cc diff --git a/mfbt/double-conversion/cached-powers.h b/mfbt/double-conversion/source/cached-powers.h similarity index 100% rename from mfbt/double-conversion/cached-powers.h rename to mfbt/double-conversion/source/cached-powers.h diff --git a/mfbt/double-conversion/diy-fp.cc b/mfbt/double-conversion/source/diy-fp.cc similarity index 100% rename from mfbt/double-conversion/diy-fp.cc rename to mfbt/double-conversion/source/diy-fp.cc diff --git a/mfbt/double-conversion/diy-fp.h b/mfbt/double-conversion/source/diy-fp.h similarity index 100% rename from mfbt/double-conversion/diy-fp.h rename to mfbt/double-conversion/source/diy-fp.h diff --git a/mfbt/double-conversion/double-conversion.cc b/mfbt/double-conversion/source/double-conversion.cc similarity index 100% rename from mfbt/double-conversion/double-conversion.cc rename to mfbt/double-conversion/source/double-conversion.cc diff --git a/mfbt/double-conversion/double-conversion.h b/mfbt/double-conversion/source/double-conversion.h similarity index 100% rename from mfbt/double-conversion/double-conversion.h rename to mfbt/double-conversion/source/double-conversion.h diff --git a/mfbt/double-conversion/fast-dtoa.cc b/mfbt/double-conversion/source/fast-dtoa.cc similarity index 100% rename from mfbt/double-conversion/fast-dtoa.cc rename to mfbt/double-conversion/source/fast-dtoa.cc diff --git a/mfbt/double-conversion/fast-dtoa.h b/mfbt/double-conversion/source/fast-dtoa.h similarity index 100% rename from mfbt/double-conversion/fast-dtoa.h rename to mfbt/double-conversion/source/fast-dtoa.h diff --git a/mfbt/double-conversion/fixed-dtoa.cc b/mfbt/double-conversion/source/fixed-dtoa.cc similarity index 100% rename from mfbt/double-conversion/fixed-dtoa.cc rename to mfbt/double-conversion/source/fixed-dtoa.cc diff --git a/mfbt/double-conversion/fixed-dtoa.h b/mfbt/double-conversion/source/fixed-dtoa.h similarity index 100% rename from mfbt/double-conversion/fixed-dtoa.h rename to mfbt/double-conversion/source/fixed-dtoa.h diff --git a/mfbt/double-conversion/ieee.h b/mfbt/double-conversion/source/ieee.h similarity index 100% rename from mfbt/double-conversion/ieee.h rename to mfbt/double-conversion/source/ieee.h diff --git a/mfbt/double-conversion/strtod.cc b/mfbt/double-conversion/source/strtod.cc similarity index 100% rename from mfbt/double-conversion/strtod.cc rename to mfbt/double-conversion/source/strtod.cc diff --git a/mfbt/double-conversion/strtod.h b/mfbt/double-conversion/source/strtod.h similarity index 100% rename from mfbt/double-conversion/strtod.h rename to mfbt/double-conversion/source/strtod.h diff --git a/mfbt/double-conversion/utils.h b/mfbt/double-conversion/source/utils.h similarity index 100% rename from mfbt/double-conversion/utils.h rename to mfbt/double-conversion/source/utils.h diff --git a/mfbt/double-conversion/update.sh b/mfbt/double-conversion/update.sh index c34f89104864e..0e8e7b290dc6d 100755 --- a/mfbt/double-conversion/update.sh +++ b/mfbt/double-conversion/update.sh @@ -29,27 +29,28 @@ if [ "$1" != "" ]; then fi # First clear out everything already present. -rm -rf ./* - -# Restore non-upstream files -hg revert update.sh -hg revert $LOCAL_PATCHES +DEST=./source +rm -rf "$DEST" +mkdir "$DEST" # Copy over critical files. -cp "$LOCAL_CLONE/LICENSE" ./ -cp "$LOCAL_CLONE/README" ./ +cp "$LOCAL_CLONE/LICENSE" "$DEST/" +cp "$LOCAL_CLONE/README" "$DEST/" # Includes for header in "$LOCAL_CLONE/src/"*.h; do - cp "$header" ./ + cp "$header" "$DEST/" done # Source for ccfile in "$LOCAL_CLONE/src/"*.cc; do - cp "$ccfile" ./ + cp "$ccfile" "$DEST/" done # Now apply our local patches. for patch in $LOCAL_PATCHES; do - patch -p3 < "$patch" + patch --directory "$DEST" --strip 4 < "$patch" done + +# Update Mercurial file status. +hg addremove "$DEST" diff --git a/mfbt/double-conversion/use-StandardInteger.patch b/mfbt/double-conversion/use-StandardInteger.patch index 7fe867f438f41..c5546f72bb467 100644 --- a/mfbt/double-conversion/use-StandardInteger.patch +++ b/mfbt/double-conversion/use-StandardInteger.patch @@ -1,7 +1,7 @@ -diff --git a/mfbt/double-conversion/utils.h b/mfbt/double-conversion/utils.h +diff --git a/mfbt/double-conversion/source/utils.h b/mfbt/double-conversion/source/utils.h index cd3e330..bdc7d4b 100644 ---- a/mfbt/double-conversion/utils.h -+++ b/mfbt/double-conversion/utils.h +--- a/mfbt/double-conversion/source/utils.h ++++ b/mfbt/double-conversion/source/utils.h @@ -74,23 +74,7 @@ #endif diff --git a/mfbt/double-conversion/use-mozilla-assertions.patch b/mfbt/double-conversion/use-mozilla-assertions.patch index c98565f655df9..1f11d88394257 100644 --- a/mfbt/double-conversion/use-mozilla-assertions.patch +++ b/mfbt/double-conversion/use-mozilla-assertions.patch @@ -1,6 +1,6 @@ -diff --git a/mfbt/double-conversion/utils.h b/mfbt/double-conversion/utils.h ---- a/mfbt/double-conversion/utils.h -+++ b/mfbt/double-conversion/utils.h +diff --git a/mfbt/double-conversion/source/utils.h b/mfbt/double-conversion/source/utils.h +--- a/mfbt/double-conversion/source/utils.h ++++ b/mfbt/double-conversion/source/utils.h @@ -31,15 +31,15 @@ #include #include diff --git a/mfbt/double-conversion/use-static_assert.patch b/mfbt/double-conversion/use-static_assert.patch index 4143782599e1f..d1841b211387c 100644 --- a/mfbt/double-conversion/use-static_assert.patch +++ b/mfbt/double-conversion/use-static_assert.patch @@ -1,6 +1,6 @@ -diff --git a/mfbt/double-conversion/utils.h b/mfbt/double-conversion/utils.h ---- a/mfbt/double-conversion/utils.h -+++ b/mfbt/double-conversion/utils.h +diff --git a/mfbt/double-conversion/source/utils.h b/mfbt/double-conversion/source/utils.h +--- a/mfbt/double-conversion/source/utils.h ++++ b/mfbt/double-conversion/source/utils.h @@ -275,19 +275,18 @@ class StringBuilder { // There is an additional use for BitCast. // Recent gccs will warn when they see casts that may result in breakage due to diff --git a/mfbt/moz.build b/mfbt/moz.build index f3c996a0f7a69..f7bee9161558d 100644 --- a/mfbt/moz.build +++ b/mfbt/moz.build @@ -33,8 +33,8 @@ EXPORTS.mozilla = [ 'Compression.h', 'DebugOnly.h', 'decimal/Decimal.h', - 'double-conversion/double-conversion.h', - 'double-conversion/utils.h', + 'double-conversion/source/double-conversion.h', + 'double-conversion/source/utils.h', 'EndianUtils.h', 'EnumeratedArray.h', 'EnumeratedRange.h', diff --git a/mfbt/objs.mozbuild b/mfbt/objs.mozbuild index 37b2240c467fd..6630a6e424432 100644 --- a/mfbt/objs.mozbuild +++ b/mfbt/objs.mozbuild @@ -7,14 +7,14 @@ mfbt_src_lcppsrcs = [ 'Assertions.cpp', 'ChaosMode.cpp', - 'double-conversion/bignum-dtoa.cc', - 'double-conversion/bignum.cc', - 'double-conversion/cached-powers.cc', - 'double-conversion/diy-fp.cc', - 'double-conversion/double-conversion.cc', - 'double-conversion/fast-dtoa.cc', - 'double-conversion/fixed-dtoa.cc', - 'double-conversion/strtod.cc', + 'double-conversion/source/bignum-dtoa.cc', + 'double-conversion/source/bignum.cc', + 'double-conversion/source/cached-powers.cc', + 'double-conversion/source/diy-fp.cc', + 'double-conversion/source/double-conversion.cc', + 'double-conversion/source/fast-dtoa.cc', + 'double-conversion/source/fixed-dtoa.cc', + 'double-conversion/source/strtod.cc', 'FloatingPoint.cpp', 'HashFunctions.cpp', 'JSONWriter.cpp', diff --git a/tools/rewriting/ThirdPartyPaths.txt b/tools/rewriting/ThirdPartyPaths.txt index fb644e350880e..0365ba17017df 100644 --- a/tools/rewriting/ThirdPartyPaths.txt +++ b/tools/rewriting/ThirdPartyPaths.txt @@ -44,7 +44,7 @@ media/sphinxbase/ media/webrtc/trunk/ memory/jemalloc/src/ mfbt/decimal/ -mfbt/double-conversion/ +mfbt/double-conversion/source/ mfbt/lz4 mobile/android/thirdparty/ modules/brotli/