Fixup generation (#5)

wpilibsuite · May 7, 2024 · fdd5684 · fdd5684
1 parent 002eda2
commit fdd5684
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 5 deletions.
diff --git a/.bazelrc b/.bazelrc
@@ -3,6 +3,9 @@ import .bazelrc-cc
 import .bazelrc-java
 import .bazelrc-buildbuddy
 
+build --test_env=LD_LIBRARY_PATH=.
+build --test_env=DYLD_LIBRARY_PATH=.
+
 # Roborio
 build:roborio --platforms=@rules_bzlmodrio_toolchains//platforms/roborio
 build:roborio --build_tag_filters=-no-roborio

diff --git a/.bazelrc-cc b/.bazelrc-cc
@@ -17,7 +17,7 @@ build:windows_arm --copt=/wd5105
 build:windows_arm --cxxopt=/wd4146
 build:windows_arm --cxxopt=/wd4267
 build:windows_arm --cxxopt=/wd4244
-build:windows_arm --cpu=x64_arm64_windows
+build:windows_arm --cpu=arm64_windows
 
 # Linux
 build:linux --copt=-Wall

diff --git a/MODULE.bazel b/MODULE.bazel
@@ -1,6 +1,6 @@
 module(
     name = "rules_bzlmodrio_jdk",
-    version = "17.0.8+7",
+    version = "17.0.8-7",
     compatibility_level = 2024,
 )
 

diff --git a/generate/BUILD.bazel b/generate/BUILD.bazel
@@ -24,6 +24,7 @@ py_binary(
     srcs = ["publish.py"],
     visibility = ["//visibility:public"],
     deps = [
+        ":get_toolchain_dependencies",
         "@bzlmodrio-gentool//bazelrio_gentool",
     ],
 )

diff --git a/generate/get_version.py b/generate/get_version.py
@@ -2,7 +2,7 @@
 
 
 def main():
-    print(get_toolchain_dependencies().jdk_version)
+    print(get_toolchain_dependencies().sanitized_version)
 
 
 if __name__ == "__main__":

diff --git a/generate/templates/MODULE.bazel.jinja2 b/generate/templates/MODULE.bazel.jinja2
@@ -1,6 +1,6 @@
 module(
     name = "{{group.repo_name}}",
-    version = "{{group.sanitized_version.replace('-', '+')}}{{group.patch}}",
+    version = "{{group.sanitized_version}}{{group.patch}}",
     compatibility_level = {{group.year}},
 )
 

diff --git a/tests/.bazelrc b/tests/.bazelrc
@@ -3,6 +3,9 @@ import .bazelrc-cc
 import .bazelrc-java
 import .bazelrc-buildbuddy
 
+build --test_env=LD_LIBRARY_PATH=.
+build --test_env=DYLD_LIBRARY_PATH=.
+
 # Roborio
 build:roborio --platforms=@rules_bzlmodrio_toolchains//platforms/roborio
 build:roborio --build_tag_filters=-no-roborio

diff --git a/tests/.bazelrc-cc b/tests/.bazelrc-cc
@@ -17,7 +17,7 @@ build:windows_arm --copt=/wd5105
 build:windows_arm --cxxopt=/wd4146
 build:windows_arm --cxxopt=/wd4267
 build:windows_arm --cxxopt=/wd4244
-build:windows_arm --cpu=x64_arm64_windows
+build:windows_arm --cpu=arm64_windows
 
 # Linux
 build:linux --copt=-Wall