Skip to content

Commit

Permalink
Don't delete bin/dispatcher in the bazel make target (#2965)
Browse files Browse the repository at this point in the history
bin/dispatcher isn't created by bazel.
  • Loading branch information
kormat authored Aug 7, 2019
1 parent 8c0a891 commit 8097edc
Showing 1 changed file with 7 additions and 3 deletions.
10 changes: 7 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.PHONY: all clean goenv gogenlinks gogenlinks_clean vendor bazel gazelle setcap clibs libscion libfilter dispatcher uninstall tags
.PHONY: all clean goenv gogenlinks gogenlinks_clean vendor bazel bazel_bin_clean gazelle setcap clibs libscion libfilter dispatcher uninstall tags

BRACCEPT = bin/braccept

Expand Down Expand Up @@ -26,12 +26,16 @@ gogenlinks_clean:
vendor:
./tools/vendor.sh

bazel: vendor
bazel: vendor bazel_bin_clean
bazel build //:scion //:scion-ci --workspace_status_command=./tools/bazel-build-env
rm -f bin/*
tar -kxf bazel-bin/scion.tar -C bin
tar -kxf bazel-bin/scion-ci.tar -C bin

# Delete everything in bin/ that isn't bin/dispatcher or a hidden file, as
# those aren't created by bazel.
bazel_bin_clean:
find bin/ -mindepth 1 ! -iname dispatcher -a ! -iname ".*" -exec rm {} +

gazelle:
bazel run //:gazelle -- update -mode=$(GAZELLE_MODE) -index=false -external=external -exclude go/vendor -exclude docker/_build ./go

Expand Down

0 comments on commit 8097edc

Please sign in to comment.