From 85fcae9a0ee14a201e5aed7ec1a3efd4486a8f13 Mon Sep 17 00:00:00 2001 From: Youngjae Shin Date: Mon, 7 Dec 2015 13:37:44 +0900 Subject: [PATCH] modify build script for provisioning Change-Id: I527fcf3f16889c16dd9811c1eb4ba321d35b0252 --- packaging/iotivity.spec | 5 +++++ resource/examples/SConscript | 4 ++-- resource/provisioning/SConscript | 2 +- resource/provisioning/examples/SConscript | 14 +++++++------- resource/src/SConscript | 2 +- 5 files changed, 16 insertions(+), 11 deletions(-) diff --git a/packaging/iotivity.spec b/packaging/iotivity.spec index f3add3c..82d22cf 100644 --- 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 3e44315..4c270c7 100644 --- 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 a7c035d..0f2afa5 100644 --- 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 184a73a..e6813c5 100644 --- 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 df2f209..c63a979 100644 --- 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') -- 2.7.4