This is an automated email from the ASF dual-hosted git repository. nicknezis pushed a commit to branch nicknezis/bazel-2 in repository https://gitbox.apache.org/repos/asf/incubator-heron.git
commit 6f07b82a0f0086f85d7f2babd08c9e02de139f27 Author: Nicholas Nezis <[email protected]> AuthorDate: Tue Apr 7 03:41:44 2020 -0400 Various BUILD file updates --- scripts/packages/BUILD | 2 +- third_party/nomad/BUILD | 4 ++-- third_party/nomad/nomad.BUILD | 6 ++---- third_party/zookeeper/BUILD | 49 ++++++++++++++++++++++++++++++------------- tools/platform/BUILD | 2 ++ 5 files changed, 42 insertions(+), 21 deletions(-) diff --git a/scripts/packages/BUILD b/scripts/packages/BUILD index 7281219..a5462a6 100644 --- a/scripts/packages/BUILD +++ b/scripts/packages/BUILD @@ -273,7 +273,7 @@ pkg_tar( "//heron/tools/explorer/src/python:heron-explorer", "//heron/tools/tracker/src/python:heron-tracker", "//heron/tools/ui/src/python:heron-ui", - # "//third_party/nomad:heron-nomad", + "//third_party/nomad:heron-nomad", ], package_dir = "bin", ) diff --git a/third_party/nomad/BUILD b/third_party/nomad/BUILD index d039ea3..367848e 100644 --- a/third_party/nomad/BUILD +++ b/third_party/nomad/BUILD @@ -5,7 +5,7 @@ package(default_visibility = ["//visibility:public"]) filegroup( name = "heron-nomad", srcs = select({ - "//tools/platform:darwin": ["@nomad_mac//:nomad-scheduler"], - "//conditions:default": ["@nomad_linux//:nomad-scheduler"], + "//tools/platform:darwin": ["@nomad_mac//:nomad"], + "//conditions:default": ["@nomad_linux//:nomad"], }), ) diff --git a/third_party/nomad/nomad.BUILD b/third_party/nomad/nomad.BUILD index 23dc30b..5ff9879 100644 --- a/third_party/nomad/nomad.BUILD +++ b/third_party/nomad/nomad.BUILD @@ -2,9 +2,7 @@ licenses(["notice"]) package(default_visibility = ["//visibility:public"]) -genrule( - name = "nomad-scheduler", +filegroup( + name = "nomad", srcs = ["nomad"], - outs = ["heron-nomad"], - cmd = "mv $< $@", ) diff --git a/third_party/zookeeper/BUILD b/third_party/zookeeper/BUILD index d9f06ee..bddf454 100644 --- a/third_party/zookeeper/BUILD +++ b/third_party/zookeeper/BUILD @@ -20,20 +20,33 @@ genrule( "lib/libzookeeper_mt.a", "lib/libzookeeper_st.a", ], - - cmd = "\n".join([ - "export INSTALL_DIR=$$(pwd)/$(@D)", - "export TMP_DIR=$$(mktemp -d -t zookeeper.XXXXX)", - "export CXXFLAGS=-Wno-error", - "export CFLAGS=-Wno-error", - "mkdir -p $$TMP_DIR", - "cp -R $$(pwd)/external/org_apache_zookeeper/* $$TMP_DIR", - "cd $$TMP_DIR/zookeeper-client/zookeeper-client-c", - "autoreconf -if", - "./configure --prefix=$$INSTALL_DIR --enable-shared=no", - "make install", - "rm -rf $$TMP_DIR", - ]), + cmd = select({ + ":darwin": "\n".join([ + "export INSTALL_DIR=$$(pwd)/$(@D)", + "export TMP_DIR=$$(mktemp -d -t zookeeper.XXXXX)", + "export CXXFLAGS=-Wno-error", + "export CFLAGS=-Wno-error", + "mkdir -p $$TMP_DIR", + "cp -R $$(pwd)/external/org_apache_zookeeper/* $$TMP_DIR", + "cd $$TMP_DIR/zookeeper-client/zookeeper-client-c", + "./configure --prefix=$$INSTALL_DIR --enable-shared=no", + "make install", + "rm -rf $$TMP_DIR", + ]), + "//conditions:default": "\n".join([ + "export INSTALL_DIR=$$(pwd)/$(@D)", + "export TMP_DIR=$$(mktemp -d -t zookeeper.XXXXX)", + "export CXXFLAGS=-Wno-error", + "export CFLAGS=-Wno-error", + "mkdir -p $$TMP_DIR", + "cp -R $$(pwd)/external/org_apache_zookeeper/* $$TMP_DIR", + "cd $$TMP_DIR/zookeeper-client/zookeeper-client-c", + "autoreconf -if", + "./configure --prefix=$$INSTALL_DIR --enable-shared=no", + "make install", + "rm -rf $$TMP_DIR", + ]), + }), ) cc_library( @@ -73,3 +86,11 @@ cc_library( ], linkstatic = 1, ) + +config_setting( + name = "darwin", + values = { + "cpu": "darwin", + }, + visibility = ["//visibility:public"], +) \ No newline at end of file diff --git a/tools/platform/BUILD b/tools/platform/BUILD index 0a47b0d..d176770 100644 --- a/tools/platform/BUILD +++ b/tools/platform/BUILD @@ -1,3 +1,5 @@ +package(default_visibility = ["//visibility:public"]) + config_setting( name = "darwin", values = {
