Skip to content

Commit aab6848

Browse files
committed
feat: bzlmodify + update ecsact modules
1 parent 91984ad commit aab6848

File tree

7 files changed

+52
-199
lines changed

7 files changed

+52
-199
lines changed

.bazelrc

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,29 @@
1+
startup --windows_enable_symlinks
12
common --enable_bzlmod
3+
common --registry=https://raw.githubusercontent.com/ecsact-dev/bazel_registry/main
4+
common --registry=https://raw.githubusercontent.com/bazelboost/registry/main
5+
common --registry=https://bcr.bazel.build
26
build --enable_platform_specific_config
37
build --incompatible_use_platforms_repo_for_constraints
48
build --incompatible_enable_cc_toolchain_resolution
59
build --incompatible_strict_action_env
610
build --enable_runfiles
11+
build --noincompatible_remove_rule_name_parameter
12+
query --noincompatible_remove_rule_name_parameter
13+
14+
build [email protected]//:use_std_fs
15+
build [email protected]//:use_std_fs
16+
query [email protected]//:use_std_fs
17+
query [email protected]//:use_std_fs
18+
19+
build --@ecsact_cli//:use_sdk_version
20+
query --@ecsact_cli//:use_sdk_version
721

8-
build:windows --platforms=//bazel/platforms:windows
9-
build:windows --host_platform=//bazel/platforms:windows
1022
build:windows --workspace_status_command=bazel/tools/wsc.cmd
23+
build:linux --workspace_status_command=bazel/tools/wsc.sh
1124

12-
build:linux --platforms=//bazel/platforms:linux
13-
build:linux --host_platform=//bazel/platforms:linux
25+
# Temporary until https://github.com/grailbio/bazel-toolchain/pull/198 is merged
1426
build:linux --extra_toolchains=@llvm_toolchain//:cc-toolchain-x86_64-linux
15-
build:linux --workspace_status_command=bazel/tools/wsc.sh
1627

1728
common:ci --announce_rc
1829
common:ci --disk_cache=~/.cache/bazel-disk-cache

BUILD.bazel

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -2,30 +2,10 @@ load(":pkg.bzl", "pkg_executable")
22
load("@rules_pkg//pkg:tar.bzl", "pkg_tar")
33
load("@bzlws//:index.bzl", "bzlws_copy", "bzlws_extract")
44

5-
pkg_executable(
6-
name = "ecsact_rtb_runfiles",
7-
bin = "@ecsact_rtb//cli:ecsact_rtb",
8-
path = "ecsact_rtb",
9-
)
10-
11-
pkg_tar(
12-
name = "runfiles_tar",
13-
srcs = [":ecsact_rtb_runfiles"],
14-
)
15-
16-
bzlws_extract(
17-
name = "copy_runfiles",
18-
testonly = True,
19-
srcs = [":runfiles_tar"],
20-
out = "dist/bin",
21-
force = True,
22-
)
23-
245
bzlws_copy(
256
name = "copy_dist_bin",
267
srcs = [
278
"@ecsact_cli",
28-
"@ecsact_rtb//cli:ecsact_rtb",
299
"@ecsact_lsp_server",
3010
],
3111
out = "dist/bin/{FILENAME}",

CopyDist.ps1

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,8 @@
33
$ErrorActionPreference = 'Stop'
44

55
git clean dist -fdx
6-
bazel build //:copy_dist_include //:copy_runfiles //:copy_dist_bin //:copy_dist_codegen_plugins //:copy_dist_images
6+
bazel build //:copy_dist_include //:copy_dist_bin //:copy_dist_codegen_plugins //:copy_dist_images
77
bazel run --ui_event_filters=-info --noshow_progress //:copy_dist_include
88
bazel run --ui_event_filters=-info --noshow_progress //:copy_dist_images
9-
bazel run --ui_event_filters=-info --noshow_progress //:copy_runfiles
109
bazel run --ui_event_filters=-info --noshow_progress //:copy_dist_bin
1110
bazel run --ui_event_filters=-info --noshow_progress //:copy_dist_codegen_plugins

MODULE.bazel

Lines changed: 35 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,35 @@
1-
module(name = "ecsact_sdk")
2-
3-
bazel_dep(name = "nlohmann_json", version = "3.11.2")
4-
bazel_dep(name = "rules_cc", version = "0.0.8")
5-
bazel_dep(name = "platforms", version = "0.0.7")
6-
bazel_dep(name = "rules_pkg", version = "0.9.1")
7-
bazel_dep(name = "bazel_skylib", version = "1.4.2")
1+
module(name = "ecsact_sdk")
2+
3+
bazel_dep(name = "rules_cc", version = "0.0.9")
4+
bazel_dep(name = "platforms", version = "0.0.7")
5+
bazel_dep(name = "rules_pkg", version = "0.9.1")
6+
bazel_dep(name = "bazel_skylib", version = "1.4.2")
7+
bazel_dep(name = "ecsact_si_wasm", version = "0.1.1")
8+
bazel_dep(name = "rules_ecsact", version = "0.4.5")
9+
bazel_dep(name = "ecsact_rt_entt", version = "0.2.2")
10+
bazel_dep(name = "ecsact_codegen", version = "0.1.3")
11+
bazel_dep(name = "ecsact_parse", version = "0.3.3")
12+
bazel_dep(name = "ecsact_runtime", version = "0.5.4")
13+
bazel_dep(name = "ecsact_interpret", version = "0.5.3")
14+
bazel_dep(name = "ecsact_lang_cpp", version = "0.3.1")
15+
bazel_dep(name = "ecsact_cli", version = "0.2.3")
16+
bazel_dep(name = "ecsact_lsp_server", version = "0.2.0")
17+
bazel_dep(name = "ecsact_lang_json", version = "0.1.2")
18+
bazel_dep(name = "ecsact_lang_csharp", version = "0.1.2")
19+
bazel_dep(name = "boost.dll", version = "1.83.0.bzl.2")
20+
bazel_dep(name = "boost.process", version = "1.83.0.bzl.2")
21+
22+
# https://github.com/jbeder/yaml-cpp/issues/1229
23+
bazel_dep(name = "yaml-cpp")
24+
git_override(
25+
module_name = "yaml-cpp",
26+
commit = "37f1b8b8c9e5172ff3a79a3d5fdbb87f2994842b",
27+
remote = "https://github.com/jbeder/yaml-cpp",
28+
)
29+
30+
bazel_dep(name = "bzlws")
31+
git_override(
32+
module_name = "bzlws",
33+
commit = "b90ae6b38e351979cae2af355f55d2c68d997030",
34+
remote = "https://github.com/zaucy/bzlws",
35+
)

WORKSPACE.bazel

Lines changed: 0 additions & 142 deletions
Original file line numberDiff line numberDiff line change
@@ -2,108 +2,6 @@ workspace(name = "ecsact_sdk")
22

33
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive", "http_file")
44

5-
http_archive(
6-
name = "bazelregistry_docopt_cpp",
7-
sha256 = "a06e705978b1c09427f130a187cb361916c1e7d66b69e91b865ebcd5390a6774",
8-
strip_prefix = "docopt.cpp-1e38ceb67655f576814ae1c95f138eb8b61453c9",
9-
url = "https://github.com/bazelregistry/docopt.cpp/archive/1e38ceb67655f576814ae1c95f138eb8b61453c9.zip",
10-
)
11-
12-
http_archive(
13-
name = "boost",
14-
sha256 = "4a79c389add7e3d54d0e12c83098d471d24536ba2d6b8593d3a95f151f25eebb",
15-
strip_prefix = "boost-da62319c330d81ef032517cbe13b6f35d97387cb",
16-
urls = ["https://github.com/bazelboost/boost/archive/da62319c330d81ef032517cbe13b6f35d97387cb.zip"],
17-
)
18-
19-
load("@boost//:index.bzl", "boost_http_archives")
20-
21-
boost_http_archives()
22-
23-
http_archive(
24-
name = "rules_cc_stamp",
25-
strip_prefix = "rules_cc_stamp-63d4861f4d420b574fa0f112599aae2b8aee785e",
26-
urls = ["https://github.com/zaucy/rules_cc_stamp/archive/63d4861f4d420b574fa0f112599aae2b8aee785e.zip"],
27-
sha256 = "f469a3b97eeabeb850c655f59ea17799ff40badd3a0b3e9de38534c89ad2f87d",
28-
)
29-
30-
http_archive(
31-
name = "ecsact_si_wasm",
32-
sha256 = "e208a94d4f4a9c09f32b8a9ea91a4f799492e11c7c852b0329b4a3595a45cee6",
33-
strip_prefix = "ecsact_si_wasm-0.1.0",
34-
urls = ["https://github.com/seaube/ecsact_si_wasm/archive/refs/tags/0.1.0.tar.gz"],
35-
)
36-
37-
http_archive(
38-
name = "rules_ecsact",
39-
sha256 = "3db6d498a681e036dabdcc1bb7e5ee254acadae4ab2ecf19d253f824db88d5e4",
40-
strip_prefix = "rules_ecsact-0.3.0",
41-
urls = ["https://github.com/ecsact-dev/rules_ecsact/archive/refs/tags/0.3.0.tar.gz"],
42-
)
43-
44-
http_archive(
45-
name = "ecsact_rt_entt",
46-
sha256 = "7608497049cfca47f283ab0a7e8a6490d5a75033c9e732150284afc806f20b6d",
47-
strip_prefix = "ecsact_rt_entt-0.2.0",
48-
urls = ["https://github.com/ecsact-dev/ecsact_rt_entt/archive/refs/tags/0.2.0.tar.gz"],
49-
)
50-
51-
http_archive(
52-
name = "ecsact_rtb",
53-
sha256 = "3b856216479a0c18fe729d129ec63273dca3ae71bdef1bd2cc4fdd9346c7b624",
54-
strip_prefix = "ecsact_rtb-0.2.1",
55-
url = "https://github.com/ecsact-dev/ecsact_rtb/archive/refs/tags/0.2.1.tar.gz",
56-
)
57-
58-
http_archive(
59-
name = "ecsact_codegen",
60-
sha256 = "5a1a466dbddbe042c2e5910f3b65ca44a5ffcef5831fdd0c3b2e2863c13cfb31",
61-
strip_prefix = "ecsact_codegen-0.0.2",
62-
urls = ["https://github.com/ecsact-dev/ecsact_codegen/archive/refs/tags/0.0.2.tar.gz"],
63-
)
64-
65-
http_archive(
66-
name = "ecsact_parse",
67-
sha256 = "706066e8870aa07f6937ca5f3187c7f3bb970255d028790b5f441e24e22d37f6",
68-
strip_prefix = "ecsact_parse-0.2.1",
69-
url = "https://github.com/ecsact-dev/ecsact_parse/archive/refs/tags/0.2.1.tar.gz",
70-
)
71-
72-
http_archive(
73-
name = "ecsact_runtime",
74-
sha256 = "35b03aaef0925fda5b5aefb2d6a6e2c9593f31d6414ab157091f9ca26a992da3",
75-
strip_prefix = "ecsact_runtime-0.3.0",
76-
urls = ["https://github.com/ecsact-dev/ecsact_runtime/archive/refs/tags/0.3.0.tar.gz"],
77-
)
78-
79-
http_archive(
80-
name = "ecsact_interpret",
81-
sha256 = "27c42403d6dc9a435346ca94ac6cd385246c22caa2388e1283ca1dbb679167e1",
82-
strip_prefix = "ecsact_interpret-0.3.0",
83-
urls = ["https://github.com/ecsact-dev/ecsact_interpret/archive/refs/tags/0.3.0.tar.gz"],
84-
)
85-
86-
http_archive(
87-
name = "ecsact_lang_cpp",
88-
sha256 = "7ecf1d23fba53edfa5abf75498028b03068970a044eab3c703bd74b1edb0b2d5",
89-
strip_prefix = "ecsact_lang_cpp-0.2.0",
90-
url = "https://github.com/ecsact-dev/ecsact_lang_cpp/archive/refs/tags/0.2.0.tar.gz",
91-
)
92-
93-
http_archive(
94-
name = "ecsact_lang_json",
95-
sha256 = "2760e495e176dd250cf1ed15af9bbb3724b78a28f5766d699c73b0cf67621a67",
96-
strip_prefix = "ecsact_lang_json-0.1.0",
97-
url = "https://github.com/ecsact-dev/ecsact_lang_json/archive/refs/tags/0.1.0.tar.gz",
98-
)
99-
100-
http_archive(
101-
name = "ecsact_lang_csharp",
102-
sha256 = "f30d48ac6a5be4fd8fb197f7f60ad74fffadc96cf1faf43b6e541000644d1c05",
103-
strip_prefix = "ecsact_lang_csharp-0.1.0",
104-
url = "https://github.com/ecsact-dev/ecsact_lang_csharp/archive/refs/tags/0.1.0.tar.gz",
105-
)
106-
1075
http_file(
1086
name = "ecsact_rust_codegen_windows",
1097
sha256 = "d35c8226f4953faf2d527d295c41adefd3215c61bad6f709e8ac812919c07daf",
@@ -118,46 +16,6 @@ http_file(
11816
downloaded_file_path = "ecsact_rust_codegen.so",
11917
)
12018

121-
http_archive(
122-
name = "ecsact_lsp_server",
123-
sha256 = "43316e54229d148f4fd37762868d4a9ff9885008dda1e4e25e61ffeef77055d8",
124-
strip_prefix = "ecsact_lsp_server-0.1.0",
125-
url = "https://github.com/ecsact-dev/ecsact_lsp_server/archive/refs/tags/0.1.0.tar.gz",
126-
)
127-
128-
http_archive(
129-
name = "ecsact_cli",
130-
sha256 = "9a4695aea37a49cb29a4a6987912c6e1b736b5d2bc238fb9f281ba92b80984cd",
131-
strip_prefix = "ecsact_cli-0.1.1",
132-
urls = ["https://github.com/ecsact-dev/ecsact_cli/archive/refs/tags/0.1.1.tar.gz"],
133-
)
134-
135-
load("@ecsact_parse//:repositories.bzl", "ecsact_parse_dependencies")
136-
137-
ecsact_parse_dependencies()
138-
139-
load("@ecsact_rtb//:repositories.bzl", "ecsact_rtb_repositories")
140-
141-
ecsact_rtb_repositories()
142-
143-
http_archive(
144-
name = "com_google_googletest",
145-
sha256 = "d4cb2430eb82495a49a24310a609b99726726bf126c2fbfa92fd04c14f6a3b31",
146-
strip_prefix = "googletest-d1a0039b97291dd1dc14f123b906bb7622ffe07c",
147-
url = "https://github.com/google/googletest/archive/d1a0039b97291dd1dc14f123b906bb7622ffe07c.zip",
148-
)
149-
150-
http_archive(
151-
name = "bzlws",
152-
sha256 = "312b04b13dfcb77c283a5b9d411a5b24d886bea9bd513b6e2bb7c355566c974b",
153-
strip_prefix = "bzlws-3dcd03ed6a1be7099f65fd514c9a3efed800d0a0",
154-
url = "https://github.com/zaucy/bzlws/archive/3dcd03ed6a1be7099f65fd514c9a3efed800d0a0.zip",
155-
)
156-
157-
load("@bzlws//:repo.bzl", "bzlws_deps")
158-
159-
bzlws_deps()
160-
16119
http_archive(
16220
name = "rules_7zip",
16321
sha256 = "a1603959be68272506849a7ed91e7acd4c2b036a2df1b6d9112c7733a7d607db",

bazel/copts.bzl

Lines changed: 0 additions & 4 deletions
This file was deleted.

bazel/platforms/BUILD.bazel

Lines changed: 0 additions & 19 deletions
This file was deleted.

0 commit comments

Comments
 (0)