mirror of
https://github.com/godotengine/godot.git
synced 2024-11-27 09:16:35 +08:00
Update the logic to query for the 'scons' command executable path.
This commit is contained in:
parent
9e7348f788
commit
46cc3233d8
@ -22,8 +22,6 @@ allprojects {
|
||||
}
|
||||
|
||||
ext {
|
||||
sconsExt = org.gradle.internal.os.OperatingSystem.current().isWindows() ? ".bat" : ""
|
||||
|
||||
supportedAbis = ["armv7", "arm64v8", "x86", "x86_64"]
|
||||
supportedTargets = ["release", "debug"]
|
||||
|
||||
|
@ -64,10 +64,42 @@ android {
|
||||
throw new GradleException("Invalid default abi: " + defaultAbi)
|
||||
}
|
||||
|
||||
// Find scons' executable path
|
||||
File sconsExecutableFile = null
|
||||
def sconsName = "scons"
|
||||
def sconsExts = (org.gradle.internal.os.OperatingSystem.current().isWindows()
|
||||
? [".bat", ".exe"]
|
||||
: [""])
|
||||
logger.lifecycle("Looking for $sconsName executable path")
|
||||
for (ext in sconsExts) {
|
||||
String sconsNameExt = sconsName + ext
|
||||
logger.lifecycle("Checking $sconsNameExt")
|
||||
|
||||
sconsExecutableFile = org.gradle.internal.os.OperatingSystem.current().findInPath(sconsNameExt)
|
||||
if (sconsExecutableFile != null) {
|
||||
// We're done!
|
||||
break
|
||||
}
|
||||
|
||||
// Check all the options in path
|
||||
List<File> allOptions = org.gradle.internal.os.OperatingSystem.current().findAllInPath(sconsNameExt)
|
||||
if (!allOptions.isEmpty()) {
|
||||
// Pick the first option and we're done!
|
||||
sconsExecutableFile = allOptions.get(0)
|
||||
break
|
||||
}
|
||||
}
|
||||
|
||||
if (sconsExecutableFile == null) {
|
||||
throw new GradleException("Unable to find executable path for the '$sconsName' command.")
|
||||
} else {
|
||||
logger.lifecycle("Found executable path for $sconsName: ${sconsExecutableFile.absolutePath}")
|
||||
}
|
||||
|
||||
// Creating gradle task to generate the native libraries for the default abi.
|
||||
def taskName = getSconsTaskName(buildType)
|
||||
tasks.create(name: taskName, type: Exec) {
|
||||
executable "scons" + sconsExt
|
||||
executable sconsExecutableFile.absolutePath
|
||||
args "--directory=${pathToRootDir}", "platform=android", "target=${releaseTarget}", "android_arch=${defaultAbi}", "-j" + Runtime.runtime.availableProcessors()
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user