Buck: Rename gwtxml to gwt_xml in gwt_module()
gwt_xml is more pythonic naming convention. Beside that recent Buck version introduced new gwt_jar parameter in prebuilt_jar() rule and future Buck versions may introduce gwt_xml parameter to java_library() rule. Change-Id: Ia6447e62945ce3eb5ff951421ebf2f0fdf622b3d
This commit is contained in:
parent
7d6b923e17
commit
76e396b49b
|
@ -20,7 +20,7 @@ java_library(
|
|||
gwt_module(
|
||||
name = 'client',
|
||||
srcs = glob([SRC + 'common/**/*.java'], excludes = EXCLUDES),
|
||||
gwtxml = SRC + 'Common.gwt.xml',
|
||||
gwt_xml = SRC + 'Common.gwt.xml',
|
||||
deps = [
|
||||
':annotations',
|
||||
'//gerrit-extension-api:client',
|
||||
|
|
|
@ -10,7 +10,7 @@ gwt_module(
|
|||
SRC + 'common/SubmitType.java',
|
||||
SRC + 'webui/GerritTopMenu.java',
|
||||
]),
|
||||
gwtxml = SRC + 'Extensions.gwt.xml',
|
||||
gwt_xml = SRC + 'Extensions.gwt.xml',
|
||||
visibility = ['PUBLIC'],
|
||||
)
|
||||
|
||||
|
|
|
@ -3,7 +3,7 @@ SRC = 'src/main/java/com/google/gwtexpui/'
|
|||
gwt_module(
|
||||
name = 'Clippy',
|
||||
srcs = glob([SRC + 'clippy/client/*.java']),
|
||||
gwtxml = SRC + 'clippy/Clippy.gwt.xml',
|
||||
gwt_xml = SRC + 'clippy/Clippy.gwt.xml',
|
||||
resources = [
|
||||
SRC + 'clippy/client/clippy.css',
|
||||
SRC + 'clippy/client/clippy.swf',
|
||||
|
@ -28,7 +28,7 @@ java_library(
|
|||
gwt_module(
|
||||
name = 'GlobalKey',
|
||||
srcs = glob([SRC + 'globalkey/client/*.java']),
|
||||
gwtxml = SRC + 'globalkey/GlobalKey.gwt.xml',
|
||||
gwt_xml = SRC + 'globalkey/GlobalKey.gwt.xml',
|
||||
resources = [
|
||||
SRC + 'globalkey/client/KeyConstants.properties',
|
||||
SRC + 'globalkey/client/key.css',
|
||||
|
@ -51,7 +51,7 @@ java_library(
|
|||
gwt_module(
|
||||
name = 'Progress',
|
||||
srcs = glob([SRC + 'progress/client/*.java']),
|
||||
gwtxml = SRC + 'progress/Progress.gwt.xml',
|
||||
gwt_xml = SRC + 'progress/Progress.gwt.xml',
|
||||
resources = [SRC + 'progress/client/progress.css'],
|
||||
deps = ['//lib/gwt:user'],
|
||||
visibility = ['PUBLIC'],
|
||||
|
@ -60,7 +60,7 @@ gwt_module(
|
|||
gwt_module(
|
||||
name = 'SafeHtml',
|
||||
srcs = glob([SRC + 'safehtml/client/*.java']),
|
||||
gwtxml = SRC + 'safehtml/SafeHtml.gwt.xml',
|
||||
gwt_xml = SRC + 'safehtml/SafeHtml.gwt.xml',
|
||||
resources = [SRC + 'safehtml/client/safehtml.css'],
|
||||
deps = ['//lib/gwt:user'],
|
||||
visibility = ['PUBLIC'],
|
||||
|
@ -83,7 +83,7 @@ java_test(
|
|||
gwt_module(
|
||||
name = 'UserAgent',
|
||||
srcs = glob([SRC + 'user/client/*.java']),
|
||||
gwtxml = SRC + 'user/User.gwt.xml',
|
||||
gwt_xml = SRC + 'user/User.gwt.xml',
|
||||
deps = ['//lib/gwt:user'],
|
||||
visibility = ['PUBLIC'],
|
||||
)
|
||||
|
|
|
@ -3,7 +3,7 @@ SRC = 'src/main/java/com/google/gerrit/'
|
|||
gwt_module(
|
||||
name = 'client',
|
||||
srcs = glob([SRC + 'client/**/*.java']),
|
||||
gwtxml = SRC + 'GerritGwtUICommon.gwt.xml',
|
||||
gwt_xml = SRC + 'GerritGwtUICommon.gwt.xml',
|
||||
deps = ['//lib/gwt:user'],
|
||||
visibility = ['PUBLIC'],
|
||||
)
|
||||
|
|
|
@ -64,7 +64,7 @@ DIFFY = glob(['src/main/java/com/google/gerrit/client/diffy*.png'])
|
|||
gwt_module(
|
||||
name = 'ui_module',
|
||||
srcs = glob(['src/main/java/**/*.java']),
|
||||
gwtxml = 'src/main/java/%s.gwt.xml' % MODULE.replace('.', '/'),
|
||||
gwt_xml = 'src/main/java/%s.gwt.xml' % MODULE.replace('.', '/'),
|
||||
resources = glob(['src/main/java/**/*'], excludes = DIFFY),
|
||||
deps = [
|
||||
':diffy_logo',
|
||||
|
|
|
@ -6,7 +6,7 @@ gwt_module(
|
|||
SRC + 'diff/Edit_JsonSerializer.java',
|
||||
SRC + 'diff/ReplaceEdit.java',
|
||||
],
|
||||
gwtxml = SRC + 'JGit.gwt.xml',
|
||||
gwt_xml = SRC + 'JGit.gwt.xml',
|
||||
deps = [
|
||||
'//lib:gwtjsonrpc',
|
||||
'//lib/gwt:user',
|
||||
|
|
|
@ -6,7 +6,7 @@ gwt_module(
|
|||
SRC + 'client/**/*.java',
|
||||
SRC + 'common/**/*.java',
|
||||
]),
|
||||
gwtxml = SRC + 'PrettyFormatter.gwt.xml',
|
||||
gwt_xml = SRC + 'PrettyFormatter.gwt.xml',
|
||||
resources = glob([
|
||||
'src/main/java/com/google/gerrit/prettify/client/*.properties',
|
||||
]),
|
||||
|
|
|
@ -3,7 +3,7 @@ SRC = 'src/main/java/com/google/gerrit/reviewdb/'
|
|||
gwt_module(
|
||||
name = 'client',
|
||||
srcs = glob([SRC + 'client/**/*.java']),
|
||||
gwtxml = SRC + 'ReviewDB.gwt.xml',
|
||||
gwt_xml = SRC + 'ReviewDB.gwt.xml',
|
||||
deps = [
|
||||
'//gerrit-extension-api:client',
|
||||
'//lib:gwtorm',
|
||||
|
|
|
@ -32,12 +32,12 @@ def genantlr(
|
|||
out = out,
|
||||
)
|
||||
|
||||
def gwt_module(gwtxml=None, **kwargs):
|
||||
def gwt_module(gwt_xml=None, **kwargs):
|
||||
kw = copy.deepcopy(kwargs)
|
||||
if 'resources' not in kw:
|
||||
kw['resources'] = []
|
||||
if gwtxml:
|
||||
kw['resources'] += [gwtxml]
|
||||
if gwt_xml:
|
||||
kw['resources'] += [gwt_xml]
|
||||
if 'srcs' in kw:
|
||||
kw['resources'] += kw['srcs']
|
||||
java_library(**kw)
|
||||
|
|
Loading…
Reference in New Issue