From 9aa5736543eb1abc158e45c1cfafe2f8af175a78 Mon Sep 17 00:00:00 2001 From: Doug Hudson Date: Wed, 27 May 2015 11:25:08 -0400 Subject: [PATCH] Fix broken build for Arduino when UPLOAD=yes. Bug documented in JIRA IOT-521. Change-Id: I613b0abdd8a1aab75abfe5d27fbeb0ef5f86ec1b Signed-off-by: Doug Hudson Reviewed-on: https://gerrit.iotivity.org/gerrit/1120 Tested-by: jenkins-iotivity Reviewed-by: Sakthivel Samidurai Reviewed-by: Joseph Morrow Reviewed-by: Erich Keane --- resource/csdk/connectivity/SConstruct | 62 ---------------------- .../csdk/connectivity/samples/arduino/SConscript | 2 +- 2 files changed, 1 insertion(+), 63 deletions(-) delete mode 100644 resource/csdk/connectivity/SConstruct diff --git a/resource/csdk/connectivity/SConstruct b/resource/csdk/connectivity/SConstruct deleted file mode 100644 index 58d0fd9..0000000 --- a/resource/csdk/connectivity/SConstruct +++ /dev/null @@ -1,62 +0,0 @@ -## -# The main build script -# -## - -# Load common build config -# Load common build config -SConscript('./build/SConscript') - -Import('env') - -sample_env = env.Clone() - -target_os = env.get('TARGET_OS') -transport = env.get('TARGET_TRANSPORT') -secured = env.get('SECURED') -release_mode = env.get('RELEASE') -buildsample = env.get('BUILD_SAMPLE') - -print "Given Transport is %s" % transport -print "Given OS is %s" % target_os -print "Secured %s" % env.get('SECURED') -print "Build sample is set to %s" % buildsample - -build_dir = env.get('BUILD_DIR') - -if target_os == 'tizen': - command = "sh build/tizen/gbsbuild.sh %s %s %s" % (transport, buildsample, release_mode) - print "Created Command is %s" % command - gbs_script = env.Command('gbs_build', None, command) - AlwaysBuild ('gbs_script') -elif target_os == 'arduino': - SConscript('build/arduino/arduino.scons') - - # Build 'libcoap' library - SConscript(build_dir + 'lib/libcoap-4.1.1/SConscript') - - # Build 'src' sub-project - SConscript(build_dir + 'SConscript') - - # Build 'samples' sub-project - SConscript(build_dir + 'samples/arduino/SConscript') -elif target_os == 'linux': - - # Build 'libcoap' library - SConscript(build_dir + 'lib/libcoap-4.1.1/SConscript') - - # Build 'src' sub-project - SConscript(build_dir + 'SConscript') - - # Build 'samples' sub-project - env.SConscript(build_dir + 'samples/linux/SConscript') -elif target_os == 'android': - - # Build 'libcoap' library - SConscript(build_dir + 'lib/libcoap-4.1.1/SConscript') - - # Build 'src' sub-project - SConscript(build_dir + 'SConscript') - - # Build 'samples' sub-project - env.SConscript(build_dir + 'samples/android/SConscript') diff --git a/resource/csdk/connectivity/samples/arduino/SConscript b/resource/csdk/connectivity/samples/arduino/SConscript index 660cd72..0722421 100644 --- a/resource/csdk/connectivity/samples/arduino/SConscript +++ b/resource/csdk/connectivity/samples/arduino/SConscript @@ -26,5 +26,5 @@ Alias('arduino_simplecs', i_arduino_simplecs) sample_env.Default('CASample.hex') if(sample_env['UPLOAD'] == True): - sample_env.Upload(env.get('BUILD_DIR') + '/samples/arduino/' + 'CASample.hex') + sample_env.Upload(env.get('BUILD_DIR') + 'resource/csdk/connectivity/samples/arduino/' + 'CASample.hex') -- 2.7.4