From f75c8f6e813eaa2233e6d9920204997cbfa95158 Mon Sep 17 00:00:00 2001 From: aozima Date: Thu, 26 Oct 2017 10:51:21 +0800 Subject: [PATCH] update SConscript: support scons 3. --- bsp/CME_M7/CMSIS/SConscript | 6 +++--- bsp/gd32450z-eval/Libraries/SConscript | 6 +++--- bsp/lpc824/Libraries/SConscript | 2 +- components/external/cairo/SConscript | 6 +++--- components/external/ftk/SConscript | 6 +++--- components/external/pixman/SConscript | 6 +++--- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/bsp/CME_M7/CMSIS/SConscript b/bsp/CME_M7/CMSIS/SConscript index fc01453c4a..3891ee96d7 100644 --- a/bsp/CME_M7/CMSIS/SConscript +++ b/bsp/CME_M7/CMSIS/SConscript @@ -16,9 +16,9 @@ if rtconfig.CROSS_TOOL == 'gcc': elif rtconfig.CROSS_TOOL == 'keil': src += ['CME_M7/startup/arm/startup_cmem7.s'] elif rtconfig.CROSS_TOOL == 'iar': - print '================ERROR============================' - print 'Not support IAR yet!' - print '=================================================' + print('================ERROR============================') + print('Not support IAR yet!') + print('=================================================') exit(0) path = [cwd + '/CME_M7'] diff --git a/bsp/gd32450z-eval/Libraries/SConscript b/bsp/gd32450z-eval/Libraries/SConscript index e4a83cde55..1794429040 100644 --- a/bsp/gd32450z-eval/Libraries/SConscript +++ b/bsp/gd32450z-eval/Libraries/SConscript @@ -11,9 +11,9 @@ src += [cwd + '/CMSIS/GD/GD32F4xx/Source/system_gd32f4xx.c'] #add for startup script if rtconfig.CROSS_TOOL == 'gcc': - print '=================================================' - print 'Not support gcc yet!' - print '=================================================' + print('=================================================') + print('Not support gcc yet!') + print('=================================================') exit(0) elif rtconfig.CROSS_TOOL == 'keil': src += [cwd + '/CMSIS/GD/GD32F4xx/Source/ARM/startup_gd32f4xx.s'] diff --git a/bsp/lpc824/Libraries/SConscript b/bsp/lpc824/Libraries/SConscript index 3ed5fd3b0c..a013cdd077 100644 --- a/bsp/lpc824/Libraries/SConscript +++ b/bsp/lpc824/Libraries/SConscript @@ -12,7 +12,7 @@ src += Glob('common/chip/*.c') # add for startup script if rtconfig.CROSS_TOOL == 'gcc': - print "not gcc startup file" + print("not gcc startup file") exit(0) elif rtconfig.CROSS_TOOL == 'keil': src += [cwd + '/common/startup/keil_startup_lpc82x.s'] diff --git a/components/external/cairo/SConscript b/components/external/cairo/SConscript index 2e3b5b78cd..3c6651b9b7 100644 --- a/components/external/cairo/SConscript +++ b/components/external/cairo/SConscript @@ -6,9 +6,9 @@ CAIRO_PATH = 'cairo-' + CAIRO_VERSION cwd = GetCurrentDir() if GetDepend('RT_USING_CAIRO') and not os.path.exists(CAIRO_PATH): - print '================ERROR============================' - print 'Please get cairo dist and put them under cairo folder' - print '=================================================' + print('================ERROR============================') + print('Please get cairo dist and put them under cairo folder') + print('=================================================') exit(0) # source files diff --git a/components/external/ftk/SConscript b/components/external/ftk/SConscript index 2dd016d0d3..2f4fbe1ec0 100644 --- a/components/external/ftk/SConscript +++ b/components/external/ftk/SConscript @@ -8,9 +8,9 @@ if os.path.isfile(os.path.join(RTT_ROOT, 'components', 'external', 'ftk', objs = SConscript('ftk/src/os/rt-thread/SConscript') else: if GetDepend('RT_USING_FTK'): - print '================ERROR============================' - print 'Please get ftk file and put them under ftk folder' - print '=================================================' + print('================ERROR============================') + print('Please get ftk file and put them under ftk folder') + print('=================================================') exit(0) objs = [] diff --git a/components/external/pixman/SConscript b/components/external/pixman/SConscript index d52990a5dd..7ab5c50ce1 100644 --- a/components/external/pixman/SConscript +++ b/components/external/pixman/SConscript @@ -8,9 +8,9 @@ PIXMAN_VERSION = '0.21.6' PIXMAN_PATH = 'pixman-' + PIXMAN_VERSION if GetDepend('RT_USING_CAIRO') and not os.path.exists(PIXMAN_PATH): - print '================ERROR============================' - print 'Please get pixman dist and put them under pixman folder' - print '=================================================' + print('================ERROR============================') + print('Please get pixman dist and put them under pixman folder') + print('=================================================') exit(0) # core source files