From 83a9f87fe1d3ef3470c698f2f64d264ac7c9a133 Mon Sep 17 00:00:00 2001 From: iwgeric Date: Sat, 24 Jan 2015 10:53:34 -0500 Subject: [PATCH] Enclose startParameter.excludedTaskNames inside task --- jme3-bullet-native/build.gradle | 34 +++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/jme3-bullet-native/build.gradle b/jme3-bullet-native/build.gradle index b6304f0ff..446bc0ec7 100644 --- a/jme3-bullet-native/build.gradle +++ b/jme3-bullet-native/build.gradle @@ -21,7 +21,7 @@ libraries { } else{ cppCompiler.args '-I', "${org.gradle.internal.jvm.Jvm.current().javaHome}/include" } - + if (targetPlatform.operatingSystem.name == "osx") { cppCompiler.args '-I', "${org.gradle.internal.jvm.Jvm.current().javaHome}/include/darwin" } else if (targetPlatform.operatingSystem.name == "linux") { @@ -160,7 +160,7 @@ binaries.withType(SharedLibraryBinary) { binary -> return } } - + // For all binaries that can be built on the current system def builderTask = binary.tasks // Add output to jar file @@ -176,20 +176,22 @@ binaries.withType(SharedLibraryBinary) { binary -> jar.dependsOn("copyBinaryToLibs${targetPlatform}") } -// Remove all native build tasks, will be added as needed above -gradle.startParameter.excludedTaskNames += "windows_x86BulletjmeStaticLibrary" -gradle.startParameter.excludedTaskNames += "windows_x86_64BulletjmeStaticLibrary" -gradle.startParameter.excludedTaskNames += "linux_x86BulletjmeStaticLibrary" -gradle.startParameter.excludedTaskNames += "linux_x86_64BulletjmeStaticLibrary" -gradle.startParameter.excludedTaskNames += "osx_x86BulletjmeStaticLibrary" -gradle.startParameter.excludedTaskNames += "osx_x86_64BulletjmeStaticLibrary" - -gradle.startParameter.excludedTaskNames += "windows_x86BulletjmeSharedLibrary" -gradle.startParameter.excludedTaskNames += "windows_x86_64BulletjmeSharedLibrary" -gradle.startParameter.excludedTaskNames += "linux_x86BulletjmeSharedLibrary" -gradle.startParameter.excludedTaskNames += "linux_x86_64BulletjmeSharedLibrary" -gradle.startParameter.excludedTaskNames += "osx_x86BulletjmeSharedLibrary" -gradle.startParameter.excludedTaskNames += "osx_x86_64BulletjmeSharedLibrary" +task { + // Remove all native build tasks, will be added as needed above + gradle.startParameter.excludedTaskNames += "windows_x86BulletjmeStaticLibrary" + gradle.startParameter.excludedTaskNames += "windows_x86_64BulletjmeStaticLibrary" + gradle.startParameter.excludedTaskNames += "linux_x86BulletjmeStaticLibrary" + gradle.startParameter.excludedTaskNames += "linux_x86_64BulletjmeStaticLibrary" + gradle.startParameter.excludedTaskNames += "osx_x86BulletjmeStaticLibrary" + gradle.startParameter.excludedTaskNames += "osx_x86_64BulletjmeStaticLibrary" + + gradle.startParameter.excludedTaskNames += "windows_x86BulletjmeSharedLibrary" + gradle.startParameter.excludedTaskNames += "windows_x86_64BulletjmeSharedLibrary" + gradle.startParameter.excludedTaskNames += "linux_x86BulletjmeSharedLibrary" + gradle.startParameter.excludedTaskNames += "linux_x86_64BulletjmeSharedLibrary" + gradle.startParameter.excludedTaskNames += "osx_x86BulletjmeSharedLibrary" + gradle.startParameter.excludedTaskNames += "osx_x86_64BulletjmeSharedLibrary" +} // Helper class to wrap ant dowload task class MyDownload extends DefaultTask {