X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=arduino.scons;h=43297753eb137022e27dd353c7697376feeac214;hb=f68df5a9eae24122d1df34d8e649e51a5bee5545;hp=143b114bad9447ca89c359a9f574aa7e2c6c73fb;hpb=49ead758a03c532e7c95f5b6eb88c1d979cd36a0;p=platform%2Fupstream%2Fiotivity.git

diff --git a/arduino.scons b/arduino.scons
index 143b114..4329775 100644
--- a/arduino.scons
+++ b/arduino.scons
@@ -23,19 +23,30 @@
 ##
 Import('env')
 
+# Add 'SHIELD' build option, let user select board network connection type
+vars = Variables()
+if 'IP' in env.get('TARGET_TRANSPORT'):
+	vars.Add(EnumVariable('SHIELD', 'Network connection type', 'WIFI', ['ETH', 'WIFI']))
+elif 'BLE' in env.get('TARGET_TRANSPORT'):
+	vars.Add(EnumVariable('SHIELD', 'Network connection type', 'RBL_NRF8001', ['RBL_NRF8001']))
+vars.Update(env)
+Help(vars.GenerateHelpText(env))
+
 env.ImportLib('SPI')
-if 'ETHERNET' in env.get('TARGET_TRANSPORT'):
+if 'ETH' in env.get('SHIELD'):
 	env.ImportLib('Ethernet')
-if 'WIFI' in env.get('TARGET_TRANSPORT'):
+	env.AppendUnique(CPPDEFINES = ['ARDUINOETH'])
+if 'WIFI' in env.get('SHIELD'):
 	env.ImportLib('WiFi')
 	env.AppendUnique(CPPDEFINES = ['ARDUINOWIFI'])
-if 'BLE' in env.get('TARGET_TRANSPORT'):
+if 'RBL_NRF8001' in env.get('SHIELD'):
 	env.ImportLib('BLE')
 	env.ImportLib('RBL_nRF8001')
 
 env.ImportLib('Time/Time')
 # we have variety of macros for arduino!!
-if env.get('RELEASE'):
-	env.AppendUnique(CPPDEFINES = ['WITH_ARDUINO', '__ARDUINO__'])
-else:
-	env.AppendUnique(CPPDEFINES = ['WITH_ARDUINO', '__ARDUINO__', 'TB_LOG'])
+env.AppendUnique(CPPDEFINES = ['WITH_ARDUINO', '__ARDUINO__'])
+# Set device name to __OIC_DEVICE_NAME__
+env.AppendUnique(CPPDEFINES = ['-D__OIC_DEVICE_NAME__=' + "\'\"" + env.get('DEVICE_NAME') + "\"\'"])
+if env.get('LOGGING'):
+	env.AppendUnique(CPPDEFINES = ['TB_LOG'])