Merge branch 'devel'

Conflicts:
	Makefile

Author: dannyp11

.gitignore

@@ -13,6 +13,8 @@
 *.h.cpp
 *.ocxx
 *.cxxtest
+tmp/
+build-uno/
 
 # Packages #
 ############

.gitmodules

@@ -4,6 +4,7 @@
 [submodule "submodules/ChibiOS"]
 	path = submodules/ChibiOS
 	url = https://github.com/ChibiOS/ChibiOS
+    ignore = dirty
 [submodule "submodules/googletest"]
 	path = submodules/googletest
 	url = https://github.com/google/googletest

.travis.yml

@@ -31,6 +31,7 @@ compiler:
 
 script: 
 - make check
+- make compile
 
 before_install:
   - sudo apt-get -qq update

Makefile

@@ -5,17 +5,12 @@ TOP = ./
 # run all unit tests in all folders
 check:
 	$(TOP)/project_manager.sh -T
-	$(TOP)/project_manager.sh -k test/
-	$(TOP)/project_manager.sh -k c-project/
-	$(TOP)/project_manager.sh -k cpp-project/
-	$(TOP)/project_manager.sh -k common/
+	$(TOP)/project_manager.sh -k test c-project cpp-project common
 
 # comipile all projects
-compile:
+compile:        
 	$(TOP)/project_manager.sh -T
-	$(TOP)/project_manager.sh -m test/
-	$(TOP)/project_manager.sh -f -m c-project/ 
-	$(TOP)/project_manager.sh -f -m cpp-project/ 
+	$(TOP)/project_manager.sh -fm test c-project cpp-project
 
 # clean all projects for maintaining purpose
 clean:

ReleaseNote.txt

@@ -23,12 +23,13 @@ RelNote -*- mode : org -*-
 *** DONE GPS breakout board to output to softserial
     - State "DONE"       from "INPROGRESS" [2017-06-11 Sun 22:54]
 
-* INPROGRESS v2.1.0 - Google test support & C sensor library support
+* DONE v2.1.0 - Google test support & C sensor library support
+  - State "DONE"       from "FEEDBACK"   [2017-07-30 Sun 17:46]
+  - State "FEEDBACK"   from "INPROGRESS" [2017-07-30 Sun 17:46]
 ** DONE add common/makefiles/gtest.mk
    - State "DONE"       from "INPROGRESS" [2017-06-12 Mon 20:05]
 *** DONE add simple gtest project
     - State "DONE"       from "INPROGRESS" [2017-06-12 Mon 20:05]
-** WAIT full range adc & pin change interrupt C support
 ** DONE add checking dependency in fresh repo clone
    - State "DONE"       from "FEEDBACK"   [2017-07-29 Sat 20:14]
    - State "FEEDBACK"   from "INPROGRESS" [2017-07-29 Sat 20:14]
@@ -41,10 +42,14 @@ RelNote -*- mode : org -*-
 ** DONE integrate Travis CI in project
    - State "DONE"       from "FEEDBACK"   [2017-07-30 Sun 16:39]
    - State "FEEDBACK"   from "INPROGRESS" [2017-07-30 Sun 16:39]
-** TODO motion sensor test code
-** TODO hand clap sound detector
+** DONE integrate build error code in project_manager.sh
+   - State "DONE"       from "FEEDBACK"   [2017-07-30 Sun 17:45]
+   - State "FEEDBACK"   from "INPROGRESS" [2017-07-30 Sun 17:45]
 * WAIT v2.2.0 - more integrated module in i2c-console
 ** LSM303DLHC support: compass & accelerator in test/
 *** accelerometer support
 *** compass support
 *** i2c-console support
+** WAIT full range adc & pin change interrupt C support
+** TODO hand clap sound detector
+** TODO motion sensor test code

common/makefiles/gtest.mk

@@ -43,14 +43,14 @@ ifneq ($(filter $(BRIEF), $(TRUE)),) # check if compile message should be output
 check: 
 	@$(MAKE) TEST_GEN -j4 > /dev/null 
 	@printf "Running test binaries \n\n"
-	-$(foreach bin, $(TEST_BINARIES), ./$(bin) ; )
+	$(foreach bin, $(TEST_BINARIES), ./$(bin) ; )
 	@printf "\nDone running tests\n"
 	@$(MAKE) cleantest > /dev/null
 else
 check: 
 	$(MAKE) TEST_GEN -j4
 	@printf "Running test binaries \n\n"
-	-$(foreach bin, $(TEST_BINARIES), ./$(bin) ; )
+	$(foreach bin, $(TEST_BINARIES), ./$(bin) ; )
 	@printf "\nDone running tests\n"
 	$(MAKE) cleantest > /dev/null
 endif

project_manager.sh

@@ -1,6 +1,7 @@
 #!/bin/bash
 #
 #       maintainer script
+#       essential for travis builder
 #       
 
 # path to this script file
@@ -9,7 +10,10 @@ SCRIPT_DIR_RELATIVE=$0
 
 # global vars
 FORCE_CONTINUE=0
-FULL_REPORT=0
+FULL_REPORT=1
+
+RETVAL_FILE=.retVal.tmp # file contains return value of script, useful for travis
+rm -f $RETVAL_FILE # rm retval file first
 
 # print colored title
 print_title()
@@ -37,21 +41,48 @@ print_warning()
 	echo -e "|==============================================${NC}"
 }
 
+updateRetval()
+{
+    # add $1 to retVal file
+    local retVal=0
+    local incVal=$1
+    
+    if [ -f $RETVAL_FILE ]; then
+        # get content of retvalfile to retVal
+        retVal=$(cat $RETVAL_FILE)
+    fi
+        
+    ((retVal = retVal + incVal))
+    echo $retVal > $RETVAL_FILE
+}
+
 # run all make check in directory recursively
 function checkFolder()
 {
-    local retVal=0
 	find "$1" -name Makefile | while read line; do		
         local TEST_DIR=$(dirname $line)/test/
         if [ -d "$TEST_DIR" ] ; then
         	print_title "Checking in $(dirname ${line})"
-            make -C $(dirname $line) check BRIEF=1 -j4
-            
-            ((retVal = retVal + $?))
+            make -C $(dirname $line) check BRIEF=1 -j4       
+            updateRetval $?
         fi		
 	done
-	
-	return $retVal		
+}
+
+# run checkFolder on multiple folders
+function checkMultipleFolders()
+{
+    # $* - list of folders
+    dirList=("$*")
+    
+    for D in $dirList; do
+        if [ -d $D ]; then
+            checkFolder $D
+        else
+            print_warning "$D doesn't exist"
+            updateRetval 1
+        fi
+    done
 }
 
 # run make clean in dir recursively
@@ -65,19 +96,17 @@ function cleanFolder()
 # run make all in dir recursively
 function makeFolder()
 {
-    local retVal=0
-
 	find "$1" -name Makefile | while read line; do	
         print_title "Compile in $(dirname ${line})..." ;
 
         if (($FULL_REPORT == 0)) ; then
-              make -C $(dirname $line) all -j4 > /dev/null
+            make -C $(dirname $line) all -j4 > /dev/null
         else
-          make -C $(dirname $line) all -j4
+            make -C $(dirname $line) all -j4
         fi	
 
 	    local MK_RESULT=$?
-	    ((retVal=retVal + MK_RESULT))
+	    updateRetval $MK_RESULT
 
 	    if (($MK_RESULT!=0)) ; then
 		    print_warning "Error code $MK_RESULT on compiling $(dirname $line)"
@@ -86,14 +115,26 @@ function makeFolder()
 		    fi
 	    fi
 	done
-	
-	return $retVal		
 }
 
-function checkDependency()
+# run makeFolder on multiple folders
+function makeMultipleFolders()
 {
-    local retVal=0
+    # $* - list of folders
+    dirList=("$*")
 
+    for D in $dirList; do
+        if [ -d $D ]; then        
+            makeFolder $D
+        else
+            print_warning "$D doesn't exist"
+            updateRetval 1
+        fi
+    done
+}
+
+function checkDependency()
+{    
     # check submodules
     # for each dir in submodules
     local TOP=$(dirname $(readlink -f $0))
@@ -115,40 +156,49 @@ function checkDependency()
     if [ -z "$(which avr-gcc 2>/dev/null)" ] || [ -z "$(which avrdude 2>/dev/null)" ]; then  
         ((retVal=retVal+1))
         print_warning "Missing avr package, please install gcc-avr binutils-avr gdb-avr avr-libc avrdude"
-    fi    
-    
-    return $retVal
+    fi
 }
 
 function showHelp()
 {
 cat << EOF
-        usage: $SCRIPT_DIR_RELATIVE option [value]
+        usage: $SCRIPT_DIR_RELATIVE [option] {value} DIR1 DIR2 ...
         
         OPTION  DECRIPTION
         -c dir  search in dir recursively and run make clean
-        -k dir  search in dir recursively and run make check
-        -m dir	search in dir recursively and run make all
+        -k      search in DIR1 DIR2 ... recursively and run make check
+        -m      search in DIR1 DIR2 ... recursively and run make all
         
         -T      check dependency
         -f      force continue on make error, default: $FORCE_CONTINUE
-        -l      full report, default: $FULL_REPORT
+        -l      set FULL_REPORT=0, default: $FULL_REPORT
         -h      this menu
 EOF
 }
 
+function detectBuildFailure()
+{
+    # check if there is .hex and .elf file generated from make
+    # if not, return number of failures
+    echo ""
+}
+
 # main ##############################################################
+CHECK_DIR=0
+COMPILE_DIR=0
+
 # getopt
-while getopts ":c:k:m:t:flT" o; do
+while getopts ":c:kmt:flT" o; do
     case "${o}" in
         c)
             cleanFolder ${OPTARG}            
+            exit $?            
             ;;
         k)
-            checkFolder ${OPTARG}
+            CHECK_DIR=1
             ;;
         m)
-            makeFolder ${OPTARG}
+            COMPILE_DIR=1
             ;;
         t)
             print_title ${OPTARG}
@@ -157,7 +207,7 @@ while getopts ":c:k:m:t:flT" o; do
             FORCE_CONTINUE=1
             ;;
         l)
-            FULL_REPORT=1
+            FULL_REPORT=0            
             ;;
         T)
             checkDependency
@@ -169,3 +219,23 @@ while getopts ":c:k:m:t:flT" o; do
 done
 shift $((OPTIND-1))
 
+# make check on a list of dirs recursively
+if [ "$CHECK_DIR" -ne "0" ]; then
+    checkMultipleFolders "$*"
+fi
+
+# make all on a list of dirs recursively
+if [ "$COMPILE_DIR" -ne "0" ]; then
+    makeMultipleFolders "$*"
+fi
+
+# make all on a list of dirs recursively
+
+# find return value
+if [ -f $RETVAL_FILE ]; then
+    retVal=$(cat $RETVAL_FILE)
+    rm -f $RETVAL_FILE
+    exit $retVal
+else
+    exit -1
+fi