diff --git a/.buckversion b/.buckversion index 46408a5195..6686020de4 100644 --- a/.buckversion +++ b/.buckversion @@ -1 +1 @@ -8204fddf60b25a3c2090f3ef0742fca5d466d562 +d1be554f51fb9b2f090a85fcdbcef3b4dbbef8d7 diff --git a/Documentation/dev-buck.txt b/Documentation/dev-buck.txt index 49a4d85f50..36a6d06c81 100644 --- a/Documentation/dev-buck.txt +++ b/Documentation/dev-buck.txt @@ -106,7 +106,7 @@ To build the Gerrit web application: The output executable WAR will be placed in: ---- - buck-out/gen/gerrit.war + buck-out/gen/gerrit/gerrit.war ---- @@ -121,7 +121,7 @@ To build Gerrit in headless mode, i.e. without the GWT Web UI: 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 @@ project directories in `buck-out/gen`, here as example for plugin API: ---- 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 output JAR files for individual plugins will be placed in: 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 @@ placed in: 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 @@ To build the executable WAR with the documentation included: The WAR file will be placed in: ---- - buck-out/gen/withdocs.war + buck-out/gen/withdocs/withdocs.war ---- [[soyc]] @@ -272,7 +272,7 @@ all core plugins: 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 b64973a36e..4959cedc15 100644 --- a/Documentation/dev-readme.txt +++ b/Documentation/dev-readme.txt @@ -87,7 +87,7 @@ After compiling (above), run Gerrit's 'init' command to create a 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 @@ The daemon can be directly launched from the build area, without 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 @@ Gerrit Inspect can be started by adding '-s' option to the 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 @@ The embedded H2 database can be queried and updated from the 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 9efe6b8e1c..f66494484e 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 @@ public abstract class PluginDaemonTest extends AbstractDaemonTest { 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 597fcde803..5f0fc6c99e 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 @@ public class JettyServer { 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 0bdff3cabf..e311ff88b4 100644 --- a/tools/BUCK +++ b/tools/BUCK @@ -42,7 +42,7 @@ def os_path(): 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 f3300faec9..63afd3d7f1 100755 --- a/tools/eclipse/project.py +++ b/tools/eclipse/project.py @@ -224,8 +224,8 @@ try: 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: