diff --git a/cavis-full/build.gradle b/cavis-full/build.gradle index 809ca5c28..7421de739 100644 --- a/cavis-full/build.gradle +++ b/cavis-full/build.gradle @@ -36,8 +36,8 @@ dependencies { } } */ - if(withCpu()) api project(path: ":cavis-native:cavis-native-lib", configuration: "cpuSupportImplementation") - if(withCuda()) api project(path: ":cavis-native:cavis-native-lib", configuration: "cudaSupportImplementation") + //if(withCpu()) api project(path: ":cavis-native:cavis-native-lib", configuration: "cpuSupportImplementation") + //if(withCuda()) api project(path: ":cavis-native:cavis-native-lib", configuration: "cudaSupportImplementation") //if(withCuda()) api project(path: ":cavis-native:cavis-native-lib", configuration: "cudaSupportCompileClasspath") /* diff --git a/cavis-native/cavis-native-lib/build.gradle b/cavis-native/cavis-native-lib/build.gradle index 0e18c9428..7f81613e7 100644 --- a/cavis-native/cavis-native-lib/build.gradle +++ b/cavis-native/cavis-native-lib/build.gradle @@ -69,14 +69,6 @@ plugins { id 'signing' } -chipList.each{ thisChip -> - - configurations { - create("${thisChip}SupportImplementation") - findByName("${thisChip}SupportImplementation").setCanBeConsumed(true) - } -} - chipList.each {thisChip -> sourceSets.register("${thisChip}Support") { java { @@ -114,17 +106,9 @@ java { } } -/* -configurations.each(s -> { - println "Configurations: " + s.name + " " + s.artifacts.each( x -> - { println x.getFile().getName()}) -}) -*/ dependencies { api platform(project(':cavis-common-platform')) - - implementation "org.bytedeco:javacpp" implementation group: "org.bytedeco", name: "javacpp", classifier: "${javacppPlatform}" @@ -422,10 +406,6 @@ chipList.each { thisChip -> thisTask.with spec thisTask.archiveClassifier = "${javacppPlatform}${javacppPlatformExtension}-${thisChip}" } - - //tasks.getByName("${thisChip}SupportJar").dependsOn("javacpp${thisChip.capitalize()}SupportJar") - - } //Before we can compile the whole java part, we @@ -469,10 +449,7 @@ javadoc { -if(! osdetector.os.startsWith("windows")) { - //tasks.getByName("publish") { - // enabled = false - // } + tasks.getByName("generatePomFileForMavenJavaPublication") { enabled = true } @@ -481,10 +458,10 @@ if(! osdetector.os.startsWith("windows")) { } chipList.each { thisChip -> artifacts { - archives tasks.getByName("${thisChip}SupportJar") + artifact tasks.getByName("${thisChip}SupportJar") } } -} + chipList.each { thisChip ->