diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2016-10-03 08:33:54 +0200 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2016-10-03 08:33:54 +0200 |
| commit | c85c5fd9e7055c9ec585e8a8f47035370354024d (patch) | |
| tree | d718d209943eb4741ca0f0564d9cf31a6a38a002 /.travis.yml | |
| parent | bd14f06fed22d7c77e0c54bddcd191a883cf72ad (diff) | |
| download | ATCD-c85c5fd9e7055c9ec585e8a8f47035370354024d.tar.gz | |
Simplify travis-ci file
* .travis.yml:
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index 0efff690f65..95baf1a4c4a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -55,8 +55,7 @@ before_script: - echo -e "xerces3=1\nssl=1\n" >> $ACE_ROOT/bin/MakeProjectCreator/config/default.features - echo -e "TAO/tests/Hello/run_test.pl" >> $TAO_ROOT/bin/travis-ci.lst - if [ "$TRAVIS_OS_NAME" == "osx" ]; then echo -e "include \$(ACE_ROOT)/include/makeinclude/platform_macosx.GNU" >> $ACE_ROOT/include/makeinclude/platform_macros.GNU; fi - - if [ "$TRAVIS_OS_NAME" == "linux" && "$CXX" == "g++" ]; then echo -e "include \$(ACE_ROOT)/include/makeinclude/platform_linux.GNU" >> $ACE_ROOT/include/makeinclude/platform_macros.GNU; fi - - if [ "$TRAVIS_OS_NAME" == "linux" && "$CXX" == "clang++" ]; then echo -e "include \$(ACE_ROOT)/include/makeinclude/platform_linux_clang.GNU" >> $ACE_ROOT/include/makeinclude/platform_macros.GNU; fi + - if [ "$TRAVIS_OS_NAME" == "linux" ]; then echo -e "include \$(ACE_ROOT)/include/makeinclude/platform_linux.GNU" >> $ACE_ROOT/include/makeinclude/platform_macros.GNU; fi - cat $TRAVIS_BUILD_DIR/travis.mwc - cat $ACE_ROOT/bin/MakeProjectCreator/config/default.features - cat $ACE_ROOT/ace/config.h |