Buck: Simplify build rules
Since [1] dependencies to targets used in $(exe //path/to:target) and $(location //path/to:target) macros are added implicitly. [1] https://github.com/facebook/buck/issues/128 Change-Id: Id98257e1118830205821e35816d0e562e56e961a
This commit is contained in:
@@ -18,10 +18,6 @@ genrule(
|
|||||||
'unzip -qo $(location :ui_opt);' +
|
'unzip -qo $(location :ui_opt);' +
|
||||||
'mkdir -p \$(dirname $OUT);' +
|
'mkdir -p \$(dirname $OUT);' +
|
||||||
'zip -qr $OUT .',
|
'zip -qr $OUT .',
|
||||||
deps = [
|
|
||||||
':ui_dbg',
|
|
||||||
':ui_opt',
|
|
||||||
],
|
|
||||||
out = 'ui_optdbg.zip',
|
out = 'ui_optdbg.zip',
|
||||||
visibility = ['PUBLIC'],
|
visibility = ['PUBLIC'],
|
||||||
)
|
)
|
||||||
|
@@ -22,16 +22,13 @@ def maven_package(
|
|||||||
war = {}):
|
war = {}):
|
||||||
cmd = ['$(exe //tools/maven:mvn)', '-v', version, '-o', '$OUT']
|
cmd = ['$(exe //tools/maven:mvn)', '-v', version, '-o', '$OUT']
|
||||||
api_cmd = []
|
api_cmd = []
|
||||||
api_deps = []
|
|
||||||
for type,d in [('jar', jar), ('java-source', src), ('javadoc', doc)]:
|
for type,d in [('jar', jar), ('java-source', src), ('javadoc', doc)]:
|
||||||
for a,t in d.iteritems():
|
for a,t in d.iteritems():
|
||||||
api_cmd.append('-s %s:%s:$(location %s)' % (a,type,t))
|
api_cmd.append('-s %s:%s:$(location %s)' % (a,type,t))
|
||||||
api_deps.append(t)
|
|
||||||
|
|
||||||
genrule(
|
genrule(
|
||||||
name = 'api_install',
|
name = 'api_install',
|
||||||
cmd = ' '.join(cmd + api_cmd + ['-a', 'install']),
|
cmd = ' '.join(cmd + api_cmd + ['-a', 'install']),
|
||||||
deps = api_deps + ['//tools/maven:mvn'],
|
|
||||||
out = 'api_install.info',
|
out = 'api_install.info',
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -42,20 +39,16 @@ def maven_package(
|
|||||||
'-a', 'deploy',
|
'-a', 'deploy',
|
||||||
'--repository', repository,
|
'--repository', repository,
|
||||||
'--url', url]),
|
'--url', url]),
|
||||||
deps = api_deps + ['//tools/maven:mvn'],
|
|
||||||
out = 'api_deploy.info',
|
out = 'api_deploy.info',
|
||||||
)
|
)
|
||||||
|
|
||||||
war_cmd = []
|
war_cmd = []
|
||||||
war_deps = []
|
|
||||||
for a,t in war.iteritems():
|
for a,t in war.iteritems():
|
||||||
war_cmd.append('-s %s:war:$(location %s)' % (a,t))
|
war_cmd.append('-s %s:war:$(location %s)' % (a,t))
|
||||||
war_deps.append(t)
|
|
||||||
|
|
||||||
genrule(
|
genrule(
|
||||||
name = 'war_install',
|
name = 'war_install',
|
||||||
cmd = ' '.join(cmd + war_cmd + ['-a', 'install']),
|
cmd = ' '.join(cmd + war_cmd + ['-a', 'install']),
|
||||||
deps = war_deps + ['//tools/maven:mvn'],
|
|
||||||
out = 'war_install.info',
|
out = 'war_install.info',
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -66,6 +59,5 @@ def maven_package(
|
|||||||
'-a', 'deploy',
|
'-a', 'deploy',
|
||||||
'--repository', repository,
|
'--repository', repository,
|
||||||
'--url', url]),
|
'--url', url]),
|
||||||
deps = war_deps + ['//tools/maven:mvn'],
|
|
||||||
out = 'war_deploy.info',
|
out = 'war_deploy.info',
|
||||||
)
|
)
|
||||||
|
Reference in New Issue
Block a user