f5e06e1205
This brings IoTivity to version 1.0.0. The patches removed by this commit are merged upstream now. There are some new patches needed for new problems with Big Endian CPUs and also for musl. The plugin manager was removed in upstream IoTivity 1.0.0. Signed-off-by: Hauke Mehrtens <hauke.mehrtens@lantiq.com>
40 lines
1.6 KiB
Diff
40 lines
1.6 KiB
Diff
--- a/resource/SConscript
|
|
+++ b/resource/SConscript
|
|
@@ -71,7 +71,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/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
|
|
@@ -71,6 +71,6 @@ SConscript('sampleapp/SConscript')
|
|
######################################################################
|
|
# Build UnitTests Things Manager
|
|
################################################ ######################
|
|
-if target_os == 'linux':
|
|
- SConscript('unittests/SConscript')
|
|
+# if target_os == 'linux':
|
|
+# SConscript('unittests/SConscript')
|
|
|