Update buck to the latest version
This version includes a lot of new features and improvements,
including:
* Switched to top-down-building, which should generally make builds
faster. The old behavior can be bypassed by passing --deep on the
command line [1]
* New query command was added (inspired by Bazel) [2]
* Performance improvement in file globbing
Extend tools/eclipse/project.py to pass the --deep option to ask Buck
to execute bottom-up build when generating the Eclipse project. This is
needed otherwise after using the buck clean command only the gerrit.war
file would be fetched from the cache and the buck-out/gen/lib folder
would remain empty.
With [3] genrule output is now namespaced with the genrule name. Adapt
documentation and references in the code to the new location of Buck
artifacts. Because of this change, `buck clean` must be issued after
Buck upgrade, otherwise the build would fail. The same prolem exists
when switching between branches: `buck clean` must be issued, otherwise
the build would fail.
Test plan:
* buck build release
* buck build api_install
* buck test
* install and verify new gerrit site
* upgrade and verify existing gerrit site
* reindex existing gerrit site
* verify that tools/eclipse/project.py produces sane Eclipse project
* verify that unit test execution from Eclipse works
* verify that daemon started from Eclipse works
* verify that GWT SDM debug session started from Eclipe works
[1] https://github.com/facebook/buck/commit/217cec33bcd0b0eb7ebd0c444938495379267d60
[2] https://buckbuild.com/command/query.html
[3] https://github.com/facebook/buck/commit/c92ef212b53fff08a8452649b4d4faadc6b89b11
Change-Id: Ib3f22e70b7cb9eb9349618f2bcc018bf799c40f8
diff --git a/.buckversion b/.buckversion
index 46408a5..6686020 100644
--- a/.buckversion
+++ b/.buckversion
@@ -1 +1 @@
-8204fddf60b25a3c2090f3ef0742fca5d466d562
+d1be554f51fb9b2f090a85fcdbcef3b4dbbef8d7
diff --git a/Documentation/dev-buck.txt b/Documentation/dev-buck.txt
index 49a4d85..36a6d06 100644
--- a/Documentation/dev-buck.txt
+++ b/Documentation/dev-buck.txt
@@ -106,7 +106,7 @@
The output executable WAR will be placed in:
----
- buck-out/gen/gerrit.war
+ buck-out/gen/gerrit/gerrit.war
----
@@ -121,7 +121,7 @@
The output executable WAR will be placed in:
----
- buck-out/gen/headless.war
+ buck-out/gen/headless/headless.war
----
=== Extension and Plugin API JAR Files
@@ -137,8 +137,8 @@
----
buck-out/gen/gerrit-plugin-api/plugin-api.jar
+ buck-out/gen/gerrit-plugin-api/plugin-api-javadoc/plugin-api-javadoc.jar
buck-out/gen/gerrit-plugin-api/plugin-api-src.jar
- buck-out/gen/gerrit-plugin-api/plugin-api-javadoc.jar
----
Install {extension,plugin,gwt}-api to the local maven repository:
@@ -170,7 +170,7 @@
The JAR files will also be packaged in:
----
- buck-out/gen/plugins/core.zip
+ buck-out/gen/plugins/core/core.zip
----
To build a specific plugin:
@@ -224,7 +224,7 @@
The html files will also be bundled into `searchfree.zip` in this location:
----
- buck-out/gen/Documentation/searchfree.zip
+ buck-out/gen/Documentation/searchfree/searchfree.zip
----
To build the executable WAR with the documentation included:
@@ -236,7 +236,7 @@
The WAR file will be placed in:
----
- buck-out/gen/withdocs.war
+ buck-out/gen/withdocs/withdocs.war
----
[[soyc]]
@@ -272,7 +272,7 @@
The output release WAR will be placed in:
----
- buck-out/gen/release.war
+ buck-out/gen/release/release.war
----
[[all]]
diff --git a/Documentation/dev-readme.txt b/Documentation/dev-readme.txt
index b64973a..4959ced 100644
--- a/Documentation/dev-readme.txt
+++ b/Documentation/dev-readme.txt
@@ -87,7 +87,7 @@
testing site for development use:
----
- java -jar buck-out/gen/gerrit.war init -d ../gerrit_testsite
+ java -jar buck-out/gen/gerrit/gerrit.war init -d ../gerrit_testsite
----
Accept defaults by pressing Enter until 'init' completes, or add
@@ -130,7 +130,7 @@
copying to the test site:
----
- java -jar buck-out/gen/gerrit.war daemon -d ../gerrit_testsite
+ java -jar buck-out/gen/gerrit/gerrit.war daemon -d ../gerrit_testsite
----
=== Running the Daemon with Gerrit Inspector
@@ -149,7 +149,7 @@
command used to launch the daemon:
----
- java -jar buck-out/gen/gerrit.war daemon -d ../gerrit_testsite -s
+ java -jar buck-out/gen/gerrit/gerrit.war daemon -d ../gerrit_testsite -s
----
Gerrit Inspector examines Java libraries first, then loads
@@ -176,7 +176,7 @@
command line. If the daemon is not currently running:
----
- java -jar buck-out/gen/gerrit.war gsql -d ../gerrit_testsite
+ java -jar buck-out/gen/gerrit/gerrit.war gsql -d ../gerrit_testsite
----
Or, if it is running and the database is in use, connect over SSH
diff --git a/gerrit-acceptance-framework/src/test/java/com/google/gerrit/acceptance/PluginDaemonTest.java b/gerrit-acceptance-framework/src/test/java/com/google/gerrit/acceptance/PluginDaemonTest.java
index 9efe6b8..f664944 100644
--- a/gerrit-acceptance-framework/src/test/java/com/google/gerrit/acceptance/PluginDaemonTest.java
+++ b/gerrit-acceptance-framework/src/test/java/com/google/gerrit/acceptance/PluginDaemonTest.java
@@ -189,7 +189,7 @@
private Properties loadBuckProperties() throws IOException {
Properties properties = new Properties();
- Path propertiesPath = gen.resolve("tools").resolve("buck.properties");
+ Path propertiesPath = gen.resolve(Paths.get("tools/buck/buck.properties"));
if (Files.exists(propertiesPath)) {
try (InputStream in = Files.newInputStream(propertiesPath)) {
properties.load(in);
diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/http/jetty/JettyServer.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/http/jetty/JettyServer.java
index 597fcde..5f0fc6c 100644
--- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/http/jetty/JettyServer.java
+++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/http/jetty/JettyServer.java
@@ -682,7 +682,7 @@
throws FileNotFoundException, IOException {
Properties properties = new Properties();
try (InputStream in = new FileInputStream(
- gen.resolve(Paths.get("tools/buck.properties")).toFile())) {
+ gen.resolve(Paths.get("tools/buck/buck.properties")).toFile())) {
properties.load(in);
}
return properties;
diff --git a/tools/BUCK b/tools/BUCK
index 0bdff3c..e311ff8 100644
--- a/tools/BUCK
+++ b/tools/BUCK
@@ -42,7 +42,7 @@
return environ.get('PATH')
genrule(
- name = 'buck.properties',
+ name = 'buck',
cmd = 'echo buck=`which buck`>$OUT;' +
("echo PATH=\''%s'\' >>$OUT;" % shquote(os_path())),
deps = [],
diff --git a/tools/eclipse/project.py b/tools/eclipse/project.py
index f3300fa..63afd3d 100755
--- a/tools/eclipse/project.py
+++ b/tools/eclipse/project.py
@@ -224,8 +224,8 @@
gen_factorypath()
try:
- targets = ['//tools:buck.properties'] + MAIN + GWT
- check_call(['buck', 'build'] + targets)
+ targets = ['//tools:buck'] + MAIN + GWT
+ check_call(['buck', 'build', '--deep'] + targets)
except CalledProcessError as err:
exit(1)
except KeyboardInterrupt:
