[bsp/stm32] improve build output.

Author: Guozhanxin

bsp/stm32/libraries/templates/stm32f0xx/SConstruct

@@ -41,6 +41,9 @@ if os.path.exists(SDK_ROOT + '/libraries'):
 else:
     libraries_path_prefix = os.path.dirname(SDK_ROOT) + '/libraries'
 
+from utils import _make_path_relative
+libraries_path_prefix = _make_path_relative(os.path.abspath('./'), libraries_path_prefix)
+
 SDK_LIB = libraries_path_prefix
 Export('SDK_LIB')
 
@@ -50,11 +53,19 @@ objs = PrepareBuilding(env, RTT_ROOT, has_libcpu=False)
 stm32_library = 'STM32F0xx_HAL'
 rtconfig.BSP_LIBRARY_TYPE = stm32_library
 
+bsp_vdir = 'build'
+
 # include libraries
-objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript')))
+objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'),
+                        variant_dir=bsp_vdir + '/libraries/'+ stm32_library, duplicate=0))
 
 # include drivers
-objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript')))
+objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'),
+                        variant_dir=bsp_vdir + '/libraries/HAL_Drivers', duplicate=0))
+
+bsp_port_script = os.path.join(os.getcwd(), 'board', 'ports', 'SConscript')
+if os.path.isfile(bsp_port_script):
+    objs.extend(SConscript(bsp_port_script, variant_dir=bsp_vdir + '/board/ports', duplicate=0))
 
 # make a building
 DoBuilding(TARGET, objs)

bsp/stm32/libraries/templates/stm32f10x/SConstruct

@@ -41,6 +41,9 @@ if os.path.exists(SDK_ROOT + '/libraries'):
 else:
     libraries_path_prefix = os.path.dirname(SDK_ROOT) + '/libraries'
 
+from utils import _make_path_relative
+libraries_path_prefix = _make_path_relative(os.path.abspath('./'), libraries_path_prefix)
+
 SDK_LIB = libraries_path_prefix
 Export('SDK_LIB')
 
@@ -50,11 +53,19 @@ objs = PrepareBuilding(env, RTT_ROOT, has_libcpu=False)
 stm32_library = 'STM32F1xx_HAL'
 rtconfig.BSP_LIBRARY_TYPE = stm32_library
 
+bsp_vdir = 'build'
+
 # include libraries
-objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript')))
+objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'),
+                        variant_dir=bsp_vdir + '/libraries/'+ stm32_library, duplicate=0))
 
 # include drivers
-objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript')))
+objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'),
+                        variant_dir=bsp_vdir + '/libraries/HAL_Drivers', duplicate=0))
+
+bsp_port_script = os.path.join(os.getcwd(), 'board', 'ports', 'SConscript')
+if os.path.isfile(bsp_port_script):
+    objs.extend(SConscript(bsp_port_script, variant_dir=bsp_vdir + '/board/ports', duplicate=0))
 
 # make a building
 DoBuilding(TARGET, objs)

bsp/stm32/libraries/templates/stm32f2xx/SConstruct

@@ -41,6 +41,9 @@ if os.path.exists(SDK_ROOT + '/libraries'):
 else:
     libraries_path_prefix = os.path.dirname(SDK_ROOT) + '/libraries'
 
+from utils import _make_path_relative
+libraries_path_prefix = _make_path_relative(os.path.abspath('./'), libraries_path_prefix)
+
 SDK_LIB = libraries_path_prefix
 Export('SDK_LIB')
 
@@ -50,11 +53,19 @@ objs = PrepareBuilding(env, RTT_ROOT, has_libcpu=False)
 stm32_library = 'STM32F2xx_HAL'
 rtconfig.BSP_LIBRARY_TYPE = stm32_library
 
+bsp_vdir = 'build'
+
 # include libraries
-objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript')))
+objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'),
+                        variant_dir=bsp_vdir + '/libraries/'+ stm32_library, duplicate=0))
 
 # include drivers
-objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript')))
+objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'),
+                        variant_dir=bsp_vdir + '/libraries/HAL_Drivers', duplicate=0))
+
+bsp_port_script = os.path.join(os.getcwd(), 'board', 'ports', 'SConscript')
+if os.path.isfile(bsp_port_script):
+    objs.extend(SConscript(bsp_port_script, variant_dir=bsp_vdir + '/board/ports', duplicate=0))
 
 # make a building
 DoBuilding(TARGET, objs)

bsp/stm32/libraries/templates/stm32f3xx/SConstruct

@@ -41,6 +41,9 @@ if os.path.exists(SDK_ROOT + '/libraries'):
 else:
     libraries_path_prefix = os.path.dirname(SDK_ROOT) + '/libraries'
 
+from utils import _make_path_relative
+libraries_path_prefix = _make_path_relative(os.path.abspath('./'), libraries_path_prefix)
+
 SDK_LIB = libraries_path_prefix
 Export('SDK_LIB')
 
@@ -50,11 +53,19 @@ objs = PrepareBuilding(env, RTT_ROOT, has_libcpu=False)
 stm32_library = 'STM32F3xx_HAL'
 rtconfig.BSP_LIBRARY_TYPE = stm32_library
 
+bsp_vdir = 'build'
+
 # include libraries
-objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript')))
+objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'),
+                        variant_dir=bsp_vdir + '/libraries/'+ stm32_library, duplicate=0))
 
 # include drivers
-objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript')))
+objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'),
+                        variant_dir=bsp_vdir + '/libraries/HAL_Drivers', duplicate=0))
+
+bsp_port_script = os.path.join(os.getcwd(), 'board', 'ports', 'SConscript')
+if os.path.isfile(bsp_port_script):
+    objs.extend(SConscript(bsp_port_script, variant_dir=bsp_vdir + '/board/ports', duplicate=0))
 
 # make a building
 DoBuilding(TARGET, objs)

bsp/stm32/libraries/templates/stm32f4xx/SConstruct

@@ -41,6 +41,9 @@ if os.path.exists(SDK_ROOT + '/libraries'):
 else:
     libraries_path_prefix = os.path.dirname(SDK_ROOT) + '/libraries'
 
+from utils import _make_path_relative
+libraries_path_prefix = _make_path_relative(os.path.abspath('./'), libraries_path_prefix)
+
 SDK_LIB = libraries_path_prefix
 Export('SDK_LIB')
 
@@ -50,11 +53,19 @@ objs = PrepareBuilding(env, RTT_ROOT, has_libcpu=False)
 stm32_library = 'STM32F4xx_HAL'
 rtconfig.BSP_LIBRARY_TYPE = stm32_library
 
+bsp_vdir = 'build'
+
 # include libraries
-objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript')))
+objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'),
+                        variant_dir=bsp_vdir + '/libraries/'+ stm32_library, duplicate=0))
 
 # include drivers
-objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript')))
+objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'),
+                        variant_dir=bsp_vdir + '/libraries/HAL_Drivers', duplicate=0))
+
+bsp_port_script = os.path.join(os.getcwd(), 'board', 'ports', 'SConscript')
+if os.path.isfile(bsp_port_script):
+    objs.extend(SConscript(bsp_port_script, variant_dir=bsp_vdir + '/board/ports', duplicate=0))
 
 # make a building
 DoBuilding(TARGET, objs)

bsp/stm32/libraries/templates/stm32f7xx/SConstruct

@@ -41,6 +41,9 @@ if os.path.exists(SDK_ROOT + '/libraries'):
 else:
     libraries_path_prefix = os.path.dirname(SDK_ROOT) + '/libraries'
 
+from utils import _make_path_relative
+libraries_path_prefix = _make_path_relative(os.path.abspath('./'), libraries_path_prefix)
+
 SDK_LIB = libraries_path_prefix
 Export('SDK_LIB')
 
@@ -50,11 +53,19 @@ objs = PrepareBuilding(env, RTT_ROOT, has_libcpu=False)
 stm32_library = 'STM32F7xx_HAL'
 rtconfig.BSP_LIBRARY_TYPE = stm32_library
 
+bsp_vdir = 'build'
+
 # include libraries
-objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript')))
+objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'),
+                        variant_dir=bsp_vdir + '/libraries/'+ stm32_library, duplicate=0))
 
 # include drivers
-objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript')))
+objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'),
+                        variant_dir=bsp_vdir + '/libraries/HAL_Drivers', duplicate=0))
+
+bsp_port_script = os.path.join(os.getcwd(), 'board', 'ports', 'SConscript')
+if os.path.isfile(bsp_port_script):
+    objs.extend(SConscript(bsp_port_script, variant_dir=bsp_vdir + '/board/ports', duplicate=0))
 
 # make a building
 DoBuilding(TARGET, objs)

bsp/stm32/libraries/templates/stm32h7xx/SConstruct

@@ -41,6 +41,9 @@ if os.path.exists(SDK_ROOT + '/libraries'):
 else:
     libraries_path_prefix = os.path.dirname(SDK_ROOT) + '/libraries'
 
+from utils import _make_path_relative
+libraries_path_prefix = _make_path_relative(os.path.abspath('./'), libraries_path_prefix)
+
 SDK_LIB = libraries_path_prefix
 Export('SDK_LIB')
 
@@ -50,11 +53,19 @@ objs = PrepareBuilding(env, RTT_ROOT, has_libcpu=False)
 stm32_library = 'STM32H7xx_HAL'
 rtconfig.BSP_LIBRARY_TYPE = stm32_library
 
-# include drivers
-objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript')))
+bsp_vdir = 'build'
 
 # include libraries
-objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript')))
+objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'),
+                        variant_dir=bsp_vdir + '/libraries/'+ stm32_library, duplicate=0))
+
+# include drivers
+objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'),
+                        variant_dir=bsp_vdir + '/libraries/HAL_Drivers', duplicate=0))
+
+bsp_port_script = os.path.join(os.getcwd(), 'board', 'ports', 'SConscript')
+if os.path.isfile(bsp_port_script):
+    objs.extend(SConscript(bsp_port_script, variant_dir=bsp_vdir + '/board/ports', duplicate=0))
 
 # make a building
 DoBuilding(TARGET, objs)

bsp/stm32/libraries/templates/stm32l1xx/SConstruct

@@ -41,6 +41,9 @@ if os.path.exists(SDK_ROOT + '/libraries'):
 else:
     libraries_path_prefix = os.path.dirname(SDK_ROOT) + '/libraries'
 
+from utils import _make_path_relative
+libraries_path_prefix = _make_path_relative(os.path.abspath('./'), libraries_path_prefix)
+
 SDK_LIB = libraries_path_prefix
 Export('SDK_LIB')
 
@@ -50,11 +53,19 @@ objs = PrepareBuilding(env, RTT_ROOT, has_libcpu=False)
 stm32_library = 'STM32L1xx_HAL'
 rtconfig.BSP_LIBRARY_TYPE = stm32_library
 
+bsp_vdir = 'build'
+
 # include libraries
-objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript')))
+objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'),
+                        variant_dir=bsp_vdir + '/libraries/'+ stm32_library, duplicate=0))
 
 # include drivers
-objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript')))
+objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'),
+                        variant_dir=bsp_vdir + '/libraries/HAL_Drivers', duplicate=0))
+
+bsp_port_script = os.path.join(os.getcwd(), 'board', 'ports', 'SConscript')
+if os.path.isfile(bsp_port_script):
+    objs.extend(SConscript(bsp_port_script, variant_dir=bsp_vdir + '/board/ports', duplicate=0))
 
 # make a building
 DoBuilding(TARGET, objs)

bsp/stm32/libraries/templates/stm32l4xx/SConstruct

@@ -41,6 +41,9 @@ if os.path.exists(SDK_ROOT + '/libraries'):
 else:
     libraries_path_prefix = os.path.dirname(SDK_ROOT) + '/libraries'
 
+from utils import _make_path_relative
+libraries_path_prefix = _make_path_relative(os.path.abspath('./'), libraries_path_prefix)
+
 SDK_LIB = libraries_path_prefix
 Export('SDK_LIB')
 
@@ -50,11 +53,19 @@ objs = PrepareBuilding(env, RTT_ROOT, has_libcpu=False)
 stm32_library = 'STM32L4xx_HAL'
 rtconfig.BSP_LIBRARY_TYPE = stm32_library
 
+bsp_vdir = 'build'
+
 # include libraries
-objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript')))
+objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'),
+                        variant_dir=bsp_vdir + '/libraries/'+ stm32_library, duplicate=0))
 
 # include drivers
-objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript')))
+objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'),
+                        variant_dir=bsp_vdir + '/libraries/HAL_Drivers', duplicate=0))
+
+bsp_port_script = os.path.join(os.getcwd(), 'board', 'ports', 'SConscript')
+if os.path.isfile(bsp_port_script):
+    objs.extend(SConscript(bsp_port_script, variant_dir=bsp_vdir + '/board/ports', duplicate=0))
 
 # make a building
 DoBuilding(TARGET, objs)

bsp/stm32/libraries/templates/stm32l5xx/SConstruct

@@ -41,6 +41,9 @@ if os.path.exists(SDK_ROOT + '/libraries'):
 else:
     libraries_path_prefix = os.path.dirname(SDK_ROOT) + '/libraries'
 
+from utils import _make_path_relative
+libraries_path_prefix = _make_path_relative(os.path.abspath('./'), libraries_path_prefix)
+
 SDK_LIB = libraries_path_prefix
 Export('SDK_LIB')
 
@@ -50,11 +53,19 @@ objs = PrepareBuilding(env, RTT_ROOT, has_libcpu=False)
 stm32_library = 'STM32L5xx_HAL'
 rtconfig.BSP_LIBRARY_TYPE = stm32_library
 
+bsp_vdir = 'build'
+
 # include libraries
-objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript')))
+objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'),
+                        variant_dir=bsp_vdir + '/libraries/'+ stm32_library, duplicate=0))
 
 # include drivers
-objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript')))
+objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'),
+                        variant_dir=bsp_vdir + '/libraries/HAL_Drivers', duplicate=0))
+
+bsp_port_script = os.path.join(os.getcwd(), 'board', 'ports', 'SConscript')
+if os.path.isfile(bsp_port_script):
+    objs.extend(SConscript(bsp_port_script, variant_dir=bsp_vdir + '/board/ports', duplicate=0))
 
 # make a building
 DoBuilding(TARGET, objs)