From: Jaehun Jeong <jh4u.jeong@samsung.com>
Date: Mon, 24 Jul 2017 10:03:19 +0000 (+0900)
Subject: enable static build
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e190dcd16dbbc5ed9385fc6784fefc57aa3b91c4;p=platform%2Fupstream%2Fiotivity.git

enable static build

Signed-off-by: Jaehun Jeong <jh4u.jeong@samsung.com>
---

diff --git a/packaging/iotivity.spec b/packaging/iotivity.spec
index 4d1efb21f..ba45a8a64 100644
--- a/packaging/iotivity.spec
+++ b/packaging/iotivity.spec
@@ -54,7 +54,7 @@ BuildRequires: python-accel-aarch64-cross-aarch64
 %{!?RD_MODE: %define RD_MODE CLIENT}
 %{!?RELEASE: %define RELEASE 1}
 %{!?ROUTING: %define ROUTING EP}
-%{!?SECURED: %define SECURED 1}
+%{!?SECURED: %define SECURED 0}
 %{!?TARGET_ARCH: %define TARGET_ARCH %{_arch}}
 %{!?TARGET_OS: %define TARGET_OS tizen}
 %{!?TARGET_TRANSPORT: %define TARGET_TRANSPORT IP,BT}
@@ -152,7 +152,7 @@ scons %{?_smp_mflags} --prefix=%{_prefix} \
     WITH_CLOUD=%{WITH_CLOUD} \
     WITH_MQ=%{WITH_MQ} \
     WITH_PROXY=%{WITH_PROXY} \
-    WITH_TCP=%{WITH_TCP} \
+    WITH_TCP=%{WITH_TCP}
     #eol
 
 
@@ -175,7 +175,7 @@ scons install --install-sandbox=%{buildroot} --prefix=%{_prefix} \
     WITH_CLOUD=%{WITH_CLOUD} \
     WITH_MQ=%{WITH_MQ} \
     WITH_PROXY=%{WITH_PROXY} \
-    WITH_TCP=%{WITH_TCP} \
+    WITH_TCP=%{WITH_TCP}
     #eol
 
 mkdir -p %{ex_install_dir}
@@ -235,7 +235,7 @@ ln -fs ../resource %{buildroot}%{_includedir}/iotivity/
 ln -fs ../service %{buildroot}%{_includedir}/iotivity/
 ln -fs ../c_common %{buildroot}%{_includedir}/iotivity/
 
-rm -rfv out %{buildroot}/out %{buildroot}/${HOME} ||:
+#rm -rfv out %{buildroot}/out %{buildroot}/${HOME} ||:
 
 
 %post -p /sbin/ldconfig
@@ -247,8 +247,8 @@ rm -rfv out %{buildroot}/out %{buildroot}/${HOME} ||:
 %defattr(-,root,root,-)
 %license LICENSE
 %{_libdir}/liboc.so
-%{_libdir}/liboc_logger.so
-%{_libdir}/liboc_logger_core.so
+#%{_libdir}/liboc_logger.so
+#%{_libdir}/liboc_logger_core.so
 %{_libdir}/liboctbstack.so
 %{_libdir}/libconnectivity_abstraction.so
 %if 0%{?SECURED} == 1
diff --git a/resource/csdk/resource-directory/src/rd_client.c b/resource/csdk/resource-directory/src/rd_client.c
index 2206a7dd5..414a497ff 100644
--- a/resource/csdk/resource-directory/src/rd_client.c
+++ b/resource/csdk/resource-directory/src/rd_client.c
@@ -121,14 +121,21 @@ OCStackResult OCRDPublishWithDeviceId(const char *host, const unsigned char *id,
         return OC_STACK_NO_MEMORY;
     }
 
+    char *n = 0;
+    OCGetPropertyValue(PAYLOAD_TYPE_DEVICE, OC_RSRVD_DEVICE_NAME, (void **)&n);
+    if (n)
+    {
+        OCRepPayloadSetPropString(rdPayload, OC_RSRVD_DEVICE_NAME, n);
+    }
+
     OCRepPayloadSetPropString(rdPayload, OC_RSRVD_DEVICE_ID, id);
     OCRepPayloadSetPropInt(rdPayload, OC_RSRVD_DEVICE_TTL, OIC_RD_PUBLISH_TTL);
 
     OCRepPayload **linkArr = OICCalloc(nPubResHandles, sizeof(OCRepPayload *));
     if (!linkArr)
     {
-       OCRepPayloadDestroy(rdPayload);
-       return OC_STACK_NO_MEMORY;
+        OCRepPayloadDestroy(rdPayload);
+        return OC_STACK_NO_MEMORY;
     }
     size_t dimensions[MAX_REP_ARRAY_DEPTH] = {nPubResHandles, 0, 0};
 
@@ -185,7 +192,7 @@ OCStackResult OCRDPublishWithDeviceId(const char *host, const unsigned char *id,
             {
                 OIC_LOG(ERROR, TAG, "Memory allocation failed!");
 
-                for(uint8_t i = 0; i < nPubResHandles; i++)
+                for (uint8_t i = 0; i < nPubResHandles; i++)
                 {
                     OCRepPayloadDestroy(linkArr[i]);
                 }
@@ -207,7 +214,8 @@ OCStackResult OCRDPublishWithDeviceId(const char *host, const unsigned char *id,
         }
     }
 
-    OCRepPayloadSetPropObjectArray(rdPayload, OC_RSRVD_LINKS, (const OCRepPayload **)linkArr, dimensions);
+    OCRepPayloadSetPropObjectArray(rdPayload, OC_RSRVD_LINKS, (const OCRepPayload **)linkArr,
+                                   dimensions);
     OIC_LOG_PAYLOAD(DEBUG, (OCPayload *) rdPayload);
 
     for (uint8_t i = 0; i < nPubResHandles; i++)
diff --git a/resource/oc_logger/SConscript b/resource/oc_logger/SConscript
index b5712f85d..280de8836 100644
--- a/resource/oc_logger/SConscript
+++ b/resource/oc_logger/SConscript
@@ -60,10 +60,12 @@ if target_os in ['windows', 'msys_nt','ios']:
 	oc_logger_libs += liboc_logger_env.StaticLibrary('oc_logger',
 		['c/oc_logger.c', 'c/oc_console_logger.c', 'cpp/oc_ostream_logger.cpp'])
 else:
-	oc_logger_libs += Flatten(liboc_logger_env.SharedLibrary('oc_logger_core',
-		['c/oc_logger.c'],  OBJPREFIX='core_'))
-	oc_logger_libs += Flatten(liboc_logger_env.SharedLibrary('oc_logger',
-		['c/oc_logger.c', 'c/oc_console_logger.c', 'cpp/oc_ostream_logger.cpp']))
+#	oc_logger_libs += Flatten(liboc_logger_env.SharedLibrary('oc_logger_core',
+#		['c/oc_logger.c'],  OBJPREFIX='core_'))
+#	oc_logger_libs += Flatten(liboc_logger_env.SharedLibrary('oc_logger',
+#		['c/oc_logger.c', 'c/oc_console_logger.c', 'cpp/oc_ostream_logger.cpp']))
+    oc_logger_libs += liboc_logger_env.StaticLibrary('oc_logger',
+        ['c/oc_logger.c', 'c/oc_console_logger.c', 'cpp/oc_ostream_logger.cpp'])
 
 liboc_logger_env.InstallTarget(oc_logger_libs, 'oc_logger')
 liboc_logger_env.UserInstallTargetLib(oc_logger_libs, 'oc_logger')
diff --git a/resource/src/SConscript b/resource/src/SConscript
index 463bffbd1..c53ba014e 100644
--- a/resource/src/SConscript
+++ b/resource/src/SConscript
@@ -126,6 +126,8 @@ if target_os in ['windows','ios']:
 	oclib = oclib_env.StaticLibrary('oc', oclib_src)
 else:
 	oclib = oclib_env.SharedLibrary('oc', oclib_src)
+	oclib += oclib_env.StaticLibrary('oc', oclib_src)
+
 oclib_env.InstallTarget(oclib, 'oc')
 oclib_env.UserInstallTargetLib(oclib, 'oc')
 header_dir = os.path.join(oclib_env.get('SRC_DIR') , 'resource' , 'include') + os.sep