Update Travis build script (even if there are no examples)

.gitignore

@@ -0,0 +1,2 @@
+
+.DS_Store

.travis.yml

@@ -1,17 +1,21 @@
 sudo: false
-
+language: bash
-language: python
-python:
-  - "2.7"
-
 os:
   - linux
 
-dist:
+git:
-  - xenial
+  depth: false
 
-script:
+stages:
-  - bash $TRAVIS_BUILD_DIR/travis/build.sh
+  - build
+
+jobs:
+  include:
+
+    - name: "Build Examples"
+      if: tag IS blank AND (type = pull_request OR (type = push AND branch = master))
+      stage: build
+      script: bash $TRAVIS_BUILD_DIR/travis/build.sh
 
 notifications:
   email:

travis/build.py

@@ -1,131 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
-# build.py — build a sketch using arduino-builder
-#
-# Wrapper script around arduino-builder which accepts some ESP8266-specific
-# options and translates them into FQBN
-#
-# Copyright © 2016 Ivan Grokhotkov
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-#
-
-
-from __future__ import print_function
-import sys
-import os
-import argparse
-import subprocess
-import tempfile
-import shutil
-
-def compile(tmp_dir, sketch, tools_dir, hardware_dir, ide_path, f, args):
-    cmd = ide_path + '/arduino-builder '
-    cmd += '-compile -logger=human '
-    cmd += '-build-path "' + tmp_dir + '" '
-    cmd += '-tools "' +  ide_path + '/tools-builder" '
-    if args.library_path:
-        for lib_dir in args.library_path:
-            cmd += '-libraries "' + lib_dir + '" '
-    cmd += '-hardware "' + ide_path + '/hardware" '
-    if args.hardware_dir:
-        for hw_dir in args.hardware_dir:
-            cmd += '-hardware "' + hw_dir + '" '
-    else:
-        cmd += '-hardware "' + hardware_dir + '" '
-    # Debug=Serial,DebugLevel=Core____
-    cmd += '-fqbn=espressif:esp32:{board_name}:' \
-            'FlashFreq={flash_freq},' \
-            'PartitionScheme=huge_app,' \
-            'UploadSpeed=921600'.format(**vars(args))
-    cmd += ' '
-    cmd += '-ide-version=10607 '
-    cmd += '-warnings={warnings} '.format(**vars(args))
-    if args.verbose:
-        cmd += '-verbose '
-    cmd += sketch
-
-    if args.verbose:
-        print('Building: ' + cmd, file=f)
-
-    cmds = cmd.split(' ')
-    p = subprocess.Popen(cmds, stdout=f, stderr=subprocess.STDOUT)
-    p.wait()
-    return p.returncode
-
-def parse_args():
-    parser = argparse.ArgumentParser(description='Sketch build helper')
-    parser.add_argument('-v', '--verbose', help='Enable verbose output',
-                        action='store_true')
-    parser.add_argument('-i', '--ide_path', help='Arduino IDE path')
-    parser.add_argument('-p', '--build_path', help='Build directory')
-    parser.add_argument('-l', '--library_path', help='Additional library path',
-                        action='append')
-    parser.add_argument('-d', '--hardware_dir', help='Additional hardware path',
-                        action='append')
-    parser.add_argument('-b', '--board_name', help='Board name', default='esp32')
-    parser.add_argument('-w', '--warnings', help='Compilation warnings level',
-                        default='none', choices=['none', 'all', 'more'])
-    parser.add_argument('-o', '--output_binary', help='File name for output binary')
-    parser.add_argument('-k', '--keep', action='store_true',
-                        help='Don\'t delete temporary build directory')
-    parser.add_argument('--flash_freq', help='Flash frequency', default=40,
-                        type=int, choices=[40, 80])
-    parser.add_argument('sketch_path', help='Sketch file path')
-    return parser.parse_args()
-
-def main():
-    args = parse_args()
-
-    ide_path = args.ide_path
-    if not ide_path:
-        ide_path = os.environ.get('ARDUINO_IDE_PATH')
-        if not ide_path:
-            print("Please specify Arduino IDE path via --ide_path option"
-                  "or ARDUINO_IDE_PATH environment variable.", file=sys.stderr)
-            return 2
-
-    sketch_path = args.sketch_path
-    tmp_dir = args.build_path
-    created_tmp_dir = False
-    if not tmp_dir:
-        tmp_dir = tempfile.mkdtemp()
-        created_tmp_dir = True
-
-    tools_dir = os.path.dirname(os.path.realpath(__file__)) + '/../tools'
-    # this is not the correct hardware folder to add.
-    hardware_dir = ide_path + '/hardware'
-
-    output_name = tmp_dir + '/' + os.path.basename(sketch_path) + '.bin'
-    if args.verbose:
-        print("Sketch: ", sketch_path)
-        print("Build dir: ", tmp_dir)
-        print("Output: ", output_name)
-
-    if args.verbose:
-        f = sys.stdout
-    else:
-        f = open(tmp_dir + '/build.log', 'w')
-
-    res = compile(tmp_dir, sketch_path, tools_dir, hardware_dir, ide_path, f, args)
-    if res != 0:
-        return res
-
-    if args.output_binary is not None:
-        shutil.copy(output_name, args.output_binary)
-
-    if created_tmp_dir and not args.keep:
-        shutil.rmtree(tmp_dir, ignore_errors=True)
-
-if __name__ == '__main__':
-    sys.exit(main())

travis/build.sh

@@ -1,14 +1,37 @@
 #!/bin/bash
 
-echo -e "travis_fold:start:sketch_test_env_prepare"
+CHUNK_INDEX=$1
-pip install pyserial
+CHUNKS_CNT=$2
+if [ "$#" -lt 2 ]; then
+	echo "Building all sketches"
+	CHUNK_INDEX=0
+	CHUNKS_CNT=1
+fi
+if [ "$CHUNKS_CNT" -le 0 ]; then
+	echo "Chunks count must be positive number"
+	exit 1
+fi
+if [ "$CHUNK_INDEX" -ge "$CHUNKS_CNT" ]; then
+	echo "Chunk index must be less than chunks count"
+	exit 1
+fi
+
+echo -e "travis_fold:start:prep_arduino_ide"
+# Install Arduino IDE
 wget -O arduino.tar.xz https://www.arduino.cc/download.php?f=/arduino-nightly-linux64.tar.xz
 tar xf arduino.tar.xz
 mv arduino-nightly $HOME/arduino_ide
 mkdir -p $HOME/Arduino/libraries
+mkdir -p $HOME/Arduino/hardware
+echo -e "travis_fold:end:prep_arduino_ide"
+
+echo -e "travis_fold:start:sketch_test_env_prepare"
 cd $HOME/Arduino/libraries
 cp -rf $TRAVIS_BUILD_DIR AsyncTCP
-cd $HOME/arduino_ide/hardware
+PLATFORM_EXAMPLES=$TRAVIS_BUILD_DIR/examples
+
+cd $HOME/Arduino/hardware
+pip install pyserial
 mkdir espressif
 cd espressif
 git clone https://github.com/espressif/arduino-esp32.git esp32
@@ -16,12 +39,158 @@ cd esp32
 git submodule update --init --recursive
 cd tools
 python get.py
-cd $TRAVIS_BUILD_DIR
+PLATFORM_FQBN="espressif:esp32:esp32"
-export PATH="$HOME/arduino_ide:$HOME/arduino_ide/hardware/espressif/esp32/tools/xtensa-esp32-elf/bin:$PATH"
+PLATFORM_SIZE_BIN=$HOME/Arduino/hardware/espressif/esp32/tools/xtensa-esp32-elf/bin/xtensa-esp32-elf-size
-source travis/common.sh
 echo -e "travis_fold:end:sketch_test_env_prepare"
 
-echo -e "travis_fold:start:sketch_test"
+cd $TRAVIS_BUILD_DIR
-build_sketches $HOME/arduino_ide $HOME/Arduino/libraries/AsyncTCP/examples "-l $HOME/Arduino/libraries"
+
+ARDUINO_IDE_PATH=$HOME/arduino_ide
+ARDUINO_USR_PATH=$HOME/Arduino
+ARDUINO_BUILD_DIR=$HOME/build.tmp
+ARDUINO_CACHE_DIR=$HOME/cache.tmp
+ARDUINO_BUILD_CMD="$ARDUINO_IDE_PATH/arduino-builder -compile -logger=human -core-api-version=10810 -hardware \"$ARDUINO_IDE_PATH/hardware\" -hardware \"$ARDUINO_USR_PATH/hardware\" -tools \"$ARDUINO_IDE_PATH/tools-builder\" -built-in-libraries \"$ARDUINO_IDE_PATH/libraries\" -libraries \"$ARDUINO_USR_PATH/libraries\" -fqbn=$PLATFORM_FQBN -warnings=\"all\" -build-cache \"$ARDUINO_CACHE_DIR\" -build-path \"$ARDUINO_BUILD_DIR\" -verbose"
+
+function print_size_info()
+{
+    elf_file=$1
+
+    if [ -z "$elf_file" ]; then
+    	printf "sketch                           iram0.text flash.text flash.rodata dram0.data dram0.bss    dram     flash\n"
+        return 0
+    fi
+
+    elf_name=$(basename $elf_file)
+    sketch_name="${elf_name%.*}"
+    declare -A segments
+    while read -a tokens; do
+        seg=${tokens[0]}
+        seg=${seg//./}
+        size=${tokens[1]}
+        addr=${tokens[2]}
+        if [ "$addr" -eq "$addr" -a "$addr" -ne "0" ] 2>/dev/null; then
+            segments[$seg]=$size
+        fi
+    done < <($PLATFORM_SIZE_BIN --format=sysv $elf_file)
+
+    total_ram=$((${segments[dram0data]} + ${segments[dram0bss]}))
+    total_flash=$((${segments[iram0text]} + ${segments[flashtext]} + ${segments[dram0data]} + ${segments[flashrodata]}))
+    printf "%-32s %-8d   %-8d   %-8d     %-8d   %-8d     %-8d %-8d\n" $sketch_name ${segments[iram0text]} ${segments[flashtext]} ${segments[flashrodata]} ${segments[dram0data]} ${segments[dram0bss]} $total_ram $total_flash
+    return 0
+}
+
+function build_sketch()
+{
+	local sketch=$1
+    echo -e "\n------------ Building $sketch ------------\n";
+    rm -rf $ARDUINO_BUILD_DIR/*
+    time ($ARDUINO_BUILD_CMD $sketch >build.log)
+    local result=$?
+    if [ $result -ne 0 ]; then
+        echo "Build failed ($1)"
+        echo "Build log:"
+        cat build.log
+        return $result
+    fi
+    rm build.log
+    return 0
+}
+
+function count_sketches()
+{
+    local sketches=$(find $PLATFORM_EXAMPLES -name *.ino)
+    local sketchnum=0
+    rm -rf sketches.txt
+    for sketch in $sketches; do
+        local sketchdir=$(dirname $sketch)
+        local sketchdirname=$(basename $sketchdir)
+        local sketchname=$(basename $sketch)
+        if [[ "${sketchdirname}.ino" != "$sketchname" ]]; then
+            continue
+        fi
+        echo $sketch >> sketches.txt
+        sketchnum=$(($sketchnum + 1))
+    done
+    return $sketchnum
+}
+
+function build_sketches()
+{
+    mkdir -p $ARDUINO_BUILD_DIR
+    mkdir -p $ARDUINO_CACHE_DIR
+    mkdir -p $ARDUINO_USR_PATH/libraries
+    mkdir -p $ARDUINO_USR_PATH/hardware
+    
+    local chunk_idex=$1
+    local chunks_num=$2
+    count_sketches
+    local sketchcount=$?
+    local sketches=$(cat sketches.txt)
+
+    local chunk_size=$(( $sketchcount / $chunks_num ))
+    local all_chunks=$(( $chunks_num * $chunk_size ))
+    if [ "$all_chunks" -lt "$sketchcount" ]; then
+    	chunk_size=$(( $chunk_size + 1 ))
+    fi
+
+    local start_index=$(( $chunk_idex * $chunk_size ))
+    if [ "$sketchcount" -le "$start_index" ]; then
+    	echo "Skipping job"
+    	return 0
+    fi
+
+    local end_index=$(( $(( $chunk_idex + 1 )) * $chunk_size ))
+    if [ "$end_index" -gt "$sketchcount" ]; then
+    	end_index=$sketchcount
+    fi
+
+    local start_num=$(( $start_index + 1 ))
+    #echo -e "Sketches: \n$sketches\n"
+    echo "Found $sketchcount Sketches";
+    echo "Chunk Count : $chunks_num"
+    echo "Chunk Size  : $chunk_size"
+    echo "Start Sketch: $start_num"
+    echo "End Sketch  : $end_index"
+
+    local sketchnum=0
+    print_size_info >size.log
+    for sketch in $sketches; do
+        local sketchdir=$(dirname $sketch)
+        local sketchdirname=$(basename $sketchdir)
+        local sketchname=$(basename $sketch)
+        if [[ "${sketchdirname}.ino" != "$sketchname" ]]; then
+            #echo "Skipping $sketch, beacause it is not the main sketch file";
+            continue
+        fi;
+        if [[ -f "$sketchdir/.test.skip" ]]; then
+            #echo "Skipping $sketch marked";
+            continue
+        fi
+        sketchnum=$(($sketchnum + 1))
+        if [ "$sketchnum" -le "$start_index" ]; then
+        	#echo "Skipping $sketch index low"
+        	continue
+        fi
+        if [ "$sketchnum" -gt "$end_index" ]; then
+        	#echo "Skipping $sketch index high"
+        	continue
+        fi
+        build_sketch $sketch
+        local result=$?
+        if [ $result -ne 0 ]; then
+            return $result
+        fi
+        print_size_info $ARDUINO_BUILD_DIR/*.elf >>size.log
+    done
+    return 0
+}
+
+echo -e "travis_fold:start:test_arduino_ide"
+# Build Examples
+build_sketches $CHUNK_INDEX $CHUNKS_CNT
 if [ $? -ne 0 ]; then exit 1; fi
-echo -e "travis_fold:end:sketch_test"
+echo -e "travis_fold:end:test_arduino_ide"
+
+echo -e "travis_fold:start:size_report"
+cat size.log
+echo -e "travis_fold:end:size_report"

travis/common.sh

@@ -1,39 +0,0 @@
-#!/bin/bash
-
-function build_sketches()
-{
-    #set +e
-    local arduino=$1
-    local srcpath=$2
-    local build_arg=$3
-    local build_dir=build.tmp
-    mkdir -p $build_dir
-    local build_cmd="python travis/build.py -b esp32 -k -p $PWD/$build_dir $build_arg "
-    local sketches=$(find $srcpath -name *.ino)
-    export ARDUINO_IDE_PATH=$arduino
-    for sketch in $sketches; do
-        rm -rf $build_dir/*
-        local sketchdir=$(dirname $sketch)
-        local sketchdirname=$(basename $sketchdir)
-        local sketchname=$(basename $sketch)
-        if [[ "${sketchdirname}.ino" != "$sketchname" ]]; then
-            echo "Skipping $sketch, beacause it is not the main sketch file";
-            continue
-        fi;
-        if [[ -f "$sketchdir/.test.skip" ]]; then
-            echo -e "\n ------------ Skipping $sketch ------------ \n";
-            continue
-        fi
-        echo -e "\n ------------ Building $sketch ------------ \n";
-        time ($build_cmd $sketch >$build_dir/build.log)
-        local result=$?
-        if [ $result -ne 0 ]; then
-            echo "Build failed ($1)"
-            echo "Build log:"
-            cat $build_dir/build.log
-            return $result
-        fi
-        rm $build_dir/build.log
-    done
-    #set -e
-}