kiss-lang/lime
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't pass 'build' buildaction when running an ios archive

Browse Source
This commit is contained in:
Adam
2017-11-28 12:22:31 -08:00
parent d9668baaa1
commit 4035c881b8
1 changed files with 36 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
lime/tools/helpers/IOSHelper.hx
View File

@@ -21,8 +21,38 @@ class IOSHelper {
initialize (project); initialize (project);
var commands = getXCodeArgs(project);
if (project.targetFlags.exists("archive")) {
var configuration = project.environment.get ("CONFIGURATION");
var platformName = project.environment.get ("PLATFORM_NAME");
commands.push ("archive");
commands.push ("-scheme");
commands.push (project.app.file);
commands.push ("-archivePath");
commands.push (PathHelper.combine("build", PathHelper.combine(configuration + "-" + platformName, project.app.file)));
}
else {
commands.push("build");
}
if (additionalArguments != null) {
commands = commands.concat (additionalArguments);
}
ProcessHelper.runCommand (workingDirectory, "xcodebuild", commands);
}
private static function getXCodeArgs(project:HXProject):Array<String> {
var platformName = "iphoneos"; var platformName = "iphoneos";
var iphoneVersion = project.environment.get ("IPHONE_VER");
if (project.targetFlags.exists ("simulator")) { if (project.targetFlags.exists ("simulator")) {
platformName = "iphonesimulator"; platformName = "iphonesimulator";
@@ -37,8 +67,11 @@ class IOSHelper {
} }
var iphoneVersion = project.environment.get ("IPHONE_VER"); project.setenv ("PLATFORM_NAME", platformName);
var commands = [ "build", "-configuration", configuration, "PLATFORM_NAME=" + platformName, "SDKROOT=" + platformName + iphoneVersion ]; project.setenv ("CONFIGURATION", configuration);
// setting CONFIGURATION and PLATFORM_NAME in project.environment doesn't set them for xcodebuild so also pass via command line
var commands = [ "-configuration", configuration, "PLATFORM_NAME=" + platformName, "SDKROOT=" + platformName + iphoneVersion ];
if (project.targetFlags.exists ("simulator")) { if (project.targetFlags.exists ("simulator")) {
@@ -74,22 +107,7 @@ class IOSHelper {
commands.push ("-project"); commands.push ("-project");
commands.push (project.app.file + ".xcodeproj"); commands.push (project.app.file + ".xcodeproj");
if (project.targetFlags.exists("archive")) { return commands;
commands.push ("archive");
commands.push ("-scheme");
commands.push (project.app.file);
commands.push ("-archivePath");
commands.push (PathHelper.combine("build", PathHelper.combine(configuration + "-" + platformName, project.app.file)));
}
if (additionalArguments != null) {
commands = commands.concat (additionalArguments);
}
ProcessHelper.runCommand (workingDirectory, "xcodebuild", commands);
} }