Merge branch 'stable-2.14'
* stable-2.14:
Make project.py classpath generation work for standalone plugin
Change-Id: Id53d44a3790e30a76fdcb28ca5d0d5f34623339d
diff --git a/tools/eclipse/project.py b/tools/eclipse/project.py
index e4980b9..f2d34bf 100755
--- a/tools/eclipse/project.py
+++ b/tools/eclipse/project.py
@@ -109,12 +109,12 @@
src = set()
lib = set()
- java_library = re.compile('bazel-out/(?:.*)-fastbuild/bin/(.*)/[^/]+[.]jar$')
+ java_library = re.compile('bazel-out/(?:.*)-fastbuild/bin(.*)/[^/]+[.]jar$')
srcs = re.compile('(.*/external/[^/]+)/jar/(.*)[.]jar')
for p in _query_classpath(MAIN):
m = java_library.match(p)
if m:
- src.add(m.group(1))
+ src.add(m.group(1).lstrip('/'))
else:
if p.startswith("external"):
p = path.join(ext, p)
