3.0 prep
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
This commit is contained in:
parent
ef1de9ecaf
commit
ecbd5ca720
|
@ -24,6 +24,7 @@ BitBake build tools.
|
||||||
#
|
#
|
||||||
# Based on functions from the base bb module, Copyright 2003 Holger Schurig
|
# Based on functions from the base bb module, Copyright 2003 Holger Schurig
|
||||||
|
|
||||||
|
from __future__ import absolute_import
|
||||||
from __future__ import print_function
|
from __future__ import print_function
|
||||||
import os, re
|
import os, re
|
||||||
import bb
|
import bb
|
||||||
|
@ -727,18 +728,18 @@ class Fetch(object):
|
||||||
key = self._revision_key(url, ud, d)
|
key = self._revision_key(url, ud, d)
|
||||||
return "%s-%s" % (key, bb.data.getVar("PN", d, True) or "")
|
return "%s-%s" % (key, bb.data.getVar("PN", d, True) or "")
|
||||||
|
|
||||||
import cvs
|
from . import cvs
|
||||||
import git
|
from . import git
|
||||||
import local
|
from . import local
|
||||||
import svn
|
from . import svn
|
||||||
import wget
|
from . import wget
|
||||||
import svk
|
from . import svk
|
||||||
import ssh
|
from . import ssh
|
||||||
import perforce
|
from . import perforce
|
||||||
import bzr
|
from . import bzr
|
||||||
import hg
|
from . import hg
|
||||||
import osc
|
from . import osc
|
||||||
import repo
|
from . import repo
|
||||||
|
|
||||||
methods.append(local.Local())
|
methods.append(local.Local())
|
||||||
methods.append(wget.Wget())
|
methods.append(wget.Wget())
|
||||||
|
|
|
@ -25,6 +25,7 @@ BitBake build tools.
|
||||||
#
|
#
|
||||||
# Based on functions from the base bb module, Copyright 2003 Holger Schurig
|
# Based on functions from the base bb module, Copyright 2003 Holger Schurig
|
||||||
|
|
||||||
|
from future_builtins import zip
|
||||||
import os
|
import os
|
||||||
import bb
|
import bb
|
||||||
from bb import data
|
from bb import data
|
||||||
|
|
|
@ -21,6 +21,8 @@
|
||||||
# with this program; if not, write to the Free Software Foundation, Inc.,
|
# with this program; if not, write to the Free Software Foundation, Inc.,
|
||||||
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||||
|
|
||||||
|
from __future__ import absolute_import
|
||||||
|
from future_builtins import filter
|
||||||
import bb, re, string
|
import bb, re, string
|
||||||
from bb import methodpool
|
from bb import methodpool
|
||||||
import itertools
|
import itertools
|
||||||
|
|
|
@ -25,12 +25,14 @@
|
||||||
# with this program; if not, write to the Free Software Foundation, Inc.,
|
# with this program; if not, write to the Free Software Foundation, Inc.,
|
||||||
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||||
|
|
||||||
|
from __future__ import absolute_import
|
||||||
import re, bb, os
|
import re, bb, os
|
||||||
import bb.fetch, bb.build, bb.utils
|
import bb.fetch, bb.build, bb.utils
|
||||||
from bb import data
|
from bb import data
|
||||||
|
|
||||||
from ConfHandler import include, init
|
from . import ConfHandler
|
||||||
from bb.parse import resolve_file, ast
|
from .. import resolve_file, ast
|
||||||
|
from .ConfHandler import include, init
|
||||||
|
|
||||||
# For compatibility
|
# For compatibility
|
||||||
bb.deprecate_import(__name__, "bb.parse", ["vars_from_file"])
|
bb.deprecate_import(__name__, "bb.parse", ["vars_from_file"])
|
||||||
|
@ -231,10 +233,9 @@ def feeder(lineno, s, fn, root, statements):
|
||||||
ast.handleInherit(statements, m)
|
ast.handleInherit(statements, m)
|
||||||
return
|
return
|
||||||
|
|
||||||
from bb.parse import ConfHandler
|
|
||||||
return ConfHandler.feeder(lineno, s, fn, statements)
|
return ConfHandler.feeder(lineno, s, fn, statements)
|
||||||
|
|
||||||
# Add us to the handlers list
|
# Add us to the handlers list
|
||||||
from bb.parse import handlers
|
from .. import handlers
|
||||||
handlers.append({'supports': supports, 'handle': handle, 'init': init})
|
handlers.append({'supports': supports, 'handle': handle, 'init': init})
|
||||||
del handlers
|
del handlers
|
||||||
|
|
|
@ -25,7 +25,9 @@ File parsers for the BitBake build tools.
|
||||||
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||||
#
|
#
|
||||||
# Based on functions from the base bb module, Copyright 2003 Holger Schurig
|
# Based on functions from the base bb module, Copyright 2003 Holger Schurig
|
||||||
__version__ = '1.0'
|
|
||||||
|
|
||||||
import ConfHandler
|
from __future__ import absolute_import
|
||||||
import BBHandler
|
from . import ConfHandler
|
||||||
|
from . import BBHandler
|
||||||
|
|
||||||
|
__version__ = '1.0'
|
||||||
|
|
|
@ -44,6 +44,8 @@
|
||||||
|
|
||||||
"""
|
"""
|
||||||
|
|
||||||
|
from __future__ import division
|
||||||
|
|
||||||
import os, sys, curses, itertools, time
|
import os, sys, curses, itertools, time
|
||||||
import bb
|
import bb
|
||||||
import xmlrpclib
|
import xmlrpclib
|
||||||
|
@ -199,8 +201,8 @@ class NCursesUI:
|
||||||
|
|
||||||
main_left = 0
|
main_left = 0
|
||||||
main_top = 0
|
main_top = 0
|
||||||
main_height = ( height / 3 * 2 )
|
main_height = ( height // 3 * 2 )
|
||||||
main_width = ( width / 3 ) * 2
|
main_width = ( width // 3 ) * 2
|
||||||
clo_left = main_left
|
clo_left = main_left
|
||||||
clo_top = main_top + main_height
|
clo_top = main_top + main_height
|
||||||
clo_height = height - main_height - main_top - 1
|
clo_height = height - main_height - main_top - 1
|
||||||
|
@ -266,7 +268,7 @@ class NCursesUI:
|
||||||
mw.appendText("Parsing finished. %d cached, %d parsed, %d skipped, %d masked."
|
mw.appendText("Parsing finished. %d cached, %d parsed, %d skipped, %d masked."
|
||||||
% ( event.cached, event.parsed, event.skipped, event.masked ))
|
% ( event.cached, event.parsed, event.skipped, event.masked ))
|
||||||
else:
|
else:
|
||||||
mw.setStatus("Parsing: %s (%04d/%04d) [%2d %%]" % ( next(parsespin), x, y, x*100/y ) )
|
mw.setStatus("Parsing: %s (%04d/%04d) [%2d %%]" % ( next(parsespin), x, y, x*100//y ) )
|
||||||
# if isinstance(event, bb.build.TaskFailed):
|
# if isinstance(event, bb.build.TaskFailed):
|
||||||
# if event.logfile:
|
# if event.logfile:
|
||||||
# if data.getVar("BBINCLUDELOGS", d):
|
# if data.getVar("BBINCLUDELOGS", d):
|
||||||
|
|
Loading…
Reference in New Issue