rik/jlibloader
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Upgraded wrapper to use 1.4-rc-1.

Browse Source
This commit is contained in:
Adam Murdoch
2013-01-20 06:32:12 +11:00
parent a4b166bc02
commit 47f914b49d
2 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
build.gradle
View File

@@ -85,7 +85,7 @@ libraries {
if (org.gradle.internal.os.OperatingSystem.current().macOsX) { if (org.gradle.internal.os.OperatingSystem.current().macOsX) {
all { all {
spec { spec {
includes(['/System/Library/Frameworks/JavaVM.framework/Versions/Current/Headers/']) includes(files('/System/Library/Frameworks/JavaVM.framework/Versions/Current/Headers/'))
args("-arch", "x86_64", "-arch", "i386") args("-arch", "x86_64", "-arch", "i386")
} }
} }
@@ -108,8 +108,8 @@ libraries {
} else if (org.gradle.internal.os.OperatingSystem.current().windows) { } else if (org.gradle.internal.os.OperatingSystem.current().windows) {
all { all {
spec { spec {
includes(["${org.gradle.internal.jvm.Jvm.current().javaHome}/include"]) includes(files("${org.gradle.internal.jvm.Jvm.current().javaHome}/include"))
includes(["${org.gradle.internal.jvm.Jvm.current().javaHome}/include/win32"]) includes(files("${org.gradle.internal.jvm.Jvm.current().javaHome}/include/win32"))
args("/DWIN32") args("/DWIN32")
} }
} }
@@ -144,8 +144,8 @@ libraries {
} else if (org.gradle.internal.os.OperatingSystem.current().linux) { } else if (org.gradle.internal.os.OperatingSystem.current().linux) {
all { all {
spec { spec {
includes(["${org.gradle.internal.jvm.Jvm.current().javaHome}/include"]) includes(files("${org.gradle.internal.jvm.Jvm.current().javaHome}/include"))
includes(["${org.gradle.internal.jvm.Jvm.current().javaHome}/include/linux"]) includes(files("${org.gradle.internal.jvm.Jvm.current().javaHome}/include/linux"))
} }
} }
if (System.getProperty('os.arch') == 'i386' || project.hasProperty('multiarch')) { if (System.getProperty('os.arch') == 'i386' || project.hasProperty('multiarch')) {
@@ -188,8 +188,8 @@ libraries {
sourceSets << cpp.sourceSets.main sourceSets << cpp.sourceSets.main
sourceSets << cpp.sourceSets.curses sourceSets << cpp.sourceSets.curses
spec { spec {
includes(["${org.gradle.internal.jvm.Jvm.current().javaHome}/include"]) includes(files("${org.gradle.internal.jvm.Jvm.current().javaHome}/include"))
includes(["${org.gradle.internal.jvm.Jvm.current().javaHome}/include/solaris"]) includes(files("${org.gradle.internal.jvm.Jvm.current().javaHome}/include/solaris"))
args("-DSOLARIS", "-lcurses") args("-DSOLARIS", "-lcurses")
} }
} }
@@ -197,10 +197,11 @@ libraries {
} }
all { all {
spec { spec {
includes([nativeHeadersDir, 'src/main/headers']) includes(files(nativeHeadersDir, 'src/main/headers'))
} }
spec.task.dependsOn nativeHeaders def task = tasks["compile${spec.binary.name.capitalize()}"]
test.dependsOn spec.task task.dependsOn nativeHeaders
test.dependsOn spec
} }
} }
@@ -213,7 +214,7 @@ def deployer = uploadJni.repositories.mavenDeployer
variants.each { variant, libs -> variants.each { variant, libs ->
def variantName = GUtil.toCamelCase(variant) def variantName = GUtil.toCamelCase(variant)
def nativeJar = task("nativeJar${variantName}", type: Jar) { def nativeJar = task("nativeJar${variantName}", type: Jar) {
from libs.collect { it.spec.task } from libs.collect { tasks["compile${it.name.capitalize()}"] }
baseName = "native-platform-$variant" baseName = "native-platform-$variant"
} }
artifacts { artifacts {

2
gradle/wrapper/gradle-wrapper.properties vendored
View File

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
distributionUrl=http\://services.gradle.org/distributions-snapshots/gradle-1.3-20120907220018+0000-bin.zip distributionUrl=http\://services.gradle.org/distributions/gradle-1.4-rc-1-bin.zip