From 094d0b4fe3ec5301ce98a16f6bdd1a746f8ab6f3 Mon Sep 17 00:00:00 2001 From: WangQiang Date: Fri, 12 Jun 2020 16:15:40 +0800 Subject: [PATCH 01/11] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86imxrt1064-nxp-?= =?UTF-8?q?evk=E7=9A=84BSP=E4=BD=BF=E7=94=A8scons=20--dist=E7=94=9F?= =?UTF-8?q?=E6=88=90=E7=9A=84=E5=B7=A5=E7=A8=8B=E7=9B=AE=E5=BD=95=E4=B8=AD?= =?UTF-8?q?=E6=B2=A1=E6=9C=89libraries=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bsp/imxrt/imxrt1064-nxp-evk/SConstruct | 19 +++++++++++++++++-- bsp/imxrt/imxrt1064-nxp-evk/rtconfig.py | 10 ++++++++++ bsp/imxrt/tools/sdk_dist.py | 9 +++++---- 3 files changed, 32 insertions(+), 6 deletions(-) diff --git a/bsp/imxrt/imxrt1064-nxp-evk/SConstruct b/bsp/imxrt/imxrt1064-nxp-evk/SConstruct index 71be0c13c6..2827f048f0 100644 --- a/bsp/imxrt/imxrt1064-nxp-evk/SConstruct +++ b/bsp/imxrt/imxrt1064-nxp-evk/SConstruct @@ -45,11 +45,26 @@ if rtconfig.PLATFORM == 'iar': Export('RTT_ROOT') Export('rtconfig') +SDK_ROOT = os.path.abspath('./') +if os.path.exists(SDK_ROOT + '/Libraries'): + libraries_path_prefix = SDK_ROOT + '/Libraries' +else: + libraries_path_prefix = os.path.dirname(SDK_ROOT) + '/Libraries' + +SDK_LIB = libraries_path_prefix +Export('SDK_LIB') + # prepare building environment objs = PrepareBuilding(env, RTT_ROOT, has_libcpu=False) -objs = objs + SConscript('../libraries/drivers/SConscript') -objs = objs + SConscript('../libraries/MIMXRT1064/SConscript') +imxrt_library = 'MIMXRT1064' +rtconfig.BSP_LIBRARY_TYPE = imxrt_library + +# include libraries +objs.extend(SConscript(os.path.join(libraries_path_prefix, imxrt_library, 'SConscript'))) + +# include drivers +objs.extend(SConscript(os.path.join(libraries_path_prefix, 'drivers', 'SConscript'))) # make a building DoBuilding(TARGET, objs) diff --git a/bsp/imxrt/imxrt1064-nxp-evk/rtconfig.py b/bsp/imxrt/imxrt1064-nxp-evk/rtconfig.py index 4eccbc92fd..2acb77e3ed 100644 --- a/bsp/imxrt/imxrt1064-nxp-evk/rtconfig.py +++ b/bsp/imxrt/imxrt1064-nxp-evk/rtconfig.py @@ -5,6 +5,9 @@ ARCH='arm' CPU='cortex-m7' CROSS_TOOL='gcc' +# bsp lib config +BSP_LIBRARY_TYPE = None + if os.getenv('RTT_CC'): CROSS_TOOL = os.getenv('RTT_CC') if os.getenv('RTT_ROOT'): @@ -150,3 +153,10 @@ elif PLATFORM == 'iar': EXEC_PATH = EXEC_PATH + '/arm/bin/' POST_ACTION = 'ielftool --bin $TARGET rtthread.bin' + +def dist_handle(BSP_ROOT, dist_dir): + import sys + cwd_path = os.getcwd() + sys.path.append(os.path.join(os.path.dirname(BSP_ROOT), 'tools')) + from sdk_dist import dist_do_building + dist_do_building(BSP_ROOT, dist_dir) diff --git a/bsp/imxrt/tools/sdk_dist.py b/bsp/imxrt/tools/sdk_dist.py index ebf869b689..120bfafd1a 100644 --- a/bsp/imxrt/tools/sdk_dist.py +++ b/bsp/imxrt/tools/sdk_dist.py @@ -5,15 +5,16 @@ cwd_path = os.getcwd() sys.path.append(os.path.join(os.path.dirname(cwd_path), 'rt-thread', 'tools')) # BSP dist function -def dist_do_building(BSP_ROOT): +def dist_do_building(BSP_ROOT, dist_dir): from mkdist import bsp_copy_files import rtconfig - dist_dir = os.path.join(BSP_ROOT, 'dist', os.path.basename(BSP_ROOT)) + print("=> copy imxrt bsp library") library_path = os.path.join(os.path.dirname(BSP_ROOT), 'libraries') library_dir = os.path.join(dist_dir, 'libraries') + bsp_copy_files(os.path.join(library_path, rtconfig.BSP_LIBRARY_TYPE), + os.path.join(library_dir, rtconfig.BSP_LIBRARY_TYPE)) + print("=> copy bsp drivers") bsp_copy_files(os.path.join(library_path, 'drivers'), os.path.join(library_dir, 'drivers')) - print("=> copy bsp library") - bsp_copy_files(os.path.join(library_path, rtconfig.BSP_LIBRARY_TYPE), os.path.join(library_dir, rtconfig.BSP_LIBRARY_TYPE)) shutil.copyfile(os.path.join(library_path, 'Kconfig'), os.path.join(library_dir, 'Kconfig')) -- Gitee From 6da9c939fae084c6d0d86e950aa6d605117934c6 Mon Sep 17 00:00:00 2001 From: WangQiang Date: Mon, 15 Jun 2020 11:44:35 +0800 Subject: [PATCH 02/11] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BA=86sdk=5Fdist.py?= =?UTF-8?q?=E4=B8=AD=E7=9A=84dist=5Fdo=5Fbuilding=E5=87=BD=E6=95=B0?= =?UTF-8?q?=EF=BC=8C=E4=B8=8D=E4=BC=9A=E5=BD=B1=E5=93=8D=E5=85=B6=E4=BB=96?= =?UTF-8?q?BSP=E7=9A=84=E8=B0=83=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bsp/imxrt/tools/sdk_dist.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bsp/imxrt/tools/sdk_dist.py b/bsp/imxrt/tools/sdk_dist.py index 120bfafd1a..89b7da4356 100644 --- a/bsp/imxrt/tools/sdk_dist.py +++ b/bsp/imxrt/tools/sdk_dist.py @@ -5,10 +5,13 @@ cwd_path = os.getcwd() sys.path.append(os.path.join(os.path.dirname(cwd_path), 'rt-thread', 'tools')) # BSP dist function -def dist_do_building(BSP_ROOT, dist_dir): +def dist_do_building(BSP_ROOT, dist_dir=None): from mkdist import bsp_copy_files import rtconfig + if dist_dir is None: + dist_dir = os.path.join(BSP_ROOT, 'dist', os.path.basename(BSP_ROOT)) + print("=> copy imxrt bsp library") library_path = os.path.join(os.path.dirname(BSP_ROOT), 'libraries') library_dir = os.path.join(dist_dir, 'libraries') -- Gitee From 574ace9146c75cad009b13628d44845542c5688d Mon Sep 17 00:00:00 2001 From: WangQiang Date: Mon, 15 Jun 2020 17:01:59 +0800 Subject: [PATCH 03/11] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86imxrt=E4=B8=8B?= =?UTF-8?q?imxrt1052-atk-commander,=20imxrt1052-fire-pro,=20imxrt1052-nxp-?= =?UTF-8?q?evk=E7=AD=89BSP=E7=9A=84scons=20--dist=E5=A4=B1=E8=B4=A5?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bsp/imxrt/imxrt1052-atk-commander/rtconfig.py | 9 +++++++-- bsp/imxrt/imxrt1052-fire-pro/rtconfig.py | 9 +++++++-- bsp/imxrt/imxrt1052-nxp-evk/rtconfig.py | 8 ++++++-- 3 files changed, 20 insertions(+), 6 deletions(-) diff --git a/bsp/imxrt/imxrt1052-atk-commander/rtconfig.py b/bsp/imxrt/imxrt1052-atk-commander/rtconfig.py index 9b0c3da87f..cf79de685a 100644 --- a/bsp/imxrt/imxrt1052-atk-commander/rtconfig.py +++ b/bsp/imxrt/imxrt1052-atk-commander/rtconfig.py @@ -6,6 +6,9 @@ ARCH='arm' CPU='cortex-m7' CROSS_TOOL='gcc' +# bsp lib config +BSP_LIBRARY_TYPE = None + if os.getenv('RTT_CC'): CROSS_TOOL = os.getenv('RTT_CC') if os.getenv('RTT_ROOT'): @@ -149,9 +152,11 @@ elif PLATFORM == 'iar': EXEC_PATH = EXEC_PATH + '/arm/bin/' POST_ACTION = 'ielftool --bin $TARGET rtthread.bin' -def dist_handle(BSP_ROOT): + +def dist_handle(BSP_ROOT, dist_dir): + import sys cwd_path = os.getcwd() sys.path.append(os.path.join(os.path.dirname(BSP_ROOT), 'tools')) from sdk_dist import dist_do_building - dist_do_building(BSP_ROOT) + dist_do_building(BSP_ROOT, dist_dir) \ No newline at end of file diff --git a/bsp/imxrt/imxrt1052-fire-pro/rtconfig.py b/bsp/imxrt/imxrt1052-fire-pro/rtconfig.py index 9b0c3da87f..552cefe835 100644 --- a/bsp/imxrt/imxrt1052-fire-pro/rtconfig.py +++ b/bsp/imxrt/imxrt1052-fire-pro/rtconfig.py @@ -6,6 +6,9 @@ ARCH='arm' CPU='cortex-m7' CROSS_TOOL='gcc' +# bsp lib config +BSP_LIBRARY_TYPE = None + if os.getenv('RTT_CC'): CROSS_TOOL = os.getenv('RTT_CC') if os.getenv('RTT_ROOT'): @@ -149,9 +152,11 @@ elif PLATFORM == 'iar': EXEC_PATH = EXEC_PATH + '/arm/bin/' POST_ACTION = 'ielftool --bin $TARGET rtthread.bin' -def dist_handle(BSP_ROOT): +def dist_handle(BSP_ROOT, dist_dir): + import sys cwd_path = os.getcwd() sys.path.append(os.path.join(os.path.dirname(BSP_ROOT), 'tools')) from sdk_dist import dist_do_building - dist_do_building(BSP_ROOT) + dist_do_building(BSP_ROOT, dist_dir) + \ No newline at end of file diff --git a/bsp/imxrt/imxrt1052-nxp-evk/rtconfig.py b/bsp/imxrt/imxrt1052-nxp-evk/rtconfig.py index 88fd75b5e6..44de4dc1df 100644 --- a/bsp/imxrt/imxrt1052-nxp-evk/rtconfig.py +++ b/bsp/imxrt/imxrt1052-nxp-evk/rtconfig.py @@ -6,6 +6,9 @@ ARCH='arm' CPU='cortex-m7' CROSS_TOOL='gcc' +# bsp lib config +BSP_LIBRARY_TYPE = None + if os.getenv('RTT_CC'): CROSS_TOOL = os.getenv('RTT_CC') if os.getenv('RTT_ROOT'): @@ -149,9 +152,10 @@ elif PLATFORM == 'iar': EXEC_PATH = EXEC_PATH + '/arm/bin/' POST_ACTION = 'ielftool --bin $TARGET rtthread.bin' -def dist_handle(BSP_ROOT): +def dist_handle(BSP_ROOT, dist_dir): + import sys cwd_path = os.getcwd() sys.path.append(os.path.join(os.path.dirname(BSP_ROOT), 'tools')) from sdk_dist import dist_do_building - dist_do_building(BSP_ROOT) + dist_do_building(BSP_ROOT, dist_dir) \ No newline at end of file -- Gitee From b01da3315a4f24b32aaf2017ef9ced1b191cce74 Mon Sep 17 00:00:00 2001 From: shaoguoji Date: Tue, 16 Jun 2020 15:09:56 +0800 Subject: [PATCH 04/11] [add]Jenkinsfile --- Jenkinsfile | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 Jenkinsfile diff --git a/Jenkinsfile b/Jenkinsfile new file mode 100644 index 0000000000..4e7eb4a6bc --- /dev/null +++ b/Jenkinsfile @@ -0,0 +1,12 @@ +pipeline { + agent { + docker { image 'ubuntu_ci:latest' } + } + stages { + stage('Test') { + steps { + sh 'scons --version' + } + } + } +} -- Gitee From 51ac526770cd44f3c457b9147a1f766b29cc2582 Mon Sep 17 00:00:00 2001 From: shaoguoji Date: Tue, 16 Jun 2020 17:34:19 +0800 Subject: [PATCH 05/11] [update]Jenkinsfile add before_script stage. --- Jenkinsfile | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 4e7eb4a6bc..12c277783b 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -3,9 +3,28 @@ pipeline { docker { image 'ubuntu_ci:latest' } } stages { - stage('Test') { + stage('before_script') { steps { - sh 'scons --version' + sh 'uname -a' + sh 'cat /etc/issue' + sh 'apt-get update' + sh 'echo machine git.rt-thread.com login $CI_REGISTRY_USER password $CI_REGISTRY_PASSWORD >> ~/.netrc' + sh 'apt-get install -y -qq lib32ncurses5 lib32z1 > /dev/null' + sh 'git config --global http.sslVerify false' + sh 'git submodule sync --recursive' + sh 'git submodule update --init --recursive' + } + } + + stage('env') { + steps { + sh "echo 'stage: env'" + } + } + + stage('compile') { + steps { + sh "echo 'stage: compile'" } } } -- Gitee From de3daae6bbc661614d70795b6176284af73f1654 Mon Sep 17 00:00:00 2001 From: shaoguoji Date: Tue, 16 Jun 2020 18:38:02 +0800 Subject: [PATCH 06/11] [update]Jenkinsfile add env stage. --- Jenkinsfile | 114 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 114 insertions(+) diff --git a/Jenkinsfile b/Jenkinsfile index 12c277783b..39e363891c 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -5,6 +5,7 @@ pipeline { stages { stage('before_script') { steps { + sh "echo 'stage: before_script'" sh 'uname -a' sh 'cat /etc/issue' sh 'apt-get update' @@ -19,6 +20,119 @@ pipeline { stage('env') { steps { sh "echo 'stage: env'" + // sh "RTT_BSP='simulator' RTT_CC='clang-analyze' RTT_EXEC_PATH=/usr/share/clang/scan-build + sh "RTT_BSP='CME_M7' RTT_TOOL_CHAIN='sourcery-arm'" + sh "RTT_BSP='apollo2' RTT_TOOL_CHAIN='sourcery-arm'" + sh "RTT_BSP='asm9260t' RTT_TOOL_CHAIN='sourcery-arm'" + sh "RTT_BSP='at91sam9260' RTT_TOOL_CHAIN='sourcery-arm'" + sh "RTT_BSP='allwinner_tina' RTT_TOOL_CHAIN='sourcery-arm'" + // sh "RTT_BSP='avr32uc3b0' RTT_TOOL_CHAIN='atmel-avr32'" + // sh "RTT_BSP='bf533' // no scons + sh "RTT_BSP='efm32' RTT_TOOL_CHAIN='sourcery-arm'" + // sh "RTT_BSP='es32f0334' RTT_TOOL_CHAIN='sourcery-arm' // not support gcc + // sh "RTT_BSP='es32f0654' RTT_TOOL_CHAIN='sourcery-arm' // not support gcc + sh "RTT_BSP='gd32e230k-start' RTT_TOOL_CHAIN='sourcery-arm'" + sh "RTT_BSP='gd32303e-eval' RTT_TOOL_CHAIN='sourcery-arm'" + sh "RTT_BSP='gd32450z-eval' RTT_TOOL_CHAIN='sourcery-arm'" + sh "RTT_BSP='gkipc' RTT_TOOL_CHAIN='sourcery-arm'" + sh "RTT_BSP='imx6sx/cortex-a9' RTT_TOOL_CHAIN='sourcery-arm'" + sh "RTT_BSP='imxrt/imxrt1052-atk-commander' RTT_TOOL_CHAIN='sourcery-arm'" + sh "RTT_BSP='imxrt/imxrt1052-fire-pro' RTT_TOOL_CHAIN='sourcery-arm'" + sh "RTT_BSP='imxrt/imxrt1052-nxp-evk' RTT_TOOL_CHAIN='sourcery-arm'" + sh "RTT_BSP='lm3s8962' RTT_TOOL_CHAIN='sourcery-arm'" + sh "RTT_BSP='lm3s9b9x' RTT_TOOL_CHAIN='sourcery-arm'" + sh "RTT_BSP='lm4f232' RTT_TOOL_CHAIN='sourcery-arm'" + sh "RTT_BSP='tm4c129x' RTT_TOOL_CHAIN='sourcery-arm'" + sh "RTT_BSP='lpc43xx/M4' RTT_TOOL_CHAIN='sourcery-arm'" + sh "RTT_BSP='lpc176x' RTT_TOOL_CHAIN='sourcery-arm'" + sh "RTT_BSP='lpc178x' RTT_TOOL_CHAIN='sourcery-arm'" + sh "RTT_BSP='lpc408x' RTT_TOOL_CHAIN='sourcery-arm'" + sh "RTT_BSP='lpc1114' RTT_TOOL_CHAIN='sourcery-arm'" + // sh "RTT_BSP='lpc824' RTT_TOOL_CHAIN='sourcery-arm' // not support gcc + sh "RTT_BSP='lpc2148' RTT_TOOL_CHAIN='sourcery-arm'" + sh "RTT_BSP='lpc2478' RTT_TOOL_CHAIN='sourcery-arm'" + sh "RTT_BSP='lpc5410x' RTT_TOOL_CHAIN='sourcery-arm'" + sh "RTT_BSP='lpc54114-lite' RTT_TOOL_CHAIN='sourcery-arm'" + // sh "RTT_BSP='lpc54608-LPCXpresso' RTT_TOOL_CHAIN='sourcery-arm'" + sh "RTT_BSP='ls1bdev' RTT_TOOL_CHAIN='sourcery-mips'" + sh "RTT_BSP='ls1cdev' RTT_TOOL_CHAIN='sourcery-mips'" + // sh "RTT_BSP='m16c62p' // m32c + sh "RTT_BSP='mb9bf500r' RTT_TOOL_CHAIN='sourcery-arm'" + sh "RTT_BSP='mb9bf506r' RTT_TOOL_CHAIN='sourcery-arm'" + sh "RTT_BSP='mb9bf618s' RTT_TOOL_CHAIN='sourcery-arm'" + sh "RTT_BSP='mb9bf568r' RTT_TOOL_CHAIN='sourcery-arm'" + // sh "RTT_BSP='microblaze' // no scons + sh "RTT_BSP='mini2440' RTT_TOOL_CHAIN='sourcery-arm'" + // sh "RTT_BSP='mini4020' // no scons + // sh "RTT_BSP='mm32l07x' // not support gcc + // sh "RTT_BSP='nios_ii' // no scons + sh "RTT_BSP='nuvoton_nuc472' RTT_TOOL_CHAIN='sourcery-arm'" + sh "RTT_BSP='nuvoton_m05x' RTT_TOOL_CHAIN='sourcery-arm'" + // sh "RTT_BSP='pic32ethernet' // no scons + sh "RTT_BSP='qemu-vexpress-a9' RTT_TOOL_CHAIN='sourcery-arm'" + sh "RTT_BSP='qemu-vexpress-gemini' RTT_TOOL_CHAIN='sourcery-arm'" + sh "RTT_BSP='sam7x' RTT_TOOL_CHAIN='sourcery-arm'" + // sh "RTT_BSP='simulator' // x86 + sh "RTT_BSP='stm32/stm32f072-st-nucleo' RTT_TOOL_CHAIN='sourcery-arm'" + sh "RTT_BSP='stm32/stm32f091-st-nucleo' RTT_TOOL_CHAIN='sourcery-arm'" + sh "RTT_BSP='stm32/stm32f103-atk-nano' RTT_TOOL_CHAIN='sourcery-arm'" + sh "RTT_BSP='stm32/stm32f103-atk-warshipv3' RTT_TOOL_CHAIN='sourcery-arm'" + sh "RTT_BSP='stm32/stm32f103-dofly-lyc8' RTT_TOOL_CHAIN='sourcery-arm'" + sh "RTT_BSP='stm32/stm32f103-dofly-M3S' RTT_TOOL_CHAIN='sourcery-arm'" + sh "RTT_BSP='stm32/stm32f103-fire-arbitrary' RTT_TOOL_CHAIN='sourcery-arm'" + sh "RTT_BSP='stm32/stm32f103-hw100k-ibox' RTT_TOOL_CHAIN='sourcery-arm'" + sh "RTT_BSP='stm32/stm32f103-mini-system' RTT_TOOL_CHAIN='sourcery-arm'" + sh "RTT_BSP='stm32/stm32f103-onenet-nbiot' RTT_TOOL_CHAIN='sourcery-arm'" + sh "RTT_BSP='stm32/stm32f103-yf-ufun' RTT_TOOL_CHAIN='sourcery-arm'" + sh "RTT_BSP='stm32/stm32f107-uc-eval' RTT_TOOL_CHAIN='sourcery-arm'" + sh "RTT_BSP='stm32/stm32f401-st-nucleo' RTT_TOOL_CHAIN='sourcery-arm'" + sh "RTT_BSP='stm32/stm32f405-smdz-breadfruit' RTT_TOOL_CHAIN='sourcery-arm'" + sh "RTT_BSP='stm32/stm32f407-atk-explorer' RTT_TOOL_CHAIN='sourcery-arm'" + sh "RTT_BSP='stm32/stm32f407-st-discovery' RTT_TOOL_CHAIN='sourcery-arm'" + sh "RTT_BSP='stm32/stm32f410-st-nucleo' RTT_TOOL_CHAIN='sourcery-arm'" + sh "RTT_BSP='stm32/stm32f411-st-nucleo' RTT_TOOL_CHAIN='sourcery-arm'" + sh "RTT_BSP='stm32/stm32f411-weact-MiniF4' RTT_TOOL_CHAIN='sourcery-arm'" + sh "RTT_BSP='stm32/stm32f413-st-nucleo' RTT_TOOL_CHAIN='sourcery-arm'" + sh "RTT_BSP='stm32/stm32f427-robomaster-a' RTT_TOOL_CHAIN='sourcery-arm'" + sh "RTT_BSP='stm32/stm32f429-armfly-v6' RTT_TOOL_CHAIN='sourcery-arm'" + sh "RTT_BSP='stm32/stm32f429-atk-apollo' RTT_TOOL_CHAIN='sourcery-arm'" + sh "RTT_BSP='stm32/stm32f429-fire-challenger' RTT_TOOL_CHAIN='sourcery-arm'" + sh "RTT_BSP='stm32/stm32f429-st-disco' RTT_TOOL_CHAIN='sourcery-arm'" + sh "RTT_BSP='stm32/stm32f446-st-nucleo' RTT_TOOL_CHAIN='sourcery-arm'" + sh "RTT_BSP='stm32/stm32f469-st-disco' RTT_TOOL_CHAIN='sourcery-arm'" + sh "RTT_BSP='stm32/stm32f746-st-disco' RTT_TOOL_CHAIN='sourcery-arm'" + sh "RTT_BSP='stm32/stm32f767-atk-apollo' RTT_TOOL_CHAIN='sourcery-arm'" + sh "RTT_BSP='stm32/stm32f767-fire-challenger' RTT_TOOL_CHAIN='sourcery-arm'" + sh "RTT_BSP='stm32/stm32f767-st-nucleo' RTT_TOOL_CHAIN='sourcery-arm'" + sh "RTT_BSP='stm32/stm32g071-st-nucleo' RTT_TOOL_CHAIN='sourcery-arm'" + sh "RTT_BSP='stm32/stm32g431-st-nucleo' RTT_TOOL_CHAIN='sourcery-arm'" + sh "RTT_BSP='stm32/stm32h743-atk-apollo' RTT_TOOL_CHAIN='sourcery-arm'" + sh "RTT_BSP='stm32/stm32h743-st-nucleo' RTT_TOOL_CHAIN='sourcery-arm'" + sh "RTT_BSP='stm32/stm32h747-st-discovery' RTT_TOOL_CHAIN='sourcery-arm'" + sh "RTT_BSP='stm32/stm32l4r9-st-eval' RTT_TOOL_CHAIN='sourcery-arm'" + sh "RTT_BSP='stm32/stm32l010-st-nucleo' RTT_TOOL_CHAIN='sourcery-arm'" + sh "RTT_BSP='stm32/stm32l053-st-nucleo' RTT_TOOL_CHAIN='sourcery-arm'" + sh "RTT_BSP='stm32/stm32l412-st-nucleo' RTT_TOOL_CHAIN='sourcery-arm'" + sh "RTT_BSP='stm32/stm32l432-st-nucleo' RTT_TOOL_CHAIN='sourcery-arm'" + sh "RTT_BSP='stm32/stm32l433-st-nucleo' RTT_TOOL_CHAIN='sourcery-arm'" + sh "RTT_BSP='stm32/stm32l475-atk-pandora' RTT_TOOL_CHAIN='sourcery-arm'" + sh "RTT_BSP='stm32/stm32l475-st-discovery' RTT_TOOL_CHAIN='sourcery-arm'" + sh "RTT_BSP='stm32/stm32l476-st-nucleo' RTT_TOOL_CHAIN='sourcery-arm'" + sh "RTT_BSP='stm32/stm32l496-ali-developer' RTT_TOOL_CHAIN='sourcery-arm'" + sh "RTT_BSP='stm32/stm32l496-st-nucleo' RTT_TOOL_CHAIN='sourcery-arm'" + sh "RTT_BSP='stm32f20x' RTT_TOOL_CHAIN='sourcery-arm'" + sh "RTT_BSP='swm320-lq100' RTT_TOOL_CHAIN='sourcery-arm'" + // sh "RTT_BSP='taihu' RTT_TOOL_CHAIN='sourcery-ppc'" + // sh "RTT_BSP='upd70f3454' // iar + // sh "RTT_BSP='x86' // x86 + sh "RTT_BSP='beaglebone' RTT_TOOL_CHAIN='sourcery-arm'" + sh "RTT_BSP='zynq7000' RTT_TOOL_CHAIN='sourcery-arm'" + sh "RTT_BSP='frdm-k64f' RTT_TOOL_CHAIN='sourcery-arm'" + sh "RTT_BSP='fh8620' RTT_TOOL_CHAIN='sourcery-arm'" + sh "RTT_BSP='x1000' RTT_TOOL_CHAIN='sourcery-mips'" + sh "RTT_BSP='xplorer4330/M4' RTT_TOOL_CHAIN='sourcery-arm'" + sh "RTT_BSP='at32/at32f403a-start' RTT_TOOL_CHAIN='sourcery-arm'" + sh "RTT_BSP='at32/at32f407-start' RTT_TOOL_CHAIN='sourcery-arm'" } } -- Gitee From 9d7820bf5ecc0ecb529cb46cb9b46b873d38be13 Mon Sep 17 00:00:00 2001 From: shaoguoji Date: Tue, 16 Jun 2020 18:45:28 +0800 Subject: [PATCH 07/11] [update]Jenkinsfile update env stage. --- Jenkinsfile | 112 +--------------------------------------------------- 1 file changed, 1 insertion(+), 111 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 39e363891c..6d9501ce3c 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -22,123 +22,13 @@ pipeline { sh "echo 'stage: env'" // sh "RTT_BSP='simulator' RTT_CC='clang-analyze' RTT_EXEC_PATH=/usr/share/clang/scan-build sh "RTT_BSP='CME_M7' RTT_TOOL_CHAIN='sourcery-arm'" - sh "RTT_BSP='apollo2' RTT_TOOL_CHAIN='sourcery-arm'" - sh "RTT_BSP='asm9260t' RTT_TOOL_CHAIN='sourcery-arm'" - sh "RTT_BSP='at91sam9260' RTT_TOOL_CHAIN='sourcery-arm'" - sh "RTT_BSP='allwinner_tina' RTT_TOOL_CHAIN='sourcery-arm'" - // sh "RTT_BSP='avr32uc3b0' RTT_TOOL_CHAIN='atmel-avr32'" - // sh "RTT_BSP='bf533' // no scons - sh "RTT_BSP='efm32' RTT_TOOL_CHAIN='sourcery-arm'" - // sh "RTT_BSP='es32f0334' RTT_TOOL_CHAIN='sourcery-arm' // not support gcc - // sh "RTT_BSP='es32f0654' RTT_TOOL_CHAIN='sourcery-arm' // not support gcc - sh "RTT_BSP='gd32e230k-start' RTT_TOOL_CHAIN='sourcery-arm'" - sh "RTT_BSP='gd32303e-eval' RTT_TOOL_CHAIN='sourcery-arm'" - sh "RTT_BSP='gd32450z-eval' RTT_TOOL_CHAIN='sourcery-arm'" - sh "RTT_BSP='gkipc' RTT_TOOL_CHAIN='sourcery-arm'" - sh "RTT_BSP='imx6sx/cortex-a9' RTT_TOOL_CHAIN='sourcery-arm'" - sh "RTT_BSP='imxrt/imxrt1052-atk-commander' RTT_TOOL_CHAIN='sourcery-arm'" - sh "RTT_BSP='imxrt/imxrt1052-fire-pro' RTT_TOOL_CHAIN='sourcery-arm'" - sh "RTT_BSP='imxrt/imxrt1052-nxp-evk' RTT_TOOL_CHAIN='sourcery-arm'" - sh "RTT_BSP='lm3s8962' RTT_TOOL_CHAIN='sourcery-arm'" - sh "RTT_BSP='lm3s9b9x' RTT_TOOL_CHAIN='sourcery-arm'" - sh "RTT_BSP='lm4f232' RTT_TOOL_CHAIN='sourcery-arm'" - sh "RTT_BSP='tm4c129x' RTT_TOOL_CHAIN='sourcery-arm'" - sh "RTT_BSP='lpc43xx/M4' RTT_TOOL_CHAIN='sourcery-arm'" - sh "RTT_BSP='lpc176x' RTT_TOOL_CHAIN='sourcery-arm'" - sh "RTT_BSP='lpc178x' RTT_TOOL_CHAIN='sourcery-arm'" - sh "RTT_BSP='lpc408x' RTT_TOOL_CHAIN='sourcery-arm'" - sh "RTT_BSP='lpc1114' RTT_TOOL_CHAIN='sourcery-arm'" - // sh "RTT_BSP='lpc824' RTT_TOOL_CHAIN='sourcery-arm' // not support gcc - sh "RTT_BSP='lpc2148' RTT_TOOL_CHAIN='sourcery-arm'" - sh "RTT_BSP='lpc2478' RTT_TOOL_CHAIN='sourcery-arm'" - sh "RTT_BSP='lpc5410x' RTT_TOOL_CHAIN='sourcery-arm'" - sh "RTT_BSP='lpc54114-lite' RTT_TOOL_CHAIN='sourcery-arm'" - // sh "RTT_BSP='lpc54608-LPCXpresso' RTT_TOOL_CHAIN='sourcery-arm'" - sh "RTT_BSP='ls1bdev' RTT_TOOL_CHAIN='sourcery-mips'" - sh "RTT_BSP='ls1cdev' RTT_TOOL_CHAIN='sourcery-mips'" - // sh "RTT_BSP='m16c62p' // m32c - sh "RTT_BSP='mb9bf500r' RTT_TOOL_CHAIN='sourcery-arm'" - sh "RTT_BSP='mb9bf506r' RTT_TOOL_CHAIN='sourcery-arm'" - sh "RTT_BSP='mb9bf618s' RTT_TOOL_CHAIN='sourcery-arm'" - sh "RTT_BSP='mb9bf568r' RTT_TOOL_CHAIN='sourcery-arm'" - // sh "RTT_BSP='microblaze' // no scons - sh "RTT_BSP='mini2440' RTT_TOOL_CHAIN='sourcery-arm'" - // sh "RTT_BSP='mini4020' // no scons - // sh "RTT_BSP='mm32l07x' // not support gcc - // sh "RTT_BSP='nios_ii' // no scons - sh "RTT_BSP='nuvoton_nuc472' RTT_TOOL_CHAIN='sourcery-arm'" - sh "RTT_BSP='nuvoton_m05x' RTT_TOOL_CHAIN='sourcery-arm'" - // sh "RTT_BSP='pic32ethernet' // no scons - sh "RTT_BSP='qemu-vexpress-a9' RTT_TOOL_CHAIN='sourcery-arm'" - sh "RTT_BSP='qemu-vexpress-gemini' RTT_TOOL_CHAIN='sourcery-arm'" - sh "RTT_BSP='sam7x' RTT_TOOL_CHAIN='sourcery-arm'" - // sh "RTT_BSP='simulator' // x86 - sh "RTT_BSP='stm32/stm32f072-st-nucleo' RTT_TOOL_CHAIN='sourcery-arm'" - sh "RTT_BSP='stm32/stm32f091-st-nucleo' RTT_TOOL_CHAIN='sourcery-arm'" - sh "RTT_BSP='stm32/stm32f103-atk-nano' RTT_TOOL_CHAIN='sourcery-arm'" - sh "RTT_BSP='stm32/stm32f103-atk-warshipv3' RTT_TOOL_CHAIN='sourcery-arm'" - sh "RTT_BSP='stm32/stm32f103-dofly-lyc8' RTT_TOOL_CHAIN='sourcery-arm'" - sh "RTT_BSP='stm32/stm32f103-dofly-M3S' RTT_TOOL_CHAIN='sourcery-arm'" - sh "RTT_BSP='stm32/stm32f103-fire-arbitrary' RTT_TOOL_CHAIN='sourcery-arm'" - sh "RTT_BSP='stm32/stm32f103-hw100k-ibox' RTT_TOOL_CHAIN='sourcery-arm'" - sh "RTT_BSP='stm32/stm32f103-mini-system' RTT_TOOL_CHAIN='sourcery-arm'" - sh "RTT_BSP='stm32/stm32f103-onenet-nbiot' RTT_TOOL_CHAIN='sourcery-arm'" - sh "RTT_BSP='stm32/stm32f103-yf-ufun' RTT_TOOL_CHAIN='sourcery-arm'" - sh "RTT_BSP='stm32/stm32f107-uc-eval' RTT_TOOL_CHAIN='sourcery-arm'" - sh "RTT_BSP='stm32/stm32f401-st-nucleo' RTT_TOOL_CHAIN='sourcery-arm'" - sh "RTT_BSP='stm32/stm32f405-smdz-breadfruit' RTT_TOOL_CHAIN='sourcery-arm'" - sh "RTT_BSP='stm32/stm32f407-atk-explorer' RTT_TOOL_CHAIN='sourcery-arm'" - sh "RTT_BSP='stm32/stm32f407-st-discovery' RTT_TOOL_CHAIN='sourcery-arm'" - sh "RTT_BSP='stm32/stm32f410-st-nucleo' RTT_TOOL_CHAIN='sourcery-arm'" - sh "RTT_BSP='stm32/stm32f411-st-nucleo' RTT_TOOL_CHAIN='sourcery-arm'" - sh "RTT_BSP='stm32/stm32f411-weact-MiniF4' RTT_TOOL_CHAIN='sourcery-arm'" - sh "RTT_BSP='stm32/stm32f413-st-nucleo' RTT_TOOL_CHAIN='sourcery-arm'" - sh "RTT_BSP='stm32/stm32f427-robomaster-a' RTT_TOOL_CHAIN='sourcery-arm'" - sh "RTT_BSP='stm32/stm32f429-armfly-v6' RTT_TOOL_CHAIN='sourcery-arm'" - sh "RTT_BSP='stm32/stm32f429-atk-apollo' RTT_TOOL_CHAIN='sourcery-arm'" - sh "RTT_BSP='stm32/stm32f429-fire-challenger' RTT_TOOL_CHAIN='sourcery-arm'" - sh "RTT_BSP='stm32/stm32f429-st-disco' RTT_TOOL_CHAIN='sourcery-arm'" - sh "RTT_BSP='stm32/stm32f446-st-nucleo' RTT_TOOL_CHAIN='sourcery-arm'" - sh "RTT_BSP='stm32/stm32f469-st-disco' RTT_TOOL_CHAIN='sourcery-arm'" - sh "RTT_BSP='stm32/stm32f746-st-disco' RTT_TOOL_CHAIN='sourcery-arm'" - sh "RTT_BSP='stm32/stm32f767-atk-apollo' RTT_TOOL_CHAIN='sourcery-arm'" - sh "RTT_BSP='stm32/stm32f767-fire-challenger' RTT_TOOL_CHAIN='sourcery-arm'" - sh "RTT_BSP='stm32/stm32f767-st-nucleo' RTT_TOOL_CHAIN='sourcery-arm'" - sh "RTT_BSP='stm32/stm32g071-st-nucleo' RTT_TOOL_CHAIN='sourcery-arm'" - sh "RTT_BSP='stm32/stm32g431-st-nucleo' RTT_TOOL_CHAIN='sourcery-arm'" - sh "RTT_BSP='stm32/stm32h743-atk-apollo' RTT_TOOL_CHAIN='sourcery-arm'" - sh "RTT_BSP='stm32/stm32h743-st-nucleo' RTT_TOOL_CHAIN='sourcery-arm'" - sh "RTT_BSP='stm32/stm32h747-st-discovery' RTT_TOOL_CHAIN='sourcery-arm'" - sh "RTT_BSP='stm32/stm32l4r9-st-eval' RTT_TOOL_CHAIN='sourcery-arm'" - sh "RTT_BSP='stm32/stm32l010-st-nucleo' RTT_TOOL_CHAIN='sourcery-arm'" - sh "RTT_BSP='stm32/stm32l053-st-nucleo' RTT_TOOL_CHAIN='sourcery-arm'" - sh "RTT_BSP='stm32/stm32l412-st-nucleo' RTT_TOOL_CHAIN='sourcery-arm'" - sh "RTT_BSP='stm32/stm32l432-st-nucleo' RTT_TOOL_CHAIN='sourcery-arm'" - sh "RTT_BSP='stm32/stm32l433-st-nucleo' RTT_TOOL_CHAIN='sourcery-arm'" - sh "RTT_BSP='stm32/stm32l475-atk-pandora' RTT_TOOL_CHAIN='sourcery-arm'" - sh "RTT_BSP='stm32/stm32l475-st-discovery' RTT_TOOL_CHAIN='sourcery-arm'" - sh "RTT_BSP='stm32/stm32l476-st-nucleo' RTT_TOOL_CHAIN='sourcery-arm'" - sh "RTT_BSP='stm32/stm32l496-ali-developer' RTT_TOOL_CHAIN='sourcery-arm'" - sh "RTT_BSP='stm32/stm32l496-st-nucleo' RTT_TOOL_CHAIN='sourcery-arm'" - sh "RTT_BSP='stm32f20x' RTT_TOOL_CHAIN='sourcery-arm'" - sh "RTT_BSP='swm320-lq100' RTT_TOOL_CHAIN='sourcery-arm'" - // sh "RTT_BSP='taihu' RTT_TOOL_CHAIN='sourcery-ppc'" - // sh "RTT_BSP='upd70f3454' // iar - // sh "RTT_BSP='x86' // x86 - sh "RTT_BSP='beaglebone' RTT_TOOL_CHAIN='sourcery-arm'" - sh "RTT_BSP='zynq7000' RTT_TOOL_CHAIN='sourcery-arm'" - sh "RTT_BSP='frdm-k64f' RTT_TOOL_CHAIN='sourcery-arm'" - sh "RTT_BSP='fh8620' RTT_TOOL_CHAIN='sourcery-arm'" - sh "RTT_BSP='x1000' RTT_TOOL_CHAIN='sourcery-mips'" - sh "RTT_BSP='xplorer4330/M4' RTT_TOOL_CHAIN='sourcery-arm'" - sh "RTT_BSP='at32/at32f403a-start' RTT_TOOL_CHAIN='sourcery-arm'" - sh "RTT_BSP='at32/at32f407-start' RTT_TOOL_CHAIN='sourcery-arm'" } } stage('compile') { steps { sh "echo 'stage: compile'" + sh 'scons -C bsp/$RTT_BSP' } } } -- Gitee From 40d3f20b719344d64dcb10ed9e1463beead85e18 Mon Sep 17 00:00:00 2001 From: shaoguoji Date: Tue, 16 Jun 2020 19:08:51 +0800 Subject: [PATCH 08/11] [update]Jenkinsfile. --- Jenkinsfile | 26 +++++++++++--------------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 6d9501ce3c..956f481436 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -3,9 +3,9 @@ pipeline { docker { image 'ubuntu_ci:latest' } } stages { - stage('before_script') { + stage('build') { steps { - sh "echo 'stage: before_script'" + sh 'uname -a' sh 'cat /etc/issue' sh 'apt-get update' @@ -14,21 +14,17 @@ pipeline { sh 'git config --global http.sslVerify false' sh 'git submodule sync --recursive' sh 'git submodule update --init --recursive' - } - } - stage('env') { - steps { - sh "echo 'stage: env'" - // sh "RTT_BSP='simulator' RTT_CC='clang-analyze' RTT_EXEC_PATH=/usr/share/clang/scan-build - sh "RTT_BSP='CME_M7' RTT_TOOL_CHAIN='sourcery-arm'" - } - } + sh ''' + export RTT_BSP='CME_M7' + export RTT_TOOL_CHAIN='sourcery-arm' + wget -q https://github.com/RT-Thread/toolchains-ci/releases/download/arm-2017q2-v6/gcc-arm-none-eabi-6-2017-q2-update-linux.tar.bz2 && sudo tar xjf gcc-arm-none-eabi-6-2017-q2-update-linux.tar.bz2 -C /opt && export RTT_EXEC_PATH=/opt/gcc-arm-none-eabi-6-2017-q2-update/bin && /opt/gcc-arm-none-eabi-6-2017-q2-update/bin/arm-none-eabi-gcc --version || true - stage('compile') { - steps { - sh "echo 'stage: compile'" - sh 'scons -C bsp/$RTT_BSP' + echo $RTT_BSP + echo $RTT_TOOL_CHAIN + + scons -C bsp/$RTT_BSP + ''' } } } -- Gitee From fe3a1ec1fd1f159cb303a08d2147e95fb52ff13f Mon Sep 17 00:00:00 2001 From: shaoguoji Date: Wed, 17 Jun 2020 09:16:32 +0800 Subject: [PATCH 09/11] [update]Caching data for containers. --- Jenkinsfile | 35 +++++++++++++++++++++-------------- 1 file changed, 21 insertions(+), 14 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 956f481436..de182f5d0e 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,28 +1,35 @@ pipeline { agent { - docker { image 'ubuntu_ci:latest' } + docker { + image 'ubuntu_ci:latest' + args '-v $HOME/.m2:/root/.m2' + } } stages { stage('build') { steps { - - sh 'uname -a' - sh 'cat /etc/issue' - sh 'apt-get update' - sh 'echo machine git.rt-thread.com login $CI_REGISTRY_USER password $CI_REGISTRY_PASSWORD >> ~/.netrc' - sh 'apt-get install -y -qq lib32ncurses5 lib32z1 > /dev/null' - sh 'git config --global http.sslVerify false' - sh 'git submodule sync --recursive' - sh 'git submodule update --init --recursive' - sh ''' - export RTT_BSP='CME_M7' + uname -a + cat /etc/issue + apt-get update + echo machine git.rt-thread.com login $CI_REGISTRY_USER password $CI_REGISTRY_PASSWORD >> ~/.netrc + apt-get install -y -qq lib32ncurses5 lib32z1 > /dev/null + git config --global http.sslVerify false + git submodule sync --recursive + git submodule update --init --recursive + + export RTT_BSP='stm32f10x' export RTT_TOOL_CHAIN='sourcery-arm' - wget -q https://github.com/RT-Thread/toolchains-ci/releases/download/arm-2017q2-v6/gcc-arm-none-eabi-6-2017-q2-update-linux.tar.bz2 && sudo tar xjf gcc-arm-none-eabi-6-2017-q2-update-linux.tar.bz2 -C /opt && export RTT_EXEC_PATH=/opt/gcc-arm-none-eabi-6-2017-q2-update/bin && /opt/gcc-arm-none-eabi-6-2017-q2-update/bin/arm-none-eabi-gcc --version || true echo $RTT_BSP echo $RTT_TOOL_CHAIN - + + curl -s https://sourcery.mentor.com/public/gnu_toolchain/arm-none-eabi/arm-2014.05-28-arm-none-eabi-i686-pc-linux-gnu.tar.bz2 | sudo tar xjf - -C /opt + export RTT_EXEC_PATH=/opt/arm-2014.05/bin + /opt/arm-2014.05/bin/arm-none-eabi-gcc --version || true + + export RTT_ROOT=`pwd` + scons -C bsp/$RTT_BSP ''' } -- Gitee From 306f8589ea549e7652c0ea4aafca219339837ae6 Mon Sep 17 00:00:00 2001 From: shaoguoji Date: Wed, 17 Jun 2020 10:15:39 +0800 Subject: [PATCH 10/11] [update]Jenkinsfile. --- Jenkinsfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index de182f5d0e..ec5c5111cf 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -18,7 +18,7 @@ pipeline { git submodule sync --recursive git submodule update --init --recursive - export RTT_BSP='stm32f10x' + export RTT_BSP='stm32f20x' export RTT_TOOL_CHAIN='sourcery-arm' echo $RTT_BSP @@ -29,6 +29,8 @@ pipeline { /opt/arm-2014.05/bin/arm-none-eabi-gcc --version || true export RTT_ROOT=`pwd` + pwd + ls -al scons -C bsp/$RTT_BSP ''' -- Gitee From e3a017d1d1d78e2599b7a97d3704522e5a7acfcb Mon Sep 17 00:00:00 2001 From: shaoguoji Date: Wed, 17 Jun 2020 10:50:39 +0800 Subject: [PATCH 11/11] [compile]sucess compile "hello world"! --- Jenkinsfile | 6 ------ 1 file changed, 6 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index ec5c5111cf..805f2af8fd 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -21,16 +21,10 @@ pipeline { export RTT_BSP='stm32f20x' export RTT_TOOL_CHAIN='sourcery-arm' - echo $RTT_BSP - echo $RTT_TOOL_CHAIN - curl -s https://sourcery.mentor.com/public/gnu_toolchain/arm-none-eabi/arm-2014.05-28-arm-none-eabi-i686-pc-linux-gnu.tar.bz2 | sudo tar xjf - -C /opt export RTT_EXEC_PATH=/opt/arm-2014.05/bin /opt/arm-2014.05/bin/arm-none-eabi-gcc --version || true - export RTT_ROOT=`pwd` - pwd - ls -al scons -C bsp/$RTT_BSP ''' -- Gitee