Merge branch 'release/v3.8.0' into autobuild/alpha_v380

Author: c-lipka

.gitignore

@@ -242,4 +242,4 @@ $RECYCLE.BIN/
 /tools/windows/htmlhelp/input
 /tools/windows/htmlhelp/output
 /tools/windows/htmlhelp/debug.txt
-/tools/windows/htmlhelp/flielist.txt
+/tools/windows/htmlhelp/filelist.txt

.travis.yml

@@ -7,7 +7,6 @@ branches:
   except:
   - /^v[0-9]/
 
-
 language: cpp
 
 matrix:
@@ -18,6 +17,7 @@ matrix:
     compiler: clang
 
 sudo: false
+dist: trusty
 
 addons:
   apt:

README.md

@@ -3,14 +3,24 @@
 
 [![Semaphore Build Status](https://semaphoreci.com/api/v1/pov-ray/povray/branches/master/shields_badge.svg?label=Semaphore)](https://semaphoreci.com/pov-ray/povray  "Semaphore: Ubuntu 14.04 LTE 64-bit with gcc 4.8")
 [![AppVeyor Build status](https://img.shields.io/appveyor/ci/c-lipka/povray-exwy4.svg?label=appveyor)](https://ci.appveyor.com/project/c-lipka/povray-exwy4 "AppVeyor: Windows Server 2012 with Visual Studio 2015")
-[![Travis CI Build Status](https://img.shields.io/travis/POV-Ray/povray.svg?label=travis ci)](https://travis-ci.org/POV-Ray/povray "Travis CI: Ubuntu 12.04 LTE 64-bit with gcc 4.6; OS X 10.11 with clang 4.2")
-[![Coverity Code Analysis](https://scan.coverity.com/projects/269/badge.svg)]( "Coverity: Static Code Analysis")
-[![Maintenance Status](https://img.shields.io/maintenance/yes/2016.svg)]( "Last edited 2016-12-20")
+[![Travis CI Build Status](https://img.shields.io/travis/POV-Ray/povray.svg?label=travis%20ci)](https://travis-ci.org/POV-Ray/povray "Travis CI: Ubuntu 12.04 LTE 64-bit with gcc 4.6; OS X 10.11 with clang 4.2")
+[![Coverity Code Analysis](https://scan.coverity.com/projects/269/badge.svg)](https://scan.coverity.com/projects/pov-ray "Coverity: Static Code Analysis")
+[![Maintenance Status](https://img.shields.io/maintenance/yes/2017.svg)](README.md "Last edited 2017-08-18")
+
+- [License](#license)
+- [Forums](#forums)
+- [Bug Reports](#bug-reports)
+- [Offician Binaries](#official-binaries)
+- [Building POV-Ray](#building-pov-ray)
+- [IDE Versions](#ide-versions)
+- [3D Modeller](#3d-modeller)
+- [Documentation](#documentation)
+- [Contacting Us](#contacting-us)
 
 License
 --------------------------------------
 
-The source for POV-Ray v3.7 is licensed under the AGPL3. The documentation is under the
+As of version v3.7, the source for POV-Ray is licensed under the AGPL3. The documentation is under the
 Creative Commons Attribution-Noncommercial-ShareAlike 2.5 license, and support files such
 as SDL includes, macros, sample scenes and so forth are under the Creative Commons Attribution-ShareAlike
 3.0 Unported License (see each file header for the specific one).
@@ -43,36 +53,36 @@ obtained via http://www.povray.org/download/. We do intend to provide Mac OS X
 binaries shortly, but these will be console-mode only (based on the unix build).
 
 Official Windows binaries of selected development versions are made availabe at
-https://github.com/POV-Ray/povray/projects on a semi-irregular basis.
+https://github.com/POV-Ray/povray/releases on a semi-irregular basis.
 
 Building POV-Ray
 --------------------------------------
 
 At this point in time we generally recommend building from the latest version of the
-[3.7-stable branch](https://github.com/POV-Ray/povray/tree/3.7-stable). Alternatively,
+[`latest-stable` branch](https://github.com/POV-Ray/povray/tree/latest-stable). Alternatively,
 you may want to opt for a recent [tagged version](https://github.com/POV-Ray/povray/tags)
-to test-drive features that have been added since the last stable release.
+to test-drive features that have been added since the latest stable release.
 
 _Please do not build directly from the master branch_ (or any other non-stable branch
 for that matter), as versions from that branch may report ambiguous version numbers,
 making it difficult to obtain version-specific support or report bugs in a useful manner.
 
 POV-Ray should compile on any POSIX-compliant system with the required tools (please see
 [unix/README.md](unix/README.md) for build instructions),
-on Microsoft Windows systems that have Visual Studio 2010 or later installed (targeting
-XP or later, both 32 and 64-bit - be sure to see README.HTML in the windows source dir,
+on Microsoft Windows systems that have Visual Studio 2015 Update 1 or later installed (targeting
+XP or later, both 32 and 64-bit - be sure to see [windows/README.md](windows/README.md),
 otherwise your build _will not work_), and also on Mac systems (console mode only, using
 an appropriately-modified version of the unix build - not currently provided by us).
 
 If you are using an operating system with a package or ports system such as
-Ubuntu or FreeBSD, you may like to check whether or not POV-Ray 3.7 is available
+Ubuntu or FreeBSD, you may like to check whether or not POV-Ray is available
 via that route.
 
 IDE versions
 --------------------------------------
 
 Currently the only version of POV-Ray with an IDE as such is the Windows build.
-We do want to change that, though. With the release of POV-Ray 3.7 we have added
+We do want to change that, though. With the release of POV-Ray v3.7 we have added
 a clear split between the backend (renderer) and frontend (UI or console), along
 with a C++ layer which abstracts this into a fairly easily-understood set of 
 classes (VFE, aka 'Virtual Front End').
@@ -89,7 +99,7 @@ Putting it another way: we consider getting a cross-platform IDE a high priority
 
 POV-Ray does not currently have its own 3d modelling application (at least, not one
 in a usable state). We do own the rights to the Moray modeller, which was formerly
-commercial, but it needs a little work to get it working with v3.7. It is also
+commercial, but it needs a little work to get it working with v3.7 or later. It is also
 Windows only (due to its use of MFC). Nevertheless we will be adding the source
 to the repository at a future date.
 

appveyor.yml

@@ -1,13 +1,10 @@
-version: 3.7+av{build}
+version: 3.8+av{build}
 pull_requests:
   do_not_increment_build_number: true
 branches:
   except:
   - coverity_scan
 
-# Only build tags on this branch.
-skip_non_tags: true
-
 image: Visual Studio 2015
 
 shallow_clone: true
@@ -16,49 +13,35 @@ matrix:
   fast_finish: true
 
 environment:
+  PovBuildDefs:
+    secure: dQ/GBBYlkqKDmBEgJfgajfBn58ziSh1JPXsiWtnBL1dE3/s4QZJutGdDtLxiG3eNq0DXMVhDIbGqyPSma9Q9xazlpRZkuU7Gl8rXCw7c03A/oliLoR6q/0Jb+Q9LNH5R/oYiDCHhNP8Cx6OXys4d5A==
   matrix:
   - configuration: Release
     platform: x64
     bin_dir: bin64
     artifact_suffix: -Win64
-    PlatformToolset: v140
   - configuration: Release-SSE2
     platform: Win32
     bin_dir: bin32
     artifact_suffix: -Win32-sse2
-    PlatformToolset: v140
   - configuration: Release
     platform: Win32
     bin_dir: bin32
     artifact_suffix: -Win32
-    PlatformToolset: v140
 
 before_build:
-- ps: |
-    $env:devenv = $env:VS140COMNTOOLS + '\..\IDE\devenv'
-    & $env:devenv windows\vs10\povray.sln /upgrade
 
 build:
-  project: windows/vs10/povray.sln
+  project: windows/vs2015/povray.sln
   parallel: true
   verbosity: minimal
 
 after_build:
 - ps: |
-    $version_h = 'source/base/version.h'
-    $regexp = '^\s*#define\s+OFFICIAL_VERSION_STRING\s*"[^"]+"\s*$'
-    $line = ( select-string -Path $version_h -Pattern $regexp | % { $_.Matches } | % { $_.Value } )
-    $string = ( select-string -InputObject $line -Pattern '"[^"]+"' | % { $_.Matches } | % { $_.Value } )
-    $official_version = ( select-string -InputObject $string -Pattern '[^"]+' | % { $_.Matches } | % { $_.Value } )
-    $regexp = '^\s*#define\s+POV_RAY_PRERELEASE\s*"[^"]+"\s*$'
-    $line = ( select-string -Path $version_h -Pattern $regexp | % { $_.Matches } | % { $_.Value } )
-    $string = ( select-string -InputObject $line -Pattern '"[^"]+"' | % { $_.Matches } | % { $_.Value } )
-    $prerelease = ( select-string -InputObject $string -Pattern '[^"]+' | % { $_.Matches } | % { $_.Value } )
-    if ($prerelease) {
-      $env:pov_exe_version = $official_version + '-' + $prerelease
-    } else {
-      $env:pov_exe_version = $official_version
-    }
+    Set-ExecutionPolicy remotesigned -scope process -force
+    ./tools/windows/get-source-version.ps1 ./source/base/version.h
+    $prerelease = $env:POV_SOURCE_PRERELEASE
+    $env:pov_exe_version = $env:POV_SOURCE_VERSION
     $env:pov_tag_version = 'v' + $env:pov_exe_version
     $env:pov_build_version = $env:pov_tag_version + '+av' + $env:APPVEYOR_BUILD_NUMBER
     $env:pov_build_message = ''
@@ -103,5 +86,3 @@ deploy:
     secure: WkcFPXyr/SJ9TXixTQyivhfoR9FzlryIbc4deHeQ0eA6YRXL0wQopMYJ6XL1/FJK
   draft: true
   prerelease: true
-  on:
-    appveyor_repo_tag: true