diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2017-01-25 09:24:06 +0100 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2017-01-25 09:24:06 +0100 |
| commit | 510bcffb81d4607d2c7d9a0fa1f46ed72ae3cde4 (patch) | |
| tree | f010bc3b2c09337b902af2ee9021c910892218ca /.travis.yml | |
| parent | 58901ac73ba0eaa71ed5d395890eac8e37b07be0 (diff) | |
| download | ATCD-510bcffb81d4607d2c7d9a0fa1f46ed72ae3cde4.tar.gz | |
Changed handling of clang
* .travis.yml:
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml index bc4bb706850..f5184579152 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,16 +25,20 @@ env: - TAO_ROOT=$TRAVIS_BUILD_DIR/TAO - MPC_ROOT=$TRAVIS_BUILD_DIR/MPC - LD_LIBRARY_PATH=$ACE_ROOT/lib:$LD_LIBRARY_PATH + addons: apt: packages: - - libssl-dev - - libxerces-c-dev + - libssl-dev + - libxerces-c-dev + before_install: - git clone --depth 1 git://github.com/DOCGroup/MPC.git + branches: only: - master + before_script: - export - if [ "$TRAVIS_OS_NAME" == "linux" ]; then echo -e "#include \"ace/config-linux.h\"" >> $ACE_ROOT/ace/config.h; fi @@ -59,8 +63,13 @@ 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 + if [ "$CXX" == "g++" ]; then + echo -e "include \$(ACE_ROOT)/include/makeinclude/platform_linux.GNU" >> $ACE_ROOT/include/makeinclude/platform_macros.GNU; + else + echo -e "include \$(ACE_ROOT)/include/makeinclude/platform_linux_clang.GNU" >> $ACE_ROOT/include/makeinclude/platform_macros.GNU; + fi + fi - cat $TRAVIS_BUILD_DIR/travis.mwc - cat $ACE_ROOT/bin/MakeProjectCreator/config/default.features - cat $ACE_ROOT/ace/config.h |