diff --git a/myRobot/build.gradle b/myRobot/build.gradle index 55bb577ed0..a0abca06b7 100644 --- a/myRobot/build.gradle +++ b/myRobot/build.gradle @@ -20,6 +20,14 @@ ext { apply from: "${rootDir}/shared/opencv.gradle" +ext { + sharedUvwConfigs = [myRobotCpp : [], + myRobotCppStatic: []] + staticUvwConfigs = [:] +} + +apply from: "${rootDir}/shared/libuv.gradle" + mainClassName = 'edu.wpi.first.wpilibj.RobotBase' apply plugin: 'com.github.johnrengelman.shadow' diff --git a/shared/javacpp/setupBuild.gradle b/shared/javacpp/setupBuild.gradle index 21d63dc55b..d669b962f2 100644 --- a/shared/javacpp/setupBuild.gradle +++ b/shared/javacpp/setupBuild.gradle @@ -24,6 +24,18 @@ staticGtestConfigs["${nativeName}Test"] = [] apply from: "${rootDir}/shared/googletest.gradle" +ext { + sharedUvwConfigs = [:] + staticUvwConfigs = [:] +} + +sharedUvwConfigs["${nativeName}"] = [] +sharedUvwConfigs["${nativeName}Base"] = [] +sharedUvwConfigs["${nativeName}Dev"] = [] +sharedUvwConfigs["${nativeName}Test"] = [] + +apply from: "${rootDir}/shared/libuv.gradle" + model { components { "${nativeName}Base"(NativeLibrarySpec) { diff --git a/shared/jni/setupBuild.gradle b/shared/jni/setupBuild.gradle index 905542808f..21ab648ceb 100644 --- a/shared/jni/setupBuild.gradle +++ b/shared/jni/setupBuild.gradle @@ -15,6 +15,19 @@ ext { apply from: "${rootDir}/shared/java/javacommon.gradle" +ext { + sharedUvwConfigs = [:] + staticUvwConfigs = [:] +} + +sharedUvwConfigs["${nativeName}"] = [] +sharedUvwConfigs["${nativeName}Base"] = [] +sharedUvwConfigs["${nativeName}Dev"] = [] +sharedUvwConfigs["${nativeName}Test"] = [] +staticUvwConfigs["${nativeName}JNI"] = [] + +apply from: "${rootDir}/shared/libuv.gradle" + dependencies { compile project(':wpiutil') devCompile project(':wpiutil') diff --git a/shared/libuv.gradle b/shared/libuv.gradle new file mode 100644 index 0000000000..97d1771ce6 --- /dev/null +++ b/shared/libuv.gradle @@ -0,0 +1,13 @@ + model { + dependencyConfigs { + libuv(DependencyConfig) { + groupId = 'edu.wpi.first.thirdparty.frc2018' + artifactId = 'uvw' + headerClassifier = 'headers' + ext = 'zip' + version = '1.8.1-1.20.3' + sharedConfigs = project.sharedUvwConfigs + staticConfigs = project.staticUvwConfigs + } + } + } diff --git a/shared/plugins/setupBuild.gradle b/shared/plugins/setupBuild.gradle index d1fe6aa84d..81523a7423 100644 --- a/shared/plugins/setupBuild.gradle +++ b/shared/plugins/setupBuild.gradle @@ -5,6 +5,16 @@ if (!project.hasProperty('onlyAthena')) { ext.skipAthena = true apply from: "${rootDir}/shared/config.gradle" + ext { + sharedUvwConfigs = [:] + staticUvwConfigs = [:] + } + + sharedUvwConfigs["${pluginName}"] = [] + sharedUvwConfigs["${pluginName}Dev"] = [] + + apply from: "${rootDir}/shared/libuv.gradle" + model { components { "${pluginName}"(NativeLibrarySpec) { diff --git a/wpilibc/build.gradle b/wpilibc/build.gradle index af620785d1..3fb0c34b33 100644 --- a/wpilibc/build.gradle +++ b/wpilibc/build.gradle @@ -60,6 +60,16 @@ ext { apply from: "${rootDir}/shared/opencv.gradle" +ext { + sharedUvwConfigs = [wpilibc : [], + wpilibcBase: [], + wpilibcDev : [], + wpilibcTest: []] + staticUvwConfigs = [:] +} + +apply from: "${rootDir}/shared/libuv.gradle" + project(':').libraryBuild.dependsOn build ext { diff --git a/wpilibcExamples/build.gradle b/wpilibcExamples/build.gradle index a0636c776d..3b3438d0a1 100644 --- a/wpilibcExamples/build.gradle +++ b/wpilibcExamples/build.gradle @@ -33,10 +33,14 @@ templatesTree.list(new FilenameFilter() { ext { sharedCvConfigs = examplesMap + templatesMap + [commands: []] staticCvConfigs = [:] + sharedUvwConfigs = examplesMap + templatesMap + [commands: []] + staticUvwConfigs = [:] useJava = false useCpp = true } +apply from: "${rootDir}/shared/libuv.gradle" + apply from: "${rootDir}/shared/opencv.gradle" model { diff --git a/wpilibcIntegrationTests/build.gradle b/wpilibcIntegrationTests/build.gradle index 8fa54b0227..24a8d6ea16 100644 --- a/wpilibcIntegrationTests/build.gradle +++ b/wpilibcIntegrationTests/build.gradle @@ -18,6 +18,13 @@ apply from: "${rootDir}/shared/opencv.gradle" apply from: "${rootDir}/shared/googletest.gradle" +ext { + sharedUvwConfigs = [wpilibcIntegrationTests: []] + staticUvwConfigs = [:] +} + +apply from: "${rootDir}/shared/libuv.gradle" + model { components { wpilibcIntegrationTests(NativeExecutableSpec) { diff --git a/wpilibj/build.gradle b/wpilibj/build.gradle index 5c76546fd6..3c61493f7b 100644 --- a/wpilibj/build.gradle +++ b/wpilibj/build.gradle @@ -87,6 +87,13 @@ ext { apply from: "${rootDir}/shared/opencv.gradle" +ext { + sharedUvwConfigs = [wpilibjDev: []] + staticUvwConfigs = [:] +} + +apply from: "${rootDir}/shared/libuv.gradle" + model { components { wpilibjDev(NativeExecutableSpec) {