Skip to content

Commit 9f89b10

Browse files
authored
fix windows and linux ccinfo provision (#25)
* fix windows and linux ccinfo provision * lint + registry
1 parent 6f58e11 commit 9f89b10

12 files changed

Lines changed: 95 additions & 11 deletions

File tree

MODULE.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ bazel_dep(name = "rules_cc", version = "0.2.16")
44
bazel_dep(name = "rules_shell", version = "0.6.1")
55
bazel_dep(name = "buildifier_prebuilt", version = "8.2.1")
66
bazel_dep(name = "stardoc", version = "0.7.2")
7-
bazel_dep(name = "ape", version = "1.0.1")
7+
bazel_dep(name = "ape", version = "1.1.0")
88
bazel_dep(name = "aspect_rules_js", version = "2.0.1")
99
bazel_dep(name = "glib", version = "2.82.2.bcr.5")
1010

MODULE.bazel.lock

Lines changed: 4 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

bcr-modules/modules/rules_cfg5/0.0.4/BUILD.bazel

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ module(
5757
"rules_common@0.2.0",
5858
# "rules_vtt@0.0.1",
5959
],
60+
integrity = "sha256-WSxSkVHR2Z4YQEMSCXjFbLLI6nNtQJaDShOA46+YO8I=",
6061
module_version = "0.0.4",
6162
pkg_files_targets = [
6263
"public",
Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
load("@rules_pkg//:mappings.bzl", "pkg_files")
2+
load("//bcr-modules/macros:module_macro.bzl", "module")
3+
load("//bcr-modules/macros:upload_macro.bzl", "module_upload")
4+
5+
package(default_visibility = ["//visibility:public"])
6+
7+
module_upload(
8+
name = "upload",
9+
archive = ":rules_cfg5",
10+
upload_module_name = "rules_cfg5",
11+
version = "0.0.5",
12+
)
13+
14+
pkg_files(
15+
name = "private",
16+
srcs = [
17+
"//bcr-modules/modules/rules_cfg5/srcs:private/generate.bzl",
18+
"//bcr-modules/modules/rules_cfg5/srcs:private/start.bzl",
19+
"//bcr-modules/modules/rules_cfg5/srcs:private/toolchains.bzl",
20+
],
21+
prefix = "private",
22+
)
23+
24+
pkg_files(
25+
name = "private_common",
26+
srcs = [
27+
"//bcr-modules/modules/rules_cfg5/srcs:private/common/component_refs.bzl",
28+
],
29+
prefix = "private/common",
30+
)
31+
32+
pkg_files(
33+
name = "private_templates",
34+
srcs = [
35+
"//bcr-modules/modules/rules_cfg5/srcs:private/templates/filter_linux.sh.tpl",
36+
"//bcr-modules/modules/rules_cfg5/srcs:private/templates/filter_windows.ps1.tpl",
37+
],
38+
prefix = "private/templates",
39+
)
40+
41+
pkg_files(
42+
name = "public",
43+
srcs = [
44+
"//bcr-modules/modules/rules_cfg5/srcs:BUILD.bazel",
45+
"//bcr-modules/modules/rules_cfg5/srcs:MODULE.bazel",
46+
"//bcr-modules/modules/rules_cfg5/srcs:defs.bzl",
47+
"//bcr-modules/modules/rules_cfg5/srcs:generate.bzl",
48+
],
49+
)
50+
51+
module(
52+
name = "rules_cfg5",
53+
additional_dependencies = [
54+
"ape@1.0.1",
55+
"bazel_skylib@1.7.1",
56+
"rules_cc@0.1.1",
57+
"rules_common@0.2.0",
58+
# "rules_vtt@0.0.1",
59+
],
60+
module_version = "0.0.5",
61+
pkg_files_targets = [
62+
"public",
63+
"private",
64+
"private_common",
65+
"private_templates",
66+
],
67+
)

bcr-modules/modules/rules_cfg5/BUILD.bazel

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ module_bcr_dir(
88
"0.0.2",
99
"0.0.3",
1010
"0.0.4",
11+
"0.0.5",
1112
],
1213
visibility = ["//visibility:public"],
1314
)

bcr-modules/modules/rules_cfg5/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
## Overview
44

55
**Module Name:** `rules_cfg5`
6-
**Current Version:** 0.0.3
6+
**Current Version:** 0.0.5
77
**Purpose:** Bazel rules for DaVinci Configurator 5 (CFG5) code generation and toolchain management
88

99
### Description

bcr-modules/modules/rules_cfg5/srcs/MODULE.bazel

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@
2323

2424
module(
2525
name = "rules_cfg5",
26-
version = "0.0.4",
26+
version = "0.0.5",
2727
compatibility_level = 0,
2828
)
2929

3030
bazel_dep(name = "bazel_skylib", version = "1.7.1")
3131
bazel_dep(name = "rules_common", version = "0.2.0")
3232

3333
# bazel_dep(name = "rules_vtt", version = "0.0.1")
34-
bazel_dep(name = "ape", version = "1.0.1")
34+
bazel_dep(name = "ape", version = "1.1.0")
3535
bazel_dep(name = "rules_cc", version = "0.1.1")

bcr-modules/modules/rules_cfg5/srcs/private/generate.bzl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -177,10 +177,10 @@ def _cfg5_generate(ctx, dpa_path, dpa_folder, inputs, template, additional_genar
177177

178178
compilation_context = cc_common.create_compilation_context(
179179
headers = depset(
180-
[headers_dir],
180+
[headers_dir] + component_headers_dirs,
181181
),
182182
includes = depset(
183-
[headers_dir.path],
183+
[headers_dir.path] + [comp_hdr_dir.path for comp_hdr_dir in component_headers_dirs],
184184
),
185185
)
186186

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
module(
2+
name = "rules_cfg5",
3+
version = "0.0.5",
4+
compatibility_level = 1,
5+
)
6+
7+
bazel_dep(name = "ape", version = "1.0.1")
8+
bazel_dep(name = "bazel_skylib", version = "1.7.1")
9+
bazel_dep(name = "rules_cc", version = "0.1.1")
10+
bazel_dep(name = "rules_common", version = "0.2.0")
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"url": "https://github.com/vectorgrp/bazel-rules/releases/download/rules_cfg5/0.0.5/rules_cfg5.tar.gz",
3+
"integrity": ""
4+
}

0 commit comments

Comments
 (0)