From: Philippe Coval Date: Fri, 27 Jan 2017 21:14:16 +0000 (+0100) Subject: build: Convert EOL to use UNIX convention (yaml) X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=748c63d99183fdf6153dbbb8422a43d4b4f7eeac;p=contrib%2Fiotivity.git build: Convert EOL to use UNIX convention (yaml) Remove CRLF Change-Id: I04414a45967439cb99d0627c3a8cf00260b93c2c Signed-off-by: Philippe Coval Reviewed-on: https://gerrit.iotivity.org/gerrit/16855 Tested-by: jenkins-iotivity Reviewed-by: Mats Wichmann Reviewed-by: Ziran Sun --- diff --git a/extlibs/yaml/SConscript b/extlibs/yaml/SConscript index 4cd8948..ba569af 100755 --- a/extlibs/yaml/SConscript +++ b/extlibs/yaml/SConscript @@ -1,54 +1,54 @@ -#****************************************************************** -# -# Copyright 2014 Samsung Electronics 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 os -Import('env') - -yaml_env = env.Clone() -src_dir = env.get('SRC_DIR') - -yamlDir = os.path.join(src_dir, 'extlibs','yaml','yaml') - -if not os.path.exists(yamlDir): - print ''' -*********************************** Error: **************************************** -* Please download yaml using the following command: * -* $ git clone https://github.com/jbeder/yaml-cpp.git extlibs/yaml/yaml * -*********************************************************************************** -''' - Exit(1) - -###################################################################### -# Build flags -###################################################################### -yaml_env.AppendUnique(CPPPATH = ['yaml/src' , 'yaml/include']) -yaml_env.AppendUnique(CXXFLAGS = ['-std=c++0x', '-Wall', '-pthread']) -yaml_env.AppendUnique(CPPDEFINES = ['LINUX']) -yaml_env.AppendUnique(LIBS = ['pthread']) - -yaml_env.AppendUnique(CXXFLAGS = ['-O2', '-g', '-Wall', '-fmessage-length=0', '-std=c++0x']) - -###################################################################### -# Source files and Targets -###################################################################### -yaml_src = [env.Glob('yaml/src/*.cpp'), env.Glob('yaml/src/contrib/*.cpp')] -yamlsdk = yaml_env.StaticLibrary('YamlParser', yaml_src) - -yaml_env.InstallTarget(yamlsdk, 'libYaml') +#****************************************************************** +# +# Copyright 2014 Samsung Electronics 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 os +Import('env') + +yaml_env = env.Clone() +src_dir = env.get('SRC_DIR') + +yamlDir = os.path.join(src_dir, 'extlibs','yaml','yaml') + +if not os.path.exists(yamlDir): + print ''' +*********************************** Error: **************************************** +* Please download yaml using the following command: * +* $ git clone https://github.com/jbeder/yaml-cpp.git extlibs/yaml/yaml * +*********************************************************************************** +''' + Exit(1) + +###################################################################### +# Build flags +###################################################################### +yaml_env.AppendUnique(CPPPATH = ['yaml/src' , 'yaml/include']) +yaml_env.AppendUnique(CXXFLAGS = ['-std=c++0x', '-Wall', '-pthread']) +yaml_env.AppendUnique(CPPDEFINES = ['LINUX']) +yaml_env.AppendUnique(LIBS = ['pthread']) + +yaml_env.AppendUnique(CXXFLAGS = ['-O2', '-g', '-Wall', '-fmessage-length=0', '-std=c++0x']) + +###################################################################### +# Source files and Targets +###################################################################### +yaml_src = [env.Glob('yaml/src/*.cpp'), env.Glob('yaml/src/contrib/*.cpp')] +yamlsdk = yaml_env.StaticLibrary('YamlParser', yaml_src) + +yaml_env.InstallTarget(yamlsdk, 'libYaml')