Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[tools] add logging as Env['log'] #9870

Merged
merged 1 commit into from
Jan 5, 2025
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 16 additions & 1 deletion tools/building.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
# 2015-07-25 Bernard Add LOCAL_CCFLAGS/LOCAL_CPPPATH/LOCAL_CPPDEFINES for
# group definition.
# 2024-04-21 Bernard Add toolchain detection in sdk packages
# 2025-01-05 Bernard Add logging as Env['log']

import os
import sys
Expand All @@ -31,6 +32,7 @@
import operator
import rtconfig
import platform
import logging

from SCons.Script import *
from utils import _make_path_relative
Expand Down Expand Up @@ -130,6 +132,14 @@ def PrepareBuilding(env, root_directory, has_libcpu=False, remove_components = [
AddOptions()

Env = env

# prepare logging and set log
logging.basicConfig(level=logging.INFO, format="%(message)s")
logger = logging.getLogger('rt-scons')
if GetOption('verbose'):
logger.setLevel(logging.DEBUG)
Env['log'] = logger

Rtt_Root = os.path.abspath(root_directory)

# make an absolute root directory
Expand Down Expand Up @@ -189,6 +199,8 @@ def PrepareBuilding(env, root_directory, has_libcpu=False, remove_components = [

# auto change the 'RTT_EXEC_PATH' when 'rtconfig.EXEC_PATH' get failed
if not utils.CmdExists(os.path.join(rtconfig.EXEC_PATH, rtconfig.CC)):
Env['log'].debug('To detect CC because CC path in rtconfig.py is invalid:')
Env['log'].debug(' rtconfig.py cc ->' + os.path.join(rtconfig.EXEC_PATH, rtconfig.CC))
if 'RTT_EXEC_PATH' in os.environ:
# del the 'RTT_EXEC_PATH' and using the 'EXEC_PATH' setting on rtconfig.py
del os.environ['RTT_EXEC_PATH']
Expand All @@ -202,11 +214,14 @@ def PrepareBuilding(env, root_directory, has_libcpu=False, remove_components = [
exec_path = os.path.join(exec_path, 'bin')

if os.path.exists(exec_path):
print('set CC to ' + exec_path)
Env['log'].debug('set CC to ' + exec_path)
rtconfig.EXEC_PATH = exec_path
os.environ['RTT_EXEC_PATH'] = exec_path
else:
Env['log'].debug('No Toolchain found in path(%s).' % exec_path)
except Exception as e:
# detect failed, ignore
Env['log'].debug(e)
pass

exec_path = GetOption('exec-path')
Expand Down
Loading