Move libraries.config to init subpackage
This resource is only used by init/Libraries.java, and after moving this the resource globs can fall along package boundaries as well. Change-Id: Id62aeb5bbcaa97509ccab47ecdf377d0a02da59a
This commit is contained in:
@@ -1,4 +1,5 @@
|
|||||||
SRCS = 'src/main/java/com/google/gerrit/pgm/'
|
SRCS = 'src/main/java/com/google/gerrit/pgm/'
|
||||||
|
RSRCS = 'src/main/resources/com/google/gerrit/pgm/'
|
||||||
|
|
||||||
INIT_API_SRCS = glob([SRCS + 'init/api/*.java'])
|
INIT_API_SRCS = glob([SRCS + 'init/api/*.java'])
|
||||||
|
|
||||||
@@ -25,15 +26,11 @@ java_sources(
|
|||||||
)
|
)
|
||||||
|
|
||||||
INIT_SRCS = glob([SRCS + 'init/*.java'])
|
INIT_SRCS = glob([SRCS + 'init/*.java'])
|
||||||
INIT_RSRCS = [
|
|
||||||
'src/main/resources/com/google/gerrit/pgm/libraries.config',
|
|
||||||
'src/main/resources/com/google/gerrit/pgm/init/gerrit.sh',
|
|
||||||
]
|
|
||||||
|
|
||||||
java_library(
|
java_library(
|
||||||
name = 'init',
|
name = 'init',
|
||||||
srcs = INIT_SRCS,
|
srcs = INIT_SRCS,
|
||||||
resources = INIT_RSRCS,
|
resources = glob([RSRCS + 'init/*']),
|
||||||
deps = [
|
deps = [
|
||||||
':init-api',
|
':init-api',
|
||||||
':util',
|
':util',
|
||||||
@@ -93,9 +90,7 @@ java_library(
|
|||||||
['src/main/java/**/*.java'],
|
['src/main/java/**/*.java'],
|
||||||
excludes = INIT_API_SRCS + INIT_SRCS + UTIL_SRCS
|
excludes = INIT_API_SRCS + INIT_SRCS + UTIL_SRCS
|
||||||
),
|
),
|
||||||
resources = glob(
|
resources = glob([RSRCS + '*']),
|
||||||
['src/main/resources/**/*'],
|
|
||||||
excludes = INIT_RSRCS),
|
|
||||||
deps = [
|
deps = [
|
||||||
':init',
|
':init',
|
||||||
':init-api',
|
':init-api',
|
||||||
|
@@ -33,7 +33,7 @@ import java.lang.reflect.Modifier;
|
|||||||
@Singleton
|
@Singleton
|
||||||
class Libraries {
|
class Libraries {
|
||||||
private static final String RESOURCE_FILE =
|
private static final String RESOURCE_FILE =
|
||||||
"com/google/gerrit/pgm/libraries.config";
|
"com/google/gerrit/pgm/init/libraries.config";
|
||||||
|
|
||||||
private final Provider<LibraryDownloader> downloadProvider;
|
private final Provider<LibraryDownloader> downloadProvider;
|
||||||
|
|
||||||
|
@@ -1,7 +1,7 @@
|
|||||||
include_defs('//lib/maven.defs')
|
include_defs('//lib/maven.defs')
|
||||||
|
|
||||||
# This version must match the version that also appears in
|
# This version must match the version that also appears in
|
||||||
# gerrit-pgm/src/main/resources/com/google/gerrit/pgm/libraries.config
|
# gerrit-pgm/src/main/resources/com/google/gerrit/pgm/init/libraries.config
|
||||||
VERSION = '1.49'
|
VERSION = '1.49'
|
||||||
|
|
||||||
maven_jar(
|
maven_jar(
|
||||||
|
Reference in New Issue
Block a user