Merge pull request #11 from schoppmp/fix-build

Fix build with Bazel >= 2

4 files changed, 44 insertions, 358 deletions

diff --git a/BUILD b/BUILD
index 73c5498..2849a8b 100644
--- a/BUILD
+++ b/BUILD
@@ -23,7 +23,7 @@ grpc_proto_library(
     name = "private_intersection_sum_proto",
     srcs = ["private_intersection_sum.proto"],
     deps = [
-    	":match_proto",
+        ":match_proto",
     ],
 )
 
@@ -31,7 +31,7 @@ grpc_proto_library(
     name = "private_join_and_compute_proto",
     srcs = ["private_join_and_compute.proto"],
     deps = [
-    	":private_intersection_sum_proto",
+        ":private_intersection_sum_proto",
     ],
 )
 
@@ -39,8 +39,8 @@ cc_library(
     name = "message_sink",
     hdrs = ["message_sink.h"],
     deps = [
-    	":private_join_and_compute_proto",
-	"//util:status_includes",
+        ":private_join_and_compute_proto",
+        "//util:status_includes",
         "@com_google_absl//absl/memory",
     ],
 )
@@ -49,9 +49,9 @@ cc_library(
     name = "protocol_client",
     hdrs = ["protocol_client.h"],
     deps = [
-    	":message_sink",
-    	":private_join_and_compute_proto",
-	"//util:status_includes",
+        ":message_sink",
+        ":private_join_and_compute_proto",
+        "//util:status_includes",
     ],
 )
 
@@ -61,10 +61,10 @@ cc_library(
     hdrs = ["client_impl.h"],
     deps = [
         ":match_proto",
-	":message_sink",
-	":private_intersection_sum_proto",
-	":private_join_and_compute_proto",
-	":protocol_client",
+        ":message_sink",
+        ":private_intersection_sum_proto",
+        ":private_join_and_compute_proto",
+        ":protocol_client",
         "//crypto:bn_util",
         "//crypto:ec_commutative_cipher",
         "//crypto:paillier",
@@ -78,7 +78,7 @@ cc_library(
     name = "protocol_server",
     hdrs = ["protocol_server.h"],
     deps = [
-    	":message_sink",
+        ":message_sink",
         ":private_join_and_compute_proto",
         "//util:status_includes",
     ],
@@ -90,10 +90,10 @@ cc_library(
     hdrs = ["server_impl.h"],
     deps = [
         ":match_proto",
-	":message_sink",
-	":private_intersection_sum_proto",
-	":private_join_and_compute_proto",
-	":protocol_server",
+        ":message_sink",
+        ":private_intersection_sum_proto",
+        ":private_join_and_compute_proto",
+        ":protocol_server",
         "//crypto:bn_util",
         "//crypto:ec_commutative_cipher",
         "//crypto:paillier",
@@ -127,15 +127,15 @@ cc_binary(
         "@com_google_absl//absl/base",
     ],
 )
+
 cc_library(
     name = "private_join_and_compute_rpc_impl",
-
     srcs = ["private_join_and_compute_rpc_impl.cc"],
     hdrs = ["private_join_and_compute_rpc_impl.h"],
     deps = [
-	":message_sink",
-	":private_join_and_compute_proto",
-	":protocol_server",
+        ":message_sink",
+        ":private_join_and_compute_proto",
+        ":protocol_server",
         "//util:status_includes",
         "@com_github_grpc_grpc//:grpc++",
     ],
@@ -148,7 +148,7 @@ cc_binary(
         ":data_util",
         ":private_join_and_compute_proto",
         ":private_join_and_compute_rpc_impl",
-	":protocol_server",
+        ":protocol_server",
         ":server_impl",
         "@com_github_gflags_gflags//:gflags",
         "@com_github_glog_glog//:glog",
@@ -166,13 +166,13 @@ cc_binary(
         ":client_impl",
         ":data_util",
         ":private_join_and_compute_proto",
-	":protocol_client",
+        ":protocol_client",
         "@com_github_gflags_gflags//:gflags",
         "@com_github_glog_glog//:glog",
         "@com_github_grpc_grpc//:grpc",
         "@com_github_grpc_grpc//:grpc++",
         "@com_google_absl//absl/base",
         "@com_google_absl//absl/memory",
-	"@com_google_absl//absl/strings",
+        "@com_google_absl//absl/strings",
     ],
 )
diff --git a/WORKSPACE b/WORKSPACE
index fea34c0..3a76992 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -17,56 +17,41 @@
 load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository")
 load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 
-# proto_library rules implicitly depend on @com_google_protobuf//:protoc,
-# which is the proto-compiler.
-# cc_proto_library rules implicitly depend on @com_google_protobuf_cc//:cc_toolchain,
-# which is the C++ proto runtime (base classes and common utilities).
-# This statement defines the @com_google_protobuf repo.
-git_repository(
-    name = "com_google_protobuf",
-    remote = "https://github.com/google/protobuf.git",
-    tag = "v3.6.1.3",
-)
-
 http_archive(
     name = "com_github_glog_glog",
-    build_file = "@//glog_files:BUILD",
-    urls = ["https://github.com/google/glog/archive/v0.3.5.tar.gz"],
-    strip_prefix = "glog-0.3.5",
+    sha256 = "f28359aeba12f30d73d9e4711ef356dc842886968112162bc73002645139c39c",
+    strip_prefix = "glog-0.4.0",
+    urls = ["https://github.com/google/glog/archive/v0.4.0.tar.gz"],
 )
 
 # gflags
 # Needed for glog
-git_repository(
-    name = "com_github_gflags_gflags",
-    remote = "https://github.com/gflags/gflags.git",
-    tag = "v2.2.2",
-)
-
-# BoringSSL
 http_archive(
-    name = "boringssl",
+    name = "com_github_gflags_gflags",
+    sha256 = "34af2f15cf7367513b352bdcd2493ab14ce43692d2dcd9dfc499492966c64dcf",
+    strip_prefix = "gflags-2.2.2",
     urls = [
-        "https://mirror.bazel.build/github.com/google/boringssl/archive/a0fb951d2a26a8ee746b52f3ba81ab011a0af778.tar.gz",
-        "https://github.com/google/boringssl/archive/a0fb951d2a26a8ee746b52f3ba81ab011a0af778.tar.gz",
+        "https://mirror.bazel.build/github.com/gflags/gflags/archive/v2.2.2.tar.gz",
+        "https://github.com/gflags/gflags/archive/v2.2.2.tar.gz",
     ],
-    sha256 = "524ba98a56300149696481b4cb9ddebd0c7b7ac9b9f6edee81da2d2d7e5d2bb3",
-    strip_prefix = "boringssl-a0fb951d2a26a8ee746b52f3ba81ab011a0af778",
-)
-
-# Abseil C++ libraries
-git_repository(
-    name = "com_google_absl",
-    remote = "https://github.com/abseil/abseil-cpp.git",
-    tag = "20181200",
 )
 
 # gRPC
-git_repository(
+http_archive(
     name = "com_github_grpc_grpc",
-    remote = "https://github.com/grpc/grpc.git",
-    tag = "v1.19.0",
+    sha256 = "c2ab8a42a0d673c1acb596d276055adcc074c1116e427f118415da3e79e52969",
+    strip_prefix = "grpc-1.27.3",
+    urls = [
+        "https://github.com/grpc/grpc/archive/v1.27.3.tar.gz",
+    ],
 )
 
 load("@com_github_grpc_grpc//bazel:grpc_deps.bzl", "grpc_deps")
+
+# Includes boringssl, com_google_absl, and other dependencies.
 grpc_deps()
+
+load("@com_github_grpc_grpc//bazel:grpc_extra_deps.bzl", "grpc_extra_deps")
+
+# Loads transitive dependencies of GRPC.
+grpc_extra_deps()
diff --git a/glog_files/BUILD b/glog_files/BUILD
deleted file mode 100644
index ad326fb..0000000
--- a/glog_files/BUILD
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 2019 Google Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-package(default_visibility = ["//visibility:public"])
-
-cc_library(
-    name = "glog",
-    srcs = [
-        "config.h",
-        "src/base/commandlineflags.h",
-        "src/base/googleinit.h",
-        "src/base/mutex.h",
-        "src/demangle.cc",
-        "src/demangle.h",
-        "src/logging.cc",
-        "src/raw_logging.cc",
-        "src/signalhandler.cc",
-        "src/symbolize.cc",
-        "src/symbolize.h",
-        "src/utilities.cc",
-        "src/utilities.h",
-        "src/vlog_is_on.cc",
-    ] + glob(["src/stacktrace*.h"]),
-    hdrs = [
-        "src/glog/log_severity.h",
-        "src/glog/logging.h",
-        "src/glog/raw_logging.h",
-        "src/glog/stl_logging.h",
-        "src/glog/vlog_is_on.h",
-    ],
-    copts = [
-        "-Wno-sign-compare",
-        "-U_XOPEN_SOURCE",
-    ],
-    includes = ["./src"],
-    linkopts = ["-lpthread"] + select({
-        ":libunwind": ["-lunwind"],
-        "//conditions:default": [],
-    }),
-    visibility = ["//visibility:public"],
-    deps = [
-        "@com_github_gflags_gflags//:gflags",
-    ],
-)
-
-config_setting(
-    name = "libunwind",
-    values = {
-        "define": "libunwind=true",
-    },
-)
-
-genrule(
-    name = "run_configure",
-    srcs = [
-        "README",
-        "Makefile.in",
-        "config.guess",
-        "config.sub",
-        "install-sh",
-        "ltmain.sh",
-        "missing",
-        "libglog.pc.in",
-        "src/config.h.in",
-        "src/glog/logging.h.in",
-        "src/glog/raw_logging.h.in",
-        "src/glog/stl_logging.h.in",
-        "src/glog/vlog_is_on.h.in",
-    ],
-    outs = [
-        "config.h",
-        "src/glog/logging.h",
-        "src/glog/raw_logging.h",
-        "src/glog/stl_logging.h",
-        "src/glog/vlog_is_on.h",
-    ],
-    cmd = "$(location :configure)" +
-          "&& cp -v src/config.h $(location config.h) " +
-          "&& cp -v src/glog/logging.h $(location src/glog/logging.h) " +
-          "&& cp -v src/glog/raw_logging.h $(location src/glog/raw_logging.h) " +
-          "&& cp -v src/glog/stl_logging.h $(location src/glog/stl_logging.h) " +
-          "&& cp -v src/glog/vlog_is_on.h $(location src/glog/vlog_is_on.h) ",
-    tools = [
-        "configure",
-    ],
-)
diff --git a/glog_files/LICENSE b/glog_files/LICENSE
deleted file mode 100644
index 7a4a3ea..0000000
--- a/glog_files/LICENSE
+++ /dev/null
@@ -1,202 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
\ No newline at end of file