Skip to content

Commit 7c85ae7

Browse files
committed
Temporarily add bundle-oss.json via filegroup instead of genrule
Signed-off-by: Dom Del Nano <ddelnano@gmail.com> (cherry picked from commit cd8fb1b152def7158d1a0100c8dde6cf736508fd)
1 parent 031539c commit 7c85ae7

File tree

3 files changed

+13
-5
lines changed

3 files changed

+13
-5
lines changed

src/pxl_scripts/BUILD.bazel

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,16 @@ filegroup(
3737
visibility = ["//src:__subpackages__"],
3838
)
3939

40-
genrule(
40+
# TODO(ddelnano): Figure out issues with bazel's make variables
41+
# genrule(
42+
# name = "script_bundle",
43+
# srcs = [":makefile"],
44+
# outs = ["bundle-oss.json"],
45+
# cmd = "cd src/pxl_scripts; echo $@; touch $@; OUTPUT=$@ make bundle-oss.json",
46+
# visibility = ["//src:__subpackages__"],
47+
# )
48+
49+
filegroup(
4150
name = "script_bundle",
42-
srcs = [":makefile"],
43-
outs = ["bundle-oss.json"],
44-
cmd = "make -C src/pxl_scripts bundle-oss.json; cp bundle-oss.json $(@D)/bundle-oss.json",
45-
visibility = ["//src:__subpackages__"],
51+
srcs = ["bundle-oss.json"],
4652
)

src/pxl_scripts/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ all: bundle-oss.json.gz
2626

2727
bundle-oss.json: $(script_files)
2828
px create-bundle --search_path $(PWD) $(foreach dir,$(dirs),--base $(dir)) -o $(PWD)/bundle-oss.json
29+
# px create-bundle --search_path $(PWD) $(foreach dir,$(dirs),--base $(dir)) -o $(OUTPUT)
2930

3031
bundle-oss.json.gz: bundle-oss.json
3132
gzip -c $< > $@

src/pxl_scripts/bundle-oss.json

Lines changed: 1 addition & 0 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)