Fix main buildscript build order

1. Current plugins project changes main global env variable.
So switch Cloud sample build order prior to plugins project

2. Change Cloud sample output not to copied to main output folder.

Change-Id: If9a5d66e5606bdbc4a37864e7ff1cc001877489d
Signed-off-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5605
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>

diff --git a/SConstruct b/SConstruct
index 1e8ebfb..35ff720 100644 (file)
--- a/SConstruct
+++ b/SConstruct
@@ -62,12 +62,12 @@ if target_os not in ['arduino','darwin','ios', 'android']:
 # Build 'service' sub-project
 SConscript(build_dir + 'service/SConscript')
 
-# Build "plugin interface" sub-project
-SConscript(build_dir + 'plugins/SConscript')
-
 # Build "cloud" sub-project
 SConscript(build_dir + 'cloud/SConscript')
 
+# Build "plugin interface" sub-project
+SConscript(build_dir + 'plugins/SConscript')
+
 # Append targets information to the help information, to see help info, execute command line:
 #     $ scon [options] -h
 env.PrintTargets()

diff --git a/cloud/samples/client/SConscript b/cloud/samples/client/SConscript
index ef6e214..4bc2807 100644 (file)
--- a/cloud/samples/client/SConscript
+++ b/cloud/samples/client/SConscript
@@ -52,5 +52,4 @@ cc_sample_src = [
         'sample_device.cpp',
          ]
 
-cc_client = cc_sample_app_env.Program('cloud_device', cc_sample_src)
-cc_sample_app_env.InstallTarget(cc_client, 'cloud_device')
\ No newline at end of file
+cc_client = cc_sample_app_env.Program('cloud_device', cc_sample_src)
\ No newline at end of file