Catch up 1.3-rel on plugins reformats

Some sconscripts got missed pulling reformats over from master.
This changeset is the scripts in plugins - these six scripts will
now be identical to their counterpart in master.

Note this does pick up the change not to locally set BUILD_DIR
into LIBPATH and to not set TB_LOG into CPPDEFINES as those are
done on a global level already.

Bug: https://jira.iotivity.org/browse/IOT-1745
Change-Id: Ib793b7eeaeda1d380b805153e82cffade7e65c80
Signed-off-by: Mats Wichmann <mats@linux.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/21463
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>

diff --git a/plugins/SConscript b/plugins/SConscript
index 8fc70bc..3decb72 100644 (file)
--- a/plugins/SConscript
+++ b/plugins/SConscript
@@ -29,16 +29,16 @@ target_os = env.get('TARGET_OS')
 build_sample = env.get('BUILD_SAMPLE')
 src_dir = env.get('SRC_DIR')
 
-if target_os not in ['android', 'arduino', 'darwin', 'ios', 'tizen', 'msys_nt', 'windows']:
+if target_os not in [
+        'android', 'arduino', 'darwin', 'ios', 'tizen', 'msys_nt', 'windows'
+]:
 
-    SConscript(os.path.join('zigbee_wrapper', 'SConscript'))
+    SConscript('zigbee_wrapper/SConscript')
 
-    SConscript(os.path.join('src', 'SConscript'))
+    SConscript('src/SConscript')
 
-    SConscript(os.path.join('unittests', 'SConscript'))
+    SConscript('unittests/SConscript')
 
     if build_sample == 'ON':
-           if target_os in ['linux']:
-                   target_path = target_os
-                   SConscript(os.path.join('samples', target_path, 'SConscript'))
-
+        if target_os in ['linux']:
+            SConscript('samples/' + target_os + '/SConscript')

diff --git a/plugins/samples/linux/SConscript b/plugins/samples/linux/SConscript
index 091c790..302737b 100644 (file)
--- a/plugins/samples/linux/SConscript
+++ b/plugins/samples/linux/SConscript
@@ -30,55 +30,46 @@ pi_dir = os.path.join(src_dir, 'plugins')
 ######################################################################
 # Build flags
 ######################################################################
-samples_env.PrependUnique(CPPPATH = [
-               os.path.join(src_dir, 'resource', 'oc_logger', 'include'),
-               os.path.join(src_dir, 'resource', 'csdk', 'logger', 'include'),
-               os.path.join(src_dir, 'resource', 'csdk', 'include'),
-               os.path.join(src_dir, 'resource', 'csdk', 'stack', 'include'),
-                os.path.join(pi_dir, 'include')
-                ])
+samples_env.PrependUnique(CPPPATH=[
+    os.path.join(src_dir, 'resource', 'oc_logger', 'include'),
+    os.path.join(src_dir, 'resource', 'csdk', 'logger', 'include'),
+    os.path.join(src_dir, 'resource', 'csdk', 'include'),
+    os.path.join(src_dir, 'resource', 'csdk', 'stack', 'include'),
+    os.path.join(pi_dir, 'include')
+])
 
-samples_env.AppendUnique(CXXFLAGS = ['-std=c++0x', '-Wall', '-Wextra', '-Werror'])
-samples_env.AppendUnique(RPATH = [env.get('BUILD_DIR')])
-samples_env.AppendUnique(LIBPATH = [env.get('BUILD_DIR')])
+samples_env.AppendUnique(
+    CXXFLAGS=['-std=c++0x', '-Wall', '-Wextra', '-Werror'])
+samples_env.AppendUnique(RPATH=[env.get('BUILD_DIR')])
 
 if target_os in ['darwin', 'ios']:
-       samples_env.PrependUnique(LIBS = ['m',
-                                          'octbstack',
-                                          'ocsrm',
-                                          'connectivity_abstraction',
-                                          'coap' ])
+    samples_env.PrependUnique(
+        LIBS=['m', 'octbstack', 'ocsrm', 'connectivity_abstraction', 'coap'])
 elif target_os not in ['arduino']:
-       samples_env.PrependUnique(LIBS = ['m',
-                                          'octbstack',
-                                          'ocsrm',
-                                          'connectivity_abstraction',
-                                          'coap',
-                                          'plugin_interface'])
-       samples_env.AppendUnique(LIBS = ['rt'])
-       if target_arch in ['x86_64', 'arm64']:
-               samples_env.AppendUnique(CPPFLAGS = ['-Llib64'])
-       else:
-               samples_env.AppendUnique(CPPFLAGS = ['-Llib'])
-       samples_env.AppendUnique(LIBS = ['pthread'])
+    samples_env.PrependUnique(LIBS=[
+        'm', 'octbstack', 'ocsrm', 'connectivity_abstraction', 'coap',
+        'plugin_interface'
+    ])
+    samples_env.AppendUnique(LIBS=['rt'])
+    if target_arch in ['x86_64', 'arm64']:
+        samples_env.AppendUnique(CPPFLAGS=['-Llib64'])
+    else:
+        samples_env.AppendUnique(CPPFLAGS=['-Llib'])
+    samples_env.AppendUnique(LIBS=['pthread'])
 
 if env.get('SECURED') == '1':
-    samples_env.AppendUnique(LIBS = ['mbedtls','mbedx509','mbedcrypto'])
-
-samples_env.AppendUnique(CPPDEFINES = ['TB_LOG'])
+    samples_env.AppendUnique(LIBS=['mbedtls', 'mbedx509', 'mbedcrypto'])
 
 ######################################################################
 # Source files and Targets
 ######################################################################
 iotivityandzigbeeserver = samples_env.Program('iotivityandzigbeeserver',
-        ['IotivityandZigbeeServer.c'])
+                                              ['IotivityandZigbeeServer.c'])
 iotivityandzigbeeclient = samples_env.Program('iotivityandzigbeeclient',
-        ['IotivityandZigbeeClient.c'])
+                                              ['IotivityandZigbeeClient.c'])
 
 list_of_samples = [iotivityandzigbeeserver, iotivityandzigbeeclient]
 
 Alias("samples", list_of_samples)
 
 env.AppendTarget('samples')
-
-

diff --git a/plugins/src/SConscript b/plugins/src/SConscript
index fa9faa2..0b61819 100644 (file)
--- a/plugins/src/SConscript
+++ b/plugins/src/SConscript
@@ -29,62 +29,62 @@ target_os = env.get('TARGET_OS')
 src_dir = env.get('SRC_DIR')
 pi_path = os.path.join(src_dir, 'plugins')
 
-print"Reading PI script"
+print "Reading PI script"
 
 ######################################################################
 # Build flags
 ######################################################################
 with_unforked_libcoap = env.get('WITH_UNFORKED_LIBCOAP')
 if with_unforked_libcoap == '1':
-    env.PrependUnique(CPPPATH = ['#extlibs/libcoap/libcoap/include'])
+    env.PrependUnique(CPPPATH=['#extlibs/libcoap/libcoap/include'])
 else:
-    env.PrependUnique(CPPPATH = [os.path.join(src_dir, 'resource', 'csdk', 'connectivity', 'lib', 'libcoap-4.1.1', 'include')])
+    env.PrependUnique(CPPPATH=[
+        os.path.join(src_dir, 'resource', 'csdk', 'connectivity', 'lib',
+                     'libcoap-4.1.1', 'include')
+    ])
 
-env.PrependUnique(CPPPATH = [ os.path.join(src_dir, 'resource', 'c_common', 'oic_malloc', 'include'),
-                              os.path.join(src_dir, 'resource', 'c_common', 'oic_string', 'include'),
-                              os.path.join(src_dir, 'resource', 'c_common', 'oic_time', 'include'),
-                              os.path.join(src_dir, 'resource', 'oc_logger', 'include'),
-                              os.path.join(src_dir, 'resource', 'csdk', 'logger', 'include'),
-                              os.path.join(src_dir, 'resource', 'csdk', 'stack', 'include'),
-                              os.path.join(src_dir, 'resource', 'csdk', 'security', 'include'),
-                              os.path.join(src_dir, 'resource', 'csdk', 'include')
-                            ])
-env.AppendUnique(CPPPATH = [ os.path.join(pi_path, 'include'),
-                             os.path.join(pi_path, 'include', 'internal'),
-                             os.path.join(pi_path, 'zigbee_wrapper', 'include'),
-                             os.path.join(pi_path, 'include', 'internal')
-                           ])
+env.PrependUnique(CPPPATH=[
+    os.path.join(src_dir, 'resource', 'c_common', 'oic_malloc', 'include'),
+    os.path.join(src_dir, 'resource', 'c_common', 'oic_string', 'include'),
+    os.path.join(src_dir, 'resource', 'c_common', 'oic_time', 'include'),
+    os.path.join(src_dir, 'resource', 'oc_logger', 'include'),
+    os.path.join(src_dir, 'resource', 'csdk', 'logger', 'include'),
+    os.path.join(src_dir, 'resource', 'csdk', 'stack', 'include'),
+    os.path.join(src_dir, 'resource', 'csdk', 'security', 'include'),
+    os.path.join(src_dir, 'resource', 'csdk', 'include')
+])
+env.AppendUnique(CPPPATH=[
+    os.path.join(pi_path, 'include'),
+    os.path.join(pi_path, 'include', 'internal'),
+    os.path.join(pi_path, 'zigbee_wrapper', 'include'),
+    os.path.join(pi_path, 'include', 'internal')
+])
 
 if target_os not in ['arduino', 'windows']:
-       env.AppendUnique(CPPDEFINES = ['WITH_POSIX'])
+    env.AppendUnique(CPPDEFINES=['WITH_POSIX'])
 
-if target_os in ['darwin','ios']:
-       env.AppendUnique(CPPDEFINES = ['_DARWIN_C_SOURCE'])
+if target_os in ['darwin', 'ios']:
+    env.AppendUnique(CPPDEFINES=['_DARWIN_C_SOURCE'])
 
-env.AppendUnique(CXXFLAGS = ['-std=c++0x', '-Wall', '-Wextra', '-Werror'])
-env.AppendUnique(RPATH = [env.get('BUILD_DIR')])
-env.AppendUnique(LIBPATH = [env.get('BUILD_DIR')])
+env.AppendUnique(CXXFLAGS=['-std=c++0x', '-Wall', '-Wextra', '-Werror'])
+env.AppendUnique(RPATH=[env.get('BUILD_DIR')])
 
-env.PrependUnique(LIBS = ['zigbee_wrapper'])
-
-if env.get('LOGGING'):
-       env.AppendUnique(CPPDEFINES = ['TB_LOG'])
+env.PrependUnique(LIBS=['zigbee_wrapper'])
 
 #####################################################################
 # Source files and Target(s)
 ######################################################################
 pi_src = [
-         os.path.join(src_dir, 'resource', 'csdk', 'logger', 'src', 'logger.c'),
-         'pluginlist.c',
-         'plugininterface.c',
-            ]
+    os.path.join(src_dir, 'resource', 'csdk', 'logger', 'src', 'logger.c'),
+    'pluginlist.c',
+    'plugininterface.c',
+]
 
-env.AppendUnique(PI_SRC = pi_src)
+env.AppendUnique(PI_SRC=pi_src)
 
 if target_os in ['android', 'tizen']:
-       calib = env.SharedLibrary('plugin_interface', env.get('PI_SRC'))
+    calib = env.SharedLibrary('plugin_interface', env.get('PI_SRC'))
 else:
-       calib = env.StaticLibrary('plugin_interface', env.get('PI_SRC'))
+    calib = env.StaticLibrary('plugin_interface', env.get('PI_SRC'))
 env.InstallTarget(calib, 'plugin_interface')
 env.UserInstallTargetLib(calib, 'plugin_interface')
-

diff --git a/plugins/unittests/SConscript b/plugins/unittests/SConscript
index c1391df..8e1ade2 100644 (file)
--- a/plugins/unittests/SConscript
+++ b/plugins/unittests/SConscript
@@ -20,6 +20,7 @@
 
 import os
 import os.path
+from tools.scons.RunTest import run_test
 
 # SConscript file for Local PKI google tests
 gtest_env = SConscript('#extlibs/gtest/SConscript')
@@ -32,22 +33,22 @@ target_os = unittests_env.get('TARGET_OS')
 ######################################################################
 # Build flags
 ######################################################################
-unittests_env.PrependUnique(CPPPATH = [
-                os.path.join(pi_dir, 'include'),
-               ])
+unittests_env.PrependUnique(CPPPATH=[
+    os.path.join(pi_dir, 'include'),
+])
 
-unittests_env.AppendUnique(LIBPATH = [unittests_env.get('BUILD_DIR')])
-unittests_env.PrependUnique(LIBS = [
-               'plugin_interface',
-               'oc',
-               'octbstack',
-               'oc_logger',
-               'connectivity_abstraction',
-               'coap'
-               ])
+unittests_env.AppendUnique(LIBPATH=[unittests_env.get('BUILD_DIR')])
+unittests_env.PrependUnique(LIBS=[
+    'plugin_interface',
+    'oc',
+    'octbstack',
+    'oc_logger',
+    'connectivity_abstraction',
+    'coap',
+])
 
 if unittests_env.get('LOGGING'):
-       unittests_env.AppendUnique(CPPDEFINES = ['TB_LOG'])
+    unittests_env.AppendUnique(CPPDEFINES=['TB_LOG'])
 
 ######################################################################
 # Source files and Targets
@@ -58,10 +59,6 @@ Alias("piunittests", [piunittests])
 
 unittests_env.AppendTarget('piunittests')
 if unittests_env.get('TEST') == '1':
-       if target_os in ['linux']:
-                from tools.scons.RunTest import *
-                run_test(unittests_env,
-                         'plugins_unittests.memcheck',
-                         'plugins/unittests/piunittests',
-                         piunittests)
-
+    if target_os in ['linux']:
+        run_test(unittests_env, 'plugins_unittests.memcheck',
+                 'plugins/unittests/piunittests', piunittests)

diff --git a/plugins/zigbee_wrapper/src/SConscript b/plugins/zigbee_wrapper/src/SConscript
index 21b1bf2..6ddc5a2 100644 (file)
--- a/plugins/zigbee_wrapper/src/SConscript
+++ b/plugins/zigbee_wrapper/src/SConscript
@@ -30,54 +30,55 @@ target_os = env.get('TARGET_OS')
 src_dir = env.get('SRC_DIR')
 zw_path = os.path.join(src_dir, 'plugins')
 
-print"Reading Zigbee Wrapper (ZW) script"
+print "Reading Zigbee Wrapper (ZW) script"
 
 ######################################################################
 # Build flags
 ######################################################################
 
-env.PrependUnique(CPPPATH = [ os.path.join(src_dir, 'resource', 'c_common', 'oic_malloc', 'include'),
-                              os.path.join(src_dir, 'resource', 'c_common', 'oic_string', 'include'),
-                              os.path.join(src_dir, 'resource', 'oc_logger', 'include'),
-                              os.path.join(src_dir, 'resource', 'csdk', 'logger', 'include'),
-                              os.path.join(src_dir, 'resource', 'csdk', 'include'),
-                              os.path.join(src_dir, 'resource', 'csdk', 'stack', 'include'),
-                              ])
-env.AppendUnique(CPPPATH = [ os.path.join(zw_path, 'include'),
-                             os.path.join(zw_path, 'include', 'internal'),
-                             os.path.join(zw_path, 'zigbee_wrapper', 'include')
-                             ])
+env.PrependUnique(CPPPATH=[
+    os.path.join(src_dir, 'resource'),
+    os.path.join(src_dir, 'resource', 'c_common'),
+    os.path.join(src_dir, 'resource', 'c_common', 'oic_malloc', 'include'),
+    os.path.join(src_dir, 'resource', 'c_common', 'oic_string', 'include'),
+    os.path.join(src_dir, 'resource', 'oc_logger', 'include'),
+    os.path.join(src_dir, 'resource', 'csdk', 'logger', 'include'),
+    os.path.join(src_dir, 'resource', 'csdk', 'include'),
+    os.path.join(src_dir, 'resource', 'csdk', 'stack', 'include'),
+])
+env.AppendUnique(CPPPATH=[
+    os.path.join(zw_path, 'include'),
+    os.path.join(zw_path, 'include', 'internal'),
+    os.path.join(zw_path, 'zigbee_wrapper', 'include')
+])
 
 if target_os not in ['arduino', 'windows']:
-       env.AppendUnique(CPPDEFINES = ['WITH_POSIX'])
+    env.AppendUnique(CPPDEFINES=['WITH_POSIX'])
 
-if target_os in ['darwin','ios']:
-       env.AppendUnique(CPPDEFINES = ['_DARWIN_C_SOURCE'])
+if target_os in ['darwin', 'ios']:
+    env.AppendUnique(CPPDEFINES=['_DARWIN_C_SOURCE'])
 
-env.AppendUnique(CXXFLAGS = ['-std=c++0x', '-Wall', '-Wextra', '-Werror'])
-env.AppendUnique(RPATH = [env.get('BUILD_DIR')])
-env.AppendUnique(LIBPATH = [env.get('BUILD_DIR')])
+env.AppendUnique(CXXFLAGS=['-std=c++0x', '-Wall', '-Wextra', '-Werror'])
+env.AppendUnique(RPATH=[env.get('BUILD_DIR')])
 
-env.PrependUnique(LIBS = ['telegesis_wrapper'])
-
-if env.get('LOGGING'):
-       env.AppendUnique(CPPDEFINES = ['TB_LOG'])
+env.PrependUnique(LIBS=['telegesis_wrapper'])
 
 #####################################################################
 # Source files and Target(s)
 ######################################################################
 
 zw_src = [
-         os.path.join(src_dir, 'resource', 'c_common', 'oic_malloc', 'src', 'oic_malloc.c'),
-         os.path.join(src_dir, 'resource', 'csdk', 'logger', 'src', 'logger.c'),
-            'zigbee_wrapper.c',
-         ]
+    os.path.join(src_dir, 'resource', 'c_common', 'oic_malloc', 'src',
+                 'oic_malloc.c'),
+    os.path.join(src_dir, 'resource', 'csdk', 'logger', 'src', 'logger.c'),
+    'zigbee_wrapper.c',
+]
 
-env.AppendUnique(ZW_SRC = zw_src)
+env.AppendUnique(ZW_SRC=zw_src)
 
 if target_os in ['android', 'tizen']:
-       calib = env.SharedLibrary('zigbee_wrapper', env.get('ZW_SRC'))
+    calib = env.SharedLibrary('zigbee_wrapper', env.get('ZW_SRC'))
 else:
-       calib = env.StaticLibrary('zigbee_wrapper', env.get('ZW_SRC'))
+    calib = env.StaticLibrary('zigbee_wrapper', env.get('ZW_SRC'))
 env.InstallTarget(calib, 'libzigbee_wrapper')
 env.UserInstallTargetLib(calib, 'libzigbee_wrapper')

diff --git a/plugins/zigbee_wrapper/telegesis_wrapper/src/SConscript b/plugins/zigbee_wrapper/telegesis_wrapper/src/SConscript
index b2d71b0..284405a 100644 (file)
--- a/plugins/zigbee_wrapper/telegesis_wrapper/src/SConscript
+++ b/plugins/zigbee_wrapper/telegesis_wrapper/src/SConscript
@@ -33,37 +33,37 @@ tw_path = os.path.join(src_dir, 'plugins')
 # Source files and Target(s)
 ######################################################################
 
-print"Reading Telegesis Wrapper (TW) script"
+print "Reading Telegesis Wrapper (TW) script"
 
-env.AppendUnique(CPPPATH = [ os.path.join(tw_path, 'include'),
-                             os.path.join(tw_path, 'include', 'internal'),
-                             os.path.join(src_dir, 'resource', 'oc_logger', 'include'),
-                             os.path.join(src_dir, 'resource', 'csdk', 'include'),
-                             os.path.join(src_dir, 'resource', 'csdk', 'stack', 'include'),
-                             os.path.join(src_dir, 'resource', 'csdk', 'logger', 'include'),
-                             os.path.join(src_dir, 'resource', 'c_common', 'oic_string', 'include'),
-                             os.path.join(tw_path, 'zigbee_wrapper', 'telegesis_wrapper', 'include')
-                             ])
+env.AppendUnique(CPPPATH=[
+    os.path.join(tw_path, 'include'),
+    os.path.join(tw_path, 'include', 'internal'),
+    os.path.join(src_dir, 'resource', 'oc_logger', 'include'),
+    os.path.join(src_dir, 'resource', 'csdk', 'include'),
+    os.path.join(src_dir, 'resource', 'csdk', 'stack', 'include'),
+    os.path.join(src_dir, 'resource', 'csdk', 'logger', 'include'),
+    os.path.join(src_dir, 'resource', 'c_common', 'oic_string', 'include'),
+    os.path.join(tw_path, 'zigbee_wrapper', 'telegesis_wrapper', 'include')
+])
 
 if target_os not in ['arduino', 'windows']:
-       env.AppendUnique(CPPDEFINES = ['WITH_POSIX'])
+    env.AppendUnique(CPPDEFINES=['WITH_POSIX'])
 
-if target_os in ['darwin','ios']:
-       env.AppendUnique(CPPDEFINES = ['_DARWIN_C_SOURCE'])
+if target_os in ['darwin', 'ios']:
+    env.AppendUnique(CPPDEFINES=['_DARWIN_C_SOURCE'])
 
 tw_src = [
-         os.path.join(src_dir, 'resource', 'c_common', 'oic_string', 'src', 'oic_string.c'),
-         os.path.join(src_dir, 'resource', 'csdk', 'logger', 'src', 'logger.c'),
-         'twsocketlist.c',
-         'telegesis_socket.c',
-         'telegesis_wrapper.c'
-         ]
+    os.path.join(src_dir, 'resource', 'c_common', 'oic_string', 'src',
+                 'oic_string.c'),
+    os.path.join(src_dir, 'resource', 'csdk', 'logger', 'src', 'logger.c'),
+    'twsocketlist.c', 'telegesis_socket.c', 'telegesis_wrapper.c'
+]
 
-env.AppendUnique(TW_SRC = tw_src)
+env.AppendUnique(TW_SRC=tw_src)
 
 if target_os in ['android', 'tizen']:
-       calib = env.SharedLibrary('telegesis_wrapper', env.get('TW_SRC'))
+    calib = env.SharedLibrary('telegesis_wrapper', env.get('TW_SRC'))
 else:
-       calib = env.StaticLibrary('telegesis_wrapper', env.get('TW_SRC'))
+    calib = env.StaticLibrary('telegesis_wrapper', env.get('TW_SRC'))
 env.InstallTarget(calib, 'libtelegesis_wrapper')
 env.UserInstallTargetLib(calib, 'libtelegesis_wrapper')