Update CA layer code for tinyDTLS location

Update CA layer code to pick tinyDTLS from iotivity/extlibs
location when compiling CA shared module.

Change-Id: I2e142453a43752073938cd56878597212ff606ae
Signed-off-by: Sakthivel Samidurai <sakthivel.samidurai@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/671
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Sachin Agrawal <sachin.agrawal@intel.com>
Reviewed-by: Erich Keane <erich.keane@intel.com>

diff --git a/resource/csdk/connectivity/lib/tinydtls/SConscript b/extlibs/tinydtls/SConscript
similarity index 100%
rename from resource/csdk/connectivity/lib/tinydtls/SConscript
rename to extlibs/tinydtls/SConscript

diff --git a/resource/csdk/connectivity/lib/tinydtls/ReadMe.txt b/resource/csdk/connectivity/lib/tinydtls/ReadMe.txt
deleted file mode 100644 (file)
index 398505c..0000000
--- a/resource/csdk/connectivity/lib/tinydtls/ReadMe.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-Currently Sconscript alone has been added for tinydtls compilation.
-Before compiling the code, Please copy the source code from
-<iotivity>/extlibs/tinydtls to this directory
-

diff --git a/resource/csdk/connectivity/src/SConscript b/resource/csdk/connectivity/src/SConscript
index 4d57217..6dc68cd 100644 (file)
--- a/resource/csdk/connectivity/src/SConscript
+++ b/resource/csdk/connectivity/src/SConscript
@@ -9,7 +9,12 @@ ca_transport = env.get('TARGET_TRANSPORT')
 secured = env.get('SECURED')
 root_dir = './../'
 ca_path = './'
-build_dir = env.get('BUILD_DIR')
+current_dir=env.get('SRC_DIR')
+
+# The tinydtls library location is ~/iotivity/extlibs. When scons run from connectivity folder,
+# the build folder is ~/iotivity/resource/csdk/connectivity/out/linux/x86_64/release/.
+# To include  ~/iotivity/extlibs/tinyDTLS, it should go seven level up from the build folder.
+extlib_dir ='../../../../../../../../'
 
 #####################################################################
 # Source files and Target(s)
@@ -26,7 +31,10 @@ env.AppendUnique(CPPPATH = [root_dir + '/common/inc/'])
 env.SConscript('./../common/SConscript')
 
 if env.get('SECURED') == '1':
-       env.SConscript('./../lib/tinydtls/SConscript')
+       if current_dir.find('connectivity') == -1:
+               env.SConscript(current_dir +'/extlibs/tinydtls/SConscript')
+       else:
+               env.SConscript(extlib_dir + '/extlibs/tinydtls/SConscript')
 
 
 env.AppendUnique(CA_SRC=[ca_path+'adapter_util/caadapterutils.c'])
@@ -58,7 +66,10 @@ else:
                ]
        if secured == '1':
                env.AppendUnique(CPPDEFINES = ['__WITH_DTLS__'])
-               env.AppendUnique(CPPPATH = [root_dir + '/lib/tinydtls'])
+               if current_dir.find('connectivity') == -1:
+                       env.AppendUnique(CPPPATH = [current_dir + '/extlibs/tinydtls'])
+               else:
+                       env.AppendUnique(CPPPATH = [extlib_dir + '/extlibs/tinydtls'])
 env.AppendUnique(CA_SRC = ca_common_src)