From 9dfa798eac0980405affc3fabad5a499c3a1036d Mon Sep 17 00:00:00 2001 From: Gold856 <117957790+Gold856@users.noreply.github.com> Date: Mon, 2 Nov 2026 02:09:40 -0500 Subject: [PATCH 1/2] Rename SystemCore to Systemcore --- .github/workflows/main.yml | 2 +- README.md | 2 +- .../wpilib/toolchain/ToolchainExtension.java | 6 +- .../SystemCoreToolchainExtension.java | 4 +- .../systemcore/SystemCoreToolchainPlugin.java | 12 +-- .../systemcore/SystemCoreDownloadTest.groovy | 8 +- .../nativeutils/NativeUtilsExtension.java | 80 +++++++++---------- testing/cpp/build.gradle | 2 +- 8 files changed, 58 insertions(+), 58 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 9db97c7..1cf9f27 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -29,7 +29,7 @@ jobs: - name: Check output run: git --no-pager diff --exit-code HEAD - name: Install All Toolchains - run: ../../gradlew installArm64Toolchain installSystemCoreToolchain + run: ../../gradlew installArm64Toolchain installSystemcoreToolchain working-directory: testing/cpp - name: Build Test run: ../../gradlew build diff --git a/README.md b/README.md index e4e5732..422b838 100644 --- a/README.md +++ b/README.md @@ -185,7 +185,7 @@ toolchainsPlugin { linuxCppCompilerExecutable = "g++-14" // Add the systemcore compiler - withCrossSystemCore() + withCrossSystemcore() // Add the raspbian compiler withCrossLinuxArm64() // The above 2 are included with nativeUtils.addWpiNativeUtils() diff --git a/ToolchainPlugin/src/main/java/org/wpilib/toolchain/ToolchainExtension.java b/ToolchainPlugin/src/main/java/org/wpilib/toolchain/ToolchainExtension.java index de1e62a..9f8d2e2 100644 --- a/ToolchainPlugin/src/main/java/org/wpilib/toolchain/ToolchainExtension.java +++ b/ToolchainPlugin/src/main/java/org/wpilib/toolchain/ToolchainExtension.java @@ -19,7 +19,7 @@ import org.gradle.api.model.ObjectFactory; import org.wpilib.toolchain.arm64.Arm64ToolchainPlugin; -import org.wpilib.toolchain.systemcore.SystemCoreToolchainPlugin; +import org.wpilib.toolchain.systemcore.SystemcoreToolchainPlugin; import org.wpilib.toolchain.configurable.CrossCompilerConfiguration; public class ToolchainExtension { @@ -143,8 +143,8 @@ public void withCrossLinuxArm64() { } } - public void withCrossSystemCore() { - project.getPluginManager().apply(SystemCoreToolchainPlugin.class); + public void withCrossSystemcore() { + project.getPluginManager().apply(SystemcoreToolchainPlugin.class); } private boolean removeInvalidWindowsToolchains = true; diff --git a/ToolchainPlugin/src/main/java/org/wpilib/toolchain/systemcore/SystemCoreToolchainExtension.java b/ToolchainPlugin/src/main/java/org/wpilib/toolchain/systemcore/SystemCoreToolchainExtension.java index 2956355..557c23e 100644 --- a/ToolchainPlugin/src/main/java/org/wpilib/toolchain/systemcore/SystemCoreToolchainExtension.java +++ b/ToolchainPlugin/src/main/java/org/wpilib/toolchain/systemcore/SystemCoreToolchainExtension.java @@ -4,12 +4,12 @@ import org.wpilib.toolchain.opensdk.OpenSdkToolchainExtension; -public abstract class SystemCoreToolchainExtension extends OpenSdkToolchainExtension { +public abstract class SystemcoreToolchainExtension extends OpenSdkToolchainExtension { public static final String TOOLCHAIN_VERSION = "2027-14.3.0"; public static final String INSTALL_SUBDIR = "systemcore"; @Inject - public SystemCoreToolchainExtension() { + public SystemcoreToolchainExtension() { super(); getVersionLow().convention("14.3.0"); getVersionHigh().convention("14.3.0"); diff --git a/ToolchainPlugin/src/main/java/org/wpilib/toolchain/systemcore/SystemCoreToolchainPlugin.java b/ToolchainPlugin/src/main/java/org/wpilib/toolchain/systemcore/SystemCoreToolchainPlugin.java index 64fcc60..a9f5a34 100644 --- a/ToolchainPlugin/src/main/java/org/wpilib/toolchain/systemcore/SystemCoreToolchainPlugin.java +++ b/ToolchainPlugin/src/main/java/org/wpilib/toolchain/systemcore/SystemCoreToolchainPlugin.java @@ -18,18 +18,18 @@ import org.wpilib.toolchain.opensdk.OpenSdkToolchainBase; import org.wpilib.toolchain.opensdk.OpenSdkToolchainBase.ToolchainBaseOptions; -public class SystemCoreToolchainPlugin implements Plugin { +public class SystemcoreToolchainPlugin implements Plugin { - public static final String toolchainName = "systemCore"; + public static final String toolchainName = "systemcore"; public static final String baseToolchainName = "arm64-systemcore"; - private SystemCoreToolchainExtension systemcoreExt; + private SystemcoreToolchainExtension systemcoreExt; private Project project; private OpenSdkToolchainBase opensdk; private ExecOperations operations; @Inject - public SystemCoreToolchainPlugin(ExecOperations operations) { + public SystemcoreToolchainPlugin(ExecOperations operations) { this.operations = operations; } @@ -37,7 +37,7 @@ public SystemCoreToolchainPlugin(ExecOperations operations) { public void apply(Project project) { this.project = project; - systemcoreExt = project.getExtensions().create("systemcoreToolchain", SystemCoreToolchainExtension.class); + systemcoreExt = project.getExtensions().create("systemcoreToolchain", SystemcoreToolchainExtension.class); ToolchainExtension toolchainExt = project.getExtensions().getByType(ToolchainExtension.class); @@ -45,7 +45,7 @@ public void apply(Project project) { options.baseToolchainName = baseToolchainName; options.tcExt = systemcoreExt; options.project = project; - options.installSubdir = SystemCoreToolchainExtension.INSTALL_SUBDIR; + options.installSubdir = SystemcoreToolchainExtension.INSTALL_SUBDIR; options.toolchainPrefix = project.provider(() -> "aarch64-systemcore2027-linux-gnu"); options.rootExtension = toolchainExt.getToolchainGraphService(); diff --git a/ToolchainPlugin/src/test/groovy/org/wpilib/toolchain/systemcore/SystemCoreDownloadTest.groovy b/ToolchainPlugin/src/test/groovy/org/wpilib/toolchain/systemcore/SystemCoreDownloadTest.groovy index 0601ca3..ab3d08b 100644 --- a/ToolchainPlugin/src/test/groovy/org/wpilib/toolchain/systemcore/SystemCoreDownloadTest.groovy +++ b/ToolchainPlugin/src/test/groovy/org/wpilib/toolchain/systemcore/SystemCoreDownloadTest.groovy @@ -10,7 +10,7 @@ import spock.lang.Specification import spock.lang.IgnoreIf @IgnoreIf({ !Boolean.valueOf(env['SPOCK_RUN_TOOLCHAINS']) }) -class SystemCoreDownloadTest extends Specification { +class SystemcoreDownloadTest extends Specification { @TempDir File testProjectDir @TempDir File gradleUserHome File buildFile @@ -27,16 +27,16 @@ class SystemCoreDownloadTest extends Specification { id 'org.wpilib.Toolchain' } -toolchainsPlugin.withCrossSystemCore() +toolchainsPlugin.withCrossSystemcore() """ when: def result = GradleRunner.create() .withProjectDir(testProjectDir) - .withArguments('installSystemCoreToolchain', '--stacktrace', '-Dgradle.user.home=' + gradleUserHome) + .withArguments('installSystemcoreToolchain', '--stacktrace', '-Dgradle.user.home=' + gradleUserHome) .withPluginClasspath() .build() then: - result.task(':installSystemCoreToolchain').outcome == SUCCESS + result.task(':installSystemcoreToolchain').outcome == SUCCESS } } diff --git a/src/main/java/org/wpilib/nativeutils/NativeUtilsExtension.java b/src/main/java/org/wpilib/nativeutils/NativeUtilsExtension.java index 8a11fc3..90de1c2 100644 --- a/src/main/java/org/wpilib/nativeutils/NativeUtilsExtension.java +++ b/src/main/java/org/wpilib/nativeutils/NativeUtilsExtension.java @@ -31,11 +31,11 @@ import org.wpilib.nativeutils.dependencies.CustomDependencySet; import org.wpilib.nativeutils.dependencies.DelegatedDependencySet; import org.wpilib.nativeutils.dependencies.FastDownloadDependencySet; -import org.wpilib.nativeutils.dependencies.NativeDependency; -import org.wpilib.nativeutils.dependencies.WPIHeaderOnlyMavenDependency; -import org.wpilib.nativeutils.dependencies.WPIOnDiskDependency; -import org.wpilib.nativeutils.dependencies.WPISharedMavenDependency; -import org.wpilib.nativeutils.dependencies.WPIStaticMavenDependency; +import org.wpilib.nativeutils.dependencies.NativeDependency; +import org.wpilib.nativeutils.dependencies.WPIHeaderOnlyMavenDependency; +import org.wpilib.nativeutils.dependencies.WPIOnDiskDependency; +import org.wpilib.nativeutils.dependencies.WPISharedMavenDependency; +import org.wpilib.nativeutils.dependencies.WPIStaticMavenDependency; import org.wpilib.nativeutils.exports.DefaultExportsConfig; import org.wpilib.nativeutils.exports.ExportsConfig; import org.wpilib.nativeutils.exports.PrivateExportsConfig; @@ -49,7 +49,7 @@ import org.wpilib.toolchain.ToolchainExtension; import org.wpilib.toolchain.arm64.Arm64ToolchainPlugin; import org.wpilib.toolchain.configurable.CrossCompilerConfiguration; -import org.wpilib.toolchain.systemcore.SystemCoreToolchainPlugin; +import org.wpilib.toolchain.systemcore.SystemcoreToolchainPlugin; public class NativeUtilsExtension { @@ -105,10 +105,10 @@ public NativeUtilsExtension(Project project, ToolchainExtension tcExt) { }); dependencyContainer = objectFactory.polymorphicDomainObjectContainer(NativeDependency.class); - addNativeDependencyType(WPIStaticMavenDependency.class, project); - addNativeDependencyType(WPISharedMavenDependency.class, project); - addNativeDependencyType(WPIHeaderOnlyMavenDependency.class, project); - addNativeDependencyType(WPIOnDiskDependency.class, project); + addNativeDependencyType(WPIStaticMavenDependency.class, project); + addNativeDependencyType(WPISharedMavenDependency.class, project); + addNativeDependencyType(WPIHeaderOnlyMavenDependency.class, project); + addNativeDependencyType(WPIOnDiskDependency.class, project); addNativeDependencyType(CombinedIgnoreMissingPlatformNativeDependency.class, dependencyContainer); addNativeDependencyType(AllPlatformsCombinedNativeDependency.class, dependencyContainer); @@ -366,8 +366,8 @@ public TaskProvider generateResources(String name, Actio return project.getTasks().register(name, ResourceGenerationTask.class, configure); } - public void withCrossSystemCore() { - project.getPluginManager().apply(SystemCoreToolchainPlugin.class); + public void withCrossSystemcore() { + project.getPluginManager().apply(SystemcoreToolchainPlugin.class); } public void withCrossLinuxArm64() { @@ -410,31 +410,31 @@ public void setRemoveInvalidWindowsToolchains(boolean remove) { tcExt.setRemoveInvalidWindowsToolchains(remove); } - public boolean isRemoveInvalidWindowsToolchains() { - return tcExt.isRemoveInvalidWindowsToolchains(); - } - - public void setRequireVersionedLinuxGcc(boolean require) { - tcExt.setRequireVersionedLinuxGcc(require); - } - - public boolean isRequireVersionedLinuxGcc() { - return tcExt.isRequireVersionedLinuxGcc(); - } - - public void setLinuxCCompilerExecutable(String executable) { - tcExt.setLinuxCCompilerExecutable(executable); - } - - public String getLinuxCCompilerExecutable() { - return tcExt.getLinuxCCompilerExecutable(); - } - - public void setLinuxCppCompilerExecutable(String executable) { - tcExt.setLinuxCppCompilerExecutable(executable); - } - - public String getLinuxCppCompilerExecutable() { - return tcExt.getLinuxCppCompilerExecutable(); - } -} + public boolean isRemoveInvalidWindowsToolchains() { + return tcExt.isRemoveInvalidWindowsToolchains(); + } + + public void setRequireVersionedLinuxGcc(boolean require) { + tcExt.setRequireVersionedLinuxGcc(require); + } + + public boolean isRequireVersionedLinuxGcc() { + return tcExt.isRequireVersionedLinuxGcc(); + } + + public void setLinuxCCompilerExecutable(String executable) { + tcExt.setLinuxCCompilerExecutable(executable); + } + + public String getLinuxCCompilerExecutable() { + return tcExt.getLinuxCCompilerExecutable(); + } + + public void setLinuxCppCompilerExecutable(String executable) { + tcExt.setLinuxCppCompilerExecutable(executable); + } + + public String getLinuxCppCompilerExecutable() { + return tcExt.getLinuxCppCompilerExecutable(); + } +} diff --git a/testing/cpp/build.gradle b/testing/cpp/build.gradle index e78b64f..fd1ef47 100644 --- a/testing/cpp/build.gradle +++ b/testing/cpp/build.gradle @@ -8,7 +8,7 @@ plugins { nativeUtils.addWpiNativeUtils() nativeUtils.withCrossLinuxArm64() -nativeUtils.withCrossSystemCore(); +nativeUtils.withCrossSystemcore(); nativeUtils.crossCompilers.getByName(NativePlatforms.linuxarm64).optional = false nativeUtils.crossCompilers.getByName(NativePlatforms.systemcore).optional = false From 1945a4fe62e956bf0456745323ecbb7eba30b51f Mon Sep 17 00:00:00 2001 From: Gold856 <117957790+Gold856@users.noreply.github.com> Date: Wed, 4 Nov 2026 21:52:08 -0500 Subject: [PATCH 2/2] Rename files --- ...eToolchainExtension.java => SystemcoreToolchainExtension.java} | 0 ...temCoreToolchainPlugin.java => SystemcoreToolchainPlugin.java} | 0 ...ystemCoreDownloadTest.groovy => SystemcoreDownloadTest.groovy} | 0 3 files changed, 0 insertions(+), 0 deletions(-) rename ToolchainPlugin/src/main/java/org/wpilib/toolchain/systemcore/{SystemCoreToolchainExtension.java => SystemcoreToolchainExtension.java} (100%) rename ToolchainPlugin/src/main/java/org/wpilib/toolchain/systemcore/{SystemCoreToolchainPlugin.java => SystemcoreToolchainPlugin.java} (100%) rename ToolchainPlugin/src/test/groovy/org/wpilib/toolchain/systemcore/{SystemCoreDownloadTest.groovy => SystemcoreDownloadTest.groovy} (100%) diff --git a/ToolchainPlugin/src/main/java/org/wpilib/toolchain/systemcore/SystemCoreToolchainExtension.java b/ToolchainPlugin/src/main/java/org/wpilib/toolchain/systemcore/SystemcoreToolchainExtension.java similarity index 100% rename from ToolchainPlugin/src/main/java/org/wpilib/toolchain/systemcore/SystemCoreToolchainExtension.java rename to ToolchainPlugin/src/main/java/org/wpilib/toolchain/systemcore/SystemcoreToolchainExtension.java diff --git a/ToolchainPlugin/src/main/java/org/wpilib/toolchain/systemcore/SystemCoreToolchainPlugin.java b/ToolchainPlugin/src/main/java/org/wpilib/toolchain/systemcore/SystemcoreToolchainPlugin.java similarity index 100% rename from ToolchainPlugin/src/main/java/org/wpilib/toolchain/systemcore/SystemCoreToolchainPlugin.java rename to ToolchainPlugin/src/main/java/org/wpilib/toolchain/systemcore/SystemcoreToolchainPlugin.java diff --git a/ToolchainPlugin/src/test/groovy/org/wpilib/toolchain/systemcore/SystemCoreDownloadTest.groovy b/ToolchainPlugin/src/test/groovy/org/wpilib/toolchain/systemcore/SystemcoreDownloadTest.groovy similarity index 100% rename from ToolchainPlugin/src/test/groovy/org/wpilib/toolchain/systemcore/SystemCoreDownloadTest.groovy rename to ToolchainPlugin/src/test/groovy/org/wpilib/toolchain/systemcore/SystemcoreDownloadTest.groovy