Skip to content

Commit 78fcf7c

Browse files
mhorowitzfacebook-github-bot
mhorowitz
authored and
facebook-github-bot
committedOct 18, 2018
Get RNTester xcodeproj to compile
Summary: Marc deleted a few files from react-native-github, so I removed them from the RNTester XCode project. I also included the files he created, and created new targets: `jsiexecutor-tvOS`, `jsiexecutor`, `jsi`, `jsi-tvOS`. **Note:** The tvOS build of RNTester is broken in this diff because of a few `WKWebView` changes I landed earlier. D9844322 includes the fix. Reviewed By: axe-fb Differential Revision: D9875409 fbshipit-source-id: 31a9f241a524de91e78dfff0555aec5d1373d789
·
v0.79.0-rc.10.60.2
1 parent f85692c commit 78fcf7c

File tree

2 files changed

+783
-763
lines changed

2 files changed

+783
-763
lines changed
 

‎RNTester/RNTester.xcodeproj/project.pbxproj

+87-63
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,8 @@
131131
C654F0B31EB34A73000B7A9A /* RNTesterTestModule.m in Sources */ = {isa = PBXBuildFile; fileRef = C654F0B21EB34A73000B7A9A /* RNTesterTestModule.m */; };
132132
C654F17E1EB34D24000B7A9A /* RNTesterTestModule.m in Sources */ = {isa = PBXBuildFile; fileRef = C654F0B21EB34A73000B7A9A /* RNTesterTestModule.m */; };
133133
D85B829E1AB6D5D7003F4FE2 /* libRCTVibration.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D85B829C1AB6D5CE003F4FE2 /* libRCTVibration.a */; };
134+
ED2970992150247000B7C4FE /* JavaScriptCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = ED2970982150247000B7C4FE /* JavaScriptCore.framework */; };
135+
EDEBC856214C774100DD5AC8 /* JavaScriptCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = EDEBC7DA214C681C00DD5AC8 /* JavaScriptCore.framework */; };
134136
/* End PBXBuildFile section */
135137

136138
/* Begin PBXContainerItemProxy section */
@@ -218,20 +220,6 @@
218220
remoteGlobalIDString = 2DD3238F1DA2DD8A000FE1B8;
219221
remoteInfo = "RNTester-tvOS";
220222
};
221-
2D609F0C1F84BD7E00D65B08 /* PBXContainerItemProxy */ = {
222-
isa = PBXContainerItemProxy;
223-
containerPortal = 14AADEFF1AC3DB95002390C9 /* React.xcodeproj */;
224-
proxyType = 2;
225-
remoteGlobalIDString = 9936F3131F5F2E4B0010BF04;
226-
remoteInfo = privatedata;
227-
};
228-
2D609F0E1F84BD7E00D65B08 /* PBXContainerItemProxy */ = {
229-
isa = PBXContainerItemProxy;
230-
containerPortal = 14AADEFF1AC3DB95002390C9 /* React.xcodeproj */;
231-
proxyType = 2;
232-
remoteGlobalIDString = 9936F32F1F5F2E5B0010BF04;
233-
remoteInfo = "privatedata-tvOS";
234-
};
235223
2D66FF641ECA405900F0A767 /* PBXContainerItemProxy */ = {
236224
isa = PBXContainerItemProxy;
237225
containerPortal = 2D66FF5F1ECA405900F0A767 /* ART.xcodeproj */;
@@ -351,20 +339,6 @@
351339
remoteGlobalIDString = 3D3CD9321DE5FBEE00167DC4;
352340
remoteInfo = "cxxreact-tvOS";
353341
};
354-
3D05748F1DE6008900184BB4 /* PBXContainerItemProxy */ = {
355-
isa = PBXContainerItemProxy;
356-
containerPortal = 14AADEFF1AC3DB95002390C9 /* React.xcodeproj */;
357-
proxyType = 2;
358-
remoteGlobalIDString = 3D3CD90B1DE5FBD600167DC4;
359-
remoteInfo = jschelpers;
360-
};
361-
3D0574911DE6008900184BB4 /* PBXContainerItemProxy */ = {
362-
isa = PBXContainerItemProxy;
363-
containerPortal = 14AADEFF1AC3DB95002390C9 /* React.xcodeproj */;
364-
proxyType = 2;
365-
remoteGlobalIDString = 3D3CD9181DE5FBD800167DC4;
366-
remoteInfo = "jschelpers-tvOS";
367-
};
368342
3D13F84B1D6F6B5F00E69E0E /* PBXContainerItemProxy */ = {
369343
isa = PBXContainerItemProxy;
370344
containerPortal = 83CBB9F71A601CBA00E9B192 /* Project object */;
@@ -463,8 +437,49 @@
463437
remoteGlobalIDString = 832C81801AAF6DEF007FA2F7;
464438
remoteInfo = RCTVibration;
465439
};
440+
ED2970942150246200B7C4FE /* PBXContainerItemProxy */ = {
441+
isa = PBXContainerItemProxy;
442+
containerPortal = 14AADEFF1AC3DB95002390C9 /* React.xcodeproj */;
443+
proxyType = 2;
444+
remoteGlobalIDString = ED296FB6214C9A0900B7C4FE;
445+
remoteInfo = "jsi-tvOS";
446+
};
447+
ED2970962150246200B7C4FE /* PBXContainerItemProxy */ = {
448+
isa = PBXContainerItemProxy;
449+
containerPortal = 14AADEFF1AC3DB95002390C9 /* React.xcodeproj */;
450+
proxyType = 2;
451+
remoteGlobalIDString = ED296FEE214C9CF800B7C4FE;
452+
remoteInfo = "jsiexecutor-tvOS";
453+
};
454+
EDEBC6FB214B402000DD5AC8 /* PBXContainerItemProxy */ = {
455+
isa = PBXContainerItemProxy;
456+
containerPortal = 14AADEFF1AC3DB95002390C9 /* React.xcodeproj */;
457+
proxyType = 2;
458+
remoteGlobalIDString = EDEBC6D6214B3E7000DD5AC8;
459+
remoteInfo = jsi;
460+
};
461+
EDEBC7C9214C503A00DD5AC8 /* PBXContainerItemProxy */ = {
462+
isa = PBXContainerItemProxy;
463+
containerPortal = 14AADEFF1AC3DB95002390C9 /* React.xcodeproj */;
464+
proxyType = 2;
465+
remoteGlobalIDString = EDEBC73B214B45A300DD5AC8;
466+
remoteInfo = jsiexecutor;
467+
};
466468
/* End PBXContainerItemProxy section */
467469

470+
/* Begin PBXCopyFilesBuildPhase section */
471+
EDEBC7DE214C68E400DD5AC8 /* Embed Frameworks */ = {
472+
isa = PBXCopyFilesBuildPhase;
473+
buildActionMask = 12;
474+
dstPath = "";
475+
dstSubfolderSpec = 10;
476+
files = (
477+
);
478+
name = "Embed Frameworks";
479+
runOnlyForDeploymentPostprocessing = 0;
480+
};
481+
/* End PBXCopyFilesBuildPhase section */
482+
468483
/* Begin PBXFileReference section */
469484
001BFCE31D838343008E587E /* RCTMultipartStreamReaderTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTMultipartStreamReaderTests.m; sourceTree = "<group>"; };
470485
004D289E1AAF61C70097A701 /* RNTesterUnitTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RNTesterUnitTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -549,6 +564,8 @@
549564
BC9C033F1DC9F1D600B1C635 /* RCTDevMenuTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTDevMenuTests.m; sourceTree = "<group>"; };
550565
C654F0B21EB34A73000B7A9A /* RNTesterTestModule.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RNTesterTestModule.m; sourceTree = "<group>"; };
551566
D85B82911AB6D5CE003F4FE2 /* RCTVibration.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTVibration.xcodeproj; path = ../Libraries/Vibration/RCTVibration.xcodeproj; sourceTree = "<group>"; };
567+
ED2970982150247000B7C4FE /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS12.0.sdk/System/Library/Frameworks/JavaScriptCore.framework; sourceTree = DEVELOPER_DIR; };
568+
EDEBC7DA214C681C00DD5AC8 /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; };
552569
/* End PBXFileReference section */
553570

554571
/* Begin PBXFrameworksBuildPhase section */
@@ -577,6 +594,7 @@
577594
isa = PBXFrameworksBuildPhase;
578595
buildActionMask = 2147483647;
579596
files = (
597+
EDEBC856214C774100DD5AC8 /* JavaScriptCore.framework in Frameworks */,
580598
3D0E379D1F1CC77200DCAC9F /* libReact.a in Frameworks */,
581599
52C11BBB1EEACA7100C1A058 /* libRCTBlob.a in Frameworks */,
582600
2D66FF8F1ECA406D00F0A767 /* libART.a in Frameworks */,
@@ -615,6 +633,7 @@
615633
isa = PBXFrameworksBuildPhase;
616634
buildActionMask = 2147483647;
617635
files = (
636+
ED2970992150247000B7C4FE /* JavaScriptCore.framework in Frameworks */,
618637
52C11BE11EEACA7800C1A058 /* libRCTBlob-tvOS.a in Frameworks */,
619638
2D66FF901ECA407E00F0A767 /* libART-tvOS.a in Frameworks */,
620639
2DD323EA1DA2DE3F000FE1B8 /* libReact.a in Frameworks */,
@@ -843,16 +862,16 @@
843862
3D3C08831DE3424E00C268FA /* libyoga.a */,
844863
3D05748C1DE6008900184BB4 /* libcxxreact.a */,
845864
3D05748E1DE6008900184BB4 /* libcxxreact.a */,
846-
3D0574901DE6008900184BB4 /* libjschelpers.a */,
847-
3D0574921DE6008900184BB4 /* libjschelpers.a */,
848865
3DCE53221FEAB1C500613583 /* libjsinspector.a */,
849866
3DCE53241FEAB1C500613583 /* libjsinspector-tvOS.a */,
850867
3D507F421EBC88B700B56834 /* libthird-party.a */,
851868
2D66FF8C1ECA405900F0A767 /* libthird-party.a */,
852869
3D507F441EBC88B700B56834 /* libdouble-conversion.a */,
853870
2D66FF8E1ECA405900F0A767 /* libdouble-conversion.a */,
854-
2D609F0D1F84BD7E00D65B08 /* libprivatedata.a */,
855-
2D609F0F1F84BD7E00D65B08 /* libprivatedata-tvOS.a */,
871+
EDEBC6FC214B402000DD5AC8 /* libjsi.a */,
872+
EDEBC7CA214C503A00DD5AC8 /* libjsiexecutor.a */,
873+
ED2970952150246200B7C4FE /* libjsi-tvOS.a */,
874+
ED2970972150246200B7C4FE /* libjsiexecutor-tvOS.a */,
856875
);
857876
name = Products;
858877
sourceTree = "<group>";
@@ -920,6 +939,8 @@
920939
2DE7E7D81FB2A4F3009E225D /* Frameworks */ = {
921940
isa = PBXGroup;
922941
children = (
942+
ED2970982150247000B7C4FE /* JavaScriptCore.framework */,
943+
EDEBC7DA214C681C00DD5AC8 /* JavaScriptCore.framework */,
923944
);
924945
name = Frameworks;
925946
sourceTree = "<group>";
@@ -1039,6 +1060,7 @@
10391060
13B07F8C1A680F5B00A75B9A /* Frameworks */,
10401061
13B07F8E1A680F5B00A75B9A /* Resources */,
10411062
68CD48B71D2BCB2C007E06A9 /* Run Script */,
1063+
EDEBC7DE214C68E400DD5AC8 /* Embed Frameworks */,
10421064
);
10431065
buildRules = (
10441066
);
@@ -1151,7 +1173,7 @@
11511173
CreatedOnToolsVersion = 6.1.1;
11521174
};
11531175
13B07F861A680F5B00A75B9A = {
1154-
DevelopmentTeam = V9WTTPBFK9;
1176+
DevelopmentTeam = VYK7DLU38Z;
11551177
};
11561178
143BC5941B21E3E100462512 = {
11571179
CreatedOnToolsVersion = 6.3.2;
@@ -1332,20 +1354,6 @@
13321354
remoteRef = 14DC67F01AB71876001358AB /* PBXContainerItemProxy */;
13331355
sourceTree = BUILT_PRODUCTS_DIR;
13341356
};
1335-
2D609F0D1F84BD7E00D65B08 /* libprivatedata.a */ = {
1336-
isa = PBXReferenceProxy;
1337-
fileType = archive.ar;
1338-
path = libprivatedata.a;
1339-
remoteRef = 2D609F0C1F84BD7E00D65B08 /* PBXContainerItemProxy */;
1340-
sourceTree = BUILT_PRODUCTS_DIR;
1341-
};
1342-
2D609F0F1F84BD7E00D65B08 /* libprivatedata-tvOS.a */ = {
1343-
isa = PBXReferenceProxy;
1344-
fileType = archive.ar;
1345-
path = "libprivatedata-tvOS.a";
1346-
remoteRef = 2D609F0E1F84BD7E00D65B08 /* PBXContainerItemProxy */;
1347-
sourceTree = BUILT_PRODUCTS_DIR;
1348-
};
13491357
2D66FF651ECA405900F0A767 /* libART.a */ = {
13501358
isa = PBXReferenceProxy;
13511359
fileType = archive.ar;
@@ -1465,20 +1473,6 @@
14651473
remoteRef = 3D05748D1DE6008900184BB4 /* PBXContainerItemProxy */;
14661474
sourceTree = BUILT_PRODUCTS_DIR;
14671475
};
1468-
3D0574901DE6008900184BB4 /* libjschelpers.a */ = {
1469-
isa = PBXReferenceProxy;
1470-
fileType = archive.ar;
1471-
path = libjschelpers.a;
1472-
remoteRef = 3D05748F1DE6008900184BB4 /* PBXContainerItemProxy */;
1473-
sourceTree = BUILT_PRODUCTS_DIR;
1474-
};
1475-
3D0574921DE6008900184BB4 /* libjschelpers.a */ = {
1476-
isa = PBXReferenceProxy;
1477-
fileType = archive.ar;
1478-
path = libjschelpers.a;
1479-
remoteRef = 3D0574911DE6008900184BB4 /* PBXContainerItemProxy */;
1480-
sourceTree = BUILT_PRODUCTS_DIR;
1481-
};
14821476
3D3C08811DE3424E00C268FA /* libyoga.a */ = {
14831477
isa = PBXReferenceProxy;
14841478
fileType = archive.ar;
@@ -1570,6 +1564,34 @@
15701564
remoteRef = D85B829B1AB6D5CE003F4FE2 /* PBXContainerItemProxy */;
15711565
sourceTree = BUILT_PRODUCTS_DIR;
15721566
};
1567+
ED2970952150246200B7C4FE /* libjsi-tvOS.a */ = {
1568+
isa = PBXReferenceProxy;
1569+
fileType = archive.ar;
1570+
path = "libjsi-tvOS.a";
1571+
remoteRef = ED2970942150246200B7C4FE /* PBXContainerItemProxy */;
1572+
sourceTree = BUILT_PRODUCTS_DIR;
1573+
};
1574+
ED2970972150246200B7C4FE /* libjsiexecutor-tvOS.a */ = {
1575+
isa = PBXReferenceProxy;
1576+
fileType = archive.ar;
1577+
path = "libjsiexecutor-tvOS.a";
1578+
remoteRef = ED2970962150246200B7C4FE /* PBXContainerItemProxy */;
1579+
sourceTree = BUILT_PRODUCTS_DIR;
1580+
};
1581+
EDEBC6FC214B402000DD5AC8 /* libjsi.a */ = {
1582+
isa = PBXReferenceProxy;
1583+
fileType = archive.ar;
1584+
path = libjsi.a;
1585+
remoteRef = EDEBC6FB214B402000DD5AC8 /* PBXContainerItemProxy */;
1586+
sourceTree = BUILT_PRODUCTS_DIR;
1587+
};
1588+
EDEBC7CA214C503A00DD5AC8 /* libjsiexecutor.a */ = {
1589+
isa = PBXReferenceProxy;
1590+
fileType = archive.ar;
1591+
path = libjsiexecutor.a;
1592+
remoteRef = EDEBC7C9214C503A00DD5AC8 /* PBXContainerItemProxy */;
1593+
sourceTree = BUILT_PRODUCTS_DIR;
1594+
};
15731595
/* End PBXReferenceProxy section */
15741596

15751597
/* Begin PBXResourcesBuildPhase section */
@@ -1850,9 +1872,10 @@
18501872
isa = XCBuildConfiguration;
18511873
buildSettings = {
18521874
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
1853-
DEVELOPMENT_TEAM = V9WTTPBFK9;
1875+
DEVELOPMENT_TEAM = VYK7DLU38Z;
18541876
INFOPLIST_FILE = "$(SRCROOT)/RNTester/Info.plist";
18551877
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
1878+
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
18561879
LIBRARY_SEARCH_PATHS = "$(inherited)";
18571880
PRODUCT_BUNDLE_IDENTIFIER = com.facebook.react.uiapp;
18581881
PRODUCT_NAME = RNTester;
@@ -1864,9 +1887,10 @@
18641887
isa = XCBuildConfiguration;
18651888
buildSettings = {
18661889
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
1867-
DEVELOPMENT_TEAM = V9WTTPBFK9;
1890+
DEVELOPMENT_TEAM = VYK7DLU38Z;
18681891
INFOPLIST_FILE = "$(SRCROOT)/RNTester/Info.plist";
18691892
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
1893+
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
18701894
LIBRARY_SEARCH_PATHS = "$(inherited)";
18711895
PRODUCT_BUNDLE_IDENTIFIER = com.facebook.react.uiapp;
18721896
PRODUCT_NAME = RNTester;

‎React/React.xcodeproj/project.pbxproj

+696-700
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)
Please sign in to comment.