diff --git a/Folly/build/fbcode_builder/specs/__init__.py b/Folly/build/fbcode_builder/specs/__init__.py deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/Folly/folly/Conv.cpp b/Folly/folly/Conv.cpp index 76e14c9822..09c23b26c8 100644 --- a/Folly/folly/Conv.cpp +++ b/Folly/folly/Conv.cpp @@ -488,7 +488,10 @@ class SignedValueHandler { Expected finalize(U value) { T rv; if (negative_) { +FOLLY_PUSH_WARNING +FOLLY_MSVC_DISABLE_WARNING(4146) // unary minus operator applied to unsigned type, result still unsigned rv = T(-value); +FOLLY_POP_WARNING if (UNLIKELY(rv > 0)) { return makeUnexpected(ConversionCode::NEGATIVE_OVERFLOW); } @@ -574,7 +577,10 @@ inline Expected digits_to( UT result = 0; for (; e - b >= 4; b += 4) { +FOLLY_PUSH_WARNING +FOLLY_MSVC_DISABLE_WARNING(4309) // truncation of constant value result *= static_cast(10000); +FOLLY_POP_WARNING const int32_t r0 = shift1000[static_cast(b[0])]; const int32_t r1 = shift100[static_cast(b[1])]; const int32_t r2 = shift10[static_cast(b[2])]; @@ -700,7 +706,10 @@ Expected str_to_integral(StringPiece* src) noexcept { if (UNLIKELY(err != ConversionCode::SUCCESS)) { return makeUnexpected(err); } +FOLLY_PUSH_WARNING +FOLLY_MSVC_DISABLE_WARNING(4127) // conditional expression is constant if (std::is_signed::value && UNLIKELY(b >= past)) { +FOLLY_POP_WARNING return makeUnexpected(ConversionCode::NO_DIGITS); } if (UNLIKELY(!isdigit(*b))) { diff --git a/Folly/folly/Conv.h b/Folly/folly/Conv.h index b187d01a66..e2f5ba68f8 100644 --- a/Folly/folly/Conv.h +++ b/Folly/folly/Conv.h @@ -1276,7 +1276,10 @@ checkConversion(const Src& value) { std::numeric_limits::max() - static_cast(mmax)) { return false; } +FOLLY_PUSH_WARNING +FOLLY_MSVC_DISABLE_WARNING(4127) // conditional expression is constant } else if (std::is_signed::value && value <= tgtMinAsSrc) { +FOLLY_POP_WARNING if (value < tgtMinAsSrc) { return false; } diff --git a/Folly/folly/String-inl.h b/Folly/folly/String-inl.h index 63e88c9493..0c194d19fe 100644 --- a/Folly/folly/String-inl.h +++ b/Folly/folly/String-inl.h @@ -298,7 +298,10 @@ void internalSplit( } return; } +FOLLY_PUSH_WARNING +FOLLY_MSVC_DISABLE_WARNING(4127) // conditional expression is constant if (std::is_same::value && dSize == 1) { +FOLLY_POP_WARNING // Call the char version because it is significantly faster. return internalSplit(delimFront(delim), sp, out, ignoreEmpty); } @@ -454,7 +457,10 @@ void internalJoinAppend( Iterator end, String& output) { assert(begin != end); +FOLLY_PUSH_WARNING +FOLLY_MSVC_DISABLE_WARNING(4127) // conditional expression is constant if (std::is_same::value && delimSize(delimiter) == 1) { +FOLLY_POP_WARNING internalJoinAppend(delimFront(delimiter), begin, end, output); return; } diff --git a/Folly/folly/container/detail/dirs b/Folly/folly/container/detail/dirs new file mode 100644 index 0000000000..08ce9cffca --- /dev/null +++ b/Folly/folly/container/detail/dirs @@ -0,0 +1,4 @@ +DIRS = \ + android{droidarm,droidarm64,droidx64,droidx86} \ + win32{apple,chpe,x64,x86} \ + winrt{x86,x64,arm} \ diff --git a/Folly/folly/container/detail/sources.inc b/Folly/folly/container/detail/sources.inc new file mode 100644 index 0000000000..59d3d48833 --- /dev/null +++ b/Folly/folly/container/detail/sources.inc @@ -0,0 +1,13 @@ +LIBLETNAME = FollyContainerDetail + +!include $(OPENSOURCE_REACTNATIVE)\OfficeISS\ReactCommon\make.inc + +SOURCES_SHARED = \ + ..\F14Table.cpp \ + +SOURCES_WIN32 = $(SOURCES_SHARED) \ + +SOURCES_ANDROID = $(SOURCES_SHARED) \ + +SOURCES_WINRT = $(SOURCES_SHARED) \ + diff --git a/Folly/folly/container/detail/win32/sources b/Folly/folly/container/detail/win32/sources new file mode 100644 index 0000000000..2624feb800 --- /dev/null +++ b/Folly/folly/container/detail/win32/sources @@ -0,0 +1,5 @@ +LIBLET_WIN32 = 1 +LIBLET_LOB = 1 +!include ..\sources.inc + +SOURCES = $(SOURCES_WIN32) diff --git a/Folly/folly/container/detail/winrt/sources b/Folly/folly/container/detail/winrt/sources new file mode 100644 index 0000000000..4506b8d9c8 --- /dev/null +++ b/Folly/folly/container/detail/winrt/sources @@ -0,0 +1,5 @@ +LIBLET_WINRT = 1 +LIBLET_LOB = 1 +!include ..\sources.inc + +SOURCES = $(SOURCES_WINRT) diff --git a/Folly/folly/container/dirs b/Folly/folly/container/dirs new file mode 100644 index 0000000000..6b0454565a --- /dev/null +++ b/Folly/folly/container/dirs @@ -0,0 +1,2 @@ +DIRS = \ + detail \ diff --git a/Folly/folly/detail/sources.inc b/Folly/folly/detail/sources.inc new file mode 100644 index 0000000000..8808f58ffa --- /dev/null +++ b/Folly/folly/detail/sources.inc @@ -0,0 +1,12 @@ +LIBLETNAME = FollyDetail + +!include $(OPENSOURCE_REACTNATIVE)\OfficeISS\ReactCommon\make.inc + +SOURCES_SHARED = \ + ..\Demangle.cpp \ + +SOURCES_WIN32 = $(SOURCES_SHARED) \ + +SOURCES_ANDROID = $(SOURCES_SHARED) \ + +SOURCES_WINRT = $(SOURCES_SHARED) \ diff --git a/Folly/folly/dirs b/Folly/folly/dirs index 7a6a6d02c4..4438560ea8 100644 --- a/Folly/folly/dirs +++ b/Folly/folly/dirs @@ -1,5 +1,9 @@ DIRS = \ + container \ detail \ + hash \ + lang \ + memory \ portability{!droidarm,!droidarm64,!droidx64,!droidx86} \ android{droidarm,droidarm64,droidx64,droidx86} \ win32{apple,chpe,x64,x86} \ diff --git a/Folly/folly/hash/Hash.h b/Folly/folly/hash/Hash.h index 3177e9c436..bbb1375077 100644 --- a/Folly/folly/hash/Hash.h +++ b/Folly/folly/hash/Hash.h @@ -642,11 +642,14 @@ size_t hash_combine_generic( const Ts&... ts) noexcept(noexcept(detail::c_array_size_t{h(t), h(ts)...})) { size_t seed = h(t); +FOLLY_PUSH_WARNING +FOLLY_MSVC_DISABLE_WARNING(4127) // conditional expression is constant if (sizeof...(ts) == 0) { return seed; } size_t remainder = hash_combine_generic(h, ts...); if /* constexpr */ (sizeof(size_t) == sizeof(uint32_t)) { +FOLLY_POP_WARNING return twang_32from64((uint64_t(seed) << 32) | remainder); } else { return static_cast(hash_128_to_64(seed, remainder)); diff --git a/Folly/folly/hash/dirs b/Folly/folly/hash/dirs new file mode 100644 index 0000000000..08ce9cffca --- /dev/null +++ b/Folly/folly/hash/dirs @@ -0,0 +1,4 @@ +DIRS = \ + android{droidarm,droidarm64,droidx64,droidx86} \ + win32{apple,chpe,x64,x86} \ + winrt{x86,x64,arm} \ diff --git a/Folly/folly/hash/sources.inc b/Folly/folly/hash/sources.inc new file mode 100644 index 0000000000..15ed0cd82b --- /dev/null +++ b/Folly/folly/hash/sources.inc @@ -0,0 +1,12 @@ +LIBLETNAME = FollyHash + +!include $(OPENSOURCE_REACTNATIVE)\OfficeISS\ReactCommon\make.inc + +SOURCES_SHARED = \ + ..\SpookyHashV2.cpp \ + +SOURCES_WIN32 = $(SOURCES_SHARED) \ + +SOURCES_ANDROID = $(SOURCES_SHARED) \ + +SOURCES_WINRT = $(SOURCES_SHARED) \ diff --git a/Folly/folly/hash/win32/sources b/Folly/folly/hash/win32/sources new file mode 100644 index 0000000000..2624feb800 --- /dev/null +++ b/Folly/folly/hash/win32/sources @@ -0,0 +1,5 @@ +LIBLET_WIN32 = 1 +LIBLET_LOB = 1 +!include ..\sources.inc + +SOURCES = $(SOURCES_WIN32) diff --git a/Folly/folly/hash/winrt/sources b/Folly/folly/hash/winrt/sources new file mode 100644 index 0000000000..4506b8d9c8 --- /dev/null +++ b/Folly/folly/hash/winrt/sources @@ -0,0 +1,5 @@ +LIBLET_WINRT = 1 +LIBLET_LOB = 1 +!include ..\sources.inc + +SOURCES = $(SOURCES_WINRT) diff --git a/Folly/folly/json.cpp b/Folly/folly/json.cpp index 3d6146b270..58ba9e12c2 100644 --- a/Folly/folly/json.cpp +++ b/Folly/folly/json.cpp @@ -712,7 +712,10 @@ void escapeStringImpl( word = folly::partialLoadUnaligned(firstEsc, avail); } auto prefix = firstEscapableInWord(word, opts); +FOLLY_PUSH_WARNING +FOLLY_MSVC_DISABLE_WARNING(4018) // signed/unsigned mismatch DCHECK_LE(prefix, avail); +FOLLY_POP_WARNING firstEsc += prefix; if (prefix < 8) { break; diff --git a/Folly/folly/lang/Align.h b/Folly/folly/lang/Align.h index f750b8fc20..4e672b69f9 100644 --- a/Folly/folly/lang/Align.h +++ b/Folly/folly/lang/Align.h @@ -88,7 +88,10 @@ using max_align_v_ = max_align_t_< // // Apple's allocation reference: http://bit.ly/malloc-small constexpr std::size_t max_align_v = detail::max_align_v_::value; +FOLLY_PUSH_WARNING +FOLLY_MSVC_DISABLE_WARNING(4324) // structure was padded due to alignment specifier struct alignas(max_align_v) max_align_t {}; +FOLLY_POP_WARNING // Memory locations within the same cache line are subject to destructive // interference, also known as false sharing, which is when concurrent diff --git a/Folly/folly/lang/Bits.h b/Folly/folly/lang/Bits.h index 779705ff1b..336fc52070 100644 --- a/Folly/folly/lang/Bits.h +++ b/Folly/folly/lang/Bits.h @@ -324,7 +324,10 @@ inline T partialLoadUnaligned(const void* p, size_t l) { auto cp = static_cast(p); T value = 0; +FOLLY_PUSH_WARNING +FOLLY_MSVC_DISABLE_WARNING(4127) // conditional expression is constant if (!kHasUnalignedAccess || !kIsLittleEndian) { +FOLLY_POP_WARNING // Unsupported, use memcpy. memcpy(&value, cp, l); return value; diff --git a/Folly/folly/lang/dirs b/Folly/folly/lang/dirs new file mode 100644 index 0000000000..ccfe297e62 --- /dev/null +++ b/Folly/folly/lang/dirs @@ -0,0 +1,3 @@ +DIRS = \ + win32{apple,chpe,x64,x86} \ + winrt{x86,x64,arm} \ diff --git a/Folly/folly/lang/sources.inc b/Folly/folly/lang/sources.inc new file mode 100644 index 0000000000..fb89df7843 --- /dev/null +++ b/Folly/folly/lang/sources.inc @@ -0,0 +1,16 @@ +LIBLETNAME = FollyLang + +!include $(OPENSOURCE_REACTNATIVE)\OfficeISS\ReactCommon\make.inc + +SOURCES_SHARED = \ + ..\Assume.cpp \ + ..\ColdClass.cpp \ + +SOURCES_WIN32 = $(SOURCES_SHARED) \ + +SOURCES_ANDROID = \ + $(SOURCES_SHARED) \ + ..\SafeAssert.cpp \ + +SOURCES_WINRT = $(SOURCES_SHARED) \ + diff --git a/Folly/folly/lang/win32/sources b/Folly/folly/lang/win32/sources new file mode 100644 index 0000000000..2624feb800 --- /dev/null +++ b/Folly/folly/lang/win32/sources @@ -0,0 +1,5 @@ +LIBLET_WIN32 = 1 +LIBLET_LOB = 1 +!include ..\sources.inc + +SOURCES = $(SOURCES_WIN32) diff --git a/Folly/folly/lang/winrt/sources b/Folly/folly/lang/winrt/sources new file mode 100644 index 0000000000..4506b8d9c8 --- /dev/null +++ b/Folly/folly/lang/winrt/sources @@ -0,0 +1,5 @@ +LIBLET_WINRT = 1 +LIBLET_LOB = 1 +!include ..\sources.inc + +SOURCES = $(SOURCES_WINRT) diff --git a/Folly/folly/memory/detail/dirs b/Folly/folly/memory/detail/dirs new file mode 100644 index 0000000000..08ce9cffca --- /dev/null +++ b/Folly/folly/memory/detail/dirs @@ -0,0 +1,4 @@ +DIRS = \ + android{droidarm,droidarm64,droidx64,droidx86} \ + win32{apple,chpe,x64,x86} \ + winrt{x86,x64,arm} \ diff --git a/Folly/folly/memory/detail/sources.inc b/Folly/folly/memory/detail/sources.inc new file mode 100644 index 0000000000..a6e780f397 --- /dev/null +++ b/Folly/folly/memory/detail/sources.inc @@ -0,0 +1,12 @@ +LIBLETNAME = FollyMemoryDetail + +!include $(OPENSOURCE_REACTNATIVE)\OfficeISS\ReactCommon\make.inc + +SOURCES_SHARED = \ + ..\MallocImpl.cpp \ + +SOURCES_WIN32 = $(SOURCES_SHARED) \ + +SOURCES_ANDROID = $(SOURCES_SHARED) \ + +SOURCES_WINRT = $(SOURCES_SHARED) \ diff --git a/Folly/folly/memory/detail/win32/sources b/Folly/folly/memory/detail/win32/sources new file mode 100644 index 0000000000..2624feb800 --- /dev/null +++ b/Folly/folly/memory/detail/win32/sources @@ -0,0 +1,5 @@ +LIBLET_WIN32 = 1 +LIBLET_LOB = 1 +!include ..\sources.inc + +SOURCES = $(SOURCES_WIN32) diff --git a/Folly/folly/memory/detail/winrt/sources b/Folly/folly/memory/detail/winrt/sources new file mode 100644 index 0000000000..4506b8d9c8 --- /dev/null +++ b/Folly/folly/memory/detail/winrt/sources @@ -0,0 +1,5 @@ +LIBLET_WINRT = 1 +LIBLET_LOB = 1 +!include ..\sources.inc + +SOURCES = $(SOURCES_WINRT) diff --git a/Folly/folly/memory/dirs b/Folly/folly/memory/dirs new file mode 100644 index 0000000000..6b0454565a --- /dev/null +++ b/Folly/folly/memory/dirs @@ -0,0 +1,2 @@ +DIRS = \ + detail \ diff --git a/Folly/folly/portability/dirs b/Folly/folly/portability/dirs new file mode 100644 index 0000000000..ccfe297e62 --- /dev/null +++ b/Folly/folly/portability/dirs @@ -0,0 +1,3 @@ +DIRS = \ + win32{apple,chpe,x64,x86} \ + winrt{x86,x64,arm} \ diff --git a/Folly/folly/portability/sources.inc b/Folly/folly/portability/sources.inc new file mode 100644 index 0000000000..3c56912560 --- /dev/null +++ b/Folly/folly/portability/sources.inc @@ -0,0 +1,11 @@ +LIBLETNAME = FollyPortability +LIBLET_NO_PRECOMP = 1 + +!include $(OPENSOURCE_REACTNATIVE)\OfficeISS\ReactWindows\make.inc + +SOURCES_SHARED = \ + ..\SysMman.cpp \ + +SOURCES_WIN32 = $(SOURCES_SHARED) \ + +SOURCES_WINRT = $(SOURCES_SHARED) \ diff --git a/Folly/folly/portability/win32/sources b/Folly/folly/portability/win32/sources new file mode 100644 index 0000000000..2624feb800 --- /dev/null +++ b/Folly/folly/portability/win32/sources @@ -0,0 +1,5 @@ +LIBLET_WIN32 = 1 +LIBLET_LOB = 1 +!include ..\sources.inc + +SOURCES = $(SOURCES_WIN32) diff --git a/Folly/folly/portability/winrt/sources b/Folly/folly/portability/winrt/sources new file mode 100644 index 0000000000..4506b8d9c8 --- /dev/null +++ b/Folly/folly/portability/winrt/sources @@ -0,0 +1,5 @@ +LIBLET_WINRT = 1 +LIBLET_LOB = 1 +!include ..\sources.inc + +SOURCES = $(SOURCES_WINRT) diff --git a/Folly/folly/sources.inc b/Folly/folly/sources.inc index 41b5e18dd6..dd4ac74bf5 100644 --- a/Folly/folly/sources.inc +++ b/Folly/folly/sources.inc @@ -3,18 +3,17 @@ LIBLETNAME = Folly !include $(OPENSOURCE_REACTNATIVE)\OfficeISS\ReactCommon\make.inc SOURCES_SHARED = \ - ..\Assume.cpp \ ..\Conv.cpp \ ..\Demangle.cpp \ ..\dynamic.cpp \ + ..\Format.cpp \ ..\json.cpp \ - ..\StringBase.cpp \ + ..\json_pointer.cpp \ ..\ScopeGuard.cpp \ + ..\String.cpp \ ..\Unicode.cpp \ -SOURCES_WIN32 = \ - $(SOURCES_SHARED) \ - ..\SpookyHashV2.cpp \ +SOURCES_WIN32 = $(SOURCES_SHARED) \ SOURCES_ANDROID = $(SOURCES_SHARED) \ diff --git a/RNTester/js/FlatListExample.js b/RNTester/js/FlatListExample.js index b0dd151a94..7cade4d0c2 100644 --- a/RNTester/js/FlatListExample.js +++ b/RNTester/js/FlatListExample.js @@ -132,6 +132,7 @@ class FlatListExample extends React.PureComponent { data={this.state.empty ? [] : filteredData} debug={this.state.debug} disableVirtualization={!this.state.virtualized} + acceptsKeyboardFocus={true} // TODO(macOS ISS#2323203) enableSelectionOnKeyPress={true} onSelectionEntered={this._handleSelectionEntered} getItemLayout={ diff --git a/RNTester/js/ListExampleShared.js b/RNTester/js/ListExampleShared.js index 343a56206c..2e97f0a6f1 100644 --- a/RNTester/js/ListExampleShared.js +++ b/RNTester/js/ListExampleShared.js @@ -74,6 +74,7 @@ class ItemComponent extends React.PureComponent<{ tvParallaxProperties={{ pressMagnification: 1.1, }} + acceptsKeyboardFocus={false} // TODO(macOS ISS#2323203) style={horizontal ? styles.horizItem : styles.item}> { enableEmptySections={true} itemShouldUpdate={this._itemShouldUpdate} keyboardShouldPersistTaps="handled" + acceptsKeyboardFocus={true} // TODO(macOS ISS#2323203) + enableSelectionOnKeyPress={true} // TODO(macOS ISS#2323203) automaticallyAdjustContentInsets={false} keyboardDismissMode="on-drag" renderSectionHeader={renderSectionHeader} diff --git a/React/React.xcodeproj/project.pbxproj b/React/React.xcodeproj/project.pbxproj index 7517363e6e..730dafb69f 100644 --- a/React/React.xcodeproj/project.pbxproj +++ b/React/React.xcodeproj/project.pbxproj @@ -823,6 +823,9 @@ 2D74EAFA1DAE9590003B751B /* RCTMultipartDataTask.m in Sources */ = {isa = PBXBuildFile; fileRef = 006FC4131D9B20820057AAAD /* RCTMultipartDataTask.m */; }; 2D8C2E331DA40441000EE098 /* RCTMultipartStreamReader.m in Sources */ = {isa = PBXBuildFile; fileRef = 001BFCCF1D8381DE008E587E /* RCTMultipartStreamReader.m */; }; 352DCFF01D19F4C20056D623 /* RCTI18nUtil.m in Sources */ = {isa = PBXBuildFile; fileRef = 352DCFEF1D19F4C20056D623 /* RCTI18nUtil.m */; }; + 385362712283364F00B0989C /* RCTSRWebSocket.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 3D7BFD2C1EA8E3FA008DFB7A /* RCTSRWebSocket.h */; }; + 385362722283369800B0989C /* RCTSRWebSocket.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 3D7BFD2C1EA8E3FA008DFB7A /* RCTSRWebSocket.h */; }; + 38536273228336AC00B0989C /* RCTSRWebSocket.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 3D7BFD2C1EA8E3FA008DFB7A /* RCTSRWebSocket.h */; }; 391E86A41C623EC800009732 /* RCTTouchEvent.m in Sources */ = {isa = PBXBuildFile; fileRef = 391E86A21C623EC800009732 /* RCTTouchEvent.m */; }; 39C50FF92046EACF00CEE534 /* RCTVersion.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 199B8A6E1F44DB16005DEF67 /* RCTVersion.h */; }; 39C50FFB2046EE3500CEE534 /* RCTVersion.m in Sources */ = {isa = PBXBuildFile; fileRef = 39C50FFA2046EE3500CEE534 /* RCTVersion.m */; }; @@ -2071,6 +2074,7 @@ dstPath = include/React; dstSubfolderSpec = 16; files = ( + 385362722283369800B0989C /* RCTSRWebSocket.h in Copy Headers */, 181B13D021652D7400D3B7D2 /* RCTLinkingManager.h in Copy Headers */, 1879ECFA21E85F0D00D98372 /* RCTDynamicColor.h in Copy Headers */, 18B8F9CA214335C800CE911A /* RCTLayout.h in Copy Headers */, @@ -2217,6 +2221,7 @@ dstPath = include/React; dstSubfolderSpec = 16; files = ( + 38536273228336AC00B0989C /* RCTSRWebSocket.h in Copy Headers */, 18C2C6762141C9B4004314E0 /* RCTPlatformDisplayLink.h in Copy Headers */, 591F78DF202ADB97004A668C /* RCTLayout.h in Copy Headers */, 59EDBCC31FDF4E55003573DE /* RCTScrollableProtocol.h in Copy Headers */, @@ -2420,6 +2425,7 @@ dstPath = include/React; dstSubfolderSpec = 16; files = ( + 385362712283364F00B0989C /* RCTSRWebSocket.h in Copy Headers */, 18C2C6742141C99B004314E0 /* RCTPlatformDisplayLink.h in Copy Headers */, 39C50FF92046EACF00CEE534 /* RCTVersion.h in Copy Headers */, 591F78DE202ADB8F004A668C /* RCTLayout.h in Copy Headers */, diff --git a/React/Views/ScrollView/RCTScrollView.m b/React/Views/ScrollView/RCTScrollView.m index 933030183e..d6ef1d2bfc 100644 --- a/React/Views/ScrollView/RCTScrollView.m +++ b/React/Views/ScrollView/RCTScrollView.m @@ -520,6 +520,11 @@ RCT_NOT_IMPLEMENTED(- (instancetype)init) } #if TARGET_OS_OSX // [TODO(macOS ISS#2323203) +- (BOOL)canBecomeKeyView +{ + return [self acceptsKeyboardFocus]; +} + - (CGRect)focusRingMaskBounds { return [self bounds]; diff --git a/ReactAndroid/CopyHeaders.inc b/ReactAndroid/CopyHeaders.inc index 99e35bef71..a2d61641d0 100644 --- a/ReactAndroid/CopyHeaders.inc +++ b/ReactAndroid/CopyHeaders.inc @@ -5,56 +5,71 @@ COPYFILES_PASS0_DESTROOT = $(TARGETDIR)\include COPYFILES_PASS0 = \ $(COPYFILES_PASS0) \ - Folly\folly\ApplyTuple.h, folly; \ - Folly\folly\Array.h, folly; \ - Folly\folly\Assume.h, folly; \ - Folly\folly\Baton.h, folly; \ Folly\folly\Bits.h, folly; \ + Folly\folly\ConstexprMath.h, folly; \ + Folly\folly\container\detail\F14Defaults.h, folly\container\detail; \ + Folly\folly\container\detail\F14IntrinsicsAvailability.h, folly\container\detail; \ + Folly\folly\container\detail\F14Policy.h, folly\container\detail; \ + Folly\folly\container\detail\F14Table.h, folly\container\detail; \ + Folly\folly\container\F14Map-fwd.h, folly\container; \ + Folly\folly\container\F14Map.h, folly\container; \ Folly\folly\Conv.h, folly; \ Folly\folly\CPortability.h, folly; \ + Folly\folly\CppAttributes.h, folly; \ Folly\folly\CpuId.h, folly; \ Folly\folly\Demangle.h, folly; \ - Folly\folly\detail\BitIteratorDetail.h, folly\detail; \ - Folly\folly\detail\BitsDetail.h, folly\detail; \ - Folly\folly\detail\Malloc.h, folly\detail; \ + Folly\folly\detail\Iterators.h, folly\detail; \ Folly\folly\detail\RangeCommon.h, folly\detail; \ Folly\folly\detail\RangeSse42.h, folly\detail; \ - Folly\folly\detail\UncaughtExceptionCounter.h, folly\detail; \ - Folly\folly\dynamic.h, folly; \ Folly\folly\dynamic-inl.h, folly; \ + Folly\folly\dynamic.h, folly; \ Folly\folly\Exception.h, folly; \ Folly\folly\ExceptionString.h, folly; \ Folly\folly\Expected.h, folly; \ Folly\folly\FBString.h, folly; \ Folly\folly\FBVector.h, folly; \ + Folly\folly\Format-inl.h, folly; \ Folly\folly\Format.h, folly; \ Folly\folly\FormatArg.h, folly; \ - Folly\folly\Format-inl.h, folly; \ Folly\folly\FormatTraits.h, folly; \ + Folly\folly\functional\ApplyTuple.h, folly\functional; \ + Folly\folly\functional\Invoke.h, folly\functional; \ Folly\folly\Hash.h, folly; \ + Folly\folly\hash\Hash.h, folly\hash; \ + Folly\folly\hash\SpookyHashV1.h, folly\hash; \ + Folly\folly\hash\SpookyHashV2.h, folly\hash; \ + Folly\folly\json_pointer.h, folly; \ Folly\folly\json.h, folly; \ + Folly\folly\lang\Align.h, folly\lang; \ + Folly\folly\lang\Assume.h, folly\lang; \ + Folly\folly\lang\Bits.h, folly\lang; \ + Folly\folly\lang\ColdClass.h, folly\lang; \ + Folly\folly\lang\Exception.h, folly\lang; \ + Folly\folly\lang\Launder.h, folly\lang; \ + Folly\folly\lang\SafeAssert.h, folly\lang; \ + Folly\folly\lang\UncaughtExceptions.h, folly\lang; \ Folly\folly\Likely.h, folly; \ - Folly\folly\Malloc.h, folly; \ + Folly\folly\MapUtil.h, folly; \ Folly\folly\Memory.h, folly; \ + Folly\folly\memory\detail\MallocImpl.h, folly\memory\detail; \ + Folly\folly\memory\Malloc.h, folly\memory; \ Folly\folly\Optional.h, folly; \ Folly\folly\Portability.h, folly; \ - Folly\folly\portability\BitsFunctexcept.h, folly\portability; \ Folly\folly\portability\Builtins.h, folly\portability; \ Folly\folly\portability\Config.h, folly\portability; \ Folly\folly\portability\Constexpr.h, folly\portability; \ + Folly\folly\portability\Malloc.h, folly\portability; \ Folly\folly\portability\Math.h, folly\portability; \ Folly\folly\portability\String.h, folly\portability; \ Folly\folly\portability\Windows.h, folly\portability; \ Folly\folly\Preprocessor.h, folly; \ Folly\folly\Range.h, folly; \ Folly\folly\ScopeGuard.h, folly; \ - Folly\folly\SpookyHashV1.h, folly; \ - Folly\folly\SpookyHashV2.h, folly; \ - Folly\folly\String.h, folly; \ Folly\folly\String-inl.h, folly; \ + Folly\folly\String.h, folly; \ Folly\folly\Traits.h, folly; \ - Folly\folly\UncaughtExceptions.h, folly; \ Folly\folly\Unit.h, folly; \ + Folly\folly\Utility.h, folly; \ COPYFILES_PASS0 = \ $(COPYFILES_PASS0) \ @@ -103,4 +118,3 @@ COPYFILES_PASS0 = \ jsc\jsc-headers\JSTypedArray.h, jsc\JavaScriptCore; \ jsc\jsc-headers\JSValueRef.h, jsc\JavaScriptCore; \ jsc\jsc-headers\WebKitAvailability.h, jsc\JavaScriptCore; \ - diff --git a/ReactCommon/jsi/V8Runtime_droid.cpp b/ReactCommon/jsi/V8Runtime_droid.cpp index 3ab7e42132..1dbf4e78a3 100644 --- a/ReactCommon/jsi/V8Runtime_droid.cpp +++ b/ReactCommon/jsi/V8Runtime_droid.cpp @@ -149,4 +149,8 @@ namespace facebook { namespace v8runtime { return script; } + + std::unique_ptr makeV8Runtime(const folly::dynamic& v8Config) { + return std::make_unique(v8Config); + } }} // namespace facebook::v8runtime diff --git a/ReactCommon/jsi/V8Runtime_shared.cpp b/ReactCommon/jsi/V8Runtime_shared.cpp index 13fccbc250..10218c3470 100644 --- a/ReactCommon/jsi/V8Runtime_shared.cpp +++ b/ReactCommon/jsi/V8Runtime_shared.cpp @@ -739,8 +739,4 @@ namespace facebook { namespace v8runtime { std::unique_ptr makeV8Runtime() { return std::make_unique(); } - - std::unique_ptr makeV8Runtime(const folly::dynamic& v8Config) { - return std::make_unique(v8Config); - } }} // namespace facebook::v8runtime \ No newline at end of file diff --git a/ReactCommon/jsi/V8Runtime_win.cpp b/ReactCommon/jsi/V8Runtime_win.cpp index 2ce9c65fe3..fd046c05be 100644 --- a/ReactCommon/jsi/V8Runtime_win.cpp +++ b/ReactCommon/jsi/V8Runtime_win.cpp @@ -23,4 +23,7 @@ namespace facebook { namespace v8runtime { std::abort(); } + std::unique_ptr makeV8Runtime(const folly::dynamic& v8Config) { + return std::make_unique(v8Config); + } }} // namespace facebook::v8runtime diff --git a/ReactCommon/jsi/dirs b/ReactCommon/jsi/dirs index e7ce4cbde9..da1bc4b85f 100644 --- a/ReactCommon/jsi/dirs +++ b/ReactCommon/jsi/dirs @@ -1,5 +1,6 @@ DIRS = \ android{droidarm,droidarm64,droidx64,droidx86} \ jsicore{apple,chpe,x64,x86} \ + jsiv8{apple,chpe,x64,x86} \ win32{apple,chpe,x64,x86} \ winrt{arm,x64,x86} \ \ No newline at end of file diff --git a/ReactCommon/jsi/jsicore/sources b/ReactCommon/jsi/jsicore/sources index 5ed3b74eba..8976b26719 100644 --- a/ReactCommon/jsi/jsicore/sources +++ b/ReactCommon/jsi/jsicore/sources @@ -2,19 +2,8 @@ LIBLET_WIN32 = 1 LIBLET_DEF_NOEXPORTS = 1 LIBLET_SUFFIX = core -C_DEFINES=$(C_DEFINES) -DJSI_CORE - V8_ENABLED = 1 -# Currently this nuget package is windows only. -!LISTFILES -recursive V8_HEADERS = $(PKGOFFICE_GOOGLE_V8_1_6_0_0)\build\include *.h - -HEADERS = $(HEADERS) \ - $(V8_HEADERS) \ - -INCLUDES = $(INCLUDES); \ - $(PKGOFFICE_GOOGLE_V8_1_6_0_0)\build\include; \ - !include ..\sources.inc SOURCES = $(SOURCES_JSICORE) diff --git a/ReactCommon/jsi/jsiv8/sources b/ReactCommon/jsi/jsiv8/sources new file mode 100644 index 0000000000..5aec8fe6e8 --- /dev/null +++ b/ReactCommon/jsi/jsiv8/sources @@ -0,0 +1,20 @@ +LIBLET_WIN32 = 1 +LIBLET_DEF_NOEXPORTS = 1 +LIBLET_SUFFIX = v8 + +C_DEFINES=$(C_DEFINES) -DJSI_CORE + +V8_ENABLED = 1 + +# Currently this nuget package is windows only. +!LISTFILES -recursive V8_HEADERS = $(PKGOFFICE_GOOGLE_V8_1_6_0_0)\build\include *.h + +HEADERS = $(HEADERS) \ + $(V8_HEADERS) \ + +INCLUDES = $(INCLUDES); \ + $(PKGOFFICE_GOOGLE_V8_1_6_0_0)\build\include; \ + +!include ..\sources.inc + +SOURCES = $(SOURCES_JSIV8) diff --git a/ReactCommon/jsi/sources.inc b/ReactCommon/jsi/sources.inc index f3c69dd549..466e7488bf 100644 --- a/ReactCommon/jsi/sources.inc +++ b/ReactCommon/jsi/sources.inc @@ -28,6 +28,7 @@ SOURCES_ANDROID = \ SOURCES_ANDROID = \ $(SOURCES_SHARED);\ $(SOURCES_JSC_FILES); \ + !endif SOURCES_WIN32 = \ @@ -41,6 +42,8 @@ SOURCES_WINRT = \ SOURCES_JSICORE = \ ..\jsi.cpp \ + +SOURCES_JSIV8 = \ ..\V8Platform.cpp \ ..\V8Runtime_basic.cpp \ - ..\V8Runtime_shared.cpp \ \ No newline at end of file + ..\V8Runtime_shared.cpp \ diff --git a/glog/NEWS b/glog/NEWS deleted file mode 100644 index e69de29bb2..0000000000