From 5a5efe1156a537850c94a06a7e257957333ca6a8 Mon Sep 17 00:00:00 2001 From: Kevin Li Date: Tue, 15 Oct 2024 16:30:48 +0800 Subject: [PATCH] prepare 1.4.0 --- .bazelrc | 3 -- CMakeLists.txt | 12 ------ WORKSPACE | 8 ---- registry/modules/babylon/1.4.0/MODULE.bazel | 43 --------------------- registry/modules/babylon/1.4.0/source.json | 5 --- registry/modules/babylon/metadata.json | 1 - 6 files changed, 72 deletions(-) delete mode 100644 registry/modules/babylon/1.4.0/MODULE.bazel delete mode 100644 registry/modules/babylon/1.4.0/source.json diff --git a/.bazelrc b/.bazelrc index f8cf776..a5e4252 100644 --- a/.bazelrc +++ b/.bazelrc @@ -1,6 +1,3 @@ -common --registry=https://bcr.bazel.build -common --registry=file://%workspace%/registry - build --cxxopt=-faligned-new # Include attribute is not properly set in abseil-cpp. diff --git a/CMakeLists.txt b/CMakeLists.txt index b7e2981..41fc361 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -35,17 +35,6 @@ if(BUILD_DEPS) URL "https://github.com/google/googletest/archive/refs/tags/v1.14.0.tar.gz" URL_HASH SHA256=8ad598c73ad796e0d8280b082cebd82a630d73e73cd3c70057938a6501bba5d7 ) - FetchContent_Declare( - libcoro - URL "https://github.com/jbaldwin/libcoro/archive/refs/tags/v0.12.1.tar.gz" - URL_HASH SHA256=2cb6f45fc73dad6008cc930d92939785684835e03b12df422b98fcab9e393add - ) - if(BUILD_TESTING AND CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) - set(LIBCORO_FEATURE_NETWORKING OFF) - set(LIBCORO_BUILD_TESTS OFF) - set(LIBCORO_BUILD_EXAMPLES OFF) - FetchContent_MakeAvailable(googletest libcoro) - endif() set(protobuf_BUILD_TESTS OFF) set(ABSL_ENABLE_INSTALL ON) set(BOOST_INCLUDE_LIBRARIES preprocessor spirit) @@ -126,7 +115,6 @@ if(BUILD_TESTING AND CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) target_link_libraries("${TARGET_NAME}" babylon_test_proto) target_link_libraries("${TARGET_NAME}" babylon) target_link_libraries("${TARGET_NAME}" GTest::gtest_main) - target_link_libraries("${TARGET_NAME}" libcoro) gtest_discover_tests("${TARGET_NAME}") endforeach() diff --git a/WORKSPACE b/WORKSPACE index 12dbbff..76e65b8 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -47,14 +47,6 @@ rules_foreign_cc_dependencies() load("@bazel_features//:deps.bzl", "bazel_features_deps") bazel_features_deps() -http_archive( - name = 'libcoro', - urls = ['https://github.com/jbaldwin/libcoro/archive/refs/tags/v0.12.1.tar.gz'], - strip_prefix = 'libcoro-0.12.1', - sha256 = '2cb6f45fc73dad6008cc930d92939785684835e03b12df422b98fcab9e393add', - build_file = '@//:registry/modules/libcoro/0.12.1/overlay/BUILD', -) - http_archive( name = 'rules_cuda', urls = ['https://github.com/bazel-contrib/rules_cuda/releases/download/v0.2.3/rules_cuda-v0.2.3.tar.gz'], diff --git a/registry/modules/babylon/1.4.0/MODULE.bazel b/registry/modules/babylon/1.4.0/MODULE.bazel deleted file mode 100644 index 68b771f..0000000 --- a/registry/modules/babylon/1.4.0/MODULE.bazel +++ /dev/null @@ -1,43 +0,0 @@ -module( - name = 'babylon', - version = '1.4.0', - compatibility_level = 1, -) - -################################################################################ -# LOWER BOUND dependency versions. -# Bzlmod follows MVS: -# https://bazel.build/versions/6.0.0/build/bzlmod#version-resolution -# Thus the highest version in their module graph is resolved. - -# --registry=https://bcr.bazel.build -bazel_dep(name = 'abseil-cpp', version = '20220623.1', repo_name = 'com_google_absl') -bazel_dep(name = 'bazel_skylib', version = '1.0.3') -bazel_dep(name = 'boost.preprocessor', version = '1.83.0') -bazel_dep(name = 'boost.spirit', version = '1.83.0') -bazel_dep(name = 'protobuf', version = '3.19.6', repo_name = 'com_google_protobuf') -################################################################################ - -################################################################################ -# test only dependency - -# --registry=https://bcr.bazel.build -single_version_override(module_name = 'abseil-cpp', version = '20240722.0') -single_version_override(module_name = 'protobuf', version = '27.5') -bazel_dep(name = 'googletest', version = '1.15.2', repo_name = 'com_google_googletest', dev_dependency = True) -bazel_dep(name = 'platforms', version = '0.0.10', dev_dependency = True) -bazel_dep(name = 'rules_cc', version = '0.0.9', dev_dependency = True) -bazel_dep(name = 'rules_cuda', version = '0.2.3', dev_dependency = True) - -# --registry=https://baidu.github.io/babylon/registry -bazel_dep(name = 'libcoro', version = '0.12.1', dev_dependency = True) - -# cuda toolchain -cuda = use_extension('@rules_cuda//cuda:extensions.bzl', 'toolchain', dev_dependency = True) -cuda.local_toolchain() - -# cross compile toolchain -cross_config = use_extension('//:bazel/cross_toolchain.bzl', 'cross_config', dev_dependency = True) -use_repo(cross_config, 'cross_config_toolchain') -register_toolchains('@cross_config_toolchain//:cross-toolchain', dev_dependency = True) -################################################################################ diff --git a/registry/modules/babylon/1.4.0/source.json b/registry/modules/babylon/1.4.0/source.json deleted file mode 100644 index 3cd7b83..0000000 --- a/registry/modules/babylon/1.4.0/source.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "url": "https://github.com/baidu/babylon/archive/refs/tags/v1.4.0.tar.gz", - "strip_prefix": "babylon-1.4.0", - "integrity": "sha256-FJVJ6Z4MMUkfab6tMVMo3G0GLv6JqoQlwjuHXYau5Ew=" -} diff --git a/registry/modules/babylon/metadata.json b/registry/modules/babylon/metadata.json index df09577..f1d7937 100644 --- a/registry/modules/babylon/metadata.json +++ b/registry/modules/babylon/metadata.json @@ -7,7 +7,6 @@ } ], "versions": [ - "1.4.0", "1.3.2", "1.3.1", "1.3.0",