Merge changes Ia6447e62,Ic09dc032,I7f1ee1d6,I26fd741d,I1f13f4d2

* changes:
  Buck: Rename gwtxml to gwt_xml in gwt_module()
  Buck: Omit default values to gwt_binary() rule
  Buck: Make gwt_module() rule more pythonic
  Buck: Merge deps and compile_deps parameters in gwt_module() rule
  Update Buck and use gwt_binary()
This commit is contained in:
Shawn Pearce
2014-05-19 19:30:04 +00:00
committed by Gerrit Code Review
18 changed files with 123 additions and 220 deletions

View File

@@ -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',
@@ -11,8 +11,6 @@ gwt_module(
deps = [
':SafeHtml',
':UserAgent',
],
compile_deps = [
'//lib/gwt:user',
'//lib:LICENSE-clippy',
],
@@ -30,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',
@@ -38,8 +36,8 @@ gwt_module(
deps = [
':SafeHtml',
':UserAgent',
'//lib/gwt:user',
],
compile_deps = ['//lib/gwt:user'],
visibility = ['PUBLIC'],
)
@@ -53,18 +51,18 @@ 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'],
compile_deps = ['//lib/gwt:user'],
deps = ['//lib/gwt:user'],
visibility = ['PUBLIC'],
)
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'],
compile_deps = ['//lib/gwt:user'],
deps = ['//lib/gwt:user'],
visibility = ['PUBLIC'],
)
@@ -74,19 +72,19 @@ java_test(
'src/test/java/com/google/gwtexpui/safehtml/client/**/*.java',
]),
deps = [
':SafeHtml_lib',
':SafeHtml',
'//lib:junit',
'//lib/gwt:user',
'//lib/gwt:dev',
],
source_under_test = [':SafeHtml_lib'],
source_under_test = [':SafeHtml'],
)
gwt_module(
name = 'UserAgent',
srcs = glob([SRC + 'user/client/*.java']),
gwtxml = SRC + 'user/User.gwt.xml',
compile_deps = ['//lib/gwt:user'],
gwt_xml = SRC + 'user/User.gwt.xml',
deps = ['//lib/gwt:user'],
visibility = ['PUBLIC'],
)