status-im
/
react-native
mirror of https://github.com/status-im/react-native.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

move inspector out of jschelpers 

Differential Revision: D6385924

fbshipit-source-id: 1913d903077494cc0d86d5a8c8839620f1ecab0c
This commit is contained in:
Ben Nham 2017-11-27 07:05:22 -08:00 committed by Facebook Github Bot
parent 850efa8650
commit 70c359000a
13 changed files with 294 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
React.podspec
View File

@ -94,14 +94,21 @@ Pod::Spec.new do |s|
end
s.subspec "jschelpers_legacy" do |ss|
ss.source_files = "ReactCommon/jschelpers/{JavaScriptCore,JSCWrapper,InspectorInterfaces}.{cpp,h}", "ReactCommon/jschelpers/systemJSCWrapper.cpp"
ss.private_header_files = "ReactCommon/jschelpers/{JavaScriptCore,JSCWrapper,InspectorInterfaces}.h"
ss.source_files = "ReactCommon/jschelpers/{JavaScriptCore,JSCWrapper}.{cpp,h}", "ReactCommon/jschelpers/systemJSCWrapper.cpp"
ss.private_header_files = "ReactCommon/jschelpers/{JavaScriptCore,JSCWrapper}.h"
ss.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\"" }
ss.framework = "JavaScriptCore"
end
s.subspec "jsinspector_legacy" do |ss|
ss.source_files = "ReactCommon/jsinspector/{InspectorInterfaces}.{cpp,h}"
ss.private_header_files = "ReactCommon/jsinspector/{InspectorInterfaces}.h"
ss.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\"" }
end
s.subspec "cxxreact_legacy" do |ss|
ss.dependency "React/jschelpers_legacy"
ss.dependency "React/jsinspector_legacy"
ss.source_files = "ReactCommon/cxxreact/{JSBundleType,oss-compat-util}.{cpp,h}"
ss.private_header_files = "ReactCommon/cxxreact/{JSBundleType,oss-compat-util}.h"
ss.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\"" }
@ -117,6 +124,12 @@ Pod::Spec.new do |s|
ss.framework = "JavaScriptCore"
end
s.subspec "jsinspector" do |ss|
ss.source_files = "ReactCommon/jsinspector/*.{cpp,h}"
ss.private_header_files = "ReactCommon/jsinspector/*.h"
ss.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\"" }
end
s.subspec "PrivateDatabase" do |ss|
ss.source_files = "ReactCommon/privatedata/*.{cpp,h}"
ss.private_header_files = "ReactCommon/privatedata/*.h"
@ -125,6 +138,7 @@ Pod::Spec.new do |s|
s.subspec "cxxreact" do |ss|
ss.dependency "React/jschelpers"
ss.dependency "React/jsinspector"
ss.dependency "boost"
ss.dependency "Folly", "2016.09.26.00"
ss.compiler_flags = folly_compiler_flags

2
React/Inspector/RCTInspector.mm
View File

@ -3,8 +3,8 @@
#if RCT_DEV
#include <jschelpers/InspectorInterfaces.h>
#include <jschelpers/JavaScriptCore.h>
#include <jsinspector/InspectorInterfaces.h>
#import "RCTDefines.h"
#import "RCTInspectorPackagerConnection.h"

243
React/React.xcodeproj/project.pbxproj
View File

@ -1089,12 +1089,6 @@
59FBEFB51E46D91C0095D885 /* RCTScrollContentViewManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 59FBEFAE1E46D91C0095D885 /* RCTScrollContentViewManager.h */; };
59FBEFB61E46D91C0095D885 /* RCTScrollContentViewManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 59FBEFAF1E46D91C0095D885 /* RCTScrollContentViewManager.m */; };
59FBEFB71E46D91C0095D885 /* RCTScrollContentViewManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 59FBEFAF1E46D91C0095D885 /* RCTScrollContentViewManager.m */; };
652971251EE976BA003C8BD5 /* InspectorInterfaces.h in Headers */ = {isa = PBXBuildFile; fileRef = 652971241EE976BA003C8BD5 /* InspectorInterfaces.h */; };
652971261EE976BD003C8BD5 /* InspectorInterfaces.h in Headers */ = {isa = PBXBuildFile; fileRef = 652971241EE976BA003C8BD5 /* InspectorInterfaces.h */; };
652971271EE976EE003C8BD5 /* InspectorInterfaces.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 652971241EE976BA003C8BD5 /* InspectorInterfaces.h */; };
652971281EE97712003C8BD5 /* InspectorInterfaces.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 652971241EE976BA003C8BD5 /* InspectorInterfaces.h */; };
6529713A1EE97AA9003C8BD5 /* InspectorInterfaces.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 652971391EE97AA9003C8BD5 /* InspectorInterfaces.cpp */; };
6529713B1EE97B2D003C8BD5 /* InspectorInterfaces.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 652971391EE97AA9003C8BD5 /* InspectorInterfaces.cpp */; };
657734841EE834C900A0E9EA /* RCTInspectorDevServerHelper.h in Headers */ = {isa = PBXBuildFile; fileRef = 657734821EE834C900A0E9EA /* RCTInspectorDevServerHelper.h */; };
657734851EE834C900A0E9EA /* RCTInspectorDevServerHelper.mm in Sources */ = {isa = PBXBuildFile; fileRef = 657734831EE834C900A0E9EA /* RCTInspectorDevServerHelper.mm */; };
657734861EE834D900A0E9EA /* RCTInspectorDevServerHelper.mm in Sources */ = {isa = PBXBuildFile; fileRef = 657734831EE834C900A0E9EA /* RCTInspectorDevServerHelper.mm */; };
@ -1162,6 +1156,14 @@
CF2731C21E7B8DEF0044CA4F /* RCTDeviceInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = CF2731BE1E7B8DE40044CA4F /* RCTDeviceInfo.h */; };
CF2731C31E7B8DF30044CA4F /* RCTDeviceInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = CF2731BF1E7B8DE40044CA4F /* RCTDeviceInfo.m */; };
E9B20B7B1B500126007A2DA7 /* RCTAccessibilityManager.m in Sources */ = {isa = PBXBuildFile; fileRef = E9B20B7A1B500126007A2DA7 /* RCTAccessibilityManager.m */; };
EBF21BBC1FC498270052F4D5 /* InspectorInterfaces.h in Headers */ = {isa = PBXBuildFile; fileRef = EBF21BBA1FC498270052F4D5 /* InspectorInterfaces.h */; };
EBF21BBD1FC498270052F4D5 /* InspectorInterfaces.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EBF21BBB1FC498270052F4D5 /* InspectorInterfaces.cpp */; };
EBF21BBE1FC498630052F4D5 /* InspectorInterfaces.h in Headers */ = {isa = PBXBuildFile; fileRef = EBF21BBA1FC498270052F4D5 /* InspectorInterfaces.h */; };
EBF21BFB1FC498FC0052F4D5 /* InspectorInterfaces.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = EBF21BBA1FC498270052F4D5 /* InspectorInterfaces.h */; };
EBF21BFC1FC4990B0052F4D5 /* InspectorInterfaces.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EBF21BBB1FC498270052F4D5 /* InspectorInterfaces.cpp */; };
EBF21BFE1FC499840052F4D5 /* InspectorInterfaces.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = EBF21BBA1FC498270052F4D5 /* InspectorInterfaces.h */; };
EBF21BFF1FC4998E0052F4D5 /* InspectorInterfaces.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EBF21BBB1FC498270052F4D5 /* InspectorInterfaces.cpp */; };
EBF21C001FC499A80052F4D5 /* InspectorInterfaces.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EBF21BBB1FC498270052F4D5 /* InspectorInterfaces.cpp */; };
/* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */
@ -1263,6 +1265,20 @@
remoteGlobalIDString = 9936F3141F5F2E5B0010BF04;
remoteInfo = "privatedata-tvOS";
};
EBF21C011FC499D10052F4D5 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 83CBB9F71A601CBA00E9B192 /* Project object */;
proxyType = 1;
remoteGlobalIDString = EBF21BBF1FC498900052F4D5;
remoteInfo = jsinspector;
};
EBF21C031FC499D80052F4D5 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 83CBB9F71A601CBA00E9B192 /* Project object */;
proxyType = 1;
remoteGlobalIDString = EBF21BDD1FC4989A0052F4D5;
remoteInfo = "jsinspector-tvOS";
};
/* End PBXContainerItemProxy section */
/* Begin PBXCopyFilesBuildPhase section */
@ -1478,7 +1494,6 @@
dstPath = include/jschelpers;
dstSubfolderSpec = 16;
files = (
652971281EE97712003C8BD5 /* InspectorInterfaces.h in Copy Headers */,
3DA982601E5B1089004F2374 /* JSCHelpers.h in Copy Headers */,
3DA982611E5B1089004F2374 /* noncopyable.h in Copy Headers */,
3DA982621E5B1089004F2374 /* Unicode.h in Copy Headers */,
@ -1696,7 +1711,6 @@
dstPath = include/jschelpers;
dstSubfolderSpec = 16;
files = (
652971271EE976EE003C8BD5 /* InspectorInterfaces.h in Copy Headers */,
3DA9825A1E5B1079004F2374 /* JavaScriptCore.h in Copy Headers */,
3DA9825B1E5B1079004F2374 /* JSCHelpers.h in Copy Headers */,
3DA9825C1E5B1079004F2374 /* JSCWrapper.h in Copy Headers */,
@ -1729,6 +1743,28 @@
name = "Copy Headers";
runOnlyForDeploymentPostprocessing = 0;
};
EBF21BCB1FC498900052F4D5 /* Copy Headers */ = {
isa = PBXCopyFilesBuildPhase;
buildActionMask = 2147483647;
dstPath = include/jsinspector;
dstSubfolderSpec = 16;
files = (
EBF21BFB1FC498FC0052F4D5 /* InspectorInterfaces.h in Copy Headers */,
);
name = "Copy Headers";
runOnlyForDeploymentPostprocessing = 0;
};
EBF21BE91FC4989A0052F4D5 /* Copy Headers */ = {
isa = PBXCopyFilesBuildPhase;
buildActionMask = 2147483647;
dstPath = include/jsinspector;
dstSubfolderSpec = 16;
files = (
EBF21BFE1FC499840052F4D5 /* InspectorInterfaces.h in Copy Headers */,
);
name = "Copy Headers";
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXCopyFilesBuildPhase section */
/* Begin PBXFileReference section */
@ -2108,8 +2144,6 @@
59FBEFAD1E46D91C0095D885 /* RCTScrollContentShadowView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTScrollContentShadowView.m; sourceTree = "<group>"; };
59FBEFAE1E46D91C0095D885 /* RCTScrollContentViewManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTScrollContentViewManager.h; sourceTree = "<group>"; };
59FBEFAF1E46D91C0095D885 /* RCTScrollContentViewManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTScrollContentViewManager.m; sourceTree = "<group>"; };
652971241EE976BA003C8BD5 /* InspectorInterfaces.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InspectorInterfaces.h; sourceTree = "<group>"; };
652971391EE97AA9003C8BD5 /* InspectorInterfaces.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InspectorInterfaces.cpp; sourceTree = "<group>"; };
657734821EE834C900A0E9EA /* RCTInspectorDevServerHelper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTInspectorDevServerHelper.h; sourceTree = "<group>"; };
657734831EE834C900A0E9EA /* RCTInspectorDevServerHelper.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = RCTInspectorDevServerHelper.mm; sourceTree = "<group>"; };
6577348A1EE8354A00A0E9EA /* RCTInspector.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RCTInspector.h; path = Inspector/RCTInspector.h; sourceTree = "<group>"; };
@ -2178,6 +2212,10 @@
E3BBC8EB1ADE6F47001BBD81 /* RCTTextDecorationLineType.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RCTTextDecorationLineType.h; sourceTree = "<group>"; };
E9B20B791B500126007A2DA7 /* RCTAccessibilityManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTAccessibilityManager.h; sourceTree = "<group>"; };
E9B20B7A1B500126007A2DA7 /* RCTAccessibilityManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTAccessibilityManager.m; sourceTree = "<group>"; };
EBF21BBA1FC498270052F4D5 /* InspectorInterfaces.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InspectorInterfaces.h; sourceTree = "<group>"; };
EBF21BBB1FC498270052F4D5 /* InspectorInterfaces.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InspectorInterfaces.cpp; sourceTree = "<group>"; };
EBF21BDC1FC498900052F4D5 /* libjsinspector.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libjsinspector.a; sourceTree = BUILT_PRODUCTS_DIR; };
EBF21BFA1FC4989A0052F4D5 /* libjsinspector-tvOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libjsinspector-tvOS.a"; sourceTree = BUILT_PRODUCTS_DIR; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
@ -2545,6 +2583,7 @@
130A77021DF767AF001F9587 /* yoga */,
AC70D2EA1DE489FC002E6351 /* cxxreact */,
3D4A621D1DDD3985001F41B4 /* jschelpers */,
EBF21BB91FC497DA0052F4D5 /* jsinspector */,
);
name = ReactCommon;
path = ../ReactCommon;
@ -2601,8 +2640,6 @@
3D4A621D1DDD3985001F41B4 /* jschelpers */ = {
isa = PBXGroup;
children = (
652971391EE97AA9003C8BD5 /* InspectorInterfaces.cpp */,
652971241EE976BA003C8BD5 /* InspectorInterfaces.h */,
19DED2281E77E29200F089BB /* systemJSCWrapper.cpp */,
3D7A27DC1DE32541002E3F95 /* JavaScriptCore.h */,
3D92B1071E0369AD0018521A /* JSCHelpers.cpp */,
@ -2742,6 +2779,8 @@
3D383D621EBD27B9005632C8 /* libdouble-conversion.a */,
9936F3131F5F2E4B0010BF04 /* libprivatedata.a */,
9936F32F1F5F2E5B0010BF04 /* libprivatedata-tvOS.a */,
EBF21BDC1FC498900052F4D5 /* libjsinspector.a */,
EBF21BFA1FC4989A0052F4D5 /* libjsinspector-tvOS.a */,
);
name = Products;
sourceTree = "<group>";
@ -2909,6 +2948,15 @@
path = cxxreact;
sourceTree = "<group>";
};
EBF21BB91FC497DA0052F4D5 /* jsinspector */ = {
isa = PBXGroup;
children = (
EBF21BBB1FC498270052F4D5 /* InspectorInterfaces.cpp */,
EBF21BBA1FC498270052F4D5 /* InspectorInterfaces.h */,
);
path = jsinspector;
sourceTree = "<group>";
};
/* End PBXGroup section */
/* Begin PBXHeadersBuildPhase section */
@ -3022,7 +3070,6 @@
3D302F5B1DF828F800D6DDAE /* RCTDevMenu.h in Headers */,
657734921EE8356100A0E9EA /* RCTInspector.h in Headers */,
3D302F5C1DF828F800D6DDAE /* RCTEventEmitter.h in Headers */,
652971261EE976BD003C8BD5 /* InspectorInterfaces.h in Headers */,
3D302F5D1DF828F800D6DDAE /* RCTExceptionsManager.h in Headers */,
599FAA4B1FB274980058CCF6 /* RCTSurfaceView.h in Headers */,
599FAA3D1FB274980058CCF6 /* RCTSurfaceRootShadowView.h in Headers */,
@ -3068,6 +3115,7 @@
657734941EE8356100A0E9EA /* RCTInspectorPackagerConnection.h in Headers */,
3D302F851DF828F800D6DDAE /* RCTProgressViewManager.h in Headers */,
3D302F861DF828F800D6DDAE /* RCTRefreshControl.h in Headers */,
EBF21BBE1FC498630052F4D5 /* InspectorInterfaces.h in Headers */,
C654505F1F3BD9280090799B /* RCTManagedPointer.h in Headers */,
3D302F871DF828F800D6DDAE /* RCTRefreshControlManager.h in Headers */,
A2440AA41DF8D865006E7BFC /* RCTReloadCommand.h in Headers */,
@ -3334,6 +3382,7 @@
3D80DA551DF820620028D040 /* RCTKeyboardObserver.h in Headers */,
3D80DA561DF820620028D040 /* RCTRedBox.h in Headers */,
3D80DA571DF820620028D040 /* RCTSourceCode.h in Headers */,
EBF21BBC1FC498270052F4D5 /* InspectorInterfaces.h in Headers */,
3D80DA581DF820620028D040 /* RCTStatusBarManager.h in Headers */,
3D80DA591DF820620028D040 /* RCTTiming.h in Headers */,
3D80DA5A1DF820620028D040 /* RCTUIManager.h in Headers */,
@ -3406,7 +3455,6 @@
13134CA01E296B2A00B9F3CB /* RCTCxxUtils.h in Headers */,
599FAA4A1FB274980058CCF6 /* RCTSurfaceView.h in Headers */,
3D80DA901DF820620028D040 /* RCTWebView.h in Headers */,
652971251EE976BA003C8BD5 /* InspectorInterfaces.h in Headers */,
3D80DA911DF820620028D040 /* RCTWebViewManager.h in Headers */,
3D80DA921DF820620028D040 /* RCTWrapperViewController.h in Headers */,
3D80DA931DF820620028D040 /* UIView+Private.h in Headers */,
@ -3432,6 +3480,20 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
EBF21BC41FC498900052F4D5 /* Headers */ = {
isa = PBXHeadersBuildPhase;
buildActionMask = 2147483647;
files = (
);
runOnlyForDeploymentPostprocessing = 0;
};
EBF21BE21FC4989A0052F4D5 /* Headers */ = {
isa = PBXHeadersBuildPhase;
buildActionMask = 2147483647;
files = (
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXHeadersBuildPhase section */
/* Begin PBXNativeTarget section */
@ -3608,6 +3670,7 @@
buildRules = (
);
dependencies = (
EBF21C021FC499D10052F4D5 /* PBXTargetDependency */,
9936F3401F5F305D0010BF04 /* PBXTargetDependency */,
3D3CD9501DE5FDB900167DC4 /* PBXTargetDependency */,
);
@ -3627,6 +3690,7 @@
buildRules = (
);
dependencies = (
EBF21C041FC499D80052F4D5 /* PBXTargetDependency */,
9936F3421F5F30640010BF04 /* PBXTargetDependency */,
3DC159E81E83E2A0007B1282 /* PBXTargetDependency */,
);
@ -3691,6 +3755,40 @@
productReference = 9936F32F1F5F2E5B0010BF04 /* libprivatedata-tvOS.a */;
productType = "com.apple.product-type.library.static";
};
EBF21BBF1FC498900052F4D5 /* jsinspector */ = {
isa = PBXNativeTarget;
buildConfigurationList = EBF21BD91FC498900052F4D5 /* Build configuration list for PBXNativeTarget "jsinspector" */;
buildPhases = (
EBF21BC41FC498900052F4D5 /* Headers */,
EBF21BCB1FC498900052F4D5 /* Copy Headers */,
EBF21BD31FC498900052F4D5 /* Sources */,
);
buildRules = (
);
dependencies = (
);
name = jsinspector;
productName = React;
productReference = EBF21BDC1FC498900052F4D5 /* libjsinspector.a */;
productType = "com.apple.product-type.library.static";
};
EBF21BDD1FC4989A0052F4D5 /* jsinspector-tvOS */ = {
isa = PBXNativeTarget;
buildConfigurationList = EBF21BF71FC4989A0052F4D5 /* Build configuration list for PBXNativeTarget "jsinspector-tvOS" */;
buildPhases = (
EBF21BE21FC4989A0052F4D5 /* Headers */,
EBF21BE91FC4989A0052F4D5 /* Copy Headers */,
EBF21BF11FC4989A0052F4D5 /* Sources */,
);
buildRules = (
);
dependencies = (
);
name = "jsinspector-tvOS";
productName = "React-tvOS";
productReference = EBF21BFA1FC4989A0052F4D5 /* libjsinspector-tvOS.a */;
productType = "com.apple.product-type.library.static";
};
/* End PBXNativeTarget section */
/* Begin PBXProject section */
@ -3746,6 +3844,8 @@
3D3CD9261DE5FBEE00167DC4 /* cxxreact-tvOS */,
3D3CD8FF1DE5FBD600167DC4 /* jschelpers */,
3D3CD90C1DE5FBD800167DC4 /* jschelpers-tvOS */,
EBF21BBF1FC498900052F4D5 /* jsinspector */,
EBF21BDD1FC4989A0052F4D5 /* jsinspector-tvOS */,
139D7ECD1E25DB7D00323FB7 /* third-party */,
3D383D211EBD27B6005632C8 /* third-party-tvOS */,
139D7E871E25C6D100323FB7 /* double-conversion */,
@ -3951,6 +4051,7 @@
13134C871E296B2A00B9F3CB /* RCTCxxBridge.mm in Sources */,
CF2731C31E7B8DF30044CA4F /* RCTDeviceInfo.m in Sources */,
599FAA3F1FB274980058CCF6 /* RCTSurfaceRootShadowView.m in Sources */,
EBF21C001FC499A80052F4D5 /* InspectorInterfaces.cpp in Sources */,
597633371F4E021D005BE8A4 /* RCTShadowView+Internal.m in Sources */,
2D3B5EB11D9B090100451313 /* RCTAppState.m in Sources */,
1384E20B1E806D5B00545659 /* RCTNativeModule.mm in Sources */,
@ -4009,7 +4110,6 @@
2D3B5E9A1D9B089D00451313 /* RCTEventDispatcher.m in Sources */,
2D3B5ED61D9B098400451313 /* RCTModalHostViewManager.m in Sources */,
2D3B5EE51D9B09BE00451313 /* RCTShadowView.m in Sources */,
6529713B1EE97B2D003C8BD5 /* InspectorInterfaces.cpp in Sources */,
135A9C051E7B0F7500587AEB /* RCTJSCHelpers.mm in Sources */,
2D3B5EC71D9B095600451313 /* RCTActivityIndicatorView.m in Sources */,
2D3B5EB21D9B090300451313 /* RCTAsyncLocalStorage.m in Sources */,
@ -4244,6 +4344,7 @@
59D031F71F8353D3008361F0 /* RCTSafeAreaViewLocalData.m in Sources */,
13E067571A70F44B002CDEE1 /* RCTView.m in Sources */,
3D7749441DC1065C007EC8D8 /* RCTPlatform.m in Sources */,
EBF21BBD1FC498270052F4D5 /* InspectorInterfaces.cpp in Sources */,
13D9FEEE1CDCD93000158BD7 /* RCTKeyboardObserver.m in Sources */,
135A9C001E7B0EE600587AEB /* RCTJSCHelpers.mm in Sources */,
B233E6EA1D2D845D00BC68BA /* RCTI18nManager.m in Sources */,
@ -4277,7 +4378,6 @@
137327E71AA5CF210034F82E /* RCTTabBar.m in Sources */,
13F17A851B8493E5007D4C75 /* RCTRedBox.m in Sources */,
135A9BFC1E7B0EAE00587AEB /* RCTJSCErrorHandling.mm in Sources */,
6529713A1EE97AA9003C8BD5 /* InspectorInterfaces.cpp in Sources */,
59D031F31F8353D3008361F0 /* RCTSafeAreaView.m in Sources */,
83392EB31B6634E10013B15F /* RCTModalHostViewController.m in Sources */,
13B0801C1A69489C00A75B9A /* RCTNavItem.m in Sources */,
@ -4309,6 +4409,22 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
EBF21BD31FC498900052F4D5 /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
EBF21BFC1FC4990B0052F4D5 /* InspectorInterfaces.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
EBF21BF11FC4989A0052F4D5 /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
EBF21BFF1FC4998E0052F4D5 /* InspectorInterfaces.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXSourcesBuildPhase section */
/* Begin PBXTargetDependency section */
@ -4382,6 +4498,16 @@
target = 9936F3141F5F2E5B0010BF04 /* privatedata-tvOS */;
targetProxy = 9936F3451F5F30830010BF04 /* PBXContainerItemProxy */;
};
EBF21C021FC499D10052F4D5 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = EBF21BBF1FC498900052F4D5 /* jsinspector */;
targetProxy = EBF21C011FC499D10052F4D5 /* PBXContainerItemProxy */;
};
EBF21C041FC499D80052F4D5 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = EBF21BDD1FC4989A0052F4D5 /* jsinspector-tvOS */;
targetProxy = EBF21C031FC499D80052F4D5 /* PBXContainerItemProxy */;
};
/* End PBXTargetDependency section */
/* Begin XCBuildConfiguration section */
@ -4964,6 +5090,73 @@
};
name = Release;
};
EBF21BDA1FC498900052F4D5 /* Debug */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 3D788F841EBD2D240063D616 /* third-party.xcconfig */;
buildSettings = {
CLANG_CXX_LANGUAGE_STANDARD = "c++14";
CLANG_STATIC_ANALYZER_MODE = deep;
GCC_WARN_ABOUT_MISSING_NEWLINE = YES;
OTHER_LDFLAGS = "-ObjC";
PRODUCT_NAME = "$(TARGET_NAME)";
PUBLIC_HEADERS_FOLDER_PATH = /usr/local/include/jsinspector;
RUN_CLANG_STATIC_ANALYZER = YES;
};
name = Debug;
};
EBF21BDB1FC498900052F4D5 /* Release */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 3D788F841EBD2D240063D616 /* third-party.xcconfig */;
buildSettings = {
CLANG_CXX_LANGUAGE_STANDARD = "c++14";
CLANG_STATIC_ANALYZER_MODE = deep;
GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)";
GCC_WARN_ABOUT_MISSING_NEWLINE = YES;
OTHER_LDFLAGS = "-ObjC";
PRODUCT_NAME = "$(TARGET_NAME)";
PUBLIC_HEADERS_FOLDER_PATH = /usr/local/include/jsinspector;
RUN_CLANG_STATIC_ANALYZER = NO;
};
name = Release;
};
EBF21BF81FC4989A0052F4D5 /* Debug */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 3D788F841EBD2D240063D616 /* third-party.xcconfig */;
buildSettings = {
CLANG_ANALYZER_NONNULL = YES;
CLANG_CXX_LANGUAGE_STANDARD = "c++14";
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_SUSPICIOUS_MOVES = YES;
DEBUG_INFORMATION_FORMAT = dwarf;
ENABLE_TESTABILITY = YES;
GCC_NO_COMMON_BLOCKS = YES;
OTHER_LDFLAGS = "-ObjC";
PRODUCT_NAME = "$(TARGET_NAME)";
PUBLIC_HEADERS_FOLDER_PATH = /usr/local/include/jsinspector;
SDKROOT = appletvos;
};
name = Debug;
};
EBF21BF91FC4989A0052F4D5 /* Release */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 3D788F841EBD2D240063D616 /* third-party.xcconfig */;
buildSettings = {
CLANG_ANALYZER_NONNULL = YES;
CLANG_CXX_LANGUAGE_STANDARD = "c++14";
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_SUSPICIOUS_MOVES = YES;
COPY_PHASE_STRIP = NO;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
GCC_NO_COMMON_BLOCKS = YES;
OTHER_LDFLAGS = "-ObjC";
PRODUCT_NAME = "$(TARGET_NAME)";
PUBLIC_HEADERS_FOLDER_PATH = /usr/local/include/jsinspector;
SDKROOT = appletvos;
};
name = Release;
};
/* End XCBuildConfiguration section */
/* Begin XCConfigurationList section */
@ -5102,6 +5295,24 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
EBF21BD91FC498900052F4D5 /* Build configuration list for PBXNativeTarget "jsinspector" */ = {
isa = XCConfigurationList;
buildConfigurations = (
EBF21BDA1FC498900052F4D5 /* Debug */,
EBF21BDB1FC498900052F4D5 /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
EBF21BF71FC4989A0052F4D5 /* Build configuration list for PBXNativeTarget "jsinspector-tvOS" */ = {
isa = XCConfigurationList;
buildConfigurations = (
EBF21BF81FC4989A0052F4D5 /* Debug */,
EBF21BF91FC4989A0052F4D5 /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
/* End XCConfigurationList section */
};
rootObject = 83CBB9F71A601CBA00E9B192 /* Project object */;

1
ReactAndroid/src/main/jni/packagerconnection/BUCK
View File

@ -27,5 +27,6 @@ cxx_library(
FBJNI_TARGET,
"xplat//folly:molly",
react_native_xplat_target("jschelpers:jschelpers"),
react_native_xplat_target("jsinspector:jsinspector"),
] + JSC_DEPS) if not IS_OSS_BUILD else [],
)

2
ReactAndroid/src/main/jni/react/jni/JInspector.h
View File

@ -4,7 +4,7 @@
#ifdef WITH_INSPECTOR
#include <jschelpers/InspectorInterfaces.h>
#include <jsinspector/InspectorInterfaces.h>
#include <fb/fbjni.h>
#include <folly/Memory.h>

1
ReactCommon/cxxreact/Android.mk
View File

@ -45,4 +45,5 @@ $(call import-module,folly)
$(call import-module,jsc)
$(call import-module,glog)
$(call import-module,jschelpers)
$(call import-module,jsinspector)
$(call import-module,privatedata)

1
ReactCommon/cxxreact/BUCK
View File

@ -143,6 +143,7 @@ rn_xplat_cxx_library(
"xplat//fbsystrace:fbsystrace",
"xplat//folly:molly",
react_native_xplat_target("jschelpers:jschelpers"),
react_native_xplat_target("jsinspector:jsinspector"),
react_native_xplat_target("microprofiler:microprofiler"),
] + JSC_DEPS,
)

2
ReactCommon/cxxreact/JSCExecutor.cpp
View File

@ -19,9 +19,9 @@
#include <folly/Memory.h>
#include <folly/String.h>
#include <glog/logging.h>
#include <jschelpers/InspectorInterfaces.h>
#include <jschelpers/JSCHelpers.h>
#include <jschelpers/Value.h>
#include <jsinspector/InspectorInterfaces.h>
#include "JSBigString.h"
#include "JSBundleType.h"

1
ReactCommon/jschelpers/BUCK
View File

@ -1,7 +1,6 @@
include_defs("//ReactCommon/DEFS")
EXPORTED_HEADERS = [
"InspectorInterfaces.h",
"JavaScriptCore.h",
"JSCHelpers.h",
"JSCWrapper.h",

18
ReactCommon/jsinspector/Android.mk Normal file
View File

@ -0,0 +1,18 @@
LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
LOCAL_MODULE := jsinspector
LOCAL_SRC_FILES := \
InspectorInterfaces.cpp
LOCAL_C_INCLUDES := $(LOCAL_PATH)/..
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_C_INCLUDES)
LOCAL_CFLAGS += -Wall -Werror -fexceptions
CXX11_FLAGS := -std=c++11
LOCAL_CFLAGS += $(CXX11_FLAGS)
LOCAL_EXPORT_CPPFLAGS := $(CXX11_FLAGS)
include $(BUILD_SHARED_LIBRARY)

26
ReactCommon/jsinspector/BUCK Normal file
View File

@ -0,0 +1,26 @@
include_defs("//ReactCommon/DEFS")
EXPORTED_HEADERS = [
"InspectorInterfaces.h",
]
rn_xplat_cxx_library(
name = "jsinspector",
srcs = glob(
["*.cpp"],
),
headers = glob(
["*.h"],
excludes = EXPORTED_HEADERS,
),
header_namespace = "jsinspector",
exported_headers = EXPORTED_HEADERS,
compiler_flags = [
"-Wall",
"-fexceptions",
"-std=c++1y",
],
visibility = [
"PUBLIC",
],
)

0
ReactCommon/jschelpers/InspectorInterfaces.cpp → ReactCommon/jsinspector/InspectorInterfaces.cpp
View File

2
ReactCommon/jschelpers/InspectorInterfaces.h → ReactCommon/jsinspector/InspectorInterfaces.h
View File

@ -29,7 +29,7 @@ struct InspectorPage {
class IRemoteConnection : public IDestructible {
public:
__attribute__((visibility("default"))) virtual ~IRemoteConnection() = 0;
virtual ~IRemoteConnection() = 0;
virtual void onMessage(std::string message) = 0;
virtual void onDisconnect() = 0;
};