Merge "Update Buck to recent version"

This commit is contained in:
David Pursehouse 2014-10-31 07:24:39 +00:00 committed by Gerrit Code Review
commit 51e708c464
4 changed files with 4 additions and 4 deletions

View File

@ -1 +1 @@
f0759b0bfff1368bc715371c383dfd8c873f9991 c38b9899f7952382963cb7822bbdfc9104b42e70

View File

@ -15,7 +15,7 @@ genrule(
' gerrit_ui/gerrit_ui.nocache.js' + ' gerrit_ui/gerrit_ui.nocache.js' +
' gerrit_ui/dbg_gerrit_ui.nocache.js;' + ' gerrit_ui/dbg_gerrit_ui.nocache.js;' +
'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 = [ deps = [
':ui_dbg', ':ui_dbg',

View File

@ -56,7 +56,7 @@ def gwt_user_agent_permutations(
genrule( genrule(
name = '%s_gwtxml_gen' % gwt_name, name = '%s_gwtxml_gen' % gwt_name,
cmd = 'cd $TMP;' + cmd = 'cd $TMP;' +
('mkdir -p `dirname %s`;' % gwt) + ('mkdir -p \$(dirname %s);' % gwt) +
('echo "%s">%s;' % (xml, gwt)) + ('echo "%s">%s;' % (xml, gwt)) +
'zip -qr $OUT .', 'zip -qr $OUT .',
out = jar, out = jar,

View File

@ -80,7 +80,7 @@ def gerrit_plugin(
type = 'plugin', type = 'plugin',
visibility = ['PUBLIC']): visibility = ['PUBLIC']):
from multiprocessing import cpu_count from multiprocessing import cpu_count
mf_cmd = 'v=`git describe HEAD`;' mf_cmd = 'v=\$(git describe HEAD);'
if manifest_file: if manifest_file:
mf_src = [manifest_file] mf_src = [manifest_file]
mf_cmd += 'sed "s:@VERSION@:$v:g" $SRCS >$OUT' mf_cmd += 'sed "s:@VERSION@:$v:g" $SRCS >$OUT'