From 7ad2be172efdab9b5a85fd6f1227d9de5e2af70c Mon Sep 17 00:00:00 2001 From: Peter Johnson Date: Sat, 28 May 2022 11:12:59 -0700 Subject: [PATCH] [build] Update native-utils to 2023.0.1 (#4272) Also remove x86 build bits. --- buildSrc/build.gradle | 2 +- cameraserver/build.gradle | 13 ------------- cscore/build.gradle | 15 --------------- glass/build.gradle | 13 ------------- hal/build.gradle | 14 -------------- msvcruntime/build.gradle | 19 ------------------- ntcore/build.gradle | 14 -------------- wpigui/build.gradle | 13 ------------- wpilibNewCommands/build.gradle | 13 ------------- wpilibc/build.gradle | 13 ------------- wpinet/build.gradle | 13 ------------- wpiutil/build.gradle | 13 ------------- 12 files changed, 1 insertion(+), 154 deletions(-) diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle index a784c0f7d5..390c2baddd 100644 --- a/buildSrc/build.gradle +++ b/buildSrc/build.gradle @@ -5,5 +5,5 @@ repositories { } } dependencies { - implementation "edu.wpi.first:native-utils:2022.7.1" + implementation "edu.wpi.first:native-utils:2023.0.1" } diff --git a/cameraserver/build.gradle b/cameraserver/build.gradle index 00e0861b49..11279bcf72 100644 --- a/cameraserver/build.gradle +++ b/cameraserver/build.gradle @@ -34,19 +34,6 @@ apply from: "${rootDir}/shared/opencv.gradle" nativeUtils.exportsConfigs { cameraserver { - x86ExcludeSymbols = [ - '_CT??_R0?AV_System_error', - '_CT??_R0?AVexception', - '_CT??_R0?AVfailure', - '_CT??_R0?AVruntime_error', - '_CT??_R0?AVsystem_error', - '_CTA5?AVfailure', - '_TI5?AVfailure', - '_CT??_R0?AVout_of_range', - '_CTA3?AVout_of_range', - '_TI3?AVout_of_range', - '_CT??_R0?AVbad_cast' - ] x64ExcludeSymbols = [ '_CT??_R0?AV_System_error', '_CT??_R0?AVexception', diff --git a/cscore/build.gradle b/cscore/build.gradle index 416537b3d5..974adcad07 100644 --- a/cscore/build.gradle +++ b/cscore/build.gradle @@ -154,19 +154,6 @@ Action> symbolFilter = { symbols -> nativeUtils.exportsConfigs { cscore { - x86ExcludeSymbols = [ - '_CT??_R0?AV_System_error', - '_CT??_R0?AVexception', - '_CT??_R0?AVfailure', - '_CT??_R0?AVruntime_error', - '_CT??_R0?AVsystem_error', - '_CTA5?AVfailure', - '_TI5?AVfailure', - '_CT??_R0?AVout_of_range', - '_CTA3?AVout_of_range', - '_TI3?AVout_of_range', - '_CT??_R0?AVbad_cast' - ] x64ExcludeSymbols = [ '_CT??_R0?AV_System_error', '_CT??_R0?AVexception', @@ -182,11 +169,9 @@ nativeUtils.exportsConfigs { ] } cscoreJNI { - x86SymbolFilter = symbolFilter x64SymbolFilter = symbolFilter } cscoreJNICvStatic { - x86SymbolFilter = symbolFilter x64SymbolFilter = symbolFilter } } diff --git a/glass/build.gradle b/glass/build.gradle index c0701f4832..9f42d6f182 100644 --- a/glass/build.gradle +++ b/glass/build.gradle @@ -69,19 +69,6 @@ if (!project.hasProperty('onlylinuxathena') && !project.hasProperty('onlylinuxra nativeUtils.exportsConfigs { glass { - x86ExcludeSymbols = [ - '_CT??_R0?AV_System_error', - '_CT??_R0?AVexception', - '_CT??_R0?AVfailure', - '_CT??_R0?AVruntime_error', - '_CT??_R0?AVsystem_error', - '_CTA5?AVfailure', - '_TI5?AVfailure', - '_CT??_R0?AVout_of_range', - '_CTA3?AVout_of_range', - '_TI3?AVout_of_range', - '_CT??_R0?AVbad_cast' - ] x64ExcludeSymbols = [ '_CT??_R0?AV_System_error', '_CT??_R0?AVexception', diff --git a/hal/build.gradle b/hal/build.gradle index ed67125342..cf6cd0d17c 100644 --- a/hal/build.gradle +++ b/hal/build.gradle @@ -133,19 +133,6 @@ Action> symbolFilter = { symbols -> nativeUtils.exportsConfigs { hal { - x86ExcludeSymbols = [ - '_CT??_R0?AV_System_error', - '_CT??_R0?AVexception', - '_CT??_R0?AVfailure', - '_CT??_R0?AVruntime_error', - '_CT??_R0?AVsystem_error', - '_CTA5?AVfailure', - '_TI5?AVfailure', - '_CT??_R0?AVout_of_range', - '_CTA3?AVout_of_range', - '_TI3?AVout_of_range', - '_CT??_R0?AVbad_cast' - ] x64ExcludeSymbols = [ '_CT??_R0?AV_System_error', '_CT??_R0?AVexception', @@ -161,7 +148,6 @@ nativeUtils.exportsConfigs { ] } halJNI { - x86SymbolFilter = symbolFilter x64SymbolFilter = symbolFilter } } diff --git a/msvcruntime/build.gradle b/msvcruntime/build.gradle index 80dafa7ba7..b43d52f8ef 100644 --- a/msvcruntime/build.gradle +++ b/msvcruntime/build.gradle @@ -36,14 +36,6 @@ if (OperatingSystem.current().isWindows()) { if (runtimeVerNumber != null) { runtimeLocation = file("$runtimeLocation\\$runtimeVerNumber") - def x86Folder = null - - file("$runtimeLocation\\x86").eachFile { - if (it.name.endsWith('.CRT')) { - x86Folder = it - } - } - def x64Folder = null file("$runtimeLocation\\x64").eachFile { @@ -52,14 +44,6 @@ if (OperatingSystem.current().isWindows()) { } } - def x86ZipTask = tasks.create('x86RuntimeZip', Zip) { - destinationDirectory = outputsFolder - archiveBaseName = zipBaseName - classifier = 'x86' - - from x86Folder - } - def x64ZipTask = tasks.create('x64RuntimeZip', Zip) { destinationDirectory = outputsFolder archiveBaseName = zipBaseName @@ -68,17 +52,14 @@ if (OperatingSystem.current().isWindows()) { from x64Folder } - addTaskToCopyAllOutputs(x86ZipTask) addTaskToCopyAllOutputs(x64ZipTask) - build.dependsOn x86ZipTask build.dependsOn x64ZipTask publishing { publications { runtime(MavenPublication) { - artifact x86ZipTask artifact x64ZipTask artifactId = "${baseArtifactId}" diff --git a/ntcore/build.gradle b/ntcore/build.gradle index 30e3e7eaa8..145d589ada 100644 --- a/ntcore/build.gradle +++ b/ntcore/build.gradle @@ -24,19 +24,6 @@ Action> symbolFilter = { symbols -> nativeUtils.exportsConfigs { ntcore { - x86ExcludeSymbols = [ - '_CT??_R0?AV_System_error', - '_CT??_R0?AVexception', - '_CT??_R0?AVfailure', - '_CT??_R0?AVruntime_error', - '_CT??_R0?AVsystem_error', - '_CTA5?AVfailure', - '_TI5?AVfailure', - '_CT??_R0?AVout_of_range', - '_CTA3?AVout_of_range', - '_TI3?AVout_of_range', - '_CT??_R0?AVbad_cast' - ] x64ExcludeSymbols = [ '_CT??_R0?AV_System_error', '_CT??_R0?AVexception', @@ -52,7 +39,6 @@ nativeUtils.exportsConfigs { ] } ntcoreJNI { - x86SymbolFilter = symbolFilter x64SymbolFilter = symbolFilter } } diff --git a/wpigui/build.gradle b/wpigui/build.gradle index 5959b67026..c37d9e0cbc 100644 --- a/wpigui/build.gradle +++ b/wpigui/build.gradle @@ -17,19 +17,6 @@ if (!project.hasProperty('onlylinuxathena') && !project.hasProperty('onlylinuxra nativeUtils.exportsConfigs { wpigui { - x86ExcludeSymbols = [ - '_CT??_R0?AV_System_error', - '_CT??_R0?AVexception', - '_CT??_R0?AVfailure', - '_CT??_R0?AVruntime_error', - '_CT??_R0?AVsystem_error', - '_CTA5?AVfailure', - '_TI5?AVfailure', - '_CT??_R0?AVout_of_range', - '_CTA3?AVout_of_range', - '_TI3?AVout_of_range', - '_CT??_R0?AVbad_cast' - ] x64ExcludeSymbols = [ '_CT??_R0?AV_System_error', '_CT??_R0?AVexception', diff --git a/wpilibNewCommands/build.gradle b/wpilibNewCommands/build.gradle index 9c6348a56c..df85ed5ded 100644 --- a/wpilibNewCommands/build.gradle +++ b/wpilibNewCommands/build.gradle @@ -33,19 +33,6 @@ dependencies { nativeUtils.exportsConfigs { wpilibNewCommands { - x86ExcludeSymbols = [ - '_CT??_R0?AV_System_error', - '_CT??_R0?AVexception', - '_CT??_R0?AVfailure', - '_CT??_R0?AVruntime_error', - '_CT??_R0?AVsystem_error', - '_CTA5?AVfailure', - '_TI5?AVfailure', - '_CT??_R0?AVout_of_range', - '_CTA3?AVout_of_range', - '_TI3?AVout_of_range', - '_CT??_R0?AVbad_cast' - ] x64ExcludeSymbols = [ '_CT??_R0?AV_System_error', '_CT??_R0?AVexception', diff --git a/wpilibc/build.gradle b/wpilibc/build.gradle index f3676ba781..5d8b299253 100644 --- a/wpilibc/build.gradle +++ b/wpilibc/build.gradle @@ -62,19 +62,6 @@ apply from: "${rootDir}/shared/googletest.gradle" nativeUtils.exportsConfigs { wpilibc { - x86ExcludeSymbols = [ - '_CT??_R0?AV_System_error', - '_CT??_R0?AVexception', - '_CT??_R0?AVfailure', - '_CT??_R0?AVruntime_error', - '_CT??_R0?AVsystem_error', - '_CTA5?AVfailure', - '_TI5?AVfailure', - '_CT??_R0?AVout_of_range', - '_CTA3?AVout_of_range', - '_TI3?AVout_of_range', - '_CT??_R0?AVbad_cast' - ] x64ExcludeSymbols = [ '_CT??_R0?AV_System_error', '_CT??_R0?AVexception', diff --git a/wpinet/build.gradle b/wpinet/build.gradle index 19dff6a9c1..1a69e2a402 100644 --- a/wpinet/build.gradle +++ b/wpinet/build.gradle @@ -181,19 +181,6 @@ apply from: "${rootDir}/shared/jni/setupBuild.gradle" nativeUtils.exportsConfigs { wpinet { - x86ExcludeSymbols = [ - '_CT??_R0?AV_System_error', - '_CT??_R0?AVexception', - '_CT??_R0?AVfailure', - '_CT??_R0?AVruntime_error', - '_CT??_R0?AVsystem_error', - '_CTA5?AVfailure', - '_TI5?AVfailure', - '_CT??_R0?AVout_of_range', - '_CTA3?AVout_of_range', - '_TI3?AVout_of_range', - '_CT??_R0?AVbad_cast' - ] x64ExcludeSymbols = [ '_CT??_R0?AV_System_error', '_CT??_R0?AVexception', diff --git a/wpiutil/build.gradle b/wpiutil/build.gradle index 4f94597fde..4960835f57 100644 --- a/wpiutil/build.gradle +++ b/wpiutil/build.gradle @@ -106,19 +106,6 @@ apply from: "${rootDir}/shared/jni/setupBuild.gradle" nativeUtils.exportsConfigs { wpiutil { - x86ExcludeSymbols = [ - '_CT??_R0?AV_System_error', - '_CT??_R0?AVexception', - '_CT??_R0?AVfailure', - '_CT??_R0?AVruntime_error', - '_CT??_R0?AVsystem_error', - '_CTA5?AVfailure', - '_TI5?AVfailure', - '_CT??_R0?AVout_of_range', - '_CTA3?AVout_of_range', - '_TI3?AVout_of_range', - '_CT??_R0?AVbad_cast' - ] x64ExcludeSymbols = [ '_CT??_R0?AV_System_error', '_CT??_R0?AVexception',