Fix in-tree build
Align the BUILD files and build instructions in README with what's
on stable-2.14, so that the in-tree build works properly.
Change-Id: Ic29b83db510e0e09f5215aed2e76a6437d6b9c5b
diff --git a/README.md b/README.md
index 7c0340a..72adf36 100644
--- a/README.md
+++ b/README.md
@@ -51,10 +51,11 @@
$ git clone https://gerrit.googlesource.com/plugins/owners
$ git clone https://gerrit.googlesource.com/gerrit
$ cd gerrit/plugins
- $ ln -s ../../owners/owners* .
+ $ ln -s ../../owners/owners .
+ $ ln -s ../../owners/owners-autoassign .
$ ln -sf ../../owners/external_plugin_deps.bzl .
$ cd ..
- $ bazel test plugins/owners-common:test
+ $ ln -s ../owners/owners-common .
$ bazel build plugins/owners plugins/owners-autoassign
```
diff --git a/owners-autoassign/BUILD b/owners-autoassign/BUILD
index abca85f..051e436 100644
--- a/owners-autoassign/BUILD
+++ b/owners-autoassign/BUILD
@@ -1,7 +1,7 @@
load("//tools/bzl:junit.bzl", "junit_tests")
load("//tools/bzl:plugin.bzl", "gerrit_plugin", "PLUGIN_DEPS", "PLUGIN_TEST_DEPS")
load("//lib/prolog:prolog.bzl", "prolog_cafe_library")
-load("//plugins/owners-common:common.bzl", "EXTERNAL_DEPS")
+load("//owners-common:common.bzl", "EXTERNAL_DEPS")
gerrit_plugin(
name = "owners-autoassign",
@@ -16,7 +16,7 @@
"Gerrit-ApiVersion: 2.14-SNAPSHOT",
],
deps = [
- "//plugins/owners-common",
+ "//owners-common",
],
resources = glob(["src/main/**/*"]),
)
diff --git a/owners-common/BUILD b/owners-common/BUILD
index 8a4ea42..74064b0 100644
--- a/owners-common/BUILD
+++ b/owners-common/BUILD
@@ -1,6 +1,6 @@
load("//tools/bzl:junit.bzl", "junit_tests")
load("//tools/bzl:plugin.bzl", "gerrit_plugin", "PLUGIN_DEPS", "PLUGIN_TEST_DEPS", "PLUGIN_DEPS_NEVERLINK")
-load("//plugins/owners-common:common.bzl", "EXTERNAL_DEPS")
+load("//owners-common:common.bzl", "EXTERNAL_DEPS")
java_library(
name = "owners-common",
diff --git a/owners/BUILD b/owners/BUILD
index eb9e6a7..9f881c3 100644
--- a/owners/BUILD
+++ b/owners/BUILD
@@ -1,7 +1,7 @@
load("//tools/bzl:junit.bzl", "junit_tests")
load("//tools/bzl:plugin.bzl", "gerrit_plugin", "PLUGIN_DEPS", "PLUGIN_TEST_DEPS", "PLUGIN_DEPS_NEVERLINK")
load("//lib/prolog:prolog.bzl", "prolog_cafe_library")
-load("//plugins/owners-common:common.bzl", "EXTERNAL_DEPS")
+load("//owners-common:common.bzl", "EXTERNAL_DEPS")
java_library(
name = "gerrit-owners-lib",
@@ -10,7 +10,7 @@
]),
deps = [
"@prolog-runtime//jar:neverlink",
- "//plugins/owners-common:owners-common",
+ "//owners-common:owners-common",
] + PLUGIN_DEPS_NEVERLINK + EXTERNAL_DEPS,
)
