Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix Xcode 10 errors relating to third-party #21458

Closed
wants to merge 5 commits into from
Closed

Fix Xcode 10 errors relating to third-party #21458

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
cef5e5a
Fix Xcode 10 errors relating to third-party
mmccartney Oct 3, 2018
1642559
use postinstall to run ios-install-third-party.sh
mmccartney Oct 4, 2018
904628d
make Xcode wait for ios-install-third-party.sh to finish before compi…
Oct 4, 2018
cacccc4
make ios-install-third-party.sh ignore incomplete installs
Oct 8, 2018
0bbb388
move outputFiles into Xcode project to be Xcode 9.x compatible; chang…
Oct 8, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
make Xcode wait for ios-install-third-party.sh to finish before compi… 
…ling third-party
  • Loading branch information
Mike McCartney committed Oct 9, 2018
commit 904628de74caff8f2412d2337c727bf6461d3ec0
9 changes: 6 additions & 3 deletions React/React.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
archiveVersion = 1;
classes = {
};
objectVersion = 46;
objectVersion = 51;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

are you sure about this? isn't that Xcode 10-only-compatible mode?

objects = {

/* Begin PBXBuildFile section */
Expand Down Expand Up @@ -4000,7 +4000,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "export RCT_METRO_PORT=\"${RCT_METRO_PORT:=8081}\"\necho \"export RCT_METRO_PORT=${RCT_METRO_PORT}\" > \"${SRCROOT}/../scripts/.packager.env\"\nif [ -z \"${RCT_NO_LAUNCH_PACKAGER+xxx}\" ] ; then\n if nc -w 5 -z localhost ${RCT_METRO_PORT} ; then\n if ! curl -s \"http://localhost:${RCT_METRO_PORT}/status\" | grep -q \"packager-status:running\" ; then\n echo \"Port ${RCT_METRO_PORT} already in use, packager is either not running or not running correctly\"\n exit 2\n fi\n else\n open \"$SRCROOT/../scripts/launchPackager.command\" || echo \"Can't start packager automatically\"\n fi\nfi";
shellScript = "export RCT_METRO_PORT=\"${RCT_METRO_PORT:=8081}\"\necho \"export RCT_METRO_PORT=${RCT_METRO_PORT}\" > \"${SRCROOT}/../scripts/.packager.env\"\nif [ -z \"${RCT_NO_LAUNCH_PACKAGER+xxx}\" ] ; then\n if nc -w 5 -z localhost ${RCT_METRO_PORT} ; then\n if ! curl -s \"http://localhost:${RCT_METRO_PORT}/status\" | grep -q \"packager-status:running\" ; then\n echo \"Port ${RCT_METRO_PORT} already in use, packager is either not running or not running correctly\"\n exit 2\n fi\n else\n open \"$SRCROOT/../scripts/launchPackager.command\" || echo \"Can't start packager automatically\"\n fi\nfi\n";
showEnvVarsInLog = 0;
};
142C4F7F1B582EA6001F0B58 /* Include RCTJSCProfiler */ = {
Expand All @@ -4026,11 +4026,14 @@
inputPaths = (
);
name = "Install Third Party";
outputFileListPaths = (
"$(SRCROOT)/../third-party.xcfilelist",
);
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "cd \"$SRCROOT/..\"\nexec ./scripts/ios-install-third-party.sh";
shellScript = "cd \"$SRCROOT/..\"\nexec ./scripts/ios-install-third-party.sh\n";
};
2D6948201DA3042200B3FA97 /* Include RCTJSCProfiler */ = {
isa = PBXShellScriptBuildPhase;
Expand Down
1 change: 0 additions & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,6 @@
"flow-check-android": "flow check --flowconfig-name .flowconfig.android",
"lint": "eslint .",
"prettier": "prettier \"./**/*.js\" --write",
"postinstall": "./scripts/ios-install-third-party.sh",
"docker-setup-android": "docker pull reactnativeci/android-base:latest",
"docker-build-android-base": "docker build -t reactnativeci/android-base -f ContainerShip/Dockerfile.android-base .",
"docker-build-android": "docker build -t reactnativeci/android -f ContainerShip/Dockerfile.android .",
Expand Down
55 changes: 55 additions & 0 deletions third-party.xcfilelist
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
third-party/glog-0.3.5/src/config.h
third-party/glog-0.3.5/src/demangle.cc
third-party/glog-0.3.5/src/demangle.h
third-party/glog-0.3.5/src/logging.cc
third-party/glog-0.3.5/src/raw_logging.cc
third-party/glog-0.3.5/src/signalhandler.cc
third-party/glog-0.3.5/src/stacktrace.h
third-party/glog-0.3.5/src/symbolize.cc
third-party/glog-0.3.5/src/symbolize.h
third-party/glog-0.3.5/src/utilities.cc
third-party/glog-0.3.5/src/utilities.h
third-party/glog-0.3.5/src/vlog_is_on.cc
third-party/glog-0.3.5/src/glog/log_severity.h
third-party/glog-0.3.5/src/glog/logging.h
third-party/glog-0.3.5/src/glog/raw_logging.h
third-party/glog-0.3.5/src/glog/stl_logging.h
third-party/glog-0.3.5/src/glog/vlog_is_on.h
third-party/folly-2016.10.31.00/folly/detail/MallocImpl.cpp
third-party/folly-2016.10.31.00/folly/portability/BitsFunctexcept.cpp
third-party/folly-2016.10.31.00/folly/Demangle.cpp
third-party/folly-2016.10.31.00/folly/StringBase.cpp
third-party/folly-2016.10.31.00/folly/Unicode.cpp
third-party/folly-2016.10.31.00/folly/AtomicIntrusiveLinkedList.h
third-party/folly-2016.10.31.00/folly/Bits.cpp
third-party/folly-2016.10.31.00/folly/Bits.h
third-party/folly-2016.10.31.00/folly/Conv.cpp
third-party/folly-2016.10.31.00/folly/Conv.h
third-party/folly-2016.10.31.00/folly/dynamic-inl.h
third-party/folly-2016.10.31.00/folly/dynamic.cpp
third-party/folly-2016.10.31.00/folly/dynamic.h
third-party/folly-2016.10.31.00/folly/Exception.h
third-party/folly-2016.10.31.00/folly/json.cpp
third-party/folly-2016.10.31.00/folly/json.h
third-party/folly-2016.10.31.00/folly/Memory.h
third-party/folly-2016.10.31.00/folly/MoveWrapper.h
third-party/folly-2016.10.31.00/folly/Optional.h
third-party/folly-2016.10.31.00/folly/ScopeGuard.h
third-party/double-conversion-1.1.6/src/bignum-dtoa.cc
third-party/double-conversion-1.1.6/src/bignum-dtoa.h
third-party/double-conversion-1.1.6/src/bignum.cc
third-party/double-conversion-1.1.6/src/bignum.h
third-party/double-conversion-1.1.6/src/cached-powers.cc
third-party/double-conversion-1.1.6/src/cached-powers.h
third-party/double-conversion-1.1.6/src/diy-fp.cc
third-party/double-conversion-1.1.6/src/diy-fp.h
third-party/double-conversion-1.1.6/src/double-conversion.cc
third-party/double-conversion-1.1.6/src/double-conversion.h
third-party/double-conversion-1.1.6/src/fast-dtoa.cc
third-party/double-conversion-1.1.6/src/fast-dtoa.h
third-party/double-conversion-1.1.6/src/fixed-dtoa.cc
third-party/double-conversion-1.1.6/src/fixed-dtoa.h
third-party/double-conversion-1.1.6/src/ieee.h
third-party/double-conversion-1.1.6/src/strtod.cc
third-party/double-conversion-1.1.6/src/strtod.h
third-party/double-conversion-1.1.6/src/utils.h