Fix broken build for Arduino when UPLOAD=yes.

Bug documented in JIRA IOT-521.

Change-Id: I613b0abdd8a1aab75abfe5d27fbeb0ef5f86ec1b
Signed-off-by: Doug Hudson <douglas.hudson@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1120
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Sakthivel Samidurai <sakthivel.samidurai@intel.com>
Reviewed-by: Joseph Morrow <joseph.l.morrow@intel.com>
Reviewed-by: Erich Keane <erich.keane@intel.com>

diff --git a/resource/csdk/connectivity/SConstruct b/resource/csdk/connectivity/SConstruct
deleted file mode 100644 (file)
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 660cd72a92de9e68f0fa68708b352f6e3268943b..0722421cb3ddf8e5c3b214c925d07264c6545b9a 100644 (file)
--- 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')