diff --git a/.travis.yml b/.travis.yml index 46701f4f2..38a81900b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,18 @@ env: global: - # Required for clang. - - CXXFLAGS="-fno-fast-math" + # Required for Coverity Scan + - secure: "BT2A2IDJx9nlEUnE8ZYtJQk2XAYTGu3+BT4qTTmxrS94htpUl1c82cM0RceUW/rzKrcJ7JAvQ1YuqJLlUW7J2cIWOdrF8Mk4DtlZSV9KnMc5+h7hf3bGGPw/LnYGnhrWYtSQfjZJHeCBfJufb4e7YqDfRz3UKDQ6FZCsFFMWnCAmBymF1Zj+ip7jkUn+P2gP8/vPjZupvfEZ0h8CkCXm7kSqHmTj0l9gOBQ6OMzP0uFN3KcRD5B+DSxoTmRGe+1abOr2nxUhIQsJxQZ5Y/V0ItwgNnoevi8d35QD9A2FT7gtuDkhYu0Fb8Jz6mReXk51hM6hE1qmfW+n2Dau679WkAtm4c/2osWwtxc1dbvQNvnr/XEnj51c4pbyPugjAKWoa/B73hXAflbrq0FWm14JVG2kCJYqid12HRvkMvzGJtjgJy5jIlPx+cb+BZ6tYsoa9m7CO1rTuYxUyKsHGtXSYOMPKyc7RIePOi37ZBF9QAm/urJdP6c6pfsrLEKvNOHArmUIixjrC9ImdQdJDBcgVUgP1h4oFfWaHgrys8B0EviIMoBewmTF8dUkD9j5rbpAonfjSpX0RX0Rcqtx2Mr68W97+BSGCy+WNIBe4ACivHDjYzfUw44ruYjZqUeXKzhJUHJxCf9OnqpppJ8ru6n6Tc7kMKcEEfZGDdVICrsBuMs=" + # In Coverity Scan builds, ./configure is automatically called without parameters, so we must pass them via + # environment variables. + - COMPILED_BY="Travis CI for Coverity Scan" + # In Coverity Scan builds, the assembler gags on FMA3 instructions (e.g. VFMADD321SS) for some reason, so we must + # forbid the compiler to emit them. + # We also set a preprocessor macro to know we're building for Coverity. + - CXXFLAGS="-mno-fma -DSTATIC_CODE_ANALYSIS" + +before_install: + # Required(?) for Coverity Scan + - echo -n | openssl s_client -connect scan.coverity.com:443 | sed -ne '/-BEGIN CERTIFICATE-/,/-END CERTIFICATE-/p' | sudo tee -a /etc/ssl/certs/ca- branches: except: @@ -13,10 +24,8 @@ matrix: include: - os: linux compiler: gcc - - os: osx - compiler: clang -sudo: false +sudo: required dist: trusty addons: @@ -30,19 +39,15 @@ addons: - libpng12-dev - libtiff4-dev - zlib1g-dev - -install: -- unix/prebuild.sh -- ./configure COMPILED_BY="Travis CI" --prefix="$(pwd)/build" -- make check -- make install + # Required for Coverity Scan + coverity_scan: + project: + name: "POV-Ray/povray" + description: "Linux build submitted via Travis CI" + notification_email: coverity-scan@lipka-koeln.de + build_command_prepend: "unix/prebuild.sh ; ./configure" + build_command: "make" + branch_pattern: coverity_scan script: - true - -notifications: - email: - recipients: - - ${NOTIFICATION_EMAIL} - on_success: change - on_failure: always diff --git a/source/base/version.h b/source/base/version.h index f7e71485e..31fb5afe8 100644 --- a/source/base/version.h +++ b/source/base/version.h @@ -100,7 +100,7 @@ /// where `N` is a serial number starting at 1 in each phase, `TIME` is the number of minutes /// since 2000-01-01 00:00, and `FEATURE` is an arbitrary alphanumeric moniker for a particular /// experimental feature. -#define POV_RAY_PRERELEASE "alpha.9844485" +#define POV_RAY_PRERELEASE "alpha.9844500" #if defined(DOXYGEN) && !defined(POV_RAY_PRERELEASE) // Work around doxygen being unable to document undefined macros.