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

Gradle fix

Browse Source
This commit is contained in:
Joshua Granick
2016-08-18 07:28:33 -07:00
parent 0b8cbeb3aa
commit 978fac419f
1 changed files with 21 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
lime/tools/helpers/AndroidHelper.hx
View File

@@ -42,8 +42,16 @@ class AndroidHelper {
} }
ProcessHelper.runCommand (projectDirectory, "gradlew", [ task ]); if (PlatformHelper.hostPlatform != Platform.WINDOWS && targetType != "nodejs") {
ProcessHelper.runCommand ("", "chmod", [ "755", PathHelper.combine (projectDirectory, "gradlew.sh") ]);
ProcessHelper.runCommand (projectDirectory, "./gradlew.sh", [ task ]);
} else {
ProcessHelper.runCommand (projectDirectory, "gradlew", [ task ]);
}
} }
@@ -116,33 +124,33 @@ class AndroidHelper {
adbName = "adb"; adbName = "adb";
androidName = "android"; androidName = "android";
emulatorName = "emulator"; emulatorName = "emulator";
if (PlatformHelper.hostPlatform == Platform.WINDOWS) { if (PlatformHelper.hostPlatform == Platform.WINDOWS) {
adbName += ".exe"; adbName += ".exe";
androidName += ".bat"; androidName += ".bat";
emulatorName += ".exe"; emulatorName += ".exe";
} }
if (!FileSystem.exists (adbPath + adbName)) { if (!FileSystem.exists (adbPath + adbName)) {
adbPath = project.environment.get ("ANDROID_SDK") + "/platform-tools/"; adbPath = project.environment.get ("ANDROID_SDK") + "/platform-tools/";
} }
if (PlatformHelper.hostPlatform != Platform.WINDOWS) { if (PlatformHelper.hostPlatform != Platform.WINDOWS) {
adbName = "./" + adbName; adbName = "./" + adbName;
androidName = "./" + androidName; androidName = "./" + androidName;
emulatorName = "./" + emulatorName; emulatorName = "./" + emulatorName;
} }
if (project.environment.exists ("JAVA_HOME")) { if (project.environment.exists ("JAVA_HOME")) {
Sys.putEnv ("JAVA_HOME", project.environment.get ("JAVA_HOME")); Sys.putEnv ("JAVA_HOME", project.environment.get ("JAVA_HOME"));
} }
} }