Move prolog:common rule to gerrit-server root build file

Change-Id: Iacbff16b71d8464ccea6d2b631868e24a0605ec4
This commit is contained in:
David Ostrovsky 2017-05-18 06:11:47 +02:00
parent e251dd100d
commit 946d6c3b14
6 changed files with 16 additions and 16 deletions

View File

@ -38,8 +38,8 @@ java_library2(
"//gerrit-pgm:daemon",
"//gerrit-pgm:http-jetty",
"//gerrit-pgm:util-nodep",
"//gerrit-server:prolog-common",
"//gerrit-server:testutil",
"//gerrit-server/src/main/prolog:common",
"//lib:jimfs",
"//lib:truth",
"//lib:truth-java8-extension",

View File

@ -19,9 +19,9 @@ java_library(
"//gerrit-pgm:pgm",
"//gerrit-pgm:util",
"//gerrit-reviewdb:server",
"//gerrit-server:prolog-common",
"//gerrit-server:server",
"//gerrit-server:testutil",
"//gerrit-server/src/main/prolog:common",
"//gerrit-sshd:sshd",
"//gerrit-test-util:test_util",
"//lib:args4j",

View File

@ -19,7 +19,7 @@ EXPORTS = [
"//gerrit-extension-api:api",
"//gerrit-gwtexpui:server",
"//gerrit-reviewdb:server",
"//gerrit-server/src/main/prolog:common",
"//gerrit-server:prolog-common",
"//lib/commons:lang",
"//lib/commons:lang3",
"//lib/dropwizard:dropwizard-core",

View File

@ -1,3 +1,4 @@
load("//lib/prolog:prolog.bzl", "prolog_cafe_library")
load("//tools/bzl:junit.bzl", "junit_tests")
CONSTANTS_SRC = [
@ -17,6 +18,13 @@ java_library(
visibility = ["//visibility:public"],
)
prolog_cafe_library(
name = "prolog-common",
srcs = ["src/main/prolog/gerrit_common.pl"],
visibility = ["//visibility:public"],
deps = [":server"],
)
java_library(
name = "server",
srcs = SRCS,
@ -185,9 +193,9 @@ junit_tests(
srcs = PROLOG_TESTS,
resources = glob(["src/test/resources/com/google/gerrit/rules/**/*"]),
deps = TESTUTIL_DEPS + [
":prolog-common",
":prolog_test_case",
":testutil",
"//gerrit-server/src/main/prolog:common",
"//lib/prolog:runtime",
],
)
@ -202,10 +210,10 @@ java_library(
srcs = QUERY_TESTS,
visibility = ["//visibility:public"],
deps = TESTUTIL_DEPS + [
":prolog-common",
":testutil",
"//gerrit-antlr:query_exception",
"//gerrit-antlr:query_parser",
"//gerrit-server/src/main/prolog:common",
"//lib/antlr:java_runtime",
],
)
@ -216,10 +224,10 @@ junit_tests(
srcs = QUERY_TESTS,
visibility = ["//visibility:public"],
deps = TESTUTIL_DEPS + [
":prolog-common",
":testutil",
"//gerrit-antlr:query_exception",
"//gerrit-antlr:query_parser",
"//gerrit-server/src/main/prolog:common",
"//lib/antlr:java_runtime",
],
)
@ -235,10 +243,10 @@ junit_tests(
visibility = ["//visibility:public"],
deps = TESTUTIL_DEPS + [
":custom-truth-subjects",
":prolog-common",
":testutil",
"//gerrit-antlr:query_exception",
"//gerrit-patch-jgit:server",
"//gerrit-server/src/main/prolog:common",
"//gerrit-test-util:test_util",
"//lib:args4j",
"//lib:grappa",

View File

@ -1,8 +0,0 @@
load("//lib/prolog:prolog.bzl", "prolog_cafe_library")
prolog_cafe_library(
name = "common",
srcs = ["gerrit_common.pl"],
visibility = ["//visibility:public"],
deps = ["//gerrit-server:server"],
)

View File

@ -18,8 +18,8 @@ java_library(
"//gerrit-pgm:init-api",
"//gerrit-pgm:util",
"//gerrit-reviewdb:server",
"//gerrit-server:prolog-common",
"//gerrit-server:server",
"//gerrit-server/src/main/prolog:common",
"//gerrit-sshd:sshd",
"//lib:guava",
"//lib:gwtorm",