mirror of
https://github.com/novatiq/packages.git
synced 2026-04-30 15:38:40 +01:00
iotivity: update to version 1.2.1
This does the following changes: * update to version 1.2.1 * add iotivity-resource-directory-lib, this is needed by most applications now * do not activate security support by default, this caused some problems and needs some more settings to setup. * use sqlite version from normal package feed instead of using an own version * build against LEDE version of mbedtls * update example security configuration * remove some patches that went upstream * add some new patches fixing problems observed in my environment, most of them are on their way upstream. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
This commit is contained in:
Hauke Mehrtens
@@ -1,101 +1,3 @@
|
||||
--- a/resource/SConscript
|
||||
+++ b/resource/SConscript
|
||||
@@ -75,7 +75,7 @@ if target_os == 'linux':
|
||||
SConscript('csdk/stack/samples/linux/secure/SConscript')
|
||||
|
||||
# Build C/C++ unit tests
|
||||
- SConscript('unit_tests.scons')
|
||||
+ # SConscript('unit_tests.scons')
|
||||
|
||||
elif target_os == 'darwin':
|
||||
env.Command('../../out/darwin/iotivity-csdk.framework',None,src_dir + '/tools/darwin/mkfwk_osx.sh')
|
||||
--- a/resource/csdk/security/provisioning/ck_manager/SConscript
|
||||
+++ b/resource/csdk/security/provisioning/ck_manager/SConscript
|
||||
@@ -47,4 +47,4 @@ x509_env.AppendUnique(LIBS = ['Base64'])
|
||||
x509_env.AppendUnique(LIBS = ['Json'])
|
||||
|
||||
SConscript('sample/SConscript')
|
||||
-SConscript('unittest/SConscript')
|
||||
+# SConscript('unittest/SConscript')
|
||||
--- a/service/resource-encapsulation/SConscript
|
||||
+++ b/service/resource-encapsulation/SConscript
|
||||
@@ -113,10 +113,10 @@ SConscript('examples/SConscript')
|
||||
# Build UnitTests Resource Client , resourceCache and resourceBroker and
|
||||
# DiscoveryManager
|
||||
################################################ ######################
|
||||
-if target_os == 'linux':
|
||||
- SConscript('unittests/SConscript')
|
||||
- SConscript('src/resourceCache/unittests/SConscript')
|
||||
- SConscript('src/resourceBroker/unittest/SConscript')
|
||||
+# if target_os == 'linux':
|
||||
+# SConscript('unittests/SConscript')
|
||||
+# SConscript('src/resourceCache/unittests/SConscript')
|
||||
+# SConscript('src/resourceBroker/unittest/SConscript')
|
||||
|
||||
if target_os == 'android':
|
||||
SConscript('android/SConscript')
|
||||
\ No newline at end of file
|
||||
--- a/service/things-manager/SConscript
|
||||
+++ b/service/things-manager/SConscript
|
||||
@@ -75,6 +75,6 @@ SConscript('sampleapp/SConscript')
|
||||
######################################################################
|
||||
# Build UnitTests Things Manager
|
||||
################################################ ######################
|
||||
-if target_os == 'linux':
|
||||
- SConscript('unittests/SConscript')
|
||||
+# if target_os == 'linux':
|
||||
+# SConscript('unittests/SConscript')
|
||||
|
||||
--- a/service/resource-hosting/SConscript
|
||||
+++ b/service/resource-hosting/SConscript
|
||||
@@ -94,8 +94,8 @@ resourcehosting_env.UserInstallTargetHea
|
||||
'service/resource-hosting', 'Hosting.h')
|
||||
|
||||
# Go to build Unit test
|
||||
-if target_os == 'linux':
|
||||
- SConscript('unittest/SConscript')
|
||||
+# if target_os == 'linux':
|
||||
+# SConscript('unittest/SConscript')
|
||||
|
||||
# Go to build sample apps
|
||||
SConscript('SampleApp/SConscript')
|
||||
--- a/service/easy-setup/mediator/csdk/SConscript
|
||||
+++ b/service/easy-setup/mediator/csdk/SConscript
|
||||
@@ -124,8 +124,8 @@ if target_os == 'linux':
|
||||
######################################################################
|
||||
#Build UnitTestcases for Mediator[CSDK]
|
||||
################################################ ######################
|
||||
-if target_os == 'linux':
|
||||
- SConscript('unittests/SConscript')
|
||||
+# if target_os == 'linux':
|
||||
+# SConscript('unittests/SConscript')
|
||||
|
||||
|
||||
|
||||
--- a/service/easy-setup/mediator/richsdk/SConscript
|
||||
+++ b/service/easy-setup/mediator/richsdk/SConscript
|
||||
@@ -138,6 +138,6 @@ if target_os == 'linux':
|
||||
######################################################################
|
||||
#Build UnitTestcases for Mediator[RichSDK]
|
||||
################################################ ######################
|
||||
-if target_os == 'linux':
|
||||
- SConscript('unittests/SConscript')
|
||||
+# if target_os == 'linux':
|
||||
+# SConscript('unittests/SConscript')
|
||||
|
||||
--- a/service/resource-container/SConscript
|
||||
+++ b/service/resource-container/SConscript
|
||||
@@ -209,8 +209,8 @@ lib_env = conf2.Finish()
|
||||
######################################################################
|
||||
# build resource container unit tests
|
||||
######################################################################
|
||||
-if target_os == 'linux':
|
||||
- SConscript('unittests/SConscript')
|
||||
+# if target_os == 'linux':
|
||||
+# SConscript('unittests/SConscript')
|
||||
|
||||
######################################################################
|
||||
# Build Container Sample
|
||||
--- a/plugins/SConscript
|
||||
+++ b/plugins/SConscript
|
||||
@@ -35,7 +35,7 @@ if target_os not in ['android', 'arduino
|
||||
@@ -107,47 +9,133 @@
|
||||
|
||||
if build_sample == 'ON':
|
||||
if target_os in ['linux']:
|
||||
--- a/service/scene-manager/SConscript
|
||||
+++ b/service/scene-manager/SConscript
|
||||
@@ -101,8 +101,8 @@ scenemanager_env.UserInstallTargetHeader
|
||||
scenemanager_env.UserInstallTargetHeader('include/RemoteSceneAction.h', 'service/scene-manager', 'RemoteSceneAction.h')
|
||||
--- a/resource/SConscript
|
||||
+++ b/resource/SConscript
|
||||
@@ -78,7 +78,7 @@ if target_os in ['linux', 'windows']:
|
||||
SConscript('csdk/stack/samples/linux/secure/SConscript')
|
||||
|
||||
# Go to build Unit test
|
||||
-if target_os == 'linux':
|
||||
# Build C/C++ unit tests
|
||||
- SConscript('unit_tests.scons')
|
||||
+ # SConscript('unit_tests.scons')
|
||||
|
||||
elif target_os == 'darwin':
|
||||
env.Command('../../out/darwin/iotivity-csdk.framework',None,src_dir + '/tools/darwin/mkfwk_osx.sh')
|
||||
--- a/resource/csdk/resource-directory/SConscript
|
||||
+++ b/resource/csdk/resource-directory/SConscript
|
||||
@@ -114,8 +114,3 @@ if 'SERVER' in rd_mode:
|
||||
if target_os in ['linux']:
|
||||
SConscript('samples/SConscript')
|
||||
|
||||
-######################################################################
|
||||
-# Build UnitTests of the Resource Directory
|
||||
-################################################ ######################
|
||||
-if target_os in ['linux']:
|
||||
- SConscript('unittests/SConscript')
|
||||
+# if target_os == 'linux':
|
||||
+# SConscript('unittests/SConscript')
|
||||
--- a/service/coap-http-proxy/SConscript
|
||||
+++ b/service/coap-http-proxy/SConscript
|
||||
@@ -84,6 +84,3 @@ local_env.UserInstallTargetHeader('inclu
|
||||
######################################################################
|
||||
if target_os in ['linux', 'tizen']:
|
||||
SConscript('samples/SConscript')
|
||||
-
|
||||
-if target_os in ['linux']:
|
||||
- SConscript('unittests/SConscript')
|
||||
--- a/service/easy-setup/enrollee/SConscript
|
||||
+++ b/service/easy-setup/enrollee/SConscript
|
||||
@@ -123,7 +123,3 @@ if target_os == 'arduino':
|
||||
|
||||
# Go to build sample apps
|
||||
-SConscript('sampleapp/SConscript')
|
||||
+# SConscript('sampleapp/SConscript')
|
||||
if target_os in ['linux']:
|
||||
SConscript('../sampleapp/enrollee/linux/SConscript')
|
||||
- #Build UnitTestcases for Enrollee
|
||||
- if enrollee_env.get('SECURED') == '0':
|
||||
- SConscript('../enrollee/unittests/SConscript')
|
||||
-
|
||||
--- a/service/easy-setup/mediator/richsdk/SConscript
|
||||
+++ b/service/easy-setup/mediator/richsdk/SConscript
|
||||
@@ -163,11 +163,3 @@ if target_os in ['linux']:
|
||||
if target_os in ['android']:
|
||||
SConscript('../../sampleapp/mediator/android/SConscript')
|
||||
|
||||
-
|
||||
-######################################################################
|
||||
-#Build UnitTestcases for Mediator[RichSDK]
|
||||
-################################################ ######################
|
||||
-if env.get('SECURED') == '0':
|
||||
- if target_os == 'linux':
|
||||
- SConscript('unittests/SConscript')
|
||||
-
|
||||
--- a/service/resource-container/SConscript
|
||||
+++ b/service/resource-container/SConscript
|
||||
@@ -223,12 +223,6 @@ else:
|
||||
lib_env = conf2.Finish()
|
||||
|
||||
######################################################################
|
||||
-# build resource container unit tests
|
||||
-######################################################################
|
||||
-if target_os in ['linux']:
|
||||
- SConscript('unittests/SConscript')
|
||||
-
|
||||
-######################################################################
|
||||
# Build Container Sample
|
||||
######################################################################
|
||||
if target_os not in ['ios']:
|
||||
--- a/service/resource-encapsulation/SConscript
|
||||
+++ b/service/resource-encapsulation/SConscript
|
||||
@@ -121,14 +121,5 @@ resourceClient_env.UserInstallTargetHead
|
||||
######################################################################
|
||||
SConscript('examples/SConscript')
|
||||
|
||||
-######################################################################
|
||||
-# Build UnitTests Resource Client , resourceCache and resourceBroker and
|
||||
-# DiscoveryManager
|
||||
-################################################ ######################
|
||||
-if target_os in ['linux']:
|
||||
- SConscript('unittests/SConscript')
|
||||
- SConscript('src/resourceCache/unittests/SConscript')
|
||||
- SConscript('src/resourceBroker/unittest/SConscript')
|
||||
-
|
||||
if target_os == 'android':
|
||||
SConscript('android/SConscript')
|
||||
--- a/service/resource-encapsulation/src/common/SConscript
|
||||
+++ b/service/resource-encapsulation/src/common/SConscript
|
||||
@@ -122,9 +122,9 @@ if target_os == 'linux':
|
||||
'expiryTimer/unittests/ExpiryTimerTest.cpp'
|
||||
]
|
||||
@@ -22,10 +22,10 @@
|
||||
# rcs_common (primitiveResource and expiryTimer) build script
|
||||
##
|
||||
import os
|
||||
+Import('env')
|
||||
|
||||
- rcs_common_test = rcs_common_test_env.Program('rcs_common_test', rcs_common_test_src)
|
||||
- Alias("rcs_common_test", rcs_common_test)
|
||||
- env.AppendTarget('rcs_common_test')
|
||||
+# rcs_common_test = rcs_common_test_env.Program('rcs_common_test', rcs_common_test_src)
|
||||
+# Alias("rcs_common_test", rcs_common_test)
|
||||
+# env.AppendTarget('rcs_common_test')
|
||||
# SConscript file for Local PKI google tests
|
||||
-gtest_env = SConscript('#extlibs/gtest/SConscript')
|
||||
-lib_env = gtest_env.Clone()
|
||||
+lib_env = env.Clone()
|
||||
|
||||
if env.get('TEST') == '1':
|
||||
from tools.scons.RunTest import *
|
||||
# Add third party libraries
|
||||
SConscript('#service/third_party_libs.scons', exports = 'lib_env')
|
||||
--- a/service/resource-encapsulation/src/serverBuilder/SConscript
|
||||
+++ b/service/resource-encapsulation/src/serverBuilder/SConscript
|
||||
@@ -110,9 +110,9 @@ if target_os == 'linux':
|
||||
@@ -21,9 +21,11 @@
|
||||
##
|
||||
# rcs_server (Server Builder) project build script
|
||||
##
|
||||
+import os
|
||||
+Import('env')
|
||||
+
|
||||
# SConscript file for Local PKI google tests
|
||||
-gtest_env = SConscript('#extlibs/gtest/SConscript')
|
||||
-lib_env = gtest_env.Clone()
|
||||
+lib_env = env.Clone()
|
||||
|
||||
server_builder_test_src = env.Glob('unittests/*.cpp')
|
||||
# Add third party libraries
|
||||
SConscript('#service/third_party_libs.scons', exports = 'lib_env')
|
||||
--- a/service/scene-manager/SConscript
|
||||
+++ b/service/scene-manager/SConscript
|
||||
@@ -100,9 +100,5 @@ scenemanager_env.UserInstallTargetHeader
|
||||
scenemanager_env.UserInstallTargetHeader('include/RemoteScene.h', 'service/scene-manager', 'RemoteScene.h')
|
||||
scenemanager_env.UserInstallTargetHeader('include/RemoteSceneAction.h', 'service/scene-manager', 'RemoteSceneAction.h')
|
||||
|
||||
- server_builder_test = server_builder_test_env.Program('rcs_server_test', server_builder_test_src)
|
||||
- Alias("rcs_server_test", server_builder_test)
|
||||
- env.AppendTarget('rcs_server_test')
|
||||
+# server_builder_test = server_builder_test_env.Program('rcs_server_test', server_builder_test_src)
|
||||
+# Alias("rcs_server_test", server_builder_test)
|
||||
+# env.AppendTarget('rcs_server_test')
|
||||
|
||||
if env.get('TEST') == '1':
|
||||
from tools.scons.RunTest import *
|
||||
-# Go to build Unit test
|
||||
-if target_os in ['linux']:
|
||||
- SConscript('unittests/SConscript')
|
||||
-
|
||||
# Go to build sample apps
|
||||
SConscript('sampleapp/SConscript')
|
||||
|
||||
Reference in New Issue
Block a user