build: Convert EOL to use UNIX convention (csdk)

Remove CRLF

Also align to python coding style (using autopep8)

Change-Id: I1e4548b4557dce9c06e22b8774507cf599859015
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16857
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Dave Thaler <dthaler@microsoft.com>

diff --git a/resource/csdk/stack/samples/linux/SimpleClientServer/SConscript b/resource/csdk/stack/samples/linux/SimpleClientServer/SConscript
index 2ce662c..eca3886 100644 (file)
--- a/resource/csdk/stack/samples/linux/SimpleClientServer/SConscript
+++ b/resource/csdk/stack/samples/linux/SimpleClientServer/SConscript
@@ -1,106 +1,117 @@
-#******************************************************************\r
-#\r
-# Copyright 2014 Intel Mobile Communications GmbH All Rights Reserved.\r
-#\r
-#-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=\r
-#\r
-# Licensed under the Apache License, Version 2.0 (the "License");\r
-# you may not use this file except in compliance with the License.\r
-# You may obtain a copy of the License at\r
-#\r
-#      http://www.apache.org/licenses/LICENSE-2.0\r
-#\r
-# Unless required by applicable law or agreed to in writing, software\r
-# distributed under the License is distributed on an "AS IS" BASIS,\r
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
-# See the License for the specific language governing permissions and\r
-# limitations under the License.\r
-#\r
-#-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=\r
-Import('env')\r
-\r
-samples_env = env.Clone()\r
-SConscript('#build_common/thread.scons', exports = {'thread_env' : samples_env})\r
-\r
-target_os = samples_env.get('TARGET_OS')\r
-with_ra = samples_env.get ('WITH_RA')\r
-\r
-######################################################################\r
-# Build flags\r
-######################################################################\r
-with_upstream_libcoap = samples_env.get('WITH_UPSTREAM_LIBCOAP')\r
-if with_upstream_libcoap == '1':\r
-       # For bring up purposes only, we manually copy the forked version to where the unforked version is downloaded.\r
-       samples_env.AppendUnique(CPPPATH = ['#extlibs/libcoap/libcoap/include'])\r
-else:\r
-       # For bring up purposes only, the forked version will live here.\r
-       samples_env.AppendUnique(CPPPATH = ['../../../../../connectivity/lib/libcoap-4.1.1/include'])\r
-\r
-samples_env.PrependUnique(CPPPATH = [\r
-               '../../../../logger/include',\r
-               '../../../../include',\r
-               '../../../../stack/include',\r
-               '../../../../security/include',\r
-               '../../../../../../extlibs/boost/boost',\r
-               '../../../../../oc_logger/include',\r
-               ])\r
-\r
-compiler = samples_env.get('CXX')\r
-if 'g++' in compiler:\r
-       samples_env.AppendUnique(CXXFLAGS = ['-std=c++0x', '-Wall'])\r
-\r
-samples_env.AppendUnique(RPATH = [samples_env.get('BUILD_DIR')])\r
-samples_env.AppendUnique(LIBPATH = [samples_env.get('BUILD_DIR')])\r
-\r
-samples_env.PrependUnique(LIBS = ['octbstack', 'ocsrm', 'connectivity_abstraction', 'coap'])\r
-\r
-if target_os not in ['arduino', 'windows', 'darwin', 'ios', 'msys_nt']:\r
-       samples_env.AppendUnique(LIBS = ['rt'])\r
-\r
-if target_os not in ['windows']:\r
-       samples_env.PrependUnique(LIBS = ['m'])\r
-\r
-if samples_env.get('SECURED') == '1':\r
-       samples_env.AppendUnique(LIBS = ['tinydtls'])\r
-\r
-if target_os in ['windows']:\r
-       samples_env.AppendUnique(LIBS = ['ws2_32'])\r
-\r
-samples_env.AppendUnique(CPPDEFINES = ['TB_LOG'])\r
-\r
-src_dir = samples_env.get('SRC_DIR')\r
-sample_src_dir = src_dir + '/resource/csdk/stack/samples/linux/SimpleClientServer/'\r
-sample_build_dir = samples_env.get('BUILD_DIR') +'/resource/csdk/stack/samples/linux/SimpleClientServer/'\r
-\r
-\r
-introspectionJson = samples_env.Install(sample_build_dir,\r
-                                        sample_src_dir + 'introspection.json')\r
-\r
-\r
-######################################################################\r
-# Source files and Targets\r
-######################################################################\r
-ocserver         = samples_env.Program('ocserver', ['ocserver.cpp', 'common.cpp'])\r
-if samples_env.get('ROUTING') == 'GW':\r
-       ocrouting        = samples_env.Program('ocrouting', ['ocrouting.cpp', 'common.cpp'])\r
-occlient         = samples_env.Program('occlient', ['occlient.cpp', 'common.cpp'])\r
-ocserverslow     = samples_env.Program('ocserverslow', ['ocserverslow.cpp', 'common.cpp'])\r
-occlientslow     = samples_env.Program('occlientslow', ['occlientslow.cpp', 'common.cpp'])\r
-ocservercoll     = samples_env.Program('ocservercoll', ['ocservercoll.cpp', 'common.cpp'])\r
-occlientcoll     = samples_env.Program('occlientcoll', ['occlientcoll.cpp', 'common.cpp'])\r
-ocserverbasicops = samples_env.Program('ocserverbasicops', ['ocserverbasicops.cpp', 'common.cpp'])\r
-occlientbasicops = samples_env.Program('occlientbasicops', ['occlientbasicops.cpp', 'common.cpp'])\r
-if with_ra:\r
-       ocremoteaccessclient = samples_env.Program('ocremoteaccessclient',\r
-                                               ['ocremoteaccessclient.cpp','common.cpp'])\r
-\r
-list_of_samples = [ocserver, occlient,\r
-                               ocservercoll, occlientcoll,\r
-                               ocserverbasicops, occlientbasicops,\r
-                               ocserverslow, occlientslow\r
-                ]\r
-if with_ra:\r
-       list_of_samples.append (ocremoteaccessclient)\r
-Alias("samples", list_of_samples)\r
-\r
-samples_env.AppendTarget('samples')\r
+#******************************************************************
+#
+# Copyright 2014 Intel Mobile Communications GmbH All Rights Reserved.
+#
+#-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+#-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
+Import('env')
+
+samples_env = env.Clone()
+SConscript('#build_common/thread.scons', exports={'thread_env': samples_env})
+
+target_os = samples_env.get('TARGET_OS')
+with_ra = samples_env.get('WITH_RA')
+
+######################################################################
+# Build flags
+######################################################################
+with_upstream_libcoap = samples_env.get('WITH_UPSTREAM_LIBCOAP')
+if with_upstream_libcoap == '1':
+    # For bring up purposes only, we manually copy the forked version to where
+    # the unforked version is downloaded.
+    samples_env.AppendUnique(CPPPATH=['#extlibs/libcoap/libcoap/include'])
+else:
+    # For bring up purposes only, the forked version will live here.
+    samples_env.AppendUnique(
+        CPPPATH=['../../../../../connectivity/lib/libcoap-4.1.1/include'])
+
+samples_env.PrependUnique(CPPPATH=[
+    '../../../../logger/include',
+    '../../../../include',
+    '../../../../stack/include',
+    '../../../../security/include',
+    '../../../../../../extlibs/boost/boost',
+    '../../../../../oc_logger/include',
+])
+
+compiler = samples_env.get('CXX')
+if 'g++' in compiler:
+    samples_env.AppendUnique(CXXFLAGS=['-std=c++0x', '-Wall'])
+
+samples_env.AppendUnique(RPATH=[samples_env.get('BUILD_DIR')])
+samples_env.AppendUnique(LIBPATH=[samples_env.get('BUILD_DIR')])
+
+samples_env.PrependUnique(
+    LIBS=['octbstack', 'ocsrm', 'connectivity_abstraction', 'coap'])
+
+if target_os not in ['arduino', 'windows', 'darwin', 'ios', 'msys_nt']:
+    samples_env.AppendUnique(LIBS=['rt'])
+
+if target_os not in ['windows']:
+    samples_env.PrependUnique(LIBS=['m'])
+
+if samples_env.get('SECURED') == '1':
+    samples_env.AppendUnique(LIBS=['tinydtls'])
+
+if target_os in ['windows']:
+    samples_env.AppendUnique(LIBS=['ws2_32'])
+
+samples_env.AppendUnique(CPPDEFINES=['TB_LOG'])
+
+src_dir = samples_env.get('SRC_DIR')
+sample_src_dir = src_dir + '/resource/csdk/stack/samples/linux/SimpleClientServer/'
+sample_build_dir = samples_env.get(
+    'BUILD_DIR') + '/resource/csdk/stack/samples/linux/SimpleClientServer/'
+
+
+introspectionJson = samples_env.Install(sample_build_dir,
+                                        sample_src_dir + 'introspection.json')
+
+
+######################################################################
+# Source files and Targets
+######################################################################
+ocserver = samples_env.Program('ocserver', ['ocserver.cpp', 'common.cpp'])
+if samples_env.get('ROUTING') == 'GW':
+    ocrouting = samples_env.Program(
+        'ocrouting', ['ocrouting.cpp', 'common.cpp'])
+occlient = samples_env.Program('occlient', ['occlient.cpp', 'common.cpp'])
+ocserverslow = samples_env.Program(
+    'ocserverslow', ['ocserverslow.cpp', 'common.cpp'])
+occlientslow = samples_env.Program(
+    'occlientslow', ['occlientslow.cpp', 'common.cpp'])
+ocservercoll = samples_env.Program(
+    'ocservercoll', ['ocservercoll.cpp', 'common.cpp'])
+occlientcoll = samples_env.Program(
+    'occlientcoll', ['occlientcoll.cpp', 'common.cpp'])
+ocserverbasicops = samples_env.Program(
+    'ocserverbasicops', ['ocserverbasicops.cpp', 'common.cpp'])
+occlientbasicops = samples_env.Program(
+    'occlientbasicops', ['occlientbasicops.cpp', 'common.cpp'])
+if with_ra:
+    ocremoteaccessclient = samples_env.Program('ocremoteaccessclient',
+                                               ['ocremoteaccessclient.cpp', 'common.cpp'])
+
+list_of_samples = [ocserver, occlient,
+                   ocservercoll, occlientcoll,
+                   ocserverbasicops, occlientbasicops,
+                   ocserverslow, occlientslow
+                   ]
+if with_ra:
+    list_of_samples.append(ocremoteaccessclient)
+Alias("samples", list_of_samples)
+
+samples_env.AppendTarget('samples')