From c3b20ceb8f78516bd29dd3fa02c4c5428e7e7a78 Mon Sep 17 00:00:00 2001 From: Edouard DUPIN Date: Wed, 14 Jan 2015 21:33:25 +0100 Subject: [PATCH] [TRAVIS] try to simplify travis build interface --- .travis.yml | 10 ++++------ exml/Element.cpp | 1 + exml/Text.cpp | 3 ++- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2759f39..f1d4aab 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,24 +21,22 @@ before_script: - cd ewol; git submodule update; cd .. - cd ewol; git submodule foreach git checkout master; cd .. - cd ewol; git submodule foreach git pull; cd .. + - if [ "$CXX" == "clang++" ]; then BUILDER=clang; else BUILDER=gcc; fi #install Gcc to have lisstdc++ 4.8 & gcc 4.8 install: - sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y - sudo apt-get update -qq - sudo apt-get install -qq g++-4.8 + - sudo apt-get install -qq libstdc++-4.9-dev - sudo rm /usr/bin/gcc /usr/bin/g++ - sudo ln -s /usr/bin/gcc-4.8 /usr/bin/gcc - sudo ln -s /usr/bin/g++-4.8 /usr/bin/g++ # build sequence with Lutin : script: - - if [ "$CXX" == "clang++" ]; then ./ewol/build/lutin.py -C -P -cclang -mdebug -p exml_test; fi - - if [ "$CXX" == "g++" ]; then ./ewol/build/lutin.py -C -P -cgcc -mdebug -p exml_test; fi - -after_script: - - if [ "$CXX" == "clang++" ]; then ./out/Linux_x86_64/debug/staging/clang/exml_test/usr/bin/exml_test; fi - - if [ "$CXX" == "g++" ]; then ./out/Linux_x86_64/debug/staging/gcc/exml_test/usr/bin/exml_test; fi + - ./ewol/build/lutin.py -C -P -c$BUILDER -mdebug -p exml_test + - ./out/Linux_x86_64/debug/staging/$BUILDER/exml_test/usr/bin/exml_test -l6 #send e-mail on compilation result: notifications: diff --git a/exml/Element.cpp b/exml/Element.cpp index 385e3ee..0ccbac4 100644 --- a/exml/Element.cpp +++ b/exml/Element.cpp @@ -169,6 +169,7 @@ bool exml::Element::iGenerate(std::string& _data, int32_t _indent) const { && std::dynamic_pointer_cast(m_listSub[0])->countLines() == 1) { _data += ">"; m_listSub[0]->iGenerate(_data,0); + EXML_VERBOSE(" generate : '" << _data << "'"); } else { _data += ">\n"; diff --git a/exml/Text.cpp b/exml/Text.cpp index 7ef7cba..1ebfe0c 100644 --- a/exml/Text.cpp +++ b/exml/Text.cpp @@ -34,7 +34,7 @@ static std::string replaceSpecialChar(const std::string& _inval) { out = std::regex_replace(out, regexAPOS, std::string("'")); out = std::regex_replace(out, regexQUOT, std::string("\"")); out = std::regex_replace(out, regexAMP, std::string("&")); - //EXML_ERROR("plop "<< _inval << " => " << out); + //EXML_ERROR("INNN '"<< _inval << "' => '" << out << "'"); return out; } static std::string replaceSpecialCharOut(const std::string& _inval) { @@ -50,6 +50,7 @@ static std::string replaceSpecialCharOut(const std::string& _inval) { out = std::regex_replace(out, regexAPOS, std::string("'")); out = std::regex_replace(out, regexGT, std::string(">")); out = std::regex_replace(out, regexLT, std::string("<")); + //EXML_ERROR("OUTTT '"<< _inval << "' => '" << out << "'"); return out; }