DEV/flutter_flutter
1
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2026-02-20 02:29:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2158 from chinmaygarde/master

Browse Source 
Require the user to specify the DART_SDK_PATH manually in Xcode
This commit is contained in:
Chinmay Garde 2015-12-09 13:22:26 -08:00
commit 1d096cd954
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sky/build/PackagerInvoke
View File

@ -28,13 +28,8 @@ PackageProject() {
exit -1
fi
# Check if pub exists
RunCommand which pub
if [[ $? -ne 0 ]]; then
EchoError "Could not find 'pub'."
EchoError "Did you install the Dart SDK?"
exit -1
fi
# The 'flutter' command assumes the 'dart' binary is in $PATH
RunCommand export PATH=${PATH}:${DART_SDK_PATH}/bin
AssertExists $1
local project_path=$1

4
sky/build/sdk_xcode_harness/FlutterApplication.xcodeproj/project.pbxproj
View File

@ -334,7 +334,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "set -e\npushd ${FLUTTER_APPLICATION_PATH}\npub get\npopd\n";
shellScript = "set -e\npushd ${FLUTTER_APPLICATION_PATH}\n${DART_SDK_PATH}/bin/pub get\npopd\n";
showEnvVarsInLog = 0;
};
/* End PBXShellScriptBuildPhase section */
@ -476,6 +476,7 @@
9E07CF8F1BE7F4D200BCD8DE /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
DART_SDK_PATH = dart/sdk/path;
DEFINES_MODULE = YES;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
@ -495,6 +496,7 @@
9E07CF901BE7F4D200BCD8DE /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
DART_SDK_PATH = dart/sdk/path;
DEFINES_MODULE = YES;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;