From 38828ed8609af05a2f8995328ab6d3bb016c5209 Mon Sep 17 00:00:00 2001 From: David Ostrovsky Date: Thu, 30 Oct 2014 21:52:53 +0100 Subject: [PATCH] Update Buck to recent version This version fixes this bug [1] that allows us to eliminate these ugly shell backticks and switch again to escaped macro like invocations: \$(dirname $OUT) [1] https://github.com/facebook/buck/issues/212 Change-Id: Ie43b3ff6dfc89c4d840f2ff75c64ac0a5c6346b6 --- .buckversion | 2 +- gerrit-gwtui/BUCK | 2 +- gerrit-gwtui/gwt.defs | 2 +- tools/default.defs | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.buckversion b/.buckversion index 7bcdf5ef4d..914f3a92c7 100644 --- a/.buckversion +++ b/.buckversion @@ -1 +1 @@ -f0759b0bfff1368bc715371c383dfd8c873f9991 +c38b9899f7952382963cb7822bbdfc9104b42e70 diff --git a/gerrit-gwtui/BUCK b/gerrit-gwtui/BUCK index bc67b52e71..562f2d63e8 100644 --- a/gerrit-gwtui/BUCK +++ b/gerrit-gwtui/BUCK @@ -15,7 +15,7 @@ genrule( ' gerrit_ui/gerrit_ui.nocache.js' + ' gerrit_ui/dbg_gerrit_ui.nocache.js;' + 'unzip -qo $(location :ui_opt);' + - 'mkdir -p `dirname $OUT`;' + + 'mkdir -p \$(dirname $OUT);' + 'zip -qr $OUT .', deps = [ ':ui_dbg', diff --git a/gerrit-gwtui/gwt.defs b/gerrit-gwtui/gwt.defs index 16a653e84c..cd206c0737 100644 --- a/gerrit-gwtui/gwt.defs +++ b/gerrit-gwtui/gwt.defs @@ -56,7 +56,7 @@ def gwt_user_agent_permutations( genrule( name = '%s_gwtxml_gen' % gwt_name, cmd = 'cd $TMP;' + - ('mkdir -p `dirname %s`;' % gwt) + + ('mkdir -p \$(dirname %s);' % gwt) + ('echo "%s">%s;' % (xml, gwt)) + 'zip -qr $OUT .', out = jar, diff --git a/tools/default.defs b/tools/default.defs index 58760071a9..5d57d68c0e 100644 --- a/tools/default.defs +++ b/tools/default.defs @@ -80,7 +80,7 @@ def gerrit_plugin( type = 'plugin', visibility = ['PUBLIC']): from multiprocessing import cpu_count - mf_cmd = 'v=`git describe HEAD`;' + mf_cmd = 'v=\$(git describe HEAD);' if manifest_file: mf_src = [manifest_file] mf_cmd += 'sed "s:@VERSION@:$v:g" $SRCS >$OUT'