From ca5a5a4f5fa46689c7f47f61ea295b2b37ef2e1e Mon Sep 17 00:00:00 2001 From: Matthew Else Date: Mon, 28 Oct 2013 09:23:39 +0000 Subject: [PATCH 01/12] mbedmicro/mbed#87 Added some travis support, I hope. Only currently supports GCC_ARM and untested so far... --- .travis.yml | 6 ++++++ travis/install_dependencies.sh | 6 ++++++ 2 files changed, 12 insertions(+) create mode 100644 .travis.yml create mode 100644 travis/install_dependencies.sh diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000000..de101b1266 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,6 @@ +--- +install: travis/install_dependencies.sh +python: + - "2.7" +script: "python workspace_tools/build.py -r -e -U -u -d -b -t GCC_ARM" + diff --git a/travis/install_dependencies.sh b/travis/install_dependencies.sh new file mode 100644 index 0000000000..c7c858a170 --- /dev/null +++ b/travis/install_dependencies.sh @@ -0,0 +1,6 @@ +echo "Installing compilation dependencies." + +# Install GCC-ARM Compiler. +sudo add-apt-repository -y ppa:terry.guo/gcc-arm-embedded +sudo apt-get update +sudo apt-get install gcc-arm-none-eabi From ea181069b0c2fcf64418b895026de2deb7f38ba6 Mon Sep 17 00:00:00 2001 From: Matthew Else Date: Mon, 28 Oct 2013 09:27:03 +0000 Subject: [PATCH 02/12] Now using sudo in the travis install commands --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index de101b1266..b860597fc0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,5 @@ --- -install: travis/install_dependencies.sh +install: sudo travis/install_dependencies.sh python: - "2.7" script: "python workspace_tools/build.py -r -e -U -u -d -b -t GCC_ARM" From d5cc572df112f642a6adf565891aaa42ea07c834 Mon Sep 17 00:00:00 2001 From: Matthew Else Date: Mon, 28 Oct 2013 09:29:07 +0000 Subject: [PATCH 03/12] Added travis image to readme. --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 595e1855aa..c5ccf4b976 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,8 @@ mbed SDK ======== +[![Build Status](https://travis-ci.org/matthewelse/mbed.png)](https://travis-ci.org/matthewelse/mbed) + The mbed Software Development Kit (SDK) is a C/C++ microcontroller software platform relied upon by tens of thousands of developers to build projects fast. From 56de616b93dfd0d2a757be13f4c73d944a28ae1a Mon Sep 17 00:00:00 2001 From: Matthew Else Date: Mon, 28 Oct 2013 09:32:25 +0000 Subject: [PATCH 04/12] Updated travis :D --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index b860597fc0..c2f4042073 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,5 @@ --- -install: sudo travis/install_dependencies.sh +install: "sudo $TRAVIS_BUILD_DIR/travis/install_dependencies.sh" python: - "2.7" script: "python workspace_tools/build.py -r -e -U -u -d -b -t GCC_ARM" From 3da254960fad5b334f48d0554823a208debfab0e Mon Sep 17 00:00:00 2001 From: Matthew Else Date: Mon, 28 Oct 2013 09:35:14 +0000 Subject: [PATCH 05/12] Fixed file permissions for install_dependencies.sh --- travis/install_dependencies.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 travis/install_dependencies.sh diff --git a/travis/install_dependencies.sh b/travis/install_dependencies.sh old mode 100644 new mode 100755 From cb87dbc7428dc5c04a0f481e7b8e974acd1d1dfe Mon Sep 17 00:00:00 2001 From: Matthew Else Date: Mon, 28 Oct 2013 18:13:29 +0000 Subject: [PATCH 06/12] I think, I've added support for ARM_CC using wine... --- .travis.yml | 3 +-- travis/install_dependencies.sh | 28 +++++++++++++++++++++++++++- 2 files changed, 28 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index c2f4042073..9a32bf0ffb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,5 +2,4 @@ install: "sudo $TRAVIS_BUILD_DIR/travis/install_dependencies.sh" python: - "2.7" -script: "python workspace_tools/build.py -r -e -U -u -d -b -t GCC_ARM" - +script: "python workspace_tools/build.py -r -e -U -u -d -b -t ARM_CC;python workspace_tools/build.py -r -e -U -u -d -b -t GCC_ARM" diff --git a/travis/install_dependencies.sh b/travis/install_dependencies.sh index c7c858a170..5a606f7bfc 100755 --- a/travis/install_dependencies.sh +++ b/travis/install_dependencies.sh @@ -2,5 +2,31 @@ echo "Installing compilation dependencies." # Install GCC-ARM Compiler. sudo add-apt-repository -y ppa:terry.guo/gcc-arm-embedded +sudo add-apt-repository -y ppa:ubuntu-wine/ppa + sudo apt-get update -sudo apt-get install gcc-arm-none-eabi +sudo apt-get install -y gcc-arm-none-eabi +sudo apt-get install -y wine1.5 + +# Download ARMCC (Testing Purposes only at the moment) +wget https://dl.dropboxusercontent.com/u/15449666/ARMCC.tar.gz +tar xvfz ARMCC.tar.gz + +# Setup ARMCC environment variables + +printf "#%s/bin/bash\nwine armcc.exe" ! > ARMCC/bin/armcc +chmod a+x ARMCC/bin/armcc + +printf "#%s/bin/bash\nwine armar.exe" ! > ARMCC/bin/armar +chmod a+x ARMCC/bin/armar + +printf "#%s/bin/bash\nwine armasm.exe" ! > ARMCC/bin/armasm +chmod a+x ARMCC/bin/armasm + +printf "#%s/bin/bash\nwine armlink.exe" ! > ARMCC/bin/armlink +chmod a+x ARMCC/bin/armlink + +printf "#%s/bin/bash\nwine fromelf.exe" ! > ARMCC/bin/fromelf +chmod a+x ARMCC/bin/fromelf + +PATH = "$PATH:$TRAVIS_BUILD_DIR/ARMCC/bin" From 0a9019bd324f711e5a25607d75c5b884215886d8 Mon Sep 17 00:00:00 2001 From: Matthew Else Date: Mon, 28 Oct 2013 18:20:32 +0000 Subject: [PATCH 07/12] Fixed install_dependencies.sh --- travis/install_dependencies.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/travis/install_dependencies.sh b/travis/install_dependencies.sh index 5a606f7bfc..1a97049bdb 100755 --- a/travis/install_dependencies.sh +++ b/travis/install_dependencies.sh @@ -29,4 +29,4 @@ chmod a+x ARMCC/bin/armlink printf "#%s/bin/bash\nwine fromelf.exe" ! > ARMCC/bin/fromelf chmod a+x ARMCC/bin/fromelf -PATH = "$PATH:$TRAVIS_BUILD_DIR/ARMCC/bin" +export PATH = $PATH:$TRAVIS_BUILD_DIR"/ARMCC/bin" From 8786cbf17addef35728359268400a9650301f958 Mon Sep 17 00:00:00 2001 From: Matthew Else Date: Mon, 28 Oct 2013 18:35:10 +0000 Subject: [PATCH 08/12] Hopefully fixed install_dependencies.sh --- travis/install_dependencies.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/travis/install_dependencies.sh b/travis/install_dependencies.sh index 1a97049bdb..710fcb1dd5 100755 --- a/travis/install_dependencies.sh +++ b/travis/install_dependencies.sh @@ -29,4 +29,4 @@ chmod a+x ARMCC/bin/armlink printf "#%s/bin/bash\nwine fromelf.exe" ! > ARMCC/bin/fromelf chmod a+x ARMCC/bin/fromelf -export PATH = $PATH:$TRAVIS_BUILD_DIR"/ARMCC/bin" +export PATH=$PATH:$TRAVIS_BUILD_DIR"/ARMCC/bin" From 1054f86806753c65474f91c075ea13b1c4906319 Mon Sep 17 00:00:00 2001 From: Matthew Else Date: Tue, 29 Oct 2013 12:02:03 +0000 Subject: [PATCH 09/12] Added support for microlib compilation. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 9a32bf0ffb..4a6938e1aa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,4 +2,4 @@ install: "sudo $TRAVIS_BUILD_DIR/travis/install_dependencies.sh" python: - "2.7" -script: "python workspace_tools/build.py -r -e -U -u -d -b -t ARM_CC;python workspace_tools/build.py -r -e -U -u -d -b -t GCC_ARM" +script: "python workspace_tools/build.py -r -e -U -u -d -b -t uARM;python workspace_tools/build.py -r -e -U -u -d -b -t ARM;python workspace_tools/build.py -r -e -U -u -d -b -t GCC_ARM" From 9ef1fdec455a3636640813ab753ac05b4ae94894 Mon Sep 17 00:00:00 2001 From: Matthew Else Date: Tue, 29 Oct 2013 12:07:21 +0000 Subject: [PATCH 10/12] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 4a6938e1aa..87cf37c331 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,4 +2,4 @@ install: "sudo $TRAVIS_BUILD_DIR/travis/install_dependencies.sh" python: - "2.7" -script: "python workspace_tools/build.py -r -e -U -u -d -b -t uARM;python workspace_tools/build.py -r -e -U -u -d -b -t ARM;python workspace_tools/build.py -r -e -U -u -d -b -t GCC_ARM" +script: "python workspace_tools/build.py -r -e -U -u -d -b -t ARM_MICRO;python workspace_tools/build.py -r -e -U -u -d -b -t ARM_CC;python workspace_tools/build.py -r -e -U -u -d -b -t GCC_ARM" From 73d8eb426c8b414f5121504753e7e15445637df4 Mon Sep 17 00:00:00 2001 From: Matthew Else Date: Tue, 29 Oct 2013 12:19:09 +0000 Subject: [PATCH 11/12] Redirected some commands in Travis setup to go to /dev/null Now, we don't get all of the verbose output from the tar command, etc. --- travis/install_dependencies.sh | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/travis/install_dependencies.sh b/travis/install_dependencies.sh index 710fcb1dd5..82f7ffa488 100755 --- a/travis/install_dependencies.sh +++ b/travis/install_dependencies.sh @@ -1,19 +1,28 @@ echo "Installing compilation dependencies." # Install GCC-ARM Compiler. -sudo add-apt-repository -y ppa:terry.guo/gcc-arm-embedded -sudo add-apt-repository -y ppa:ubuntu-wine/ppa -sudo apt-get update -sudo apt-get install -y gcc-arm-none-eabi -sudo apt-get install -y wine1.5 +echo "Adding apt repositories." +sudo add-apt-repository -y ppa:terry.guo/gcc-arm-embedded > /dev/null +sudo add-apt-repository -y ppa:ubuntu-wine/ppa > /dev/null + +echo "Installing gcc_arm software" +sudo apt-get update > /dev/null +sudo apt-get install -y gcc-arm-none-eabi > /dev/null + +echo "Setting up Wine." +sudo apt-get install -y wine1.5 > /dev/null + # Download ARMCC (Testing Purposes only at the moment) -wget https://dl.dropboxusercontent.com/u/15449666/ARMCC.tar.gz -tar xvfz ARMCC.tar.gz + +echo "Installing ARMCC" +wget https://dl.dropboxusercontent.com/u/15449666/ARMCC.tar.gz > /dev/null +tar xvfz ARMCC.tar.gz > /dev/null # Setup ARMCC environment variables +echo "Setting up Environment Variables" printf "#%s/bin/bash\nwine armcc.exe" ! > ARMCC/bin/armcc chmod a+x ARMCC/bin/armcc From 908c0da4714906e0ac4a98b40c899b1170ead4c2 Mon Sep 17 00:00:00 2001 From: Matthew Else Date: Tue, 29 Oct 2013 12:29:57 +0000 Subject: [PATCH 12/12] (Hopefully) got rid of all of the setup output --- .travis.yml | 2 +- travis/install_dependencies.sh | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index 87cf37c331..44ff52f03a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,5 @@ --- -install: "sudo $TRAVIS_BUILD_DIR/travis/install_dependencies.sh" +install: "sudo $TRAVIS_BUILD_DIR/travis/install_dependencies.sh > /dev/null" python: - "2.7" script: "python workspace_tools/build.py -r -e -U -u -d -b -t ARM_MICRO;python workspace_tools/build.py -r -e -U -u -d -b -t ARM_CC;python workspace_tools/build.py -r -e -U -u -d -b -t GCC_ARM" diff --git a/travis/install_dependencies.sh b/travis/install_dependencies.sh index 82f7ffa488..c685fc3d2d 100755 --- a/travis/install_dependencies.sh +++ b/travis/install_dependencies.sh @@ -3,22 +3,22 @@ echo "Installing compilation dependencies." # Install GCC-ARM Compiler. echo "Adding apt repositories." -sudo add-apt-repository -y ppa:terry.guo/gcc-arm-embedded > /dev/null -sudo add-apt-repository -y ppa:ubuntu-wine/ppa > /dev/null +sudo add-apt-repository -y ppa:terry.guo/gcc-arm-embedded +sudo add-apt-repository -y ppa:ubuntu-wine/ppa echo "Installing gcc_arm software" -sudo apt-get update > /dev/null -sudo apt-get install -y gcc-arm-none-eabi > /dev/null +sudo apt-get update +sudo apt-get install -y gcc-arm-none-eabi echo "Setting up Wine." -sudo apt-get install -y wine1.5 > /dev/null +sudo apt-get install -y wine1.5 # Download ARMCC (Testing Purposes only at the moment) echo "Installing ARMCC" -wget https://dl.dropboxusercontent.com/u/15449666/ARMCC.tar.gz > /dev/null -tar xvfz ARMCC.tar.gz > /dev/null +wget https://dl.dropboxusercontent.com/u/15449666/ARMCC.tar.gz +tar xvfz ARMCC.tar.gz # Setup ARMCC environment variables