Skip to content

Commit d8555ca

Browse files
authored
Add libdatalog to native utils, add 2027 uber artifacts (#244)
* Add libdatalog to native utils * Add 2027 artifacts * Fix shared
1 parent a4abeec commit d8555ca

File tree

3 files changed

+48
-9
lines changed

3 files changed

+48
-9
lines changed

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ java {
1313

1414
allprojects {
1515
group = "edu.wpi.first"
16-
version = "2025.9.1"
16+
version = "2025.10.1"
1717

1818
if (project.hasProperty('publishVersion')) {
1919
version = project.publishVersion

src/main/java/edu/wpi/first/nativeutils/WPINativeUtilsExtension.java

Lines changed: 46 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,14 @@ public static class DefaultArguments {
3939

4040
public final List<String> windowsCompilerArgs = List.of("/EHsc", "/FS", "/Zc:inline", "/wd4244", "/wd4267",
4141
"/wd4146", "/wd4996", "/Zc:throwingNew", "/D_CRT_SECURE_NO_WARNINGS", "/std:c++20", "/permissive-",
42-
"/utf-8", "/bigobj", "/Zc:__cplusplus", "/Zc:preprocessor", "/wd5105", "/wd4324"); // 5105 is thrown by windows sdk headers
42+
"/utf-8", "/bigobj", "/Zc:__cplusplus", "/Zc:preprocessor", "/wd5105", "/wd4324"); // 5105 is thrown by
43+
// windows sdk
44+
// headers
4345
public final List<String> windowsCCompilerArgs = List.of("/FS", "/Zc:inline", "/D_CRT_SECURE_NO_WARNINGS");
4446
public final List<String> windowsReleaseCompilerArgs = List.of("/O2", "/MD");
4547
public final List<String> windowsDebugCompilerArgs = List.of("/Od", "/MDd");
46-
public final List<String> windowsLinkerArgs = List.of("/DEBUG:FULL", "/PDBALTPATH:%_PDB%", "/DEPENDENTLOADFLAG:0x1100");
48+
public final List<String> windowsLinkerArgs = List.of("/DEBUG:FULL", "/PDBALTPATH:%_PDB%",
49+
"/DEPENDENTLOADFLAG:0x1100");
4750
public final List<String> windowsReleaseLinkerArgs = List.of("/OPT:REF", "/OPT:ICF");
4851

4952
public final String windowsSymbolArg = "/Zi";
@@ -61,15 +64,17 @@ public static class DefaultArguments {
6164
"-pthread");
6265
public final List<String> linuxCrossCCompilerArgs = List.of("-Wformat=2", "-pedantic", "-Wno-psabi",
6366
"-Wno-unused-parameter", "-fPIC", "-pthread");
64-
public final List<String> linuxCrossLinkerArgs = List.of("-rdynamic", "-pthread", "-ldl", "-latomic", "-Wl,-rpath,'$ORIGIN'");
67+
public final List<String> linuxCrossLinkerArgs = List.of("-rdynamic", "-pthread", "-ldl", "-latomic",
68+
"-Wl,-rpath,'$ORIGIN'");
6569
public final List<String> linuxCrossReleaseCompilerArgs = List.of("-O2");
6670
public final List<String> linuxCrossDebugCompilerArgs = List.of("-Og");
6771

6872
public final List<String> linuxCompilerArgs = List.of("-std=c++20", "-Wformat=2", "-pedantic", "-Wno-psabi",
6973
"-Wno-unused-parameter", "-Wno-error=deprecated-enum-enum-conversion", "-fPIC", "-pthread");
7074
public final List<String> linuxCCompilerArgs = List.of("-Wformat=2", "-pedantic", "-Wno-psabi",
7175
"-Wno-unused-parameter", "-fPIC", "-pthread");
72-
public final List<String> linuxLinkerArgs = List.of("-rdynamic", "-pthread", "-ldl", "-latomic", "-Wl,-rpath,'$ORIGIN'");
76+
public final List<String> linuxLinkerArgs = List.of("-rdynamic", "-pthread", "-ldl", "-latomic",
77+
"-Wl,-rpath,'$ORIGIN'");
7378
public final List<String> linuxReleaseCompilerArgs = List.of("-O2");
7479
public final List<String> linuxDebugCompilerArgs = List.of("-O0");
7580

@@ -103,7 +108,8 @@ public static class Platforms {
103108
public final String linuxx64 = "linuxx86-64";
104109
public final List<String> allPlatforms = List.of(roborio, systemcore, linuxarm32, linuxarm64, windowsx64,
105110
windowsx86, windowsarm64, osxuniversal, linuxx64);
106-
public final List<String> desktopPlatforms = List.of(windowsx64, windowsx86, windowsarm64, osxuniversal, linuxx64);
111+
public final List<String> desktopPlatforms = List.of(windowsx64, windowsx86, windowsarm64, osxuniversal,
112+
linuxx64);
107113
}
108114

109115
public final Platforms platforms;
@@ -547,9 +553,10 @@ public void configureDependencies(Action<DependencyVersions> dependencies) {
547553
registerStandardDependency(configs, "cameraserver", "edu.wpi.first.cameraserver", "cameraserver-cpp",
548554
wpiVersion);
549555
registerStandardDependency(configs, "wpilibc", "edu.wpi.first.wpilibc", "wpilibc-cpp", wpiVersion);
550-
556+
registerStandardDependency(configs, "datalog", "edu.wpi.first.datalog", "datalog-cpp", wpiVersion);
551557
registerStandardDependency(configs, "wpimath", "edu.wpi.first.wpimath", "wpimath-cpp",
552558
wpiVersion);
559+
553560
registerSharedOnlyStandardDependency(configs, "apriltag", "edu.wpi.first.apriltag", "apriltag-cpp",
554561
wpiVersion);
555562

@@ -558,7 +565,8 @@ public void configureDependencies(Action<DependencyVersions> dependencies) {
558565

559566
registerStandardDependency(configs, "opencv", opencvYearGroup, "opencv-cpp",
560567
dependencyVersions.getOpencvVersion());
561-
registerStaticOnlyStandardDependency(configs, "googletest", "edu.wpi.first.thirdparty.googletest", "googletest-cpp",
568+
registerStaticOnlyStandardDependency(configs, "googletest", "edu.wpi.first.thirdparty.googletest",
569+
"googletest-cpp",
562570
wpiVersion);
563571

564572
configs.register("wpilib_jni", AllPlatformsCombinedNativeDependency.class, c -> {
@@ -618,5 +626,36 @@ public void configureDependencies(Action<DependencyVersions> dependencies) {
618626
ListProperty<String> d = c.getDependencies();
619627
d.set(List.of("cameraserver_static", "cscore_static", "opencv_static"));
620628
});
629+
630+
// 2027
631+
configs.register("wpilib_jni_2027", AllPlatformsCombinedNativeDependency.class, c -> {
632+
ListProperty<String> d = c.getDependencies();
633+
d.set(List.of("ntcore_shared", "hal_shared", "datalog_shared", "wpimath_shared", "wpinet_shared",
634+
"wpiutil_shared"));
635+
});
636+
637+
configs.register("wpilib_static_2027", AllPlatformsCombinedNativeDependency.class, c -> {
638+
ListProperty<String> d = c.getDependencies();
639+
d.set(List.of("wpilibc_static", "ntcore_static", "hal_static", "datalog_static", "wpimath_static",
640+
"wpinet_static",
641+
"wpiutil_static"));
642+
});
643+
644+
configs.register("wpilib_shared_2027", AllPlatformsCombinedNativeDependency.class, c -> {
645+
ListProperty<String> d = c.getDependencies();
646+
d.set(List.of("wpilibc_shared", "ntcore_shared", "hal_shared", "datalog_shared", "wpimath_shared",
647+
"wpinet_shared",
648+
"wpiutil_shared"));
649+
});
650+
651+
configs.register("driver_static_2027", AllPlatformsCombinedNativeDependency.class, c -> {
652+
ListProperty<String> d = c.getDependencies();
653+
d.set(List.of("hal_static", "datalog_static", "wpimath_static", "wpinet_static", "wpiutil_static"));
654+
});
655+
656+
configs.register("driver_shared_2027", AllPlatformsCombinedNativeDependency.class, c -> {
657+
ListProperty<String> d = c.getDependencies();
658+
d.set(List.of("hal_shared", "datalog_shared", "wpimath_shared", "wpinet_shared", "wpiutil_shared"));
659+
});
621660
}
622661
}

testing/cpp/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import edu.wpi.first.nativeutils.vendordeps.WPIVendorDepsPlugin
33

44
plugins {
55
id "cpp"
6-
id "edu.wpi.first.NativeUtils" version "2025.9.1"
6+
id "edu.wpi.first.NativeUtils" version "2025.10.1"
77
}
88

99
nativeUtils.addWpiNativeUtils()

0 commit comments

Comments
 (0)