modify build script for provisioning

Change-Id: I527fcf3f16889c16dd9811c1eb4ba321d35b0252

diff --git a/packaging/iotivity.spec b/packaging/iotivity.spec
index f3add3ce5a116a7a1ff6fd338fa1ae445e77c3e2..82d22cf05b55b8264009201f94d58999a667337b 100644 (file)
--- a/packaging/iotivity.spec
+++ b/packaging/iotivity.spec
@@ -150,6 +150,11 @@ cp out/tizen/*/%{build_mode}/resource/examples/simpleserverHQ %{ex_install_dir}
 cp out/tizen/*/%{build_mode}/resource/examples/threadingsample %{ex_install_dir}
 cp out/tizen/*/%{build_mode}/resource/examples/oic_svr_db_server.json %{ex_install_dir}
 cp out/tizen/*/%{build_mode}/resource/examples/oic_svr_db_client.json %{ex_install_dir}
+%if 0%{?SECURED} == 1
+mkdir -p %{ex_install_dir}/provisioning
+cp out/tizen/*/%{build_mode}/resource/provisioning/examples/oic_svr_db_client.json %{ex_install_dir}/provisioning/
+cp out/tizen/*/%{build_mode}/resource/provisioning/examples/provisioningclient %{ex_install_dir}/provisioning/
+%endif
 
 # For iotcon
 cp resource/csdk/stack/include/ocpayload.h %{buildroot}%{_includedir}/resource

diff --git a/resource/examples/SConscript b/resource/examples/SConscript
index 3e44315c3369f4d4efafbe1a6d18f59d19af5950..4c270c748cae888a474049cc796277d8707038ce 100644 (file)
--- a/resource/examples/SConscript
+++ b/resource/examples/SConscript
@@ -87,9 +87,9 @@ devicediscoveryserver = examples_env.Program('devicediscoveryserver', 'devicedis
 devicediscoveryclient = examples_env.Program('devicediscoveryclient', 'devicediscoveryclient.cpp')
 threadingsample = examples_env.Program('threadingsample', 'threadingsample.cpp')
 
-serverjson = examples_env.Install(env.get('BUILD_DIR') + '/resource/examples/',
-                               env.get('SRC_DIR') + '/resource/examples/' + 'oic_svr_db_client.json')
 clientjson = examples_env.Install(env.get('BUILD_DIR') + '/resource/examples/',
+                               env.get('SRC_DIR') + '/resource/examples/' + 'oic_svr_db_client.json')
+serverjson = examples_env.Install(env.get('BUILD_DIR') + '/resource/examples/',
                                env.get('SRC_DIR') + '/resource/examples/' + 'oic_svr_db_server.json')
 Alias("examples", [simpleserver, simpleclient,
                simpleserverHQ, simpleclientHQ,

diff --git a/resource/provisioning/SConscript b/resource/provisioning/SConscript
index a7c035d10bb46dcd6d3cc6b0fd99f2502232c12b..0f2afa5227db21e3b51e696f2e737d455305a54b 100644 (file)
--- a/resource/provisioning/SConscript
+++ b/resource/provisioning/SConscript
@@ -59,5 +59,5 @@ ocprovision_src = [
 ocprovision = ocprovision_env.StaticLibrary('ocprovision', ocprovision_src)
 ocprovision_env.InstallTarget(ocprovision, 'libocprovision')
 
-if target_os in ['linux']:
+if target_os in ['linux', 'tizen']:
     SConscript('examples/SConscript')

diff --git a/resource/provisioning/examples/SConscript b/resource/provisioning/examples/SConscript
index 184a73a3b4b7442c4ab72cedb802f98f5c01785d..e6813c5eb7cefee54e86d7ccd1dc1af02d8161a4 100644 (file)
--- a/resource/provisioning/examples/SConscript
+++ b/resource/provisioning/examples/SConscript
@@ -71,16 +71,16 @@ if target_os == 'android':
 if target_os in ['darwin', 'ios']:
        examples_env.AppendUnique(CPPDEFINES = ['_DARWIN_C_SOURCE'])
 
+if target_os == 'tizen':
+       examples_env.ParseConfig('pkg-config --libs sqlite3')
+
 ######################################################################
 # Source files and Targets
 ######################################################################
 provisioningclient = examples_env.Program('provisioningclient', 'provisioningclient.cpp')
 
-Alias("examples", [provisioningclient])
-env.AppendTarget('examples')
+clientjson = examples_env.Install(env.get('BUILD_DIR') + '/resource/provisioning/examples/',
+                               env.get('SRC_DIR') + '/resource/provisioning/examples/' + 'oic_svr_db_client.json')
 
-src_dir = examples_env.get('SRC_DIR')
-svr_db_src_dir = src_dir + '/resource/provisioning/examples/'
-svr_db_build_dir = env.get('BUILD_DIR') +'/resource/provisioning/examples/'
-examples_env.Alias("install", examples_env.Install( svr_db_build_dir,
-                svr_db_src_dir + 'oic_svr_db_client.json'))
+Alias("examples", [provisioningclient, clientjson])
+env.AppendTarget('examples')

diff --git a/resource/src/SConscript b/resource/src/SConscript
index df2f209cbb55a2304c4acbaac7467d48ad9630f2..c63a979251f23f02915b1a4a536668141365fa50 100644 (file)
--- a/resource/src/SConscript
+++ b/resource/src/SConscript
@@ -90,5 +90,5 @@ oclib_env.UserInstallTargetHeader(src_dir + '/resource/include/OCResourceRequest
 oclib_env.UserInstallTargetHeader(src_dir + '/resource/include/OCResourceResponse.h', 'resource', 'OCResourceResponse.h')
 
 # Add Provisioning library
-if target_os in ['linux', 'android'] and env.get('SECURED') == '1':
+if target_os in ['linux', 'android', 'tizen'] and env.get('SECURED') == '1':
         SConscript('../provisioning/SConscript')