Bazel: Fix eclipse classpath generation
I2b065a8ec exposed sources in GWT UI plugin API. Given that classpath generation tool chain depends on GWT UI plugin API, the transitive closure was now included in the Eclipse classpath. But we don't want to include the source JARs, because the source directories themself already included. Reported-By: Hector Oswaldo Caballero <hector.caballero@ericsson.com> Change-Id: Iaef7eecba48f08f327dce6af258d45408850d859
This commit is contained in:
@@ -170,10 +170,6 @@ def gen_classpath(ext):
|
||||
m = java_library.match(p)
|
||||
if m:
|
||||
gwt_src.add(m.group(1))
|
||||
# Exception: we need source here for GWT SDM mode to work
|
||||
if p.endswith('libEdit.jar'):
|
||||
p = p[:-4] + '-src.jar'
|
||||
lib.add(p)
|
||||
|
||||
for s in sorted(src):
|
||||
out = None
|
||||
@@ -213,10 +209,18 @@ def gen_classpath(ext):
|
||||
p = path.join(prefix, "jar", "%s-src.jar" % suffix)
|
||||
if path.exists(p):
|
||||
s = p
|
||||
# TODO(davido): make plugins actually work
|
||||
if args.plugins:
|
||||
classpathentry('lib', j, s, exported=True)
|
||||
else:
|
||||
# Filter out the source JARs that we pull through transitive closure of
|
||||
# GWT plugin API (we add source directories themself). Exception is
|
||||
# libEdit-src.jar, that is needed for GWT SDM to work.
|
||||
m = java_library.match(j)
|
||||
if m:
|
||||
if m.group(1).startswith("gerrit-") and \
|
||||
j.endswith("-src.jar") and \
|
||||
not j.endswith("libEdit-src.jar"):
|
||||
continue
|
||||
classpathentry('lib', j, s)
|
||||
|
||||
for s in sorted(gwt_src):
|
||||
|
||||
Reference in New Issue
Block a user