opendev/gerrit
Code Issues Proposed changes

Eclipse: List GWT deps after non-GWT deps

Browse Source 
The stated purpose of separating libs and gwt_libs is to avoid
incorrect versions of classes used elsewhere in Gerrit (e.g. servlet
API 3.0 instead of 3.1). But we were iterating through gwt_libs first,
so this wasn't actually working. Swap the order.

Also change the prefix check for GWT deps to a contains check, as buck
audit at some point started returning absolute paths to jars.

Change-Id: Ic372b6bfaca5a8a1c1b9cc32aaf868a86a91c6ef
This commit is contained in:
Dave Borowitz 2015-12-01 14:02:40 -05:00
parent e5a0457372
commit 004bf2a928
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tools/eclipse/project.py
View File

@ -119,7 +119,7 @@ def gen_classpath():
gwt_lib.add(p)
continue
if p.startswith('buck-out/gen/lib/gwt/'):
if 'buck-out/gen/lib/gwt/' in p:
# gwt_module() depends on huge shaded GWT JARs that import
# incorrect versions of classes for Gerrit. Collect into
# a private grouping for later use.
@ -165,7 +165,7 @@ def gen_classpath():
if path.exists(p):
classpathentry('src', p, out=o)
for libs in [gwt_lib, lib]:
for libs in [lib, gwt_lib]:
for j in sorted(libs):
s = None
if j.endswith('.jar'):