From feeb212308d935642c681f1f1e367535f5c5d6a0 Mon Sep 17 00:00:00 2001 From: David Ostrovsky Date: Wed, 27 Jan 2016 23:37:47 +0100 Subject: [PATCH] Update Buck to newest version Now, that cross-cell support is implemented: [1] we can share rules between projects. Cell is a container with its own buck-out directory. The Buck design allows to replace a cell with alternative location. This is a preparation change to support cross-cell dependencies. The prerequisite for the hijacked cell to work properly, is that the classpaths are always represented as absolute paths. That was not the case in Buck implementation and thus classpath resolution across cell boundaries was broken. This got fixed in: [2], [3]. [1] https://github.com/facebook/buck/issues/116 [2] https://github.com/facebook/buck/issues/545 [3] https://github.com/facebook/buck/pull/558 Change-Id: I3b17129c0f7ca5801f03091fff5651fb63d1482f --- .buckversion | 2 +- tools/eclipse/project.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.buckversion b/.buckversion index 2fa755d254..561a769f10 100644 --- a/.buckversion +++ b/.buckversion @@ -1 +1 @@ -6e4be2b06238f6dfa07cdc283255b2454d7712c6 +ca8d6cbac373a690f543c5159eec0116e76187a9 diff --git a/tools/eclipse/project.py b/tools/eclipse/project.py index 9fbede3a78..d36e5039b7 100755 --- a/tools/eclipse/project.py +++ b/tools/eclipse/project.py @@ -112,7 +112,8 @@ def gen_classpath(): gwt_lib = set() plugins = set() - java_library = re.compile(r'[^/]+/gen/(.*)/lib__[^/]+__output/[^/]+[.]jar$') + # Classpath entries are absolute for cross-cell support + java_library = re.compile('.*/buck-out/gen/(.*)/lib__[^/]+__output/[^/]+[.]jar$') for p in _query_classpath(MAIN): if p.endswith('-src.jar'): # gwt_module() depends on -src.jar for Java to JavaScript compiles.