From 700ce3ae6eca7aec07f2db83a66d5cf7394dffeb Mon Sep 17 00:00:00 2001
From: misonyo <misonyo@foxmail.com>
Date: Thu, 14 Feb 2019 15:55:51 +0800
Subject: [PATCH] [bsp/stm32]change str(Dir('#')) to GetCurrentDir()

---
 bsp/stm32/libraries/templates/stm32f0xx/SConscript | 3 ++-
 bsp/stm32/libraries/templates/stm32f10x/SConscript | 3 ++-
 bsp/stm32/libraries/templates/stm32f4xx/SConscript | 3 ++-
 bsp/stm32/libraries/templates/stm32f7xx/SConscript | 3 ++-
 bsp/stm32/libraries/templates/stm32l4xx/SConscript | 3 ++-
 bsp/stm32/stm32f091-st-nucleo/SConscript           | 3 ++-
 bsp/stm32/stm32f103-atk-nano/SConscript            | 3 ++-
 bsp/stm32/stm32f103-dofly-lyc8/SConscript          | 3 ++-
 bsp/stm32/stm32f103-fire-arbitrary/SConscript      | 3 ++-
 bsp/stm32/stm32f103-hw100k-ibox/SConscript         | 3 ++-
 bsp/stm32/stm32f107-uc-eval/SConscript             | 3 ++-
 bsp/stm32/stm32f407-atk-explorer/SConscript        | 3 ++-
 bsp/stm32/stm32f407-st-discovery/SConscript        | 3 ++-
 bsp/stm32/stm32f411-st-nucleo/SConscript           | 3 ++-
 bsp/stm32/stm32f429-armfly-v6/SConscript           | 3 ++-
 bsp/stm32/stm32f429-atk-apollo/SConscript          | 3 ++-
 bsp/stm32/stm32f429-fire-challenger/SConscript     | 3 ++-
 bsp/stm32/stm32f446-st-nucleo/SConscript           | 3 ++-
 bsp/stm32/stm32f746-st-disco/SConscript            | 3 ++-
 bsp/stm32/stm32f767-atk-apollo/SConscript          | 3 ++-
 bsp/stm32/stm32f767-fire-challenger/SConscript     | 3 ++-
 bsp/stm32/stm32f767-st-nucleo/SConscript           | 3 ++-
 bsp/stm32/stm32g071-st-nucleo/SConscript           | 3 ++-
 bsp/stm32/stm32l053-st-nucleo/SConscript           | 3 ++-
 bsp/stm32/stm32l432-st-nucleo/SConscript           | 3 ++-
 bsp/stm32/stm32l475-atk-pandora/SConscript         | 3 ++-
 26 files changed, 52 insertions(+), 26 deletions(-)

diff --git a/bsp/stm32/libraries/templates/stm32f0xx/SConscript b/bsp/stm32/libraries/templates/stm32f0xx/SConscript
index fe0ae941ae..20f7689c53 100644
--- a/bsp/stm32/libraries/templates/stm32f0xx/SConscript
+++ b/bsp/stm32/libraries/templates/stm32f0xx/SConscript
@@ -1,8 +1,9 @@
 # for module compiling
 import os
 Import('RTT_ROOT')
+from building import *
 
-cwd = str(Dir('#'))
+cwd = GetCurrentDir()
 objs = []
 list = os.listdir(cwd)
 
diff --git a/bsp/stm32/libraries/templates/stm32f10x/SConscript b/bsp/stm32/libraries/templates/stm32f10x/SConscript
index fe0ae941ae..20f7689c53 100644
--- a/bsp/stm32/libraries/templates/stm32f10x/SConscript
+++ b/bsp/stm32/libraries/templates/stm32f10x/SConscript
@@ -1,8 +1,9 @@
 # for module compiling
 import os
 Import('RTT_ROOT')
+from building import *
 
-cwd = str(Dir('#'))
+cwd = GetCurrentDir()
 objs = []
 list = os.listdir(cwd)
 
diff --git a/bsp/stm32/libraries/templates/stm32f4xx/SConscript b/bsp/stm32/libraries/templates/stm32f4xx/SConscript
index fe0ae941ae..20f7689c53 100644
--- a/bsp/stm32/libraries/templates/stm32f4xx/SConscript
+++ b/bsp/stm32/libraries/templates/stm32f4xx/SConscript
@@ -1,8 +1,9 @@
 # for module compiling
 import os
 Import('RTT_ROOT')
+from building import *
 
-cwd = str(Dir('#'))
+cwd = GetCurrentDir()
 objs = []
 list = os.listdir(cwd)
 
diff --git a/bsp/stm32/libraries/templates/stm32f7xx/SConscript b/bsp/stm32/libraries/templates/stm32f7xx/SConscript
index fe0ae941ae..20f7689c53 100644
--- a/bsp/stm32/libraries/templates/stm32f7xx/SConscript
+++ b/bsp/stm32/libraries/templates/stm32f7xx/SConscript
@@ -1,8 +1,9 @@
 # for module compiling
 import os
 Import('RTT_ROOT')
+from building import *
 
-cwd = str(Dir('#'))
+cwd = GetCurrentDir()
 objs = []
 list = os.listdir(cwd)
 
diff --git a/bsp/stm32/libraries/templates/stm32l4xx/SConscript b/bsp/stm32/libraries/templates/stm32l4xx/SConscript
index fe0ae941ae..20f7689c53 100644
--- a/bsp/stm32/libraries/templates/stm32l4xx/SConscript
+++ b/bsp/stm32/libraries/templates/stm32l4xx/SConscript
@@ -1,8 +1,9 @@
 # for module compiling
 import os
 Import('RTT_ROOT')
+from building import *
 
-cwd = str(Dir('#'))
+cwd = GetCurrentDir()
 objs = []
 list = os.listdir(cwd)
 
diff --git a/bsp/stm32/stm32f091-st-nucleo/SConscript b/bsp/stm32/stm32f091-st-nucleo/SConscript
index fe0ae941ae..20f7689c53 100644
--- a/bsp/stm32/stm32f091-st-nucleo/SConscript
+++ b/bsp/stm32/stm32f091-st-nucleo/SConscript
@@ -1,8 +1,9 @@
 # for module compiling
 import os
 Import('RTT_ROOT')
+from building import *
 
-cwd = str(Dir('#'))
+cwd = GetCurrentDir()
 objs = []
 list = os.listdir(cwd)
 
diff --git a/bsp/stm32/stm32f103-atk-nano/SConscript b/bsp/stm32/stm32f103-atk-nano/SConscript
index fe0ae941ae..20f7689c53 100644
--- a/bsp/stm32/stm32f103-atk-nano/SConscript
+++ b/bsp/stm32/stm32f103-atk-nano/SConscript
@@ -1,8 +1,9 @@
 # for module compiling
 import os
 Import('RTT_ROOT')
+from building import *
 
-cwd = str(Dir('#'))
+cwd = GetCurrentDir()
 objs = []
 list = os.listdir(cwd)
 
diff --git a/bsp/stm32/stm32f103-dofly-lyc8/SConscript b/bsp/stm32/stm32f103-dofly-lyc8/SConscript
index fe0ae941ae..20f7689c53 100644
--- a/bsp/stm32/stm32f103-dofly-lyc8/SConscript
+++ b/bsp/stm32/stm32f103-dofly-lyc8/SConscript
@@ -1,8 +1,9 @@
 # for module compiling
 import os
 Import('RTT_ROOT')
+from building import *
 
-cwd = str(Dir('#'))
+cwd = GetCurrentDir()
 objs = []
 list = os.listdir(cwd)
 
diff --git a/bsp/stm32/stm32f103-fire-arbitrary/SConscript b/bsp/stm32/stm32f103-fire-arbitrary/SConscript
index fe0ae941ae..20f7689c53 100644
--- a/bsp/stm32/stm32f103-fire-arbitrary/SConscript
+++ b/bsp/stm32/stm32f103-fire-arbitrary/SConscript
@@ -1,8 +1,9 @@
 # for module compiling
 import os
 Import('RTT_ROOT')
+from building import *
 
-cwd = str(Dir('#'))
+cwd = GetCurrentDir()
 objs = []
 list = os.listdir(cwd)
 
diff --git a/bsp/stm32/stm32f103-hw100k-ibox/SConscript b/bsp/stm32/stm32f103-hw100k-ibox/SConscript
index fe0ae941ae..20f7689c53 100644
--- a/bsp/stm32/stm32f103-hw100k-ibox/SConscript
+++ b/bsp/stm32/stm32f103-hw100k-ibox/SConscript
@@ -1,8 +1,9 @@
 # for module compiling
 import os
 Import('RTT_ROOT')
+from building import *
 
-cwd = str(Dir('#'))
+cwd = GetCurrentDir()
 objs = []
 list = os.listdir(cwd)
 
diff --git a/bsp/stm32/stm32f107-uc-eval/SConscript b/bsp/stm32/stm32f107-uc-eval/SConscript
index fe0ae941ae..20f7689c53 100644
--- a/bsp/stm32/stm32f107-uc-eval/SConscript
+++ b/bsp/stm32/stm32f107-uc-eval/SConscript
@@ -1,8 +1,9 @@
 # for module compiling
 import os
 Import('RTT_ROOT')
+from building import *
 
-cwd = str(Dir('#'))
+cwd = GetCurrentDir()
 objs = []
 list = os.listdir(cwd)
 
diff --git a/bsp/stm32/stm32f407-atk-explorer/SConscript b/bsp/stm32/stm32f407-atk-explorer/SConscript
index fe0ae941ae..20f7689c53 100644
--- a/bsp/stm32/stm32f407-atk-explorer/SConscript
+++ b/bsp/stm32/stm32f407-atk-explorer/SConscript
@@ -1,8 +1,9 @@
 # for module compiling
 import os
 Import('RTT_ROOT')
+from building import *
 
-cwd = str(Dir('#'))
+cwd = GetCurrentDir()
 objs = []
 list = os.listdir(cwd)
 
diff --git a/bsp/stm32/stm32f407-st-discovery/SConscript b/bsp/stm32/stm32f407-st-discovery/SConscript
index fe0ae941ae..20f7689c53 100644
--- a/bsp/stm32/stm32f407-st-discovery/SConscript
+++ b/bsp/stm32/stm32f407-st-discovery/SConscript
@@ -1,8 +1,9 @@
 # for module compiling
 import os
 Import('RTT_ROOT')
+from building import *
 
-cwd = str(Dir('#'))
+cwd = GetCurrentDir()
 objs = []
 list = os.listdir(cwd)
 
diff --git a/bsp/stm32/stm32f411-st-nucleo/SConscript b/bsp/stm32/stm32f411-st-nucleo/SConscript
index fe0ae941ae..20f7689c53 100644
--- a/bsp/stm32/stm32f411-st-nucleo/SConscript
+++ b/bsp/stm32/stm32f411-st-nucleo/SConscript
@@ -1,8 +1,9 @@
 # for module compiling
 import os
 Import('RTT_ROOT')
+from building import *
 
-cwd = str(Dir('#'))
+cwd = GetCurrentDir()
 objs = []
 list = os.listdir(cwd)
 
diff --git a/bsp/stm32/stm32f429-armfly-v6/SConscript b/bsp/stm32/stm32f429-armfly-v6/SConscript
index fe0ae941ae..20f7689c53 100644
--- a/bsp/stm32/stm32f429-armfly-v6/SConscript
+++ b/bsp/stm32/stm32f429-armfly-v6/SConscript
@@ -1,8 +1,9 @@
 # for module compiling
 import os
 Import('RTT_ROOT')
+from building import *
 
-cwd = str(Dir('#'))
+cwd = GetCurrentDir()
 objs = []
 list = os.listdir(cwd)
 
diff --git a/bsp/stm32/stm32f429-atk-apollo/SConscript b/bsp/stm32/stm32f429-atk-apollo/SConscript
index fe0ae941ae..20f7689c53 100644
--- a/bsp/stm32/stm32f429-atk-apollo/SConscript
+++ b/bsp/stm32/stm32f429-atk-apollo/SConscript
@@ -1,8 +1,9 @@
 # for module compiling
 import os
 Import('RTT_ROOT')
+from building import *
 
-cwd = str(Dir('#'))
+cwd = GetCurrentDir()
 objs = []
 list = os.listdir(cwd)
 
diff --git a/bsp/stm32/stm32f429-fire-challenger/SConscript b/bsp/stm32/stm32f429-fire-challenger/SConscript
index fe0ae941ae..20f7689c53 100644
--- a/bsp/stm32/stm32f429-fire-challenger/SConscript
+++ b/bsp/stm32/stm32f429-fire-challenger/SConscript
@@ -1,8 +1,9 @@
 # for module compiling
 import os
 Import('RTT_ROOT')
+from building import *
 
-cwd = str(Dir('#'))
+cwd = GetCurrentDir()
 objs = []
 list = os.listdir(cwd)
 
diff --git a/bsp/stm32/stm32f446-st-nucleo/SConscript b/bsp/stm32/stm32f446-st-nucleo/SConscript
index fe0ae941ae..20f7689c53 100644
--- a/bsp/stm32/stm32f446-st-nucleo/SConscript
+++ b/bsp/stm32/stm32f446-st-nucleo/SConscript
@@ -1,8 +1,9 @@
 # for module compiling
 import os
 Import('RTT_ROOT')
+from building import *
 
-cwd = str(Dir('#'))
+cwd = GetCurrentDir()
 objs = []
 list = os.listdir(cwd)
 
diff --git a/bsp/stm32/stm32f746-st-disco/SConscript b/bsp/stm32/stm32f746-st-disco/SConscript
index fe0ae941ae..20f7689c53 100644
--- a/bsp/stm32/stm32f746-st-disco/SConscript
+++ b/bsp/stm32/stm32f746-st-disco/SConscript
@@ -1,8 +1,9 @@
 # for module compiling
 import os
 Import('RTT_ROOT')
+from building import *
 
-cwd = str(Dir('#'))
+cwd = GetCurrentDir()
 objs = []
 list = os.listdir(cwd)
 
diff --git a/bsp/stm32/stm32f767-atk-apollo/SConscript b/bsp/stm32/stm32f767-atk-apollo/SConscript
index fe0ae941ae..20f7689c53 100644
--- a/bsp/stm32/stm32f767-atk-apollo/SConscript
+++ b/bsp/stm32/stm32f767-atk-apollo/SConscript
@@ -1,8 +1,9 @@
 # for module compiling
 import os
 Import('RTT_ROOT')
+from building import *
 
-cwd = str(Dir('#'))
+cwd = GetCurrentDir()
 objs = []
 list = os.listdir(cwd)
 
diff --git a/bsp/stm32/stm32f767-fire-challenger/SConscript b/bsp/stm32/stm32f767-fire-challenger/SConscript
index fe0ae941ae..20f7689c53 100644
--- a/bsp/stm32/stm32f767-fire-challenger/SConscript
+++ b/bsp/stm32/stm32f767-fire-challenger/SConscript
@@ -1,8 +1,9 @@
 # for module compiling
 import os
 Import('RTT_ROOT')
+from building import *
 
-cwd = str(Dir('#'))
+cwd = GetCurrentDir()
 objs = []
 list = os.listdir(cwd)
 
diff --git a/bsp/stm32/stm32f767-st-nucleo/SConscript b/bsp/stm32/stm32f767-st-nucleo/SConscript
index fe0ae941ae..20f7689c53 100644
--- a/bsp/stm32/stm32f767-st-nucleo/SConscript
+++ b/bsp/stm32/stm32f767-st-nucleo/SConscript
@@ -1,8 +1,9 @@
 # for module compiling
 import os
 Import('RTT_ROOT')
+from building import *
 
-cwd = str(Dir('#'))
+cwd = GetCurrentDir()
 objs = []
 list = os.listdir(cwd)
 
diff --git a/bsp/stm32/stm32g071-st-nucleo/SConscript b/bsp/stm32/stm32g071-st-nucleo/SConscript
index fe0ae941ae..20f7689c53 100644
--- a/bsp/stm32/stm32g071-st-nucleo/SConscript
+++ b/bsp/stm32/stm32g071-st-nucleo/SConscript
@@ -1,8 +1,9 @@
 # for module compiling
 import os
 Import('RTT_ROOT')
+from building import *
 
-cwd = str(Dir('#'))
+cwd = GetCurrentDir()
 objs = []
 list = os.listdir(cwd)
 
diff --git a/bsp/stm32/stm32l053-st-nucleo/SConscript b/bsp/stm32/stm32l053-st-nucleo/SConscript
index fe0ae941ae..20f7689c53 100644
--- a/bsp/stm32/stm32l053-st-nucleo/SConscript
+++ b/bsp/stm32/stm32l053-st-nucleo/SConscript
@@ -1,8 +1,9 @@
 # for module compiling
 import os
 Import('RTT_ROOT')
+from building import *
 
-cwd = str(Dir('#'))
+cwd = GetCurrentDir()
 objs = []
 list = os.listdir(cwd)
 
diff --git a/bsp/stm32/stm32l432-st-nucleo/SConscript b/bsp/stm32/stm32l432-st-nucleo/SConscript
index fe0ae941ae..20f7689c53 100644
--- a/bsp/stm32/stm32l432-st-nucleo/SConscript
+++ b/bsp/stm32/stm32l432-st-nucleo/SConscript
@@ -1,8 +1,9 @@
 # for module compiling
 import os
 Import('RTT_ROOT')
+from building import *
 
-cwd = str(Dir('#'))
+cwd = GetCurrentDir()
 objs = []
 list = os.listdir(cwd)
 
diff --git a/bsp/stm32/stm32l475-atk-pandora/SConscript b/bsp/stm32/stm32l475-atk-pandora/SConscript
index fe0ae941ae..20f7689c53 100644
--- a/bsp/stm32/stm32l475-atk-pandora/SConscript
+++ b/bsp/stm32/stm32l475-atk-pandora/SConscript
@@ -1,8 +1,9 @@
 # for module compiling
 import os
 Import('RTT_ROOT')
+from building import *
 
-cwd = str(Dir('#'))
+cwd = GetCurrentDir()
 objs = []
 list = os.listdir(cwd)
 
-- 
GitLab