waf: reorganize imports in main wscript

This commit is contained in:
Gustavo Jose de Sousa 2016-02-05 12:21:23 +00:00 committed by Lucas De Marchi
parent 049feb3e9e
commit 1a17d63114
1 changed files with 3 additions and 5 deletions

View File

@ -10,9 +10,7 @@ sys.path.insert(0, 'Tools/ardupilotwaf/')
import ardupilotwaf import ardupilotwaf
import boards import boards
from waflib import ConfigSet, Utils from waflib import Build, ConfigSet, Context, Utils
from waflib.Build import BuildContext
import waflib.Context
# TODO: implement a command 'waf help' that shows the basic tasks a # TODO: implement a command 'waf help' that shows the basic tasks a
# developer might want to do: e.g. how to configure a board, compile a # developer might want to do: e.g. how to configure a board, compile a
@ -35,8 +33,8 @@ def init(ctx):
return return
# define the variant build commands according to the board # define the variant build commands according to the board
for c in waflib.Context.classes: for c in Context.classes:
if not issubclass(c, BuildContext): if not issubclass(c, Build.BuildContext):
continue continue
c.variant = env.BOARD c.variant = env.BOARD