resource-container: Install examples 85/23685/3
authorPhilippe Coval <philippe.coval@osg.samsung.com>
Thu, 7 Dec 2017 13:29:45 +0000 (14:29 +0100)
committerMats Wichmann <mats@linux.com>
Wed, 10 Jan 2018 17:39:59 +0000 (17:39 +0000)
Yocto manually installed them,
so let's rely on scons from now on.

Bug: https://jira.iotivity.org/browse/IOT-524
Change-Id: I900f68a0aef3709eaac1a81773abea0c85bd0787
Origin: https://gerrit.iotivity.org/gerrit/#/c/23685/
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
service/resource-container/SConscript
service/resource-container/examples/BMISensorBundle/src/inputSensors/HeightSensorApp/SConscript
service/resource-container/examples/BMISensorBundle/src/inputSensors/WeightSensorApp/SConscript
service/resource-container/examples/DiscomfortIndexSensorBundle/src/inputSensors/THSensorApp/SConscript
service/resource-container/examples/DiscomfortIndexSensorBundle/src/inputSensors/THSensorApp1/SConscript

index 6dadb91..6bf4c16 100644 (file)
@@ -275,6 +275,7 @@ if lib_env.get('WITH_TEST') and target_os in ('linux'):
 ######################################################################
 # Build Container Sample
 ######################################################################
+examples = []
 if target_os not in ['ios']:
     containersample_env = resource_container_env.Clone()
     containersample_env.AppendUnique(LINKFLAGS=["-rdynamic"])
@@ -293,6 +294,7 @@ if target_os not in ['ios']:
                                                      containersampleapp_src)
     Alias("containersample", containersampleapp)
     env.AppendTarget('containersample')
+    examples += containersampleapp;
 
     ######################################################################
     # Build Container Sample Client
@@ -306,9 +308,12 @@ if target_os not in ['ios']:
         'ContainerSampleClient', containersampleclient_src)
     Alias("containersampleclient", containersampleclientapp)
     env.AppendTarget('containersampleclient')
+    examples += containersampleclientapp;
 
+containersample_env.UserInstallTargetExtra(examples)
 ######################################################################
 # Build Container Java SDK
 ######################################################################
 if target_os == 'android':
     SConscript('android/SConscript')
+
index 39e04df..19b7482 100644 (file)
@@ -38,3 +38,4 @@ heightsensorapp = linux_sample_env.Program('HeightSensorApp',
                                            'src/HeightSensorApp.cpp')
 Alias("heightsensorapp_sample", heightsensorapp)
 env.AppendTarget('heightsensorapp')
+linux_sample_env.UserInstallTargetExtra(heightsensorapp)
index 37bfa8b..1f2805f 100644 (file)
@@ -38,3 +38,4 @@ weightsensorapp = linux_sample_env.Program('WeightSensorApp',
                                            'src/WeightSensorApp.cpp')
 Alias("weightsensorapp_sample", weightsensorapp)
 env.AppendTarget('weightsensorapp')
+linux_sample_env.UserInstallTargetExtra(weightsensorapp)
index e1088d1..690aaf8 100644 (file)
@@ -38,3 +38,4 @@ thsensorapp = linux_sample_env.Program('THSensorApp',
                                        'src/ThingResourceServer.cpp')
 Alias("thsensorapp_sample", thsensorapp)
 env.AppendTarget('thsensorapp_sample')
+linux_sample_env.UserInstallTargetExtra(thsensorapp)
index c69f095..fc249ef 100644 (file)
@@ -38,3 +38,4 @@ thsensorapp1 = linux_sample_env.Program('THSensorApp1',
                                         'src/ThingResourceServer1.cpp')
 Alias("thsensorapp1_sample", thsensorapp1)
 env.AppendTarget('thsensorapp1_sample')
+linux_sample_env.UserInstallTargetExtra(thsensorapp1)