Merge remote-tracking branch 'facebook/master'

buck.iml

@@ -121,7 +121,7 @@
     <orderEntry type="library" name="protobuf-java-3.5.1" level="project" />
     <orderEntry type="library" name="grpc" level="project" />
     <orderEntry type="library" name="opencensus-api-0.12.2" level="project" />
-    <orderEntry type="library" name="googleapis" level="project" />
+    <orderEntry type="library" name="remote-apis" level="project" />
     <orderEntry type="library" name="netty-all-4.1.24.Final" level="project" />
     <orderEntry type="library" name="guava-20.0" level="project" />
     <orderEntry type="library" name="bundle" level="project" />

build.xml

@@ -125,7 +125,7 @@
     <include name="jna/jna-platform-4.5.1.jar" />
     <include name="sqlite/sqlite-jdbc-3.20.0.jar" />
     <include name="bazel/skylark-lang_deploy.jar" />
-    <include name="googleapis/googleapis.jar" />
+    <include name="remote-apis/remote-apis.jar" />
   </fileset>
 
   <fileset dir="${third-party.dir}/java" id="third-party.jars">
@@ -135,7 +135,7 @@
     <include name="android/sdk-common-25.3.0.jar" />
     <include name="aopalliance/aopalliance.jar" />
     <include name="aosp/apksig.jar" />
-    <include name="asm/asm*-6.0.jar" />
+    <include name="asm/asm*-6.2.1.jar" />
     <include name="bazel/skylark-lang_deploy.jar" />
     <include name="bundletool/bundle.jar" />
     <include name="closure-templates/soy-excluding-deps.jar" />
@@ -810,12 +810,12 @@
       <zipfileset excludes="**/*SF **/*RSA" src="${third-party.dir}/java/jacoco/org.jacoco.core-0.8.0.jar"/>
       <zipfileset excludes="**/*SF **/*RSA" src="${third-party.dir}/java/jacoco/org.jacoco.report-0.8.0.jar"/>
       <zipfileset excludes="**/*SF **/*RSA" src="${third-party.dir}/java/plexus/plexus-utils-3.0.20.jar"/>
-      <zipfileset includes="**/*.class" src="${third-party.dir}/java/asm/asm-6.0.jar" />
-      <zipfileset includes="**/*.class" src="${third-party.dir}/java/asm/asm-analysis-6.0.jar" />
-      <zipfileset includes="**/*.class" src="${third-party.dir}/java/asm/asm-commons-6.0.jar" />
-      <zipfileset includes="**/*.class" src="${third-party.dir}/java/asm/asm-tree-6.0.jar" />
-      <zipfileset includes="**/*.class" src="${third-party.dir}/java/asm/asm-util-6.0.jar" />
-      <zipfileset includes="**/*.class" src="${third-party.dir}/java/asm/asm-xml-6.0.jar" />
+      <zipfileset includes="**/*.class" src="${third-party.dir}/java/asm/asm-6.2.1.jar" />
+      <zipfileset includes="**/*.class" src="${third-party.dir}/java/asm/asm-analysis-6.2.1.jar" />
+      <zipfileset includes="**/*.class" src="${third-party.dir}/java/asm/asm-commons-6.2.1.jar" />
+      <zipfileset includes="**/*.class" src="${third-party.dir}/java/asm/asm-tree-6.2.1.jar" />
+      <zipfileset includes="**/*.class" src="${third-party.dir}/java/asm/asm-util-6.2.1.jar" />
+      <zipfileset includes="**/*.class" src="${third-party.dir}/java/asm/asm-xml-6.2.1.jar" />
       <zipfileset includes="**/*.class" src="${third-party.dir}/java/guava/guava-23.3-jre.jar"/>
       <fileset dir="${classes.dir}">
           <include name="com/facebook/buck/jvm/java/coverage/ReportGenerator.class"/>

docs/__common.soy

@@ -747,13 +747,13 @@ docsearch({
 {template .cmd_link}
   {if not $section}
     {if $rendered_text}
-      <a href="{ROOT}command/{$name}.html"><code>{$rendered_text}</code></a>
+      <a href="{ROOT}command/{$name}.html">{$rendered_text|noAutoescape}</a>
     {else}
       <a href="{ROOT}command/{$name}.html"><code>buck {$name}</code></a>
     {/if}
   {else}
     {if $rendered_text}
-      <a href="{ROOT}command/{$name}.html#{$section}"><code>{$rendered_text}</code></a>
+      <a href="{ROOT}command/{$name}.html#{$section}">{$rendered_text|noAutoescape}</a>
     {else}
       <a href="{ROOT}command/{$name}.html#{$section}"><code>{$section}</code></a>
     {/if}

docs/command/audit.soy

@@ -98,7 +98,7 @@ For more examples, see the command descriptions and <strong>Examples</strong> se
 
     <p>
     Note that properties and values specified 
-    with {call buck.cmd_link}{param name: 'common_parameters' /}{param rendered_text: '--config' /}{/call} are 
+    with {call buck.cmd_link}{param name: 'common_parameters' /}{param rendered_text: '<code>--config</code>' /}{/call} are 
     not surfaced by this command, and those properties and values
     override both <code>.buckconfig</code> and <code>.buckconfig.local</code>.
     </p>

docs/command/common_parameters.soy

@@ -8,10 +8,10 @@
 {template .verbose_levels}
   <tr> 
     <td class="verbose-levels">  
-      <code style="border: none">{$value}</code>
+      <code class="not-inline">{$value}</code>
     </td>
     <td class="verbose-levels"> 
-      <code style="border: none">{$bool}</code>
+      <code class="not-inline">{$bool}</code>
     </td>
     <td class="verbose-levels"> 
       {$description|noAutoescape}
@@ -248,7 +248,7 @@ buck build --config-file debug.buckconfig
 </p>
 
 <p>
-This <code>--config-file</code> parameter provides functionality similar 
+The <code>--config-file</code> parameter provides functionality similar 
 to <code>--flagfile</code>, but with <code>.buckconfig</code> syntax 
 rather than command-line parameter syntax.
 </p>
@@ -258,6 +258,81 @@ Any values specified using <code>--config-file</code> override values
 specified in <code>.buckconfig</code> and <code>.buckconfig.local</code>.
 </p>
 
+<p>
+  You can specify the path to the configuration file in one of three
+  ways.
+</p>
+
+<h5>
+  Use a path that is relative to the directory that contains the current
+  cell's <code>.buckconfig</code>.
+</h5>
+
+<p>
+<pre>
+{literal}
+--config-file relative/path/to/file.buckconfig
+{/literal}
+</pre>
+</p>
+
+<h5>
+  Use a path that is relative to the directory that contains 
+  a <em>specified</em> cell's <code>.buckconfig</code>.
+</h5>
+
+<p>
+<pre>
+{literal}
+--config-file cell&#x2F;&#x2F;path/to/file.buckconfig
+{/literal}
+</pre>
+</p>
+
+<h5>
+  Use an absolute path from the root of your file system.
+</h5>
+
+<p>
+<pre>
+{literal}
+--config-file /absolute/path/to/file.buckconfig
+{/literal}
+</pre>
+</p>
+
+<p>
+  You can also specify a particular cell to which to apply the
+  configuration.  By default, the settings in the configuration file
+  apply to <em>all</em> cells in the current build. 
+</p>
+
+<h5>Apply the configuration only to the current cell.</h5>
+
+<p>
+<pre>
+{literal}
+--config-file &#x2F;&#x2F;=&lt;path-to-config-file>
+{/literal}
+</pre>
+</p>
+
+<h5>Apply the configuration only to a specified target cell.</h5>
+
+<p>
+<pre>
+{literal}
+--config-file &lt;target-cell>=&lt;path-to-config-file>
+{/literal}
+</pre>
+</p>
+
+<p>
+  If you specify <code>*</code> as the target cell, the configuration is
+  applied to <em>all</em> the cells in the build. This is the default,
+  but this syntax enables you to be explicit.
+</p>
+
   {/param}
 {/call}
 
@@ -359,7 +434,7 @@ Lines in flag files must not have any leading or trailing white space.
 
 <p>
 The equals sign (<code>=</code>) separates the specified property and
-value. There should be no whitespace between the property and
+value. There should be no white space between the property and
 equals sign, nor between the equals sign and the value. 
 <p>
 

docs/command/exit_codes.soy

@@ -14,10 +14,10 @@
 {template .exit_codes}
   <tr> 
     <td class="exit-codes">  
-      <code>{$value}</code>
+      <code class="not-inline">{$value}</code>
     </td>
     <td class="exit-codes"> 
-      <code>{$enum}</code>
+      <code class="not-inline">{$enum}</code>
     </td>
     <td class="exit-codes"> 
       {$description|noAutoescape}
@@ -65,15 +65,15 @@ command exits.
   {param enum: 'BUSY' /}
   {param description}
   Buck daemon is busy processing another command. 
-  For more information, see {call buck.cmd_link}{param name: 'buckd' /}{param rendered_text: 'buckd' /}{/call}.
+  For more information, see {call buck.cmd_link}{param name: 'buckd' /}{param rendered_text: '<strong>Buck Daemon (buckd)</strong>' /}{/call}.
   {/param}
 {/call}
 {call .exit_codes}
   {param value: '3' /}
   {param enum: 'COMMANDLINE_ERROR' /}
   {param description}
   Incorrect user-supplied command-line options. 
-  For more information, see {call buck.cmd_link}{param name: 'common_parameters' /}{param rendered_text: 'Common Parameters' /}{/call} or 
+  For more information, see {call buck.cmd_link}{param name: 'common_parameters' /}{param rendered_text: '<strong>Common Parameters</strong>' /}{/call} or 
   the topic page for the specific command that you executed.
   {/param}
 {/call}

docs/concept/what_makes_buck_so_fast.soy

@@ -143,7 +143,7 @@ the project are using the same versions of these tools.
 Note that Buck reparses the build files in a project if it detects
 certain changes in the build's  configuration. Such a configuration change could be a
 change in the <code>.buckconfig</code> file itself or the result of specifying 
-the {call buck.cmd_link}{param name: 'common_parameters' /}{param rendered_text: '--config'/}{/call} command-line option.  
+the {call buck.cmd_link}{param name: 'common_parameters' /}{param rendered_text: '<code>--config</code>'/}{/call} command-line option.  
 </p>
 
 

docs/rule/cxx_genrule.soy

@@ -28,7 +28,7 @@ The information exposed through these tools and configuration options is a refle
 Buck's built-in settings, 
 the settings in {call buck.concept_link}{param page: 'buckconfig' /}{param name: '.buckconfig and .buckconfig.local' /}{/call},
 and the result of various command-line overrides specified through 
-the {sp}{call buck.cmd_link}{param name: 'common_parameters' /}{param rendered_text: '--config' /}{/call} command-line option.  
+the {sp}{call buck.cmd_link}{param name: 'common_parameters' /}{param rendered_text: '<code>--config</code>' /}{/call} command-line option.  
 </p>
 
 <p>

docs/soy2html.sh

@@ -34,4 +34,4 @@ OUTPUT_DIR="$1"
 # Generate javadoc and include it in the output directory.
 ant javadoc-with-android
 mkdir -p "${OUTPUT_DIR}"/javadoc/
-cp -r build/javadoc-with-android/* "${OUTPUT_DIR}"/javadoc/
+cp -r ant-out/javadoc-with-android/* "${OUTPUT_DIR}"/javadoc/

docs/static/buck.css

@@ -86,6 +86,23 @@ code {
     padding: 0.1em;
 }
 
+/*
+ *  
+ *  Use this class for code-formatted text that is not inline and also
+ *  not in a code block, for example, code-formatted text in a table
+ *  cell, where drawing a box around the code--as in the standard `code`
+ *  style above--looks redundant and somewhat strange: boxes inside
+ *  boxes.
+ *  
+ */
+code.not-inline {
+    background: #fff;
+    letter-spacing: 0.02em;
+    border: none;
+    border-radius: 3px;
+    padding: 0.1em;
+}
+
 pre, code {
     font-size: 14px;
 }

jitpack.yml

@@ -1,5 +1,9 @@
 install:
    - set -exo pipefail
+   - mkdir python_tmp
+   - wget https://github.com/kageiit/jitpack-python/releases/download/2.7/python-2.7.tar.gz -O python_tmp/python.tar.gz
+   - tar -C python_tmp -xf python_tmp/python.tar.gz --strip-components=1
+   - export PATH="$PATH:python_tmp/bin"
    - ant
    - PEX=$(bin/buck build buck --show-output | awk '{print $2}')
    - SHA=$(git rev-parse HEAD)

programs/classpaths

@@ -82,6 +82,7 @@ third-party/java/stringtemplate/ST-4.0.8.jar
 third-party/java/thrift/libthrift-0.10.0-patched.jar
 third-party/java/xz-java-1.5/xz-1.5.jar
 third-party/java/bazel/skylark-lang_deploy.jar
+third-party/java/remote-apis/remote-apis.jar
 # maven/aether libs
 third-party/java/aether/aether-api-1.0.2.v20150114.jar
 third-party/java/aether/aether-connector-basic-1.0.2.v20150114.jar

src-gen/com/facebook/remoteexecution/cas/BatchReadBlobsRequest.java

@@ -206,16 +206,16 @@ public void read(TProtocol iprot) throws TException {
         case REQUESTS:
           if (field.type == TType.LIST) {
             {
-              TList _list24 = iprot.readListBegin();
-              this.requests = new ArrayList<ReadBlobRequest>(Math.max(0, _list24.size));
-              for (int _i25 = 0; 
-                   (_list24.size < 0) ? iprot.peekList() : (_i25 < _list24.size); 
-                   ++_i25)
+              TList _list20 = iprot.readListBegin();
+              this.requests = new ArrayList<ReadBlobRequest>(Math.max(0, _list20.size));
+              for (int _i21 = 0; 
+                   (_list20.size < 0) ? iprot.peekList() : (_i21 < _list20.size); 
+                   ++_i21)
               {
-                ReadBlobRequest _elem26;
-                _elem26 = new ReadBlobRequest();
-                _elem26.read(iprot);
-                this.requests.add(_elem26);
+                ReadBlobRequest _elem22;
+                _elem22 = new ReadBlobRequest();
+                _elem22.read(iprot);
+                this.requests.add(_elem22);
               }
               iprot.readListEnd();
             }
@@ -244,8 +244,8 @@ public void write(TProtocol oprot) throws TException {
       oprot.writeFieldBegin(REQUESTS_FIELD_DESC);
       {
         oprot.writeListBegin(new TList(TType.STRUCT, this.requests.size()));
-        for (ReadBlobRequest _iter27 : this.requests)        {
-          _iter27.write(oprot);
+        for (ReadBlobRequest _iter23 : this.requests)        {
+          _iter23.write(oprot);
         }
         oprot.writeListEnd();
       }