[IOT-2060] Don't force-link with routingmanager

Don't force all IoTivity modules to link with routingmanager. Many
modules use the copy of routingmanager from the Shared Library
octbstack, so they don't need to link with routingmanager.

Also routingmanager currently calls into connectivity_abstraction, so
it adds unnecessary headaches when having to specify LIBS in the
strict order required by the gcc linker.

Change-Id: I1e262e62fecd0c01528d07170b8f115ba7fecd5e
Signed-off-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19101
Tested-by: jenkins-iotivity <jenkins@iotivity.org>

diff --git a/resource/csdk/routing/SConscript b/resource/csdk/routing/SConscript
index 95aac37..b8d7b13 100644 (file)
--- a/resource/csdk/routing/SConscript
+++ b/resource/csdk/routing/SConscript
@@ -1,15 +1,10 @@
 Import('env')
 import os
 
-env.AppendUnique(CPPPATH = [os.path.join(Dir('.').abspath, './include')])
-
-if env.get('TARGET_OS') not in ['tizen']:
-       env.AppendUnique(LIBPATH = [os.path.join(env.get('BUILD_DIR'), 'resource/csdk/routing/')])
-
-env.AppendUnique(LIBS = ['routingmanager'])
-
 local_env = env.Clone()
 
+local_env.AppendUnique(CPPPATH = [os.path.join(Dir('.').abspath, './include')])
+
 if env.get('ROUTING') == 'GW':
        local_env.AppendUnique(CPPPATH = [
                                os.path.join(Dir('.').abspath, './../include'),

diff --git a/resource/csdk/security/provisioning/unittest/SConscript b/resource/csdk/security/provisioning/unittest/SConscript
index c4adeaf..ce00995 100644 (file)
--- a/resource/csdk/security/provisioning/unittest/SConscript
+++ b/resource/csdk/security/provisioning/unittest/SConscript
@@ -63,6 +63,7 @@ sptest_env.PrependUnique(LIBS = [   'ocpmapi_internal',
                                     'oc',
                                     'octbstack_internal',
                                     'ocsrm',
+                                    'routingmanager',
                                     'oc_logger_internal',
                                     'connectivity_abstraction',
                                     'coap'])

diff --git a/resource/csdk/security/tool/SConscript b/resource/csdk/security/tool/SConscript
index 0c66a7f..b24d97b 100644 (file)
--- a/resource/csdk/security/tool/SConscript
+++ b/resource/csdk/security/tool/SConscript
@@ -64,8 +64,7 @@ else:
         if target_os in ['windows']:
             tools_env.AppendUnique(LIBS = ['sqlite3'])
     tools_env.AppendUnique(LIBS = ['coap', 'mbedtls', 'mbedx509', 'mbedcrypto',
-                                   'ocsrm', 'connectivity_abstraction'])
-
+                                   'ocsrm', 'routingmanager', 'connectivity_abstraction'])
 
 tools_env.PrependUnique(LIBS = ['cjson'])
 

diff --git a/resource/csdk/security/unittest/SConscript b/resource/csdk/security/unittest/SConscript
index ec188b6..d2f1de1 100644 (file)
--- a/resource/csdk/security/unittest/SConscript
+++ b/resource/csdk/security/unittest/SConscript
@@ -58,9 +58,11 @@ srmtest_env.PrependUnique(CPPPATH = [
 srmtest_env.PrependUnique(LIBS = [
         'octbstack_internal',
         'ocsrm',
+        'routingmanager',
         'oc_logger_internal',
         'connectivity_abstraction',
-        'coap'])
+        'coap'
+        ])
 
 if srmtest_env.get('SECURED') == '1':
     srmtest_env.AppendUnique(LIBS = ['mbedtls','mbedx509','mbedcrypto'])

diff --git a/resource/csdk/stack/SConscript b/resource/csdk/stack/SConscript
index f83650d..13f6c49 100644 (file)
--- a/resource/csdk/stack/SConscript
+++ b/resource/csdk/stack/SConscript
@@ -69,6 +69,7 @@ liboctbstack_env.PrependUnique(CPPPATH = [
         '#resource/csdk/security/include',
         '#resource/csdk/security/include/internal',
         '#resource/csdk/security/provisioning/include',
+        '#resource/csdk/routing/include',
         ])
 
 if 'SUB' in with_mq:

diff --git a/resource/csdk/stack/samples/arduino/SimpleClientServer/ocserver/SConscript b/resource/csdk/stack/samples/arduino/SimpleClientServer/ocserver/SConscript
index a8d4390..4982a8b 100644 (file)
--- a/resource/csdk/stack/samples/arduino/SimpleClientServer/ocserver/SConscript
+++ b/resource/csdk/stack/samples/arduino/SimpleClientServer/ocserver/SConscript
@@ -35,7 +35,8 @@ arduino_simplecs_env.PrependUnique(CPPPATH = [
 
 arduino_simplecs_env.AppendUnique(CPPDEFINES = ['TB_LOG'])
 
-arduino_simplecs_env.PrependUnique(LIBS = ['octbstack', 'ocsrm', 'connectivity_abstraction','coap'])
+arduino_simplecs_env.PrependUnique(
+    LIBS = ['octbstack', 'ocsrm', 'routingmanager', 'connectivity_abstraction','coap'])
 
 arduino_simplecs = arduino_simplecs_env.Program('SimpleClientServer', 'ocserver.cpp')
 arduino_simplecs_env.CreateBin('SimpleClientServer')

diff --git a/resource/csdk/stack/samples/linux/SimpleClientServer/SConscript b/resource/csdk/stack/samples/linux/SimpleClientServer/SConscript
index 0efcc89..e5e864c 100644 (file)
--- a/resource/csdk/stack/samples/linux/SimpleClientServer/SConscript
+++ b/resource/csdk/stack/samples/linux/SimpleClientServer/SConscript
@@ -57,6 +57,9 @@ samples_env.AppendUnique(RPATH=[samples_env.get('BUILD_DIR')])
 samples_env.PrependUnique(
     LIBS=['octbstack', 'ocsrm', 'connectivity_abstraction', 'coap'])
 
+if target_os in ['darwin']:
+    samples_env.AppendUnique(LIBS=['routingmanager'])
+
 if target_os not in ['arduino', 'windows', 'darwin', 'ios', 'msys_nt']:
     samples_env.AppendUnique(LIBS=['rt'])
 

diff --git a/resource/csdk/stack/test/SConscript b/resource/csdk/stack/test/SConscript
index 72e21ef..fcd8e65 100644 (file)
--- a/resource/csdk/stack/test/SConscript
+++ b/resource/csdk/stack/test/SConscript
@@ -48,6 +48,7 @@ stacktest_env.PrependUnique(CPPPATH = [
 
 stacktest_env.PrependUnique(LIBS = ['octbstack_internal',
                                     'ocsrm',
+                                    'routingmanager',
                                     'connectivity_abstraction',
                                     'coap',
                                     ])

diff --git a/resource/provisioning/unittests/SConscript b/resource/provisioning/unittests/SConscript
index de7d3c0..5d826d9 100755 (executable)
--- a/resource/provisioning/unittests/SConscript
+++ b/resource/provisioning/unittests/SConscript
@@ -69,6 +69,7 @@ provisiontests_env.PrependUnique(LIBS = [
         'oc',
         'ocpmapi_internal',
         'octbstack_internal',
+        'routingmanager',
         'oc_logger_internal',
         'connectivity_abstraction',
         'coap',

diff --git a/resource/unittests/SConscript b/resource/unittests/SConscript
index 16e060e..3f8ea9b 100644 (file)
--- a/resource/unittests/SConscript
+++ b/resource/unittests/SConscript
@@ -59,9 +59,11 @@ unittests_env.PrependUnique(LIBS = [
         'oc',
         'octbstack_internal',
         'ocsrm',
+        'routingmanager',
         'oc_logger_internal',
         'connectivity_abstraction',
-        'coap'])
+        'coap',
+        ])
 
 if unittests_env.get('SECURED') == '1':
     unittests_env.AppendUnique(LIBS = ['mbedtls', 'mbedx509'])