Remove outstanding references to buck

Most references are in documentation and comments. The main
developer-visible behavior change is moving the downloaded artifact
cache from ~/.gerritcodereview/buck-cache to bazel-cache, which will
result in re-downloading dependencies on the next build; this had to
happen sooner or later. Alternatives, which are not worth the effort,
include teaching the scripts to accept both locations, or having it
rearrange and/or symlink directories behind the scenes.

There are just a few references remaining, all of which are intentional:

$ git grep -Pi '\bbuck(lets?)?\b' HEAD
HEAD:java/com/google/gerrit/httpd/raw/StaticModule.java:        // https://gerrit-review.googlesource.com/#/c/57570/57/gerrit-httpd/BUCK@32
HEAD:resources/com/google/gerrit/server/mime/mime-types.properties:bucklet = text/x-python
HEAD:resources/com/google/gerrit/server/mime/mime-types.properties:BUCK = text/x-python

Change-Id: Idb93a483451ccf86ba96c379d38008a7894c3f95
This commit is contained in:
Dave Borowitz 2017-11-14 08:40:55 -05:00
parent b457c1936c
commit 9c35979e12
9 changed files with 8 additions and 19 deletions

3
.gitignore vendored
View File

@ -20,7 +20,6 @@
/.settings/org.maven.ide.eclipse.prefs
/bazel-*
/bin/
/buck-out
/eclipse-out
/extras
/gerrit-package-plugins
@ -30,4 +29,4 @@
/plugins/cookbook-plugin/
/test_site
/tools/format
/.vscode
/.vscode

View File

@ -363,18 +363,14 @@ JGit repository.
=== Cleaning The download cache
The cache for downloaded artifacts is located in
`~/.gerritcodereview/buck-cache/downloaded-artifacts`.
`~/.gerritcodereview/bazel-cache/downloaded-artifacts`.
If you really do need to clean the download cache manually, then:
----
rm -rf ~/.gerritcodereview/buck-cache/downloaded-artifacts
rm -rf ~/.gerritcodereview/bazel-cache/downloaded-artifacts
----
[NOTE] When building with Bazel the artifacts are still cached in
`~/.gerritcodereview/buck-cache/downloaded-artifacts`. This allows Bazel to
make use of libraries that were previously downloaded by Buck.
[[local-action-cache]]
To accelerate builds, local action cache can be activated. Note, that this

View File

@ -32,7 +32,7 @@ Configuration for Subprojects in `pom.xml`]
----
* Change the `id`, `bin_sha1`, and `src_sha1` values in the `maven_jar`
for the subproject in `/lib/BUCK` to the `SNAPSHOT` version.
for the subproject in `/WORKSPACE` to the `SNAPSHOT` version.
+
When Gerrit gets released, a release of the subproject has to be done
and Gerrit has to reference the released subproject version.

View File

@ -457,7 +457,7 @@ public class StaticModule extends ServletModule {
GuiceFilterRequestWrapper reqWrapper = new GuiceFilterRequestWrapper(req);
String path = pathInfo(req);
// Special case assets during development that are built by Buck and not
// Special case assets during development that are built by Bazel and not
// served out of the source tree.
//
// In the war case, these are either inlined by vulcanize, or live under

View File

@ -704,9 +704,7 @@ public final class GerritLauncher {
private static boolean includeJar(URL u) {
String path = u.getPath();
return path.endsWith(".jar")
&& !path.endsWith("-src.jar")
&& !path.contains("/buck-out/gen/lib/gwt/");
return path.endsWith(".jar") && !path.endsWith("-src.jar");
}
private GerritLauncher() {}

View File

@ -12,8 +12,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
# Port of Buck native gwt_binary() rule. See discussion in context of
# https://github.com/facebook/buck/issues/109
load("//tools/bzl:genrule2.bzl", "genrule2")
load("//tools/bzl:java.bzl", "java_library2")

View File

@ -25,8 +25,7 @@ from util import hash_file, resolve_url
from zipfile import ZipFile, BadZipfile, LargeZipFile
GERRIT_HOME = path.expanduser('~/.gerritcodereview')
# TODO(davido): Rename in bazel-cache
CACHE_DIR = path.join(GERRIT_HOME, 'buck-cache', 'downloaded-artifacts')
CACHE_DIR = path.join(GERRIT_HOME, 'bazel-cache', 'downloaded-artifacts')
LOCAL_PROPERTIES = 'local.properties'

View File

@ -13,7 +13,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
# TODO(sop): Remove hack after Buck supports Eclipse
from __future__ import print_function
# TODO(davido): use Google style for importing instead:

View File

@ -26,7 +26,7 @@ import sys
import bowerutil
CACHE_DIR = os.path.expanduser(os.path.join(
'~', '.gerritcodereview', 'buck-cache', 'downloaded-artifacts'))
'~', '.gerritcodereview', 'bazel-cache', 'downloaded-artifacts'))
def bower_cmd(bower, *args):