atria-soft/exml
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[TRAVIS] try to simplify travis build interface

Browse Source
This commit is contained in:
Edouard DUPIN 2015-01-14 21:33:25 +01:00
parent 20cfcd5aea
commit c3b20ceb8f
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
.travis.yml
View File

@ -21,24 +21,22 @@ before_script:
- cd ewol; git submodule update; cd .. - cd ewol; git submodule update; cd ..
- cd ewol; git submodule foreach git checkout master; cd .. - cd ewol; git submodule foreach git checkout master; cd ..
- cd ewol; git submodule foreach git pull; 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 Gcc to have lisstdc++ 4.8 & gcc 4.8
install: install:
- sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y - sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y
- sudo apt-get update -qq - sudo apt-get update -qq
- sudo apt-get install -qq g++-4.8 - 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 rm /usr/bin/gcc /usr/bin/g++
- sudo ln -s /usr/bin/gcc-4.8 /usr/bin/gcc - sudo ln -s /usr/bin/gcc-4.8 /usr/bin/gcc
- sudo ln -s /usr/bin/g++-4.8 /usr/bin/g++ - sudo ln -s /usr/bin/g++-4.8 /usr/bin/g++
# build sequence with Lutin : # build sequence with Lutin :
script: script:
- if [ "$CXX" == "clang++" ]; then ./ewol/build/lutin.py -C -P -cclang -mdebug -p exml_test; fi - ./ewol/build/lutin.py -C -P -c$BUILDER -mdebug -p exml_test
- if [ "$CXX" == "g++" ]; then ./ewol/build/lutin.py -C -P -cgcc -mdebug -p exml_test; fi - ./out/Linux_x86_64/debug/staging/$BUILDER/exml_test/usr/bin/exml_test -l6
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
#send e-mail on compilation result: #send e-mail on compilation result:
notifications: notifications:

1
exml/Element.cpp
View File

@ -169,6 +169,7 @@ bool exml::Element::iGenerate(std::string& _data, int32_t _indent) const {
&& std::dynamic_pointer_cast<exml::Text>(m_listSub[0])->countLines() == 1) { && std::dynamic_pointer_cast<exml::Text>(m_listSub[0])->countLines() == 1) {
_data += ">"; _data += ">";
m_listSub[0]->iGenerate(_data,0); m_listSub[0]->iGenerate(_data,0);
EXML_VERBOSE(" generate : '" << _data << "'");
} else { } else {
_data += ">\n"; _data += ">\n";

3
exml/Text.cpp
View File

@ -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, regexAPOS, std::string("'"));
out = std::regex_replace(out, regexQUOT, std::string("\"")); out = std::regex_replace(out, regexQUOT, std::string("\""));
out = std::regex_replace(out, regexAMP, std::string("&")); out = std::regex_replace(out, regexAMP, std::string("&"));
//EXML_ERROR("plop "<< _inval << " => " << out); //EXML_ERROR("INNN '"<< _inval << "' => '" << out << "'");
return out; return out;
} }
static std::string replaceSpecialCharOut(const std::string& _inval) { 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("&apos;")); out = std::regex_replace(out, regexAPOS, std::string("&apos;"));
out = std::regex_replace(out, regexGT, std::string("&gt;")); out = std::regex_replace(out, regexGT, std::string("&gt;"));
out = std::regex_replace(out, regexLT, std::string("&lt;")); out = std::regex_replace(out, regexLT, std::string("&lt;"));
//EXML_ERROR("OUTTT '"<< _inval << "' => '" << out << "'");
return out; return out;
} }