modify spec. for SECURED=1

Change-Id: I26c627c1c1907185acad22a6c42321a265bbc712
Signed-off-by: youngman <yman.jung@samsung.com>

diff --git a/build_common/SConscript b/build_common/SConscript
index 2be70ce..b6309ca 100644 (file)
--- a/build_common/SConscript
+++ b/build_common/SConscript
@@ -295,6 +295,11 @@ if env.get('ROUTING') == 'GW':
 elif env.get('ROUTING') == 'EP':
        routing_define = 'ROUTING_EP'
 
+if env.get('SECURED') == '1':
+       ocpmapi_lib = '-locpmapi'
+elif env.get('SECURED') == '0':
+       ocpmapi_lib = ''
+
 user_prefix = env.get('PREFIX')
 user_lib = env.get('LIB_INSTALL_DIR')
 if not user_lib:
@@ -305,14 +310,16 @@ if user_prefix:
                                '\@EXEC_PREFIX\@':user_prefix,
                                '\@VERSION\@': '1.0.1',
                                '\@LIB_INSTALL_DIR\@': user_lib,
-                               '\@ROUTING_DEFINE\@': routing_define
+                               '\@ROUTING_DEFINE\@': routing_define,
+                               '\@OCPMAPI_LIB\@': ocpmapi_lib
                                }
 else:
        pc_vars = {'\@PREFIX\@': env.get('BUILD_DIR'),
                                '\@EXEC_PREFIX\@': env.get('BUILD_DIR'),
                                '\@VERSION\@': '1.0.1',
                                '\@LIB_INSTALL_DIR\@': user_lib,
-                               '\@ROUTING_DEFINE\@': routing_define
+                               '\@ROUTING_DEFINE\@': routing_define,
+                               '\@OCPMAPI_LIB\@': ocpmapi_lib
                                }
 
 env.Substfile(pc_file, SUBST_DICT = pc_vars)

diff --git a/iotivity.pc.in b/iotivity.pc.in
index 59bd6b5..382cbc6 100644 (file)
--- a/iotivity.pc.in
+++ b/iotivity.pc.in
@@ -11,7 +11,8 @@ Description: IoTivity is an open source reference implementation of the OIC stan
 Version: @VERSION@
 URL: https://www.iotivity.org
 Requires:
-Libs: -L${libdir} -loc -loc_logger -loc_logger_core -loctbstack -lconnectivity_abstraction
+Libs: -L${libdir} -loc -loc_logger -loc_logger_core -loctbstack -lconnectivity_abstraction \
+                       @OCPMAPI_LIB@
 Cflags: -I${includedir}/resource \
                        -I${svcincludedir}/resource-encapsulation \
                        -I${svcincludedir}/resource-container \

diff --git a/packaging/iotivity.spec b/packaging/iotivity.spec
index c335968..2a59ec1 100644 (file)
--- a/packaging/iotivity.spec
+++ b/packaging/iotivity.spec
@@ -156,27 +156,25 @@ cp out/tizen/*/%{build_mode}/resource/examples/oic_svr_db_server.dat %{ex_instal
 cp out/tizen/*/%{build_mode}/resource/examples/oic_svr_db_client.dat %{ex_install_dir}
 %if 0%{?SECURED} == 1
 mkdir -p %{ex_install_dir}/provisioning
-mkdir -p %{ex_install_dir}/provision-sample
+cp out/tizen/*/%{build_mode}/resource/provisioning/examples/oic_svr_db_client.dat %{ex_install_dir}/provisioning/
+cp out/tizen/*/%{build_mode}/resource/provisioning/examples/provisioningclient %{ex_install_dir}/provisioning/
 
 cp ./resource/csdk/security/include/pinoxmcommon.h %{buildroot}%{_includedir}
+cp ./resource/csdk/security/include/securevirtualresourcetypes.h %{buildroot}%{_includedir}
 cp ./resource/csdk/security/provisioning/include/oxm/*.h %{buildroot}%{_includedir}
 cp ./resource/csdk/security/provisioning/include/internal/*.h %{buildroot}%{_includedir}
 cp ./resource/csdk/security/provisioning/include/*.h %{buildroot}%{_includedir}
-cp ./resource/csdk/security/provisioning/sample/oic_svr_db_server_justworks.dat %{buildroot}%{_libdir}/oic_svr_db_server.dat
-
+cp ./resource/csdk/connectivity/api/casecurityinterface.h %{buildroot}%{_includedir}
+cp ./resource/csdk/connectivity/api/cacommon.h %{buildroot}%{_includedir}
 %endif
 
-
 %if 0%{?tizen_version_major} < 3
 mkdir -p %{buildroot}/%{_datadir}/license
 cp LICENSE.APLv2 %{buildroot}/%{_datadir}/license/%{name}
 cp LICENSE.APLv2 %{buildroot}/%{_datadir}/license/%{name}-service
 cp LICENSE.APLv2 %{buildroot}/%{_datadir}/license/%{name}-test
 %endif
-cp resource/c_common/*.h %{buildroot}%{_includedir}
-cp resource/csdk/stack/include/*.h %{buildroot}%{_includedir}
 
-cp service/things-manager/sdk/inc/*.h %{buildroot}%{_includedir}
 cp service/easy-setup/inc/*.h %{buildroot}%{_includedir}
 cp service/easy-setup/enrollee/inc/*.h %{buildroot}%{_includedir}
 
@@ -193,6 +191,10 @@ cp service/easy-setup/enrollee/inc/*.h %{buildroot}%{_includedir}
 %{_libdir}/liboc_logger_core.so
 %{_libdir}/liboctbstack.so
 %{_libdir}/libconnectivity_abstraction.so
+%if 0%{?SECURED} == 1
+%{_libdir}/libocpmapi.so
+%{_libdir}/libocprovision.so
+%endif
 %if 0%{?tizen_version_major} < 3
 %{_datadir}/license/%{name}
 %else
@@ -212,11 +214,6 @@ cp service/easy-setup/enrollee/inc/*.h %{buildroot}%{_includedir}
 %{_libdir}/librcs_container.so
 %{_libdir}/librcs_server.so
 %{_libdir}/libESEnrolleeSDK.so
-%if 0%{?SECURED} == 1
-%{_libdir}/libocpmapi.so
-%{_libdir}/libocprovision.so
-%{_libdir}/oic_svr_db_server.dat
-%endif
 %if 0%{?tizen_version_major} < 3
 %{_datadir}/license/%{name}-service
 %else

diff --git a/resource/csdk/SConscript b/resource/csdk/SConscript
index 37dc29b..ab76726 100644 (file)
--- a/resource/csdk/SConscript
+++ b/resource/csdk/SConscript
@@ -160,3 +160,4 @@ else:
        liboctbstack_env.UserInstallTargetHeader('stack/include/octypes.h', 'resource', 'octypes.h')
        liboctbstack_env.UserInstallTargetHeader('stack/include/ocstack.h', 'resource', 'ocstack.h')
        liboctbstack_env.UserInstallTargetHeader('stack/include/ocpresence.h', 'resource', 'ocpresence.h')
+       liboctbstack_env.UserInstallTargetHeader('stack/include/ocpayload.h', 'resource', 'ocpayload.h')

diff --git a/resource/provisioning/SConscript b/resource/provisioning/SConscript
index 05186c1..420d8d4 100644 (file)
--- a/resource/provisioning/SConscript
+++ b/resource/provisioning/SConscript
@@ -67,5 +67,5 @@ ocprovision = ocprovision_env.SharedLibrary('ocprovision', ocprovision_src)
 ocprovision_env.InstallTarget(ocprovision, 'libocprovision')
 ocprovision_env.UserInstallTargetLib(ocprovision, 'libocprovision')
 
-if target_os in ['linux']:
+if target_os in ['linux', 'tizen']:
     SConscript('examples/SConscript')