Merge pull request #195 from Firefds/master
Fixed building on Windows environments
This commit is contained in:
commit
02cc1496c8
|
|
@ -1,3 +1,4 @@
|
||||||
|
import org.gradle.internal.os.OperatingSystem
|
||||||
apply plugin: 'java-library'
|
apply plugin: 'java-library'
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
|
|
@ -13,7 +14,10 @@ task dexInJar(type: Jar) {
|
||||||
doFirst {
|
doFirst {
|
||||||
exec {
|
exec {
|
||||||
workingDir jar.destinationDir
|
workingDir jar.destinationDir
|
||||||
executable "dx"
|
if (OperatingSystem.current().isWindows())
|
||||||
|
executable "dx.bat"
|
||||||
|
else
|
||||||
|
executable "dx"
|
||||||
args "--dex", "--output", "classes.dex", "${jar.archiveName}"
|
args "--dex", "--output", "classes.dex", "${jar.archiveName}"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,3 +1,4 @@
|
||||||
|
import org.gradle.internal.os.OperatingSystem
|
||||||
apply plugin: 'java'
|
apply plugin: 'java'
|
||||||
|
|
||||||
description = "A utility for doing compile or runtime code generation targeting Android's Dalvik VM"
|
description = "A utility for doing compile or runtime code generation targeting Android's Dalvik VM"
|
||||||
|
|
@ -18,7 +19,10 @@ task dexInJar(type: Jar) {
|
||||||
doFirst {
|
doFirst {
|
||||||
exec {
|
exec {
|
||||||
workingDir jar.destinationDir
|
workingDir jar.destinationDir
|
||||||
executable "dx"
|
if (OperatingSystem.current().isWindows())
|
||||||
|
executable "dx.bat"
|
||||||
|
else
|
||||||
|
executable "dx"
|
||||||
args "--dex", "--output", "classes.dex", "${jar.archiveName}"
|
args "--dex", "--output", "classes.dex", "${jar.archiveName}"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue