sharelib 输出逻辑完善

Signed-off-by: a1012112796 <1012112796@qq.com>
This commit is contained in:
2022-02-15 14:08:09 +08:00
parent 0209016824
commit 36da572a87
2 changed files with 57 additions and 13 deletions

View File

@@ -24,6 +24,7 @@
# group definition.
#
from math import fabs
import os
import sys
import string
@@ -335,9 +336,12 @@ def PrepareBuilding(env, root_directory, has_libcpu=False, remove_components = [
# parse rtconfig.h to get used component
PreProcessor = PatchedPreProcessor()
f = open(rtt_cfg, 'r')
contents = f.read()
f.close()
contents = ''
if os.path.isfile(rtt_cfg):
f = open(rtt_cfg, 'r')
contents = f.read()
f.close()
PreProcessor.process_contents(contents)
BuildOptions = PreProcessor.cpp_namespace
@@ -725,7 +729,10 @@ def BuildLibInstallAction(target, source, env):
do_copy_file(lib_name, dst_name)
break
def DoBuilding(target, objects, is_rtt = False):
def DoBuildingLib(lib, objects):
DoBuilding(lib, objects, build_lib=True)
def DoBuilding(target, objects, is_rtt = False, build_lib = False):
# merge all objects into one list
def one_list(l):
@@ -757,7 +764,11 @@ def DoBuilding(target, objects, is_rtt = False):
program = None
# check whether special buildlib option
lib_name = GetOption('buildlib')
if build_lib:
lib_name = target
else:
lib_name = GetOption('buildlib')
if lib_name:
objects = [] # remove all of objects
# build library with special component
@@ -790,6 +801,7 @@ def DoBuilding(target, objects, is_rtt = False):
EndBuilding(target, program, is_rtt)
def GenTargetProject(program = None):
need_exit = True
if GetOption('target') == 'mdk':
from keil import MDKProject
@@ -865,6 +877,8 @@ def GenTargetProject(program = None):
if GetOption('target') == 'cmake' or GetOption('target') == 'cmake-armclang':
from cmake import CMakeProject
CMakeProject(Env,Projects)
return need_exit
def EndBuilding(target, program = None, is_rtt = False):
@@ -891,7 +905,7 @@ def EndBuilding(target, program = None, is_rtt = False):
Clean(target, 'gen_ports/gen_ports_cpp.cpp')
if GetOption('target'):
GenTargetProject(program)
need_exit = GenTargetProject(program)
BSP_ROOT = Dir('#').abspath
if GetOption('make-dist') and program != None: