diff options
author | Eugene Kliuchnikov <eustas.ru@gmail.com> | 2019-07-16 17:49:14 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-07-16 17:49:14 +0200 |
commit | 40f0fdcdc1b6930382351571068d71c38484546d (patch) | |
tree | 3524cf45638885066f027f5161550b68466359a8 | |
parent | 78e7bbc3c34bb85ecc9a912929e8b3b224973b05 (diff) | |
download | brotli-40f0fdcdc1b6930382351571068d71c38484546d.zip brotli-40f0fdcdc1b6930382351571068d71c38484546d.tar.gz brotli-40f0fdcdc1b6930382351571068d71c38484546d.tar.bz2 |
Explicitly mark tests/testdata/* as binary. (#761)
Fixes #760
Drive-by:
* update go_rules
* modernize brotli_inc
* fix wrapper build
* update PY to 3 in Travis / OSX / Bazel build
* upgrade JS Bazel rules.
-rw-r--r-- | .gitattributes | 1 | ||||
-rw-r--r-- | BUILD | 2 | ||||
-rw-r--r-- | go/WORKSPACE | 7 | ||||
-rw-r--r-- | java/org/brotli/wrapper/common/common_jni.cc | 2 | ||||
-rw-r--r-- | js/WORKSPACE | 2 | ||||
-rwxr-xr-x | scripts/.travis.sh | 1 |
6 files changed, 10 insertions, 5 deletions
diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..a1665da --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +tests/testdata/* binary @@ -99,7 +99,7 @@ cc_library( name = "brotli_inc", hdrs = [":public_headers"], copts = STRICT_C_OPTIONS, - includes = ["c/include"], + strip_include_prefix = "c/include", ) cc_library( diff --git a/go/WORKSPACE b/go/WORKSPACE index dcb5615..e965269 100644 --- a/go/WORKSPACE +++ b/go/WORKSPACE @@ -9,8 +9,11 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") http_archive( name = "io_bazel_rules_go", - urls = ["https://github.com/bazelbuild/rules_go/releases/download/0.17.0/rules_go-0.17.0.tar.gz"], - sha256 = "492c3ac68ed9dcf527a07e6a1b2dcbf199c6bf8b35517951467ac32e421c06c1", + urls = [ + "https://storage.googleapis.com/bazel-mirror/github.com/bazelbuild/rules_go/releases/download/0.19.0/rules_go-0.19.0.tar.gz", + "https://github.com/bazelbuild/rules_go/releases/download/0.19.0/rules_go-0.19.0.tar.gz", + ], + sha256 = "9fb16af4d4836c8222142e54c9efa0bb5fc562ffc893ce2abeac3e25daead144", ) load("@io_bazel_rules_go//go:deps.bzl", "go_rules_dependencies", "go_register_toolchains") diff --git a/java/org/brotli/wrapper/common/common_jni.cc b/java/org/brotli/wrapper/common/common_jni.cc index 2ea2ad8..c71ca49 100644 --- a/java/org/brotli/wrapper/common/common_jni.cc +++ b/java/org/brotli/wrapper/common/common_jni.cc @@ -6,7 +6,7 @@ #include <jni.h> -#include "../common/dictionary.h" +#include "c/common/dictionary.h" #ifdef __cplusplus extern "C" { diff --git a/js/WORKSPACE b/js/WORKSPACE index dbd5384..f15740a 100644 --- a/js/WORKSPACE +++ b/js/WORKSPACE @@ -4,7 +4,7 @@ load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository") git_repository( name = "io_bazel_rules_closure", - commit = "a176ec89a1b251bb5442ba569d47cee3c053e633", + commit = "29ec97e7c85d607ba9e41cab3993fbb13f812c4b", remote = "https://github.com/bazelbuild/rules_closure.git", ) diff --git a/scripts/.travis.sh b/scripts/.travis.sh index 367cdfa..8b7e2b3 100755 --- a/scripts/.travis.sh +++ b/scripts/.travis.sh @@ -18,6 +18,7 @@ case "$1" in case "${BUILD_SYSTEM}" in "bazel") brew install bazel + brew upgrade python ;; esac ;; |