diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2015-06-10 12:08:47 +0200 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2015-06-10 12:08:47 +0200 |
| commit | a55702deb13d46252c09f57677abe91e47ec6357 (patch) | |
| tree | 2bfaa70117708d698a0f368ea27a699bda65c7cc | |
| parent | e7ca7479002911b7c61c271104f616cfbc795ccd (diff) | |
| parent | 52238bcbe7bcbce8bd6428969a6ee1bc402a76a2 (diff) | |
| download | ATCD-a55702deb13d46252c09f57677abe91e47ec6357.tar.gz | |
Merge pull request #95 from jwillemsen/master
Added uses_wchar configuration on travis-ci
| -rw-r--r-- | .travis.yml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/.travis.yml b/.travis.yml index 430fde91889..068956072ec 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,6 +11,7 @@ env: - CCMLW=1 ACEFORTAO=0 - CCMNOEVENT=1 ACEFORTAO=0 - ACETESTS=1 ACEFORTAO=0 + - USES_WCHAR=1 global: - ACE_ROOT=$TRAVIS_BUILD_DIR/ACE - TAO_ROOT=$TRAVIS_BUILD_DIR/TAO @@ -40,6 +41,7 @@ before_script: - if [ "$ACEFORTAO" == "1" ]; then echo -e "ace_for_tao=1" >> $ACE_ROOT/bin/MakeProjectCreator/config/default.features; fi - if [ "$CCMLW" == "1" ]; then echo -e "ccm_lw=1" >> $ACE_ROOT/bin/MakeProjectCreator/config/default.features; fi - if [ "$CCMNOEVENT" == "1" ]; then echo -e "ccm_noevent=1" >> $ACE_ROOT/bin/MakeProjectCreator/config/default.features; fi + - if [ "$USES_WCHAR" == "1" ]; then echo -e "uses_wchar=1" >> $ACE_ROOT/bin/MakeProjectCreator/config/default.features; fi - 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 |