Skip to content

Commit c799144

Browse files
author
Adam Gleitman
committed
Fix RNTester release bundling
1 parent 5181a02 commit c799144

File tree

4 files changed

+45
-14
lines changed

4 files changed

+45
-14
lines changed

‎packages/react-native/scripts/react-native-xcode.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ set -x
1313
DEST=$CONFIGURATION_BUILD_DIR/$UNLOCALIZED_RESOURCES_FOLDER_PATH
1414

1515
# Enables iOS devices to get the IP address of the machine running Metro
16-
if [[ ! "$SKIP_BUNDLING_METRO_IP" && "$CONFIGURATION" = *Debug* && ! "$PLATFORM_NAME" == *simulator ]]; then
16+
if [[ ! "$SKIP_BUNDLING_METRO_IP" && "$CONFIGURATION" = *Debug* && ! "$PLATFORM_NAME" == *simulator && ! "$PLATFORM_NAME" == macosx ]]; then
1717
for num in 0 1 2 3 4 5 6 7 8; do
1818
IP=$(ipconfig getifaddr en${num})
1919
if [ ! -z "$IP" ]; then

‎packages/rn-tester/RNTesterPods.xcodeproj/project.pbxproj‎

Lines changed: 22 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -548,6 +548,7 @@
548548
ACC52F3A299ECB7A002A2B0B /* Sources */,
549549
ACC52F3B299ECB7A002A2B0B /* Frameworks */,
550550
ACC52F3C299ECB7A002A2B0B /* Resources */,
551+
66F5AB8C2A94331500C16242 /* Build JS Bundle */,
551552
63B9AC6D4098D9EDCCD7F242 /* [CP] Copy Pods Resources */,
552553
);
553554
buildRules = (
@@ -859,6 +860,24 @@
859860
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-RNTester-macOS/Pods-RNTester-macOS-resources.sh\"\n";
860861
showEnvVarsInLog = 0;
861862
};
863+
66F5AB8C2A94331500C16242 /* Build JS Bundle */ = {
864+
isa = PBXShellScriptBuildPhase;
865+
buildActionMask = 2147483647;
866+
files = (
867+
);
868+
inputFileListPaths = (
869+
);
870+
inputPaths = (
871+
);
872+
name = "Build JS Bundle";
873+
outputFileListPaths = (
874+
);
875+
outputPaths = (
876+
);
877+
runOnlyForDeploymentPostprocessing = 0;
878+
shellPath = /bin/sh;
879+
shellScript = "set -e\n\nexport PROJECT_ROOT=\"$SRCROOT/\"\nexport ENTRY_FILE=\"$SRCROOT/js/RNTesterApp.macos.js\"\nexport SOURCEMAP_FILE=./sourcemap.macos.map\n# export FORCE_BUNDLING=true \n\nWITH_ENVIRONMENT=\"../react-native/scripts/xcode/with-environment.sh\"\nREACT_NATIVE_XCODE=\"../react-native/scripts/react-native-xcode.sh\"\n\n/bin/sh -c \"$WITH_ENVIRONMENT $REACT_NATIVE_XCODE\"\n";
880+
};
862881
67D0F81A83A6269C88257DC7 /* [CP] Copy Pods Resources */ = {
863882
isa = PBXShellScriptBuildPhase;
864883
buildActionMask = 2147483647;
@@ -912,7 +931,7 @@
912931
);
913932
runOnlyForDeploymentPostprocessing = 0;
914933
shellPath = /bin/sh;
915-
shellScript = "set -e\n\nexport PROJECT_ROOT=\"$SRCROOT/../react-native/\"\nexport ENTRY_FILE=\"$SRCROOT/js/RNTesterApp.ios.js\"\nexport SOURCEMAP_FILE=../sourcemap.ios.map\n# export FORCE_BUNDLING=true \n\nWITH_ENVIRONMENT=\"../react-native/scripts/xcode/with-environment.sh\"\nREACT_NATIVE_XCODE=\"../react-native/scripts/react-native-xcode.sh\"\n\n/bin/sh -c \"$WITH_ENVIRONMENT $REACT_NATIVE_XCODE\"\n";
934+
shellScript = "set -e\n\nexport PROJECT_ROOT=\"$SRCROOT/\"\nexport ENTRY_FILE=\"$SRCROOT/js/RNTesterApp.ios.js\"\nexport SOURCEMAP_FILE=./sourcemap.ios.map\n# export FORCE_BUNDLING=true \n\nWITH_ENVIRONMENT=\"../react-native/scripts/xcode/with-environment.sh\"\nREACT_NATIVE_XCODE=\"../react-native/scripts/react-native-xcode.sh\"\n\n/bin/sh -c \"$WITH_ENVIRONMENT $REACT_NATIVE_XCODE\"\n";
916935
};
917936
79E8BE2B119D4C5CCD2F04B3 /* [RN] Copy Hermes Framework */ = {
918937
isa = PBXShellScriptBuildPhase;
@@ -1317,10 +1336,7 @@
13171336
IPHONEOS_DEPLOYMENT_TARGET = 12.4;
13181337
MTL_ENABLE_DEBUG_INFO = YES;
13191338
ONLY_ACTIVE_ARCH = YES;
1320-
OTHER_CFLAGS = (
1321-
"$(inherited)",
1322-
" ",
1323-
);
1339+
OTHER_CFLAGS = "$(inherited) ";
13241340
OTHER_CPLUSPLUSFLAGS = (
13251341
"$(OTHER_CFLAGS)",
13261342
"-DFOLLY_NO_CONFIG",
@@ -1398,10 +1414,7 @@
13981414
GCC_WARN_UNUSED_VARIABLE = YES;
13991415
IPHONEOS_DEPLOYMENT_TARGET = 12.4;
14001416
MTL_ENABLE_DEBUG_INFO = NO;
1401-
OTHER_CFLAGS = (
1402-
"$(inherited)",
1403-
" ",
1404-
);
1417+
OTHER_CFLAGS = "$(inherited) ";
14051418
OTHER_CPLUSPLUSFLAGS = (
14061419
"$(OTHER_CFLAGS)",
14071420
"-DFOLLY_NO_CONFIG",

‎packages/rn-tester/RNTesterPods.xcodeproj/xcshareddata/xcschemes/RNTester Release.xcscheme‎

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
LastUpgradeVersion = "0820"
44
version = "1.3">
55
<BuildAction
6-
parallelizeBuildables = "NO"
6+
parallelizeBuildables = "YES"
77
buildImplicitDependencies = "YES">
88
<BuildActionEntries>
99
<BuildActionEntry
@@ -132,9 +132,18 @@
132132
BlueprintIdentifier = "13B07F861A680F5B00A75B9A"
133133
BuildableName = "RNTester.app"
134134
BlueprintName = "RNTester"
135-
ReferencedContainer = "container:RNTester.xcodeproj">
135+
ReferencedContainer = "container:RNTesterPods.xcodeproj">
136136
</BuildableReference>
137137
</BuildableProductRunnable>
138+
<MacroExpansion>
139+
<BuildableReference
140+
BuildableIdentifier = "primary"
141+
BlueprintIdentifier = "13B07F861A680F5B00A75B9A"
142+
BuildableName = "RNTester.app"
143+
BlueprintName = "RNTester"
144+
ReferencedContainer = "container:RNTester.xcodeproj">
145+
</BuildableReference>
146+
</MacroExpansion>
138147
<EnvironmentVariables>
139148
<EnvironmentVariable
140149
key = "CI_USE_PACKAGER"
@@ -159,6 +168,15 @@
159168
ReferencedContainer = "container:RNTester.xcodeproj">
160169
</BuildableReference>
161170
</BuildableProductRunnable>
171+
<MacroExpansion>
172+
<BuildableReference
173+
BuildableIdentifier = "primary"
174+
BlueprintIdentifier = "13B07F861A680F5B00A75B9A"
175+
BuildableName = "RNTester.app"
176+
BlueprintName = "RNTester"
177+
ReferencedContainer = "container:RNTester.xcodeproj">
178+
</BuildableReference>
179+
</MacroExpansion>
162180
</ProfileAction>
163181
<AnalyzeAction
164182
buildConfiguration = "Debug">

‎packages/rn-tester/RNTesterPods.xcodeproj/xcshareddata/xcschemes/RNTester-macOS Release.xcscheme‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
LastUpgradeVersion = "0830"
44
version = "1.3">
55
<BuildAction
6-
parallelizeBuildables = "NO"
6+
parallelizeBuildables = "YES"
77
buildImplicitDependencies = "YES">
88
<BuildActionEntries>
99
<BuildActionEntry
@@ -101,7 +101,7 @@
101101
runnableDebuggingMode = "0">
102102
<BuildableReference
103103
BuildableIdentifier = "primary"
104-
BlueprintIdentifier = "9F15345A233AB2C4006DFE44"
104+
BlueprintIdentifier = "ACC52F3D299ECB7A002A2B0B"
105105
BuildableName = "RNTester-macOS.app"
106106
BlueprintName = "RNTester-macOS"
107107
ReferencedContainer = "container:RNTesterPods.xcodeproj">

0 commit comments

Comments
 (0)