From d694dc4fed26ee6d4d76e0debdffdcebd4b52758 Mon Sep 17 00:00:00 2001 From: Ulf Adams Date: Fri, 23 Jan 2026 20:28:55 +0100 Subject: [PATCH 1/3] Fix Bazel build - add rules_java + rules_cc - add imports to all BUILD files - format all BUILD files --- .gitignore | 1 + MODULE.bazel | 3 + WORKSPACE | 0 ryu/BUILD | 105 ++++++------- ryu/benchmark/BUILD | 40 ++--- ryu/tests/BUILD | 114 +++++++------- scripts/BUILD | 139 +++++++++++------- src/main/java/info/adams/ryu/BUILD | 12 +- src/main/java/info/adams/ryu/analysis/BUILD | 94 ++++++------ src/main/java/info/adams/ryu/benchmark/BUILD | 24 +-- .../adams/ryu/benchmark/BenchmarkMain.java | 1 + src/test/java/info/adams/ryu/BUILD | 26 ++-- third_party/double-conversion/BUILD | 8 +- third_party/gtest/BUILD | 22 +-- third_party/jaffer/BUILD | 8 +- third_party/junit/BUILD | 21 ++- third_party/mersenne/BUILD | 8 +- third_party/mersenne_java/BUILD | 8 +- 18 files changed, 350 insertions(+), 284 deletions(-) create mode 100644 MODULE.bazel delete mode 100644 WORKSPACE diff --git a/.gitignore b/.gitignore index 28c40ffe..24c839b4 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ bazel-* +MODULE.bazel.lock /.eclipse-bin/ /.project .vscode/ diff --git a/MODULE.bazel b/MODULE.bazel new file mode 100644 index 00000000..3ab74f0a --- /dev/null +++ b/MODULE.bazel @@ -0,0 +1,3 @@ +bazel_dep(name = "rules_cc", version = "0.2.16") +bazel_dep(name = "rules_java", version = "9.1.0") + diff --git a/WORKSPACE b/WORKSPACE deleted file mode 100644 index e69de29b..00000000 diff --git a/ryu/BUILD b/ryu/BUILD index 27fec705..3e590647 100644 --- a/ryu/BUILD +++ b/ryu/BUILD @@ -1,69 +1,70 @@ -package(default_visibility=["//visibility:public"]) +load("@rules_cc//cc:defs.bzl", "cc_library") + +package(default_visibility = ["//visibility:public"]) cc_library( - name = "ryu", - srcs = [ - "f2s.c", - "f2s_full_table.h", - "f2s_intrinsics.h", - "d2s.c", - "d2fixed.c", - "d2fixed_full_table.h", - "d2s_full_table.h", - "d2s_small_table.h", - "d2s_intrinsics.h", - "digit_table.h", - "common.h", - ], - hdrs = ["ryu.h"], + name = "ryu", + srcs = [ + "common.h", + "d2fixed.c", + "d2fixed_full_table.h", + "d2s.c", + "d2s_full_table.h", + "d2s_intrinsics.h", + "d2s_small_table.h", + "digit_table.h", + "f2s.c", + "f2s_full_table.h", + "f2s_intrinsics.h", + ], + hdrs = ["ryu.h"], ) cc_library( - name = "ryu_parse", - srcs = [ - "s2d.c", - "s2f.c", - "d2s_intrinsics.h", - "d2s_full_table.h", - "d2s_small_table.h", - "f2s_intrinsics.h", - "f2s_full_table.h", - "common.h", - ], - hdrs = ["ryu_parse.h"], + name = "ryu_parse", + srcs = [ + "common.h", + "d2s_full_table.h", + "d2s_intrinsics.h", + "d2s_small_table.h", + "f2s_full_table.h", + "f2s_intrinsics.h", + "s2d.c", + "s2f.c", + ], + hdrs = ["ryu_parse.h"], ) cc_library( - name = "generic_128", - srcs = [ - "generic_128.c", - "generic_128.h", - ], - hdrs = [ - "ryu_generic_128.h", - ], - # The code does not compile on Windows. - tags = ["nowindows"], + name = "generic_128", + srcs = [ + "generic_128.c", + "generic_128.h", + ], + hdrs = [ + "ryu_generic_128.h", + ], + # The code does not compile on Windows. + tags = ["nowindows"], ) # For testing only: cc_library( - name = "common", - hdrs = [ - "common.h", - ], - testonly = True, - visibility=["//ryu/tests:__pkg__"], + name = "common", + testonly = True, + hdrs = [ + "common.h", + ], + visibility = ["//ryu/tests:__pkg__"], ) cc_library( - name = "d2s_intrinsics", - hdrs = [ - "common.h", - "d2s_intrinsics.h", - ], - testonly = True, - visibility=["//ryu/tests:__pkg__"], + name = "d2s_intrinsics", + testonly = True, + hdrs = [ + "common.h", + "d2s_intrinsics.h", + ], + visibility = ["//ryu/tests:__pkg__"], ) - diff --git a/ryu/benchmark/BUILD b/ryu/benchmark/BUILD index 3d62f08a..94c459c3 100644 --- a/ryu/benchmark/BUILD +++ b/ryu/benchmark/BUILD @@ -1,30 +1,32 @@ -package(default_visibility=["//visibility:public"]) +load("@rules_cc//cc:defs.bzl", "cc_binary") + +package(default_visibility = ["//visibility:public"]) # Build with --copt=-DMATCH_GRISU3_OUTPUT to match Grisu3 and check for # differences. cc_binary( - name = "ryu_benchmark", - srcs = ["benchmark.cc"], - deps = [ - "//ryu", - "//third_party/double-conversion", - ], + name = "ryu_benchmark", + srcs = ["benchmark.cc"], + deps = [ + "//ryu", + "//third_party/double-conversion", + ], ) cc_binary( - name = "ryu_printf_benchmark_c", - srcs = ["benchmark_fixed.c"], - deps = [ - "//ryu", - "//third_party/mersenne", - ], + name = "ryu_printf_benchmark_c", + srcs = ["benchmark_fixed.c"], + deps = [ + "//ryu", + "//third_party/mersenne", + ], ) cc_binary( - name = "ryu_printf_benchmark", - srcs = ["benchmark_fixed.cc"], - deps = [ - "//ryu", - "//third_party/mersenne", - ], + name = "ryu_printf_benchmark", + srcs = ["benchmark_fixed.cc"], + deps = [ + "//ryu", + "//third_party/mersenne", + ], ) diff --git a/ryu/tests/BUILD b/ryu/tests/BUILD index c24870f5..f70249bf 100644 --- a/ryu/tests/BUILD +++ b/ryu/tests/BUILD @@ -1,84 +1,84 @@ +load("@rules_cc//cc:defs.bzl", "cc_test") cc_test( - name = "common_test", - srcs = ["common_test.cc"], - deps = [ - "//ryu:common", - "//third_party/gtest", - ], + name = "common_test", + srcs = ["common_test.cc"], + deps = [ + "//ryu:common", + "//third_party/gtest", + ], ) cc_test( - name = "d2s_intrinsics_test", - srcs = ["d2s_intrinsics_test.cc"], - deps = [ - "//ryu:d2s_intrinsics", - "//third_party/gtest", - ], + name = "d2s_intrinsics_test", + srcs = ["d2s_intrinsics_test.cc"], + deps = [ + "//ryu:d2s_intrinsics", + "//third_party/gtest", + ], ) cc_test( - name = "d2s_test", - srcs = ["d2s_test.cc"], - deps = [ - "//ryu", - "//third_party/gtest", - ], + name = "d2s_test", + srcs = ["d2s_test.cc"], + deps = [ + "//ryu", + "//third_party/gtest", + ], ) cc_test( - name = "s2d_test", - srcs = ["s2d_test.cc"], - deps = [ - "//ryu:ryu_parse", - "//third_party/gtest", - ], + name = "s2d_test", + srcs = ["s2d_test.cc"], + deps = [ + "//ryu:ryu_parse", + "//third_party/gtest", + ], ) cc_test( - name = "d2s_table_test", - srcs = ["d2s_table_test.cc"], - deps = [ - "//ryu", - "//third_party/gtest", - ], + name = "d2s_table_test", + srcs = ["d2s_table_test.cc"], + deps = [ + "//ryu", + "//third_party/gtest", + ], ) cc_test( - name = "f2s_test", - srcs = ["f2s_test.cc"], - deps = [ - "//ryu", - "//third_party/gtest", - ], + name = "f2s_test", + srcs = ["f2s_test.cc"], + deps = [ + "//ryu", + "//third_party/gtest", + ], ) cc_test( - name = "s2f_test", - srcs = ["s2f_test.cc"], - deps = [ - "//ryu:ryu_parse", - "//third_party/gtest", - ], + name = "s2f_test", + srcs = ["s2f_test.cc"], + deps = [ + "//ryu:ryu_parse", + "//third_party/gtest", + ], ) cc_test( - name = "ryu_printf_test", - srcs = ["d2fixed_test.cc"], - deps = [ - "//ryu", - "//third_party/gtest", - ], + name = "ryu_printf_test", + srcs = ["d2fixed_test.cc"], + deps = [ + "//ryu", + "//third_party/gtest", + ], ) cc_test( - name = "generic_128_test", - srcs = ["generic_128_test.cc"], - # The code does not run on Windows yet. - tags = ["nowindows"], - deps = [ - "//ryu:generic_128", - "//third_party/gtest", - ], + name = "generic_128_test", + srcs = ["generic_128_test.cc"], + # The code does not run on Windows yet. + tags = ["nowindows"], + deps = [ + "//ryu:generic_128", + "//third_party/gtest", + ], ) - diff --git a/scripts/BUILD b/scripts/BUILD index 4b6a5919..be7adf18 100644 --- a/scripts/BUILD +++ b/scripts/BUILD @@ -1,4 +1,4 @@ -CONVERSION_CMD_RYU="".join([ +CONVERSION_CMD_RYU = "".join([ "TMP_FILE=$$(mktemp /tmp/plot.XXXXXX)", " && cat $(location %s.template)", " | sed \"s|INPUT_FILE|$<|g\"", @@ -6,14 +6,15 @@ CONVERSION_CMD_RYU="".join([ " | sed \"s|COMPARISON_NAME_2|%s|g\"", " > $${TMP_FILE}", " && gnuplot $${TMP_FILE} > $@", - " && rm -f $${TMP_FILE}"]) + " && rm -f $${TMP_FILE}", +]) [genrule( - name = "shortest-" + t + "-" + f + "-csv", - tools = [dep], - outs = ["shortest-" + t + "-" + f + ".csv"], - cmd = "$(location " + dep + ") " + o + " -classic -samples=1000 -v > $@", -) for (t,f,o,dep) in [ + name = "shortest-" + t + "-" + f + "-csv", + outs = ["shortest-" + t + "-" + f + ".csv"], + cmd = "$(location " + dep + ") " + o + " -classic -samples=1000 -v > $@", + tools = [dep], +) for (t, f, o, dep) in [ ("c", "float", "-32", "//ryu/benchmark:ryu_benchmark"), ("c", "double", "-64", "//ryu/benchmark:ryu_benchmark"), ("java", "float", "-32", "//src/main/java/info/adams/ryu/benchmark"), @@ -21,63 +22,97 @@ CONVERSION_CMD_RYU="".join([ ]] [genrule( - name = "shortest-" + t + "-" + f + "-pdf", - srcs = ["shortest-" + t + "-" + f + ".csv"], - tools = [f + ".template"], - outs = ["shortest-" + t + "-" + f + ".pdf"], - cmd = CONVERSION_CMD_RYU % (f, c, d), -) for (t,c,d) in [("c","Grisu3",""),("java","Jdk","Jaffer")] for f in ["float","double"]] - - + name = "shortest-" + t + "-" + f + "-pdf", + srcs = ["shortest-" + t + "-" + f + ".csv"], + outs = ["shortest-" + t + "-" + f + ".pdf"], + cmd = CONVERSION_CMD_RYU % (f, c, d), + tools = [f + ".template"], +) for (t, c, d) in [ + ("c", "Grisu3", ""), + ("java", "Jdk", "Jaffer"), +] for f in [ + "float", + "double", +]] -CONVERSION_CMD_RYU_PRINTF="".join([ +CONVERSION_CMD_RYU_PRINTF = "".join([ "TMP_FILE=$$(mktemp /tmp/plot.XXXXXX)", " && cat $(location %s.template)", " | sed \"s|INPUT_FILE|$<|g\"", " | sed \"s|COMPARISON_NAME_1|%s|g\"", " > $${TMP_FILE}", " && gnuplot $${TMP_FILE} > $@", - " && rm -f $${TMP_FILE}"]) + " && rm -f $${TMP_FILE}", +]) -[genrule( - name = "f-" + t + "-" + f + "-" + p + "-csv", - tools = [dep], - outs = ["f-" + t + "-" + f + "-" + p + ".csv"], - cmd = "$(location " + dep + ") " + o + " -classic -samples=2000 -precision=" + p + " -v > $@", -) for (t,f,o,dep) in [ - ("c", "double", "-f", "//ryu/benchmark:ryu_printf_benchmark"), - ] - for p in ["1", "10", "100", "1000"] +[ + genrule( + name = "f-" + t + "-" + f + "-" + p + "-csv", + outs = ["f-" + t + "-" + f + "-" + p + ".csv"], + cmd = "$(location " + dep + ") " + o + " -classic -samples=2000 -precision=" + p + " -v > $@", + tools = [dep], + ) + for (t, f, o, dep) in [ + ("c", "double", "-f", "//ryu/benchmark:ryu_printf_benchmark"), + ] + for p in [ + "1", + "10", + "100", + "1000", + ] ] -[genrule( - name = "f-" + t + "-" + f + "-" + p + "-pdf", - srcs = ["f-" + t + "-" + f + "-" + p + ".csv"], - tools = ["printf.template"], - outs = ["f-" + t + "-" + f + "-" + p + ".pdf"], - cmd = CONVERSION_CMD_RYU_PRINTF % ("printf", c), -) for (t,c,d) in [("c","snprintf","")] for f in ["double"] - for p in ["1", "10", "100", "1000"] +[ + genrule( + name = "f-" + t + "-" + f + "-" + p + "-pdf", + srcs = ["f-" + t + "-" + f + "-" + p + ".csv"], + outs = ["f-" + t + "-" + f + "-" + p + ".pdf"], + cmd = CONVERSION_CMD_RYU_PRINTF % ("printf", c), + tools = ["printf.template"], + ) + for (t, c, d) in [("c", "snprintf", "")] + for f in ["double"] + for p in [ + "1", + "10", + "100", + "1000", + ] ] -[genrule( - name = "e-" + t + "-" + f + "-" + p + "-csv", - tools = [dep], - outs = ["e-" + t + "-" + f + "-" + p + ".csv"], - cmd = "$(location " + dep + ") " + o + " -classic -samples=2000 -precision=" + p + " -v > $@", -) for (t,f,o,dep) in [ - ("c", "double", "-e", "//ryu/benchmark:ryu_printf_benchmark"), - ] - for p in ["1", "10", "100", "1000"] +[ + genrule( + name = "e-" + t + "-" + f + "-" + p + "-csv", + outs = ["e-" + t + "-" + f + "-" + p + ".csv"], + cmd = "$(location " + dep + ") " + o + " -classic -samples=2000 -precision=" + p + " -v > $@", + tools = [dep], + ) + for (t, f, o, dep) in [ + ("c", "double", "-e", "//ryu/benchmark:ryu_printf_benchmark"), + ] + for p in [ + "1", + "10", + "100", + "1000", + ] ] -[genrule( - name = "e-" + t + "-" + f + "-" + p + "-pdf", - srcs = ["e-" + t + "-" + f + "-" + p + ".csv"], - tools = ["printf.template"], - outs = ["e-" + t + "-" + f + "-" + p + ".pdf"], - cmd = CONVERSION_CMD_RYU_PRINTF % ("printf", c), -) for (t,c,d) in [("c","snprintf","")] for f in ["double"] - for p in ["1", "10", "100", "1000"] +[ + genrule( + name = "e-" + t + "-" + f + "-" + p + "-pdf", + srcs = ["e-" + t + "-" + f + "-" + p + ".csv"], + outs = ["e-" + t + "-" + f + "-" + p + ".pdf"], + cmd = CONVERSION_CMD_RYU_PRINTF % ("printf", c), + tools = ["printf.template"], + ) + for (t, c, d) in [("c", "snprintf", "")] + for f in ["double"] + for p in [ + "1", + "10", + "100", + "1000", + ] ] - diff --git a/src/main/java/info/adams/ryu/BUILD b/src/main/java/info/adams/ryu/BUILD index fb8f845a..93bfe803 100644 --- a/src/main/java/info/adams/ryu/BUILD +++ b/src/main/java/info/adams/ryu/BUILD @@ -1,8 +1,10 @@ -package(default_visibility=["//visibility:public"]) +load("@rules_java//java:defs.bzl", "java_library") + +package(default_visibility = ["//visibility:public"]) java_library( - name = "ryu", - srcs = glob(["*.java"]), - # Travis CI: No Java support on Windows. - tags = ["nowindows"], + name = "ryu", + srcs = glob(["*.java"]), + # Travis CI: No Java support on Windows. + tags = ["nowindows"], ) diff --git a/src/main/java/info/adams/ryu/analysis/BUILD b/src/main/java/info/adams/ryu/analysis/BUILD index dba83a4c..67ac79c2 100644 --- a/src/main/java/info/adams/ryu/analysis/BUILD +++ b/src/main/java/info/adams/ryu/analysis/BUILD @@ -1,76 +1,78 @@ -package(default_visibility=["//visibility:public"]) +load("@rules_java//java:defs.bzl", "java_binary", "java_library") + +package(default_visibility = ["//visibility:public"]) java_library( - name = "analysis", - srcs = glob(["*.java"]), - deps = [ - "//src/main/java/info/adams/ryu", - "//third_party/jaffer", - "//third_party/mersenne_java", - ], - # Travis CI: No Java support on Windows. - tags = ["nowindows"], + name = "analysis", + srcs = glob(["*.java"]), + # Travis CI: No Java support on Windows. + tags = ["nowindows"], + deps = [ + "//src/main/java/info/adams/ryu", + "//third_party/jaffer", + "//third_party/mersenne_java", + ], ) java_binary( - name = "ComputeRequiredBitSizes", - runtime_deps = [":analysis"], - # Travis CI: No Java support on Windows. - tags = ["nowindows"], + name = "ComputeRequiredBitSizes", + # Travis CI: No Java support on Windows. + tags = ["nowindows"], + runtime_deps = [":analysis"], ) java_binary( - name = "ExhaustiveFloatComparison", - runtime_deps = [":analysis"], - # Travis CI: No Java support on Windows. - tags = ["nowindows"], + name = "ExhaustiveFloatComparison", + # Travis CI: No Java support on Windows. + tags = ["nowindows"], + runtime_deps = [":analysis"], ) java_binary( - name = "ExtensiveDoubleComparison", - runtime_deps = [":analysis"], - # Travis CI: No Java support on Windows. - tags = ["nowindows"], + name = "ExtensiveDoubleComparison", + # Travis CI: No Java support on Windows. + tags = ["nowindows"], + runtime_deps = [":analysis"], ) java_binary( - name = "PrintFloatLookupTable", - runtime_deps = [":analysis"], - # Travis CI: No Java support on Windows. - tags = ["nowindows"], + name = "PrintFloatLookupTable", + # Travis CI: No Java support on Windows. + tags = ["nowindows"], + runtime_deps = [":analysis"], ) java_binary( - name = "PrintDoubleLookupTable", - runtime_deps = [":analysis"], - # Travis CI: No Java support on Windows. - tags = ["nowindows"], + name = "PrintDoubleLookupTable", + # Travis CI: No Java support on Windows. + tags = ["nowindows"], + runtime_deps = [":analysis"], ) java_binary( - name = "ComputeTableSizes", - runtime_deps = [":analysis"], - # Travis CI: No Java support on Windows. - tags = ["nowindows"], + name = "ComputeTableSizes", + # Travis CI: No Java support on Windows. + tags = ["nowindows"], + runtime_deps = [":analysis"], ) java_binary( - name = "FindDifferences", - runtime_deps = [":analysis"], - # Travis CI: No Java support on Windows. - tags = ["nowindows"], + name = "FindDifferences", + # Travis CI: No Java support on Windows. + tags = ["nowindows"], + runtime_deps = [":analysis"], ) java_binary( - name = "SlowConversion", - runtime_deps = [":analysis"], - # Travis CI: No Java support on Windows. - tags = ["nowindows"], + name = "SlowConversion", + # Travis CI: No Java support on Windows. + tags = ["nowindows"], + runtime_deps = [":analysis"], ) java_binary( - name = "RandomizedDoubleComparison", - runtime_deps = [":analysis"], - # Travis CI: No Java support on Windows. - tags = ["nowindows"], + name = "RandomizedDoubleComparison", + # Travis CI: No Java support on Windows. + tags = ["nowindows"], + runtime_deps = [":analysis"], ) diff --git a/src/main/java/info/adams/ryu/benchmark/BUILD b/src/main/java/info/adams/ryu/benchmark/BUILD index f699804f..75d525fa 100644 --- a/src/main/java/info/adams/ryu/benchmark/BUILD +++ b/src/main/java/info/adams/ryu/benchmark/BUILD @@ -1,14 +1,16 @@ -package(default_visibility=["//visibility:public"]) +load("@rules_java//java:defs.bzl", "java_binary") + +package(default_visibility = ["//visibility:public"]) java_binary( - name = "benchmark", - main_class = "info.adams.ryu.benchmark.BenchmarkMain", - srcs = glob(["*.java"]), - deps = [ - "//src/main/java/info/adams/ryu", - "//third_party/jaffer", - "//third_party/mersenne_java", - ], - # Travis CI: No Java support on Windows. - tags = ["nowindows"], + name = "benchmark", + srcs = glob(["*.java"]), + main_class = "info.adams.ryu.benchmark.BenchmarkMain", + # Travis CI: No Java support on Windows. + tags = ["nowindows"], + deps = [ + "//src/main/java/info/adams/ryu", + "//third_party/jaffer", + "//third_party/mersenne_java", + ], ) diff --git a/src/main/java/info/adams/ryu/benchmark/BenchmarkMain.java b/src/main/java/info/adams/ryu/benchmark/BenchmarkMain.java index 2668c4ad..1f8cbf46 100644 --- a/src/main/java/info/adams/ryu/benchmark/BenchmarkMain.java +++ b/src/main/java/info/adams/ryu/benchmark/BenchmarkMain.java @@ -20,6 +20,7 @@ import info.adams.ryu.RyuDouble; import info.adams.ryu.RyuFloat; +@SuppressWarnings("ReturnValueIgnored") public class BenchmarkMain { public static void main(String[] args) { boolean run32 = true; diff --git a/src/test/java/info/adams/ryu/BUILD b/src/test/java/info/adams/ryu/BUILD index d101b5ad..6b9bf898 100644 --- a/src/test/java/info/adams/ryu/BUILD +++ b/src/test/java/info/adams/ryu/BUILD @@ -1,15 +1,17 @@ -package(default_visibility=["//visibility:public"]) +load("@rules_java//java:defs.bzl", "java_test") + +package(default_visibility = ["//visibility:public"]) java_test( - name = "ryu", - test_class = "info.adams.ryu.AllTests", - srcs = glob(["*.java"]), - deps = [ - "//src/main/java/info/adams/ryu", - "//src/main/java/info/adams/ryu/analysis", - "//third_party/jaffer", - "//third_party/junit", - ], - # Travis CI: No Java support on Windows. - tags = ["nowindows"], + name = "ryu", + srcs = glob(["*.java"]), + # Travis CI: No Java support on Windows. + tags = ["nowindows"], + test_class = "info.adams.ryu.AllTests", + deps = [ + "//src/main/java/info/adams/ryu", + "//src/main/java/info/adams/ryu/analysis", + "//third_party/jaffer", + "//third_party/junit", + ], ) diff --git a/third_party/double-conversion/BUILD b/third_party/double-conversion/BUILD index 70c3cbd6..0903365b 100644 --- a/third_party/double-conversion/BUILD +++ b/third_party/double-conversion/BUILD @@ -1,3 +1,5 @@ +load("@rules_cc//cc:defs.bzl", "cc_library", "cc_test") + # Bazel(http://bazel.io) BUILD file licenses(["notice"]) @@ -26,12 +28,12 @@ cc_library( "double-conversion/ieee.h", "double-conversion/strtod.h", ], + includes = ["."], linkopts = select({ - "@bazel_tools//src/conditions:windows": [], - "//conditions:default": ["-lm"], + "@bazel_tools//src/conditions:windows": [], + "//conditions:default": ["-lm"], }), visibility = ["//visibility:public"], - includes = ["."], ) cc_test( diff --git a/third_party/gtest/BUILD b/third_party/gtest/BUILD index 81a0a974..c9c0416c 100644 --- a/third_party/gtest/BUILD +++ b/third_party/gtest/BUILD @@ -1,19 +1,21 @@ +load("@rules_cc//cc:defs.bzl", "cc_library") + package(default_visibility = ["//visibility:public"]) licenses(["notice"]) cc_library( - name = "gtest", - srcs = ["gtest_main.cc"], - deps = [":gtest-lib"], + name = "gtest", + srcs = ["gtest_main.cc"], + deps = [":gtest-lib"], ) cc_library( - name = "gtest-lib", - srcs = ["gtest-all.cc"], - hdrs = ["gtest.h"], - linkopts = select({ - "@bazel_tools//src/conditions:windows": [], - "//conditions:default": ["-lpthread"], - }), + name = "gtest-lib", + srcs = ["gtest-all.cc"], + hdrs = ["gtest.h"], + linkopts = select({ + "@bazel_tools//src/conditions:windows": [], + "//conditions:default": ["-lpthread"], + }), ) diff --git a/third_party/jaffer/BUILD b/third_party/jaffer/BUILD index fd68a3f2..c95073b4 100644 --- a/third_party/jaffer/BUILD +++ b/third_party/jaffer/BUILD @@ -1,8 +1,10 @@ -package(default_visibility=["//visibility:public"]) +load("@rules_java//java:defs.bzl", "java_library") + +package(default_visibility = ["//visibility:public"]) licenses(["permissive"]) java_library( - name = "jaffer", - srcs = ["java/org/yuanheng/cookjson/DoubleUtils.java"], + name = "jaffer", + srcs = ["java/org/yuanheng/cookjson/DoubleUtils.java"], ) diff --git a/third_party/junit/BUILD b/third_party/junit/BUILD index e52b6f15..12e8707f 100644 --- a/third_party/junit/BUILD +++ b/third_party/junit/BUILD @@ -1,10 +1,15 @@ -package(default_visibility = ["//visibility:public"], licenses = ["permissive"]) +load("@rules_java//java:defs.bzl", "java_import") + +package( + default_visibility = ["//visibility:public"], + licenses = ["permissive"], +) java_import( - name = "junit", - jars = [ - "junit-4.12.jar", - "hamcrest-core-1.3.jar", - ], - testonly = 1, -) \ No newline at end of file + name = "junit", + testonly = 1, + jars = [ + "junit-4.12.jar", + "hamcrest-core-1.3.jar", + ], +) diff --git a/third_party/mersenne/BUILD b/third_party/mersenne/BUILD index b92d1c11..26c1c785 100644 --- a/third_party/mersenne/BUILD +++ b/third_party/mersenne/BUILD @@ -1,9 +1,11 @@ +load("@rules_cc//cc:defs.bzl", "cc_library") + package(default_visibility = ["//visibility:public"]) licenses(["notice"]) cc_library( - name = "mersenne", - srcs = ["random.c"], - hdrs = ["random.h"], + name = "mersenne", + srcs = ["random.c"], + hdrs = ["random.h"], ) diff --git a/third_party/mersenne_java/BUILD b/third_party/mersenne_java/BUILD index 2e6d7a8b..8f743468 100644 --- a/third_party/mersenne_java/BUILD +++ b/third_party/mersenne_java/BUILD @@ -1,8 +1,10 @@ -package(default_visibility=["//visibility:public"]) +load("@rules_java//java:defs.bzl", "java_library") + +package(default_visibility = ["//visibility:public"]) licenses(["permissive"]) java_library( - name = "mersenne_java", - srcs = glob(["java/**/*.java"]), + name = "mersenne_java", + srcs = glob(["java/**/*.java"]), ) From 6255efcbe8ccf29cb968fc601ddf33303cb31a36 Mon Sep 17 00:00:00 2001 From: Ulf Adams Date: Fri, 23 Jan 2026 20:51:22 +0100 Subject: [PATCH 2/3] Add .bazelversion --- .bazelversion | 1 + 1 file changed, 1 insertion(+) create mode 100644 .bazelversion diff --git a/.bazelversion b/.bazelversion new file mode 100644 index 00000000..f9c71a52 --- /dev/null +++ b/.bazelversion @@ -0,0 +1 @@ +8.5.1 From b11b3dd2c9f71d03c765e8bf7f02cc38757503ee Mon Sep 17 00:00:00 2001 From: Ulf Adams Date: Fri, 23 Jan 2026 20:55:05 +0100 Subject: [PATCH 3/3] Try defines --- third_party/gtest/BUILD | 1 + 1 file changed, 1 insertion(+) diff --git a/third_party/gtest/BUILD b/third_party/gtest/BUILD index c9c0416c..d8b3096b 100644 --- a/third_party/gtest/BUILD +++ b/third_party/gtest/BUILD @@ -14,6 +14,7 @@ cc_library( name = "gtest-lib", srcs = ["gtest-all.cc"], hdrs = ["gtest.h"], + defines = ["GTEST_LANG_CXX11=1"], linkopts = select({ "@bazel_tools//src/conditions:windows": [], "//conditions:default": ["-lpthread"],