Bazel: Restrict src globs to Java source files
Generating the src list with an unrestricted wildcard causes all files in the source tree to be included. This results in junk files such as .orig (generated during merge conflict resolution) to be included, which causes in a build error: in srcs attribute of java_library rule //org.eclipse.jgit:jgit: file '//org.eclipse.jgit:src/org/eclipse/jgit/gitrepo/RepoCommand.java.orig' is misplaced here (expected .java, .srcjar or .properties). Modify the globs to only include Java source files. Change-Id: Iaef3db33ac71d71047cd28acb0378e15cb09ece9 Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
This commit is contained in:
parent
fe5437e96b
commit
c80d8c5901
|
@ -3,7 +3,7 @@ package(default_visibility = ["//visibility:public"])
|
||||||
java_library(
|
java_library(
|
||||||
name = "jgit-archive",
|
name = "jgit-archive",
|
||||||
srcs = glob(
|
srcs = glob(
|
||||||
["src/**"],
|
["src/**/*.java"],
|
||||||
exclude = ["src/org/eclipse/jgit/archive/FormatActivator.java"],
|
exclude = ["src/org/eclipse/jgit/archive/FormatActivator.java"],
|
||||||
),
|
),
|
||||||
resource_strip_prefix = "org.eclipse.jgit.archive/resources",
|
resource_strip_prefix = "org.eclipse.jgit.archive/resources",
|
||||||
|
|
|
@ -2,7 +2,7 @@ package(default_visibility = ["//visibility:public"])
|
||||||
|
|
||||||
java_library(
|
java_library(
|
||||||
name = "http-apache",
|
name = "http-apache",
|
||||||
srcs = glob(["src/**"]),
|
srcs = glob(["src/**/*.java"]),
|
||||||
resource_strip_prefix = "org.eclipse.jgit.http.apache/resources",
|
resource_strip_prefix = "org.eclipse.jgit.http.apache/resources",
|
||||||
resources = glob(["resources/**"]),
|
resources = glob(["resources/**"]),
|
||||||
deps = [
|
deps = [
|
||||||
|
|
|
@ -2,7 +2,7 @@ package(default_visibility = ["//visibility:public"])
|
||||||
|
|
||||||
java_library(
|
java_library(
|
||||||
name = "jgit-servlet",
|
name = "jgit-servlet",
|
||||||
srcs = glob(["src/**"]),
|
srcs = glob(["src/**/*.java"]),
|
||||||
resource_strip_prefix = "org.eclipse.jgit.http.server/resources",
|
resource_strip_prefix = "org.eclipse.jgit.http.server/resources",
|
||||||
resources = glob(["resources/**"]),
|
resources = glob(["resources/**"]),
|
||||||
deps = [
|
deps = [
|
||||||
|
|
|
@ -3,7 +3,7 @@ package(default_visibility = ["//visibility:public"])
|
||||||
java_library(
|
java_library(
|
||||||
name = "junit-http",
|
name = "junit-http",
|
||||||
testonly = 1,
|
testonly = 1,
|
||||||
srcs = glob(["src/**"]),
|
srcs = glob(["src/**/*.java"]),
|
||||||
resources = glob(["resources/**"]),
|
resources = glob(["resources/**"]),
|
||||||
# TODO(davido): we want here provided deps
|
# TODO(davido): we want here provided deps
|
||||||
deps = [
|
deps = [
|
||||||
|
|
|
@ -3,7 +3,7 @@ package(default_visibility = ["//visibility:public"])
|
||||||
java_library(
|
java_library(
|
||||||
name = "junit",
|
name = "junit",
|
||||||
testonly = 1,
|
testonly = 1,
|
||||||
srcs = glob(["src/**"]),
|
srcs = glob(["src/**/*.java"]),
|
||||||
resource_strip_prefix = "org.eclipse.jgit.junit/resources",
|
resource_strip_prefix = "org.eclipse.jgit.junit/resources",
|
||||||
resources = glob(["resources/**"]),
|
resources = glob(["resources/**"]),
|
||||||
deps = [
|
deps = [
|
||||||
|
|
|
@ -2,7 +2,7 @@ package(default_visibility = ["//visibility:public"])
|
||||||
|
|
||||||
java_library(
|
java_library(
|
||||||
name = "jgit-lfs-server",
|
name = "jgit-lfs-server",
|
||||||
srcs = glob(["src/**"]),
|
srcs = glob(["src/**/*.java"]),
|
||||||
resource_strip_prefix = "org.eclipse.jgit.lfs.server/resources",
|
resource_strip_prefix = "org.eclipse.jgit.lfs.server/resources",
|
||||||
resources = glob(["resources/**"]),
|
resources = glob(["resources/**"]),
|
||||||
deps = [
|
deps = [
|
||||||
|
|
|
@ -2,7 +2,7 @@ package(default_visibility = ["//visibility:public"])
|
||||||
|
|
||||||
java_library(
|
java_library(
|
||||||
name = "jgit-lfs",
|
name = "jgit-lfs",
|
||||||
srcs = glob(["src/**"]),
|
srcs = glob(["src/**/*.java"]),
|
||||||
resource_strip_prefix = "org.eclipse.jgit.lfs/resources",
|
resource_strip_prefix = "org.eclipse.jgit.lfs/resources",
|
||||||
resources = glob(["resources/**"]),
|
resources = glob(["resources/**"]),
|
||||||
deps = [
|
deps = [
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
java_library(
|
java_library(
|
||||||
name = "pgm",
|
name = "pgm",
|
||||||
srcs = glob(["src/**"]),
|
srcs = glob(["src/**/*.java"]),
|
||||||
resource_strip_prefix = "org.eclipse.jgit.pgm/resources",
|
resource_strip_prefix = "org.eclipse.jgit.pgm/resources",
|
||||||
resources = glob(["resources/**"]),
|
resources = glob(["resources/**"]),
|
||||||
visibility = ["//visibility:public"],
|
visibility = ["//visibility:public"],
|
||||||
|
|
|
@ -2,7 +2,7 @@ package(default_visibility = ["//visibility:public"])
|
||||||
|
|
||||||
java_library(
|
java_library(
|
||||||
name = "ui",
|
name = "ui",
|
||||||
srcs = glob(["src/**"]),
|
srcs = glob(["src/**/*.java"]),
|
||||||
resource_strip_prefix = "org.eclipse.jgit.ui/resources",
|
resource_strip_prefix = "org.eclipse.jgit.ui/resources",
|
||||||
resources = glob(["resources/**"]),
|
resources = glob(["resources/**"]),
|
||||||
deps = ["//org.eclipse.jgit:jgit"],
|
deps = ["//org.eclipse.jgit:jgit"],
|
||||||
|
|
|
@ -5,7 +5,7 @@ INSECURE_CIPHER_FACTORY = [
|
||||||
]
|
]
|
||||||
|
|
||||||
SRCS = glob(
|
SRCS = glob(
|
||||||
["src/**"],
|
["src/**/*.java"],
|
||||||
exclude = INSECURE_CIPHER_FACTORY,
|
exclude = INSECURE_CIPHER_FACTORY,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue