From a69860c746b180930f2eb7329c958a3d59e2299e Mon Sep 17 00:00:00 2001 From: Philippe Coval Date: Wed, 1 Feb 2017 10:39:42 +0100 Subject: [PATCH] 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 Reviewed-on: https://gerrit.iotivity.org/gerrit/16857 Tested-by: jenkins-iotivity Reviewed-by: Dan Mihai Reviewed-by: Dave Thaler --- .../samples/linux/SimpleClientServer/SConscript | 223 +++++++++++---------- 1 file changed, 117 insertions(+), 106 deletions(-) diff --git a/resource/csdk/stack/samples/linux/SimpleClientServer/SConscript b/resource/csdk/stack/samples/linux/SimpleClientServer/SConscript index 2ce662c..eca3886 100644 --- a/resource/csdk/stack/samples/linux/SimpleClientServer/SConscript +++ b/resource/csdk/stack/samples/linux/SimpleClientServer/SConscript @@ -1,106 +1,117 @@ -#****************************************************************** -# -# 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') +#****************************************************************** +# +# 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') -- 2.7.4