Fix build error of Soft sensor Manager after CA branch merging into master

Fix Sconscript for SSM linux Sample application due to link errors

Change-Id: Ia3d5d32b4069e669ae4d1792efd0e4d8a6c794b4
Signed-off-by: Minji Park <minjii.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/700
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>

diff --git a/service/soft-sensor-manager/SConscript b/service/soft-sensor-manager/SConscript
index e3770e1..9ea5cd1 100644 (file)
--- a/service/soft-sensor-manager/SConscript
+++ b/service/soft-sensor-manager/SConscript
@@ -176,7 +176,7 @@ SConscript('SampleApp/SConscript')
 if target_os == 'linux':
        Command("SSMTesterApp","SampleApp/linux/SSMTesterApp/SSMTesterApp", Copy("$TARGET", "$SOURCE"))
        Command("SoftSensorDescription.xml", "SoftSensorPlugin/SoftSensorDescription.xml", Copy("$TARGET", "$SOURCE"))
-       #Command("THSensorApp","SampleApp/linux/THSensorApp/THSensorApp", Copy("$TARGET", "$SOURCE"))
-       #Command("THSensorApp1","SampleApp/linux/THSensorApp1/THSensorApp1", Copy("$TARGET", "$SOURCE"))
-       #Command("HeightSensorApp","SampleApp/linux/HeightSensorApp/HeightSensorApp", Copy("$TARGET", "$SOURCE"))
-       #Command("WeightSensorApp","SampleApp/linux/WeightSensorApp/WeightSensorApp", Copy("$TARGET", "$SOURCE"))
+       Command("THSensorApp","SampleApp/linux/THSensorApp/THSensorApp", Copy("$TARGET", "$SOURCE"))
+       Command("THSensorApp1","SampleApp/linux/THSensorApp1/THSensorApp1", Copy("$TARGET", "$SOURCE"))
+       Command("HeightSensorApp","SampleApp/linux/HeightSensorApp/HeightSensorApp", Copy("$TARGET", "$SOURCE"))
+       Command("WeightSensorApp","SampleApp/linux/WeightSensorApp/WeightSensorApp", Copy("$TARGET", "$SOURCE"))

diff --git a/service/soft-sensor-manager/SampleApp/SConscript b/service/soft-sensor-manager/SampleApp/SConscript
index dec0408..1563346 100644 (file)
--- a/service/soft-sensor-manager/SampleApp/SConscript
+++ b/service/soft-sensor-manager/SampleApp/SConscript
@@ -20,10 +20,10 @@ target_os = env.get('TARGET_OS')
 if target_os == 'linux' :
        # Build linux sample app
        SConscript('linux/SSMTesterApp/SConscript')
-       #SConscript('linux/THSensorApp/SConscript')
-       #SConscript('linux/THSensorApp1/SConscript')
-       #SConscript('linux/HeightSensorApp/SConscript')
-       #SConscript('linux/WeightSensorApp/SConscript')
+       SConscript('linux/THSensorApp/SConscript')
+       SConscript('linux/THSensorApp1/SConscript')
+       SConscript('linux/HeightSensorApp/SConscript')
+       SConscript('linux/WeightSensorApp/SConscript')
 
 
 

diff --git a/service/soft-sensor-manager/SampleApp/linux/HeightSensorApp/SConscript b/service/soft-sensor-manager/SampleApp/linux/HeightSensorApp/SConscript
index 6ff1a0e..49b8dff 100755 (executable)
--- a/service/soft-sensor-manager/SampleApp/linux/HeightSensorApp/SConscript
+++ b/service/soft-sensor-manager/SampleApp/linux/HeightSensorApp/SConscript
@@ -18,12 +18,20 @@ linux_sample_env.AppendUnique(CPPDEFINES = ['LINUX'])
 linux_sample_env.AppendUnique(LIBPATH = [env.get('BUILD_DIR')])
 linux_sample_env.AppendUnique(LIBS = ['oc'])
 linux_sample_env.AppendUnique(LIBS = ['octbstack'])
-linux_sample_env.AppendUnique(LIBS = ['libcoap'])
-linux_sample_env.AppendUnique(LIBS = ['liboc_logger'])
 linux_sample_env.AppendUnique(LIBS = ['libconnectivity_abstraction'])
 linux_sample_env.AppendUnique(LIBS = ['libcoap'])
+linux_sample_env.AppendUnique(LIBS = ['liboc_logger'])
 linux_sample_env.AppendUnique(LIBS = ['pthread'])
 
+if env.get('SECURED') == '1':
+    linux_sample_env.AppendUnique(LIBS = ['tinydtls'])
+linux_sample_env.ParseConfig('pkg-config --libs glib-2.0')
+
+# On some platforms link order can miss functions so librt needs to be
+# re-scanned at the end if present. gcc 4.6 is one with this issue.
+if 'rt' in linux_sample_env.get('LIBS'):
+    linux_sample_env.Append(LIBS = ['rt'])
+
 ######################################################################
 #build sampleapp
 ######################################################################

diff --git a/service/soft-sensor-manager/SampleApp/linux/THSensorApp/SConscript b/service/soft-sensor-manager/SampleApp/linux/THSensorApp/SConscript
index fa6f396..6660356 100644 (file)
--- a/service/soft-sensor-manager/SampleApp/linux/THSensorApp/SConscript
+++ b/service/soft-sensor-manager/SampleApp/linux/THSensorApp/SConscript
@@ -18,11 +18,20 @@ linux_sample_env.AppendUnique(CPPDEFINES = ['LINUX'])
 linux_sample_env.AppendUnique(LIBPATH = [env.get('BUILD_DIR')])
 linux_sample_env.AppendUnique(LIBS = ['oc'])
 linux_sample_env.AppendUnique(LIBS = ['octbstack'])
+linux_sample_env.AppendUnique(LIBS = ['libconnectivity_abstraction'])
 linux_sample_env.AppendUnique(LIBS = ['libcoap'])
 linux_sample_env.AppendUnique(LIBS = ['liboc_logger'])
-linux_sample_env.AppendUnique(LIBS = ['libconnectivity_abstraction'])
 linux_sample_env.AppendUnique(LIBS = ['pthread'])
 
+if env.get('SECURED') == '1':
+    linux_sample_env.AppendUnique(LIBS = ['tinydtls'])
+linux_sample_env.ParseConfig('pkg-config --libs glib-2.0')
+
+# On some platforms link order can miss functions so librt needs to be
+# re-scanned at the end if present. gcc 4.6 is one with this issue.
+if 'rt' in linux_sample_env.get('LIBS'):
+    linux_sample_env.Append(LIBS = ['rt'])
+
 ######################################################################
 #build sampleapp
 ######################################################################

diff --git a/service/soft-sensor-manager/SampleApp/linux/THSensorApp1/SConscript b/service/soft-sensor-manager/SampleApp/linux/THSensorApp1/SConscript
index 770cd88..1942933 100644 (file)
--- a/service/soft-sensor-manager/SampleApp/linux/THSensorApp1/SConscript
+++ b/service/soft-sensor-manager/SampleApp/linux/THSensorApp1/SConscript
@@ -18,11 +18,20 @@ linux_sample_env.AppendUnique(CPPDEFINES = ['LINUX'])
 linux_sample_env.AppendUnique(LIBPATH = [env.get('BUILD_DIR')])
 linux_sample_env.AppendUnique(LIBS = ['oc'])
 linux_sample_env.AppendUnique(LIBS = ['octbstack'])
+linux_sample_env.AppendUnique(LIBS = ['libconnectivity_abstraction'])
 linux_sample_env.AppendUnique(LIBS = ['libcoap'])
 linux_sample_env.AppendUnique(LIBS = ['liboc_logger'])
-linux_sample_env.AppendUnique(LIBS = ['libconnectivity_abstraction'])
 linux_sample_env.AppendUnique(LIBS = ['pthread'])
 
+if env.get('SECURED') == '1':
+    linux_sample_env.AppendUnique(LIBS = ['tinydtls'])
+linux_sample_env.ParseConfig('pkg-config --libs glib-2.0')
+
+# On some platforms link order can miss functions so librt needs to be
+# re-scanned at the end if present. gcc 4.6 is one with this issue.
+if 'rt' in linux_sample_env.get('LIBS'):
+    linux_sample_env.Append(LIBS = ['rt'])
+
 ######################################################################
 #build sampleapp
 ######################################################################

diff --git a/service/soft-sensor-manager/SampleApp/linux/WeightSensorApp/SConscript b/service/soft-sensor-manager/SampleApp/linux/WeightSensorApp/SConscript
index 6bb78e6..9e94029 100755 (executable)
--- a/service/soft-sensor-manager/SampleApp/linux/WeightSensorApp/SConscript
+++ b/service/soft-sensor-manager/SampleApp/linux/WeightSensorApp/SConscript
@@ -18,11 +18,20 @@ linux_sample_env.AppendUnique(CPPDEFINES = ['LINUX'])
 linux_sample_env.AppendUnique(LIBPATH = [env.get('BUILD_DIR')])
 linux_sample_env.AppendUnique(LIBS = ['oc'])
 linux_sample_env.AppendUnique(LIBS = ['octbstack'])
+linux_sample_env.AppendUnique(LIBS = ['libconnectivity_abstraction'])
 linux_sample_env.AppendUnique(LIBS = ['libcoap'])
 linux_sample_env.AppendUnique(LIBS = ['liboc_logger'])
-linux_sample_env.AppendUnique(LIBS = ['libconnectivity_abstraction'])
 linux_sample_env.AppendUnique(LIBS = ['pthread'])
 
+if env.get('SECURED') == '1':
+    linux_sample_env.AppendUnique(LIBS = ['tinydtls'])
+linux_sample_env.ParseConfig('pkg-config --libs glib-2.0')
+
+# On some platforms link order can miss functions so librt needs to be
+# re-scanned at the end if present. gcc 4.6 is one with this issue.
+if 'rt' in linux_sample_env.get('LIBS'):
+    linux_sample_env.Append(LIBS = ['rt'])
+
 ######################################################################
 #build sampleapp
 ######################################################################