Merge pull request #6419 from theotherjimmy/fix-get-config

Correct get_config imports
pull/6442/head
Cruz Monrreal 2018-03-23 11:01:03 -05:00 committed by GitHub
commit 4a5f4aa063
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 14 deletions

View File

@ -16,6 +16,7 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
""" """
from __future__ import print_function
import sys import sys
from os.path import isdir, abspath, dirname, join from os.path import isdir, abspath, dirname, join
from os import _exit from os import _exit
@ -28,8 +29,8 @@ from tools.utils import args_error
from tools.options import get_default_options_parser from tools.options import get_default_options_parser
from tools.options import extract_mcus from tools.options import extract_mcus
from tools.build_api import get_config from tools.build_api import get_config
from config import Config from tools.config import Config
from utils import argparse_filestring_type from tools.utils import argparse_filestring_type
try: try:
import tools.private_settings as ps import tools.private_settings as ps
except: except:
@ -62,31 +63,31 @@ if __name__ == '__main__':
try: try:
params, macros, features = get_config(options.source_dir, target, toolchain) params, macros, features = get_config(options.source_dir, target, toolchain)
if not params and not macros: if not params and not macros:
print "No configuration data available." print("No configuration data available.")
_exit(0) _exit(0)
if params: if params:
print "Configuration parameters" print("Configuration parameters")
print "------------------------" print("------------------------")
for p in sorted(params): for p in sorted(params):
for s in options.prefix: for s in options.prefix:
if p.startswith(s): if p.startswith(s):
print(str(params[p]) if not options.verbose else params[p].get_verbose_description()) print(str(params[p]) if not options.verbose else params[p].get_verbose_description())
break break
print "" print("")
print "Macros" print("Macros")
print "------" print("------")
if macros: if macros:
print 'Defined with "macros":', Config.config_macros_to_macros(macros) print('Defined with "macros":', Config.config_macros_to_macros(macros))
print "Generated from configuration parameters:", Config.parameters_to_macros(params) print("Generated from configuration parameters:", Config.parameters_to_macros(params))
except KeyboardInterrupt, e: except KeyboardInterrupt as e:
print "\n[CTRL+c] exit" print("\n[CTRL+c] exit")
except Exception,e: except Exception as e:
if options.verbose: if options.verbose:
import traceback import traceback
traceback.print_exc(file=sys.stdout) traceback.print_exc(file=sys.stdout)
else: else:
print "[ERROR] %s" % str(e) print("[ERROR] %s" % str(e))
sys.exit(1) sys.exit(1)