Skip to content

Fix xcode version comparison #48

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

Merged
Fatme merged 1 commit into from
Aug 15, 2014
Merged

Fix xcode version comparison #48

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 12 additions & 4 deletions lib/services/ios-project-service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import path = require("path");
import shell = require("shelljs");
import util = require("util");
import constants = require("./../constants");
import helpers = require("./../common/helpers");
import options = require("./../options");
Expand Down Expand Up @@ -35,6 +36,11 @@ class IOSProjectService implements IPlatformProjectService {
}

var xcodeBuildVersion = this.$childProcess.exec("xcodebuild -version | head -n 1 | sed -e 's/Xcode //'").wait();
var splitedXcodeBuildVersion = xcodeBuildVersion.split(".");
if(splitedXcodeBuildVersion.length === 3) {
xcodeBuildVersion = util.format("%s.%s", splitedXcodeBuildVersion[0], splitedXcodeBuildVersion[1]);
}

if(helpers.versionCompare(xcodeBuildVersion, IOSProjectService.XCODEBUILD_MIN_VERSION) < 0) {
this.$errors.fail("NativeScript can only run in Xcode version %s or greater", IOSProjectService.XCODEBUILD_MIN_VERSION);
}
Expand Down Expand Up @@ -81,7 +87,7 @@ class IOSProjectService implements IPlatformProjectService {
var basicArgs = [
"-project", path.join(projectRoot, this.$projectData.projectName + ".xcodeproj"),
"-target", this.$projectData.projectName,
"-configuration", options.release,
"-configuration", options.release ? "Release": "Debug",
"build"
];
var args: string[] = [];
Expand All @@ -90,8 +96,8 @@ class IOSProjectService implements IPlatformProjectService {
args = basicArgs.concat([
"-xcconfig", path.join(projectRoot, "build.xcconfig"),
"-sdk", "iphoneos",
"ARCHS=\"armv7 armv7s arm64\"",
"VALID_ARCHS=\"armv7 armv7s arm64\"",
"ARCHS=\"armv7\"",
"VALID_ARCHS=\"armv7\"",
"CONFIGURATION_BUILD_DIR=" + path.join(projectRoot, "build", "device")
]);
} else {
Expand All @@ -103,7 +109,9 @@ class IOSProjectService implements IPlatformProjectService {
]);
}

this.$childProcess.spawn("xcodebuild", args, {cwd: options, stdio: 'inherit'});
var childProcess = this.$childProcess.spawn("xcodebuild", args, {cwd: options, stdio: 'inherit'});
this.$fs.futureFromEvent(childProcess, "exit").wait();

}).future<void>()();
}

Expand Down