From 7cfd6a0389076d3f7a3f7298ab339088ccbce100 Mon Sep 17 00:00:00 2001 From: Joseph Morrow Date: Mon, 13 Apr 2015 16:01:20 -0400 Subject: [PATCH] Enabled Arduino verification build. During the latest merge of connectivity-abstraction branch into master branch, the Arduino verification process was disabled in order to properly verify all other code paths on the build system post-merge to enable all IoTivity contributors' work for post-merge efforts. This changeset allows for post- merge efforts to continue as well as continuing verification of Arduino code paths. Change-Id: I3d4bc738afb072371820bb24144f6582cd4afa5c Signed-off-by: Joseph Morrow Reviewed-on: https://gerrit.iotivity.org/gerrit/705 Tested-by: jenkins-iotivity Reviewed-by: Sachin Agrawal Reviewed-by: Erich Keane --- auto_build.sh | 11 ++++------- extlibs/arduino/SConscript | 16 ++++++++-------- resource/SConscript | 4 ++-- 3 files changed, 14 insertions(+), 17 deletions(-) diff --git a/auto_build.sh b/auto_build.sh index d656ba2..7adfef5 100755 --- a/auto_build.sh +++ b/auto_build.sh @@ -43,15 +43,12 @@ function build() fi echo "*********** Build for arduino avr *************" - scons TARGET_OS=arduino UPLOAD=false BOARD=mega TARGET_ARCH=avr TARGET_TRANSPORT=ETHERNET NET=Ethernet RELEASE=$3 - scons TARGET_OS=arduino UPLOAD=false BOARD=mega TARGET_ARCH=avr TARGET_TRANSPORT=WIFI NET=Wifi RELEASE=$3 + scons resource TARGET_OS=arduino UPLOAD=false BOARD=mega TARGET_ARCH=avr TARGET_TRANSPORT=ETHERNET NET=Ethernet RELEASE=$3 + scons resource TARGET_OS=arduino UPLOAD=false BOARD=mega TARGET_ARCH=avr TARGET_TRANSPORT=WIFI NET=Wifi RELEASE=$3 echo "*********** Build for arduino arm *************" - scons TARGET_OS=arduino UPLOAD=false BOARD=arduino_due_x TARGET_ARCH=arm TARGET_TRANSPORT=ETHERNET NET=Ethernet RELEASE=$3 - scons TARGET_OS=arduino UPLOAD=false BOARD=arduino_due_x TARGET_ARCH=arm TARGET_TRANSPORT=WIFI NET=Wifi RELEASE=$3 - - echo "*********** Build for arduino mega w/WiFi *************" - scons TARGET_OS=arduino BOARD=mega NET=Wifi ARDUINO_HOME=$2 RELEASE=$3 + scons resource TARGET_OS=arduino UPLOAD=false BOARD=arduino_due_x TARGET_ARCH=arm TARGET_TRANSPORT=ETHERNET NET=Ethernet RELEASE=$3 + scons resource TARGET_OS=arduino UPLOAD=false BOARD=arduino_due_x TARGET_ARCH=arm TARGET_TRANSPORT=WIFI NET=Wifi RELEASE=$3 if [ $(uname -s) = "Darwin" ] then diff --git a/extlibs/arduino/SConscript b/extlibs/arduino/SConscript index 7028a41..22311a5 100644 --- a/extlibs/arduino/SConscript +++ b/extlibs/arduino/SConscript @@ -22,14 +22,14 @@ if target_os == 'arduino': if not arduino_home: print 'Creating ARDUINO_HOME for Arduino lib' print ''' - ******************************************************************************* - * Arduino root directory isn't set, you can set enviornment variable * - * ARDUINO_HOME or add it in command line as follows (Only set if your * - * version has fixes applied as depicted below. Press ctrl+c now if you * - * wish to manually set ARDUINO_HOME.): * - * # scons ARDUINO_HOME= ... * - ******************************************************************************* - ''' + ******************************************************************************* + * Arduino root directory isn't set, you can set enviornment variable * + * ARDUINO_HOME or add it in command line as follows (Only set if your * + * version has fixes applied as depicted below. Press ctrl+c now if you * + * wish to manually set ARDUINO_HOME.): * + * # scons ARDUINO_HOME= ... * + ******************************************************************************* + ''' arduinolib_dir = src_dir + '/extlibs/arduino/arduino-1.5.8' if not os.path.exists(arduinolib_dir): diff --git a/resource/SConscript b/resource/SConscript index 9b4bb2f..58540c9 100644 --- a/resource/SConscript +++ b/resource/SConscript @@ -62,6 +62,6 @@ if target_os == 'linux': elif target_os == 'darwin': # Build linux samples for now SConscript('csdk/stack/samples/linux/SimpleClientServer/SConscript') -#elif target_os == 'arduino': -# SConscript('csdk/stack/samples/arduino/SimpleClientServer/ocserver/SConscript') +elif target_os == 'arduino': + SConscript('csdk/stack/samples/arduino/SimpleClientServer/ocserver/SConscript') -- 2.7.4