FWGS
/
waf
mirror of https://gitlab.com/ita1024/waf.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

eclipse.py: support also if passed srcdir is a Node or a list of directories (which are valid inputs for javaw.py)

This commit is contained in:
fedepell 2018-01-17 15:32:29 +01:00 committed by ita1024
parent d21446ff71
commit daa0c135e1
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
waflib/extras/eclipse.py
View File

@ -14,7 +14,7 @@ $ waf configure eclipse
""" """
import sys, os import sys, os
from waflib import Utils, Logs, Context, Build, TaskGen, Scripting, Errors from waflib import Utils, Logs, Context, Build, TaskGen, Scripting, Errors, Node
from xml.dom.minidom import Document from xml.dom.minidom import Document
STANDARD_INCLUDES = [ '/usr/local/include', '/usr/include' ] STANDARD_INCLUDES = [ '/usr/local/include', '/usr/include' ]
@ -90,11 +90,18 @@ class eclipse(Build.BuildContext):
java_src = tg.path.relpath() java_src = tg.path.relpath()
java_srcdir = getattr(tg, 'srcdir', None) java_srcdir = getattr(tg, 'srcdir', None)
if java_srcdir: if java_srcdir:
if java_src == '.': if isinstance(java_srcdir, Node.Node):
java_src = java_srcdir java_srcdir = [java_srcdir]
else: for x in Utils.to_list(java_srcdir):
java_src += os.sep + java_srcdir if isinstance(x, Node.Node):
javasrcpath.append(java_src) x = x.name
if java_src == '.':
this_src = x
else:
this_src = java_src + os.sep + x
javasrcpath.append(this_src)
else:
javasrcpath.append(java_src)
hasjava = True hasjava = True
tg.post() tg.post()