From cb0bff3c1e7560b87a70a7bc70e79976d7bf3b30 Mon Sep 17 00:00:00 2001 From: Daisuke Nishimatsu <42202095+wep21@users.noreply.github.com> Date: Sat, 28 Dec 2024 23:02:11 +0900 Subject: [PATCH] fix: remove empty glob from geographiclib (#3495) - as title --------- Signed-off-by: wep21 --- .../cmake_configure_file/0.1.1/MODULE.bazel | 8 ++++ .../cmake_configure_file/0.1.1/presubmit.yml | 18 +++++++++ .../cmake_configure_file/0.1.1/source.json | 5 +++ modules/cmake_configure_file/metadata.json | 3 +- .../geographiclib/2.4.0.bcr.1/MODULE.bazel | 9 +++++ .../2.4.0.bcr.1/overlay/BUILD.bazel | 38 +++++++++++++++++++ .../2.4.0.bcr.1/overlay/MODULE.bazel | 1 + .../geographiclib/2.4.0.bcr.1/presubmit.yml | 18 +++++++++ modules/geographiclib/2.4.0.bcr.1/source.json | 10 +++++ modules/geographiclib/metadata.json | 3 +- 10 files changed, 111 insertions(+), 2 deletions(-) create mode 100644 modules/cmake_configure_file/0.1.1/MODULE.bazel create mode 100644 modules/cmake_configure_file/0.1.1/presubmit.yml create mode 100644 modules/cmake_configure_file/0.1.1/source.json create mode 100644 modules/geographiclib/2.4.0.bcr.1/MODULE.bazel create mode 100644 modules/geographiclib/2.4.0.bcr.1/overlay/BUILD.bazel create mode 120000 modules/geographiclib/2.4.0.bcr.1/overlay/MODULE.bazel create mode 100644 modules/geographiclib/2.4.0.bcr.1/presubmit.yml create mode 100644 modules/geographiclib/2.4.0.bcr.1/source.json diff --git a/modules/cmake_configure_file/0.1.1/MODULE.bazel b/modules/cmake_configure_file/0.1.1/MODULE.bazel new file mode 100644 index 00000000000..cb293a6ab07 --- /dev/null +++ b/modules/cmake_configure_file/0.1.1/MODULE.bazel @@ -0,0 +1,8 @@ +module(name = "cmake_configure_file", version = "0.1.1") + +bazel_dep(name = "platforms", version = "0.0.10") +bazel_dep(name = "rules_python", version = "1.0.0") + +python = use_extension("@rules_python//python/extensions:python.bzl", "python") +python.toolchain(python_version = "3.12") +use_repo(python, "python_versions") diff --git a/modules/cmake_configure_file/0.1.1/presubmit.yml b/modules/cmake_configure_file/0.1.1/presubmit.yml new file mode 100644 index 00000000000..407ba9837b3 --- /dev/null +++ b/modules/cmake_configure_file/0.1.1/presubmit.yml @@ -0,0 +1,18 @@ +matrix: + platform: + - debian10 + - debian11 + - ubuntu2004 + - ubuntu2204 + - ubuntu2404 + - macos + - macos_arm64 + - windows + bazel: [7.x, 8.x, rolling] +tasks: + verify_targets: + name: Verify build targets + platform: ${{ platform }} + bazel: ${{ bazel }} + build_targets: + - '@cmake_configure_file' diff --git a/modules/cmake_configure_file/0.1.1/source.json b/modules/cmake_configure_file/0.1.1/source.json new file mode 100644 index 00000000000..4ed11e07905 --- /dev/null +++ b/modules/cmake_configure_file/0.1.1/source.json @@ -0,0 +1,5 @@ +{ + "url": "https://github.com/wep21/cmake_configure_file/releases/download/v0.1.1/cmake_configure_file-0.1.1.tar.gz", + "strip_prefix": "cmake_configure_file-0.1.1", + "integrity": "sha256-rQWKHSBXwcXFJmamcWz71/X8pO6+rMIsPDzSXzvQNRQ=" +} diff --git a/modules/cmake_configure_file/metadata.json b/modules/cmake_configure_file/metadata.json index d2d6872f252..31ef23fab89 100644 --- a/modules/cmake_configure_file/metadata.json +++ b/modules/cmake_configure_file/metadata.json @@ -11,7 +11,8 @@ "github:wep21/cmake_configure_file" ], "versions": [ - "0.1.0" + "0.1.0", + "0.1.1" ], "yanked_versions": {} } diff --git a/modules/geographiclib/2.4.0.bcr.1/MODULE.bazel b/modules/geographiclib/2.4.0.bcr.1/MODULE.bazel new file mode 100644 index 00000000000..f0052b2123e --- /dev/null +++ b/modules/geographiclib/2.4.0.bcr.1/MODULE.bazel @@ -0,0 +1,9 @@ +module( + name = "geographiclib", + version = "2.4.0.bcr.1", + bazel_compatibility = [">=7.2.1"], + compatibility_level = 1, +) + +bazel_dep(name = "cmake_configure_file", version = "0.1.1") +bazel_dep(name = "rules_cc", version = "0.1.0") diff --git a/modules/geographiclib/2.4.0.bcr.1/overlay/BUILD.bazel b/modules/geographiclib/2.4.0.bcr.1/overlay/BUILD.bazel new file mode 100644 index 00000000000..9ad838b4111 --- /dev/null +++ b/modules/geographiclib/2.4.0.bcr.1/overlay/BUILD.bazel @@ -0,0 +1,38 @@ +load( + "@cmake_configure_file//:cmake_configure_file.bzl", + "cmake_configure_file", +) +load("@rules_cc//cc:defs.bzl", "cc_library") + +package(default_visibility = ["//visibility:public"]) + +cmake_configure_file( + name = "config_header", + src = "include/GeographicLib/Config.h.in", + out = "include/GeographicLib/Config.h", + cmakelists = [ + "CMakeLists.txt", + ], + defines = [ + "GEOGRAPHICLIB_DATA=/usr/local/share/GeographicLib", + "GEOGRAPHICLIB_HAVE_LONG_DOUBLE=0", + ], + visibility = ["//visibility:private"], +) + +cc_library( + name = "geographiclib", + srcs = glob([ + "src/*.cpp", + "src/*.hh", + ]), + hdrs = glob([ + "include/GeographicLib/*.hpp", + ]) + [ + ":config_header", + ], + includes = [ + "include", + ], + visibility = ["//visibility:public"], +) diff --git a/modules/geographiclib/2.4.0.bcr.1/overlay/MODULE.bazel b/modules/geographiclib/2.4.0.bcr.1/overlay/MODULE.bazel new file mode 120000 index 00000000000..9b599e3ad9c --- /dev/null +++ b/modules/geographiclib/2.4.0.bcr.1/overlay/MODULE.bazel @@ -0,0 +1 @@ +../MODULE.bazel \ No newline at end of file diff --git a/modules/geographiclib/2.4.0.bcr.1/presubmit.yml b/modules/geographiclib/2.4.0.bcr.1/presubmit.yml new file mode 100644 index 00000000000..0d94bb903f6 --- /dev/null +++ b/modules/geographiclib/2.4.0.bcr.1/presubmit.yml @@ -0,0 +1,18 @@ +matrix: + platform: + - debian10 + - debian11 + - macos + - macos_arm64 + - ubuntu2004 + - ubuntu2204 + - ubuntu2404 + - windows + bazel: [7.x, 8.x, rolling] +tasks: + verify_targets: + name: Verify build targets + platform: ${{ platform }} + bazel: ${{ bazel }} + build_targets: + - '@geographiclib//:geographiclib' diff --git a/modules/geographiclib/2.4.0.bcr.1/source.json b/modules/geographiclib/2.4.0.bcr.1/source.json new file mode 100644 index 00000000000..d386c29ea79 --- /dev/null +++ b/modules/geographiclib/2.4.0.bcr.1/source.json @@ -0,0 +1,10 @@ +{ + "integrity": "sha256-qn7cbYb8wpe+bm1tU9225iKkbvNv6TFzNcrJG/Rxtak=", + "strip_prefix": "geographiclib-2.4", + "url": "https://github.com/geographiclib/geographiclib/archive/refs/tags/v2.4.tar.gz", + "patch_strip": 0, + "overlay": { + "BUILD.bazel": "sha256-bKmMLFmHSu+o0v9LuxqnW0o63n9dR6kMVfcdCxmi7xg=", + "MODULE.bazel": "sha256-VpvKdCW2lA52Y+o5IodhTZP0CVSaX0bGVVG33lzSE4k=" + } +} diff --git a/modules/geographiclib/metadata.json b/modules/geographiclib/metadata.json index 1ee3d138cfb..ce2b3febc16 100644 --- a/modules/geographiclib/metadata.json +++ b/modules/geographiclib/metadata.json @@ -11,7 +11,8 @@ "github:geographiclib/geographiclib" ], "versions": [ - "2.4.0" + "2.4.0", + "2.4.0.bcr.1" ], "yanked_versions": {} }