diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2016-10-02 20:53:08 +0200 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2016-10-02 20:53:08 +0200 |
| commit | 059594d621257c002e118c190a9a62fa2e04ced2 (patch) | |
| tree | c75e328f86d1b0c8e9940169a144d5f235c6613f /.travis.yml | |
| parent | fd0d79f44b951665480b34449d969fa20cdf43ac (diff) | |
| download | ATCD-059594d621257c002e118c190a9a62fa2e04ced2.tar.gz | |
Add OSX
* .travis.yml:
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml index a32bc2f3856..0efff690f65 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,10 @@ sudo: false language: cpp +os: + - linux + - os: osx + osx_image: xcode8 + compiler: - gcc env: @@ -31,7 +36,8 @@ branches: - master before_script: - export - - echo -e "#include \"ace/config-linux.h\"" >> $ACE_ROOT/ace/config.h + - if [ "$TRAVIS_OS_NAME" == "linux" ]; then echo -e "#include \"ace/config-linux.h\"" >> $ACE_ROOT/ace/config.h; fi + - if [ "$TRAVIS_OS_NAME" == "osx" ]; then echo -e "#include \"ace/config-macosx.h\"" >> $ACE_ROOT/ace/config.h; fi - echo -e "workspace {\n\$(TAO_ROOT)/TAO_ACE.mwc\n\$(TAO_ROOT)/tests/Hello\n" >> $TRAVIS_BUILD_DIR/travis.mwc - if [ "$ACETESTS" == "1" ]; then echo -e "\$(ACE_ROOT)/tests\n" >> $TRAVIS_BUILD_DIR/travis.mwc; fi - echo -e "}\n" >> $TRAVIS_BUILD_DIR/travis.mwc @@ -48,8 +54,9 @@ before_script: - echo -e "xerces3=1\nssl=1\nipv6=1\n" >> $ACE_ROOT/include/makeinclude/platform_macros.GNU - 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 [ "$CXX" == "g++" ]; then echo -e "include \$(ACE_ROOT)/include/makeinclude/platform_linux.GNU" >> $ACE_ROOT/include/makeinclude/platform_macros.GNU; fi - - if [ "$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" == "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 - cat $TRAVIS_BUILD_DIR/travis.mwc - cat $ACE_ROOT/bin/MakeProjectCreator/config/default.features - cat $ACE_ROOT/ace/config.h |