Merge pull request #340 from PJK/ci-updates

Update Bazel setup to Bzlmod

Author: PJK

.gitignore

@@ -1,4 +1,3 @@
-build
 *~
 nbproject
 .idea
@@ -8,9 +7,11 @@ cmake-build-debug
 venv
 **.DS_Store
 .vscode
+doc/build
 # No top-level requirements, see doc/source
 requirements.txt
 examples/bazel/bazel-bazel
 examples/bazel/bazel-bin
 examples/bazel/bazel-out
 examples/bazel/bazel-testlogs
+**MODULE.bazel.lock

BUILD

@@ -0,0 +1,58 @@
+genrule(
+    name = "cbor_cmake",
+    srcs = glob(["**"]),
+    outs = [
+        "libcbor.a",
+        "cbor.h",
+        "cbor/arrays.h",
+        "cbor/bytestrings.h",
+        "cbor/callbacks.h",
+        "cbor/cbor_export.h",
+        "cbor/common.h",
+        "cbor/configuration.h",
+        "cbor/data.h",
+        "cbor/encoding.h",
+        "cbor/floats_ctrls.h",
+        "cbor/ints.h",
+        "cbor/maps.h",
+        "cbor/serialization.h",
+        "cbor/streaming.h",
+        "cbor/strings.h",
+        "cbor/tags.h",
+    ],
+    cmd = " && ".join([
+        # Remember where output should go.
+        "INITIAL_WD=`pwd`",
+        "cd `dirname $(location CMakeLists.txt)`",
+        "cmake -DCMAKE_BUILD_TYPE=Release .",
+        "cmake --build .",
+        # Export the .a and .h files for cbor rule, below.
+        "cp -R src/* $$INITIAL_WD/$(RULEDIR)",
+        "cp cbor/configuration.h $$INITIAL_WD/$(RULEDIR)/cbor",
+    ]),
+    visibility = ["//visibility:private"],
+)
+
+cc_import(
+    name = "cbor",
+    hdrs = [
+        "cbor.h",
+        "cbor/arrays.h",
+        "cbor/bytestrings.h",
+        "cbor/callbacks.h",
+        "cbor/cbor_export.h",
+        "cbor/common.h",
+        "cbor/configuration.h",
+        "cbor/data.h",
+        "cbor/encoding.h",
+        "cbor/floats_ctrls.h",
+        "cbor/ints.h",
+        "cbor/maps.h",
+        "cbor/serialization.h",
+        "cbor/streaming.h",
+        "cbor/strings.h",
+        "cbor/tags.h",
+    ],
+    static_library = "libcbor.a",
+    visibility = ["//visibility:public"],
+)

Bazel.md

@@ -0,0 +1 @@
+module(name = "libcbor")

MODULE.bazel

@@ -0,0 +1,13 @@
+module(
+    name = "libcbor_bazel_example",
+    version = "0.1.0",
+)
+
+bazel_dep(name = "rules_cc", version = "0.1.1")
+bazel_dep(name = "googletest", version = "1.15.2")
+
+bazel_dep(name = "libcbor")
+local_path_override(
+    module_name = "libcbor",
+    path = "../..",
+)

examples/bazel/MODULE.bazel

@@ -2,7 +2,7 @@ load("@rules_cc//cc:defs.bzl", "cc_library")
 load("@rules_cc//cc:defs.bzl", "cc_binary")
 
 cc_library(
-    name = "src",
+    name = "hello_lib",
     srcs = [
         "hello.cc",
     ],
@@ -18,7 +18,7 @@ cc_library(
 )
 
 cc_test(
-    name = "tests",
+    name = "hello_test",
     size = "small",
     srcs = [
         "hello_test.cc",
@@ -27,8 +27,8 @@ cc_test(
         "//visibility:private",
     ],
     deps = [
-        ":src",
-        "@gtest//:gtest_main",
+        ":hello_lib",
+        "@googletest//:gtest_main",
         "@libcbor//:cbor",
     ],
 )
@@ -40,7 +40,7 @@ cc_binary(
         "main.cc",
     ],
     deps = [
-        ":src",
+        ":hello_lib",
     ],
 )
 

examples/bazel/WORKSPACE

@@ -1,10 +1,14 @@
 #include "src/hello.h"
+#include "cbor.h"
 
 #include "gtest/gtest.h"
 
-class HelloTest : public ::testing::Test {};
+class CborTest : public ::testing::Test {};
 
-TEST_F(HelloTest, CborVersion) {
-  EXPECT_EQ(cbor_version(), 0);
+TEST_F(CborTest, IntegerItem) {
+  cbor_item_t * answer = cbor_build_uint8(42);
+  EXPECT_EQ(cbor_get_uint8(answer), 42);
+  cbor_decref(&answer);
+  EXPECT_EQ(answer, nullptr);
 }
 

examples/bazel/src/BUILD

@@ -15,8 +15,8 @@
 #
 ################################################################################
 
-mkdir build
-cd build
+mkdir oss_fuzz_build
+cd oss_fuzz_build
 # We disable libcbor's default sanitizers since we'll be configuring them ourselves via CFLAGS.
 cmake -D CMAKE_BUILD_TYPE=Debug \
       -D CMAKE_INSTALL_PREFIX="$WORK" \