Merge branch 'master' into feature/colour_model

Author: c-lipka

.gitattributes

@@ -0,0 +1,3 @@
+libraries/*             linguist-vendored
+distribution/**/*.inc   linguist-language=POV-Ray
+**/*.pov                linguist-language=POV-Ray

.gitignore

@@ -1,3 +1,7 @@
+# =====================================
+# From GitHub's C++ .gitignore template
+# =====================================
+
 # Compiled Object files
 *.slo
 *.lo
@@ -20,6 +24,10 @@
 *.out
 *.app
 
+# ==============================================
+# From GitHub's VisualStudio .gitignore template
+# ==============================================
+
 ## Ignore Visual Studio temporary files, build results, and
 ## files generated by popular Visual Studio add-ons.
 
@@ -28,21 +36,6 @@
 *.user
 *.sln.docstates
 
-# Build results
-
-[Dd]ebug/
-[Rr]elease/
-x64/
-build/
-[Bb]in/
-[Oo]bj/
-
-# Enable "build/" folder in the NuGet Packages folder since NuGet packages use it for MSBuild targets
-!packages/*/build/
-
-# Enable "build/" folder in the boost library
-!libraries/boost/libs/**/build/
-
 # MSTest test Results
 [Tt]est[Rr]esult*/
 [Bb]uild[Ll]og.*
@@ -72,7 +65,6 @@ build/
 *.scc
 
 # Visual C++ cache files
-ipch/
 *.aps
 *.ncb
 *.opensdf
@@ -90,11 +82,6 @@ $tf/
 # Guidance Automation Toolkit
 *.gpState
 
-# ReSharper is a .NET coding add-in
-_ReSharper*/
-*.[Rr]e[Ss]harper
-*.DotSettings.user
-
 # TeamCity is a build add-in
 _TeamCity*
 
@@ -109,16 +96,6 @@ _NCrunch_*
 # Installshield output folder
 [Ee]xpress/
 
-# DocProject is a documentation generator add-in
-DocProject/buildhelp/
-DocProject/Help/*.HxT
-DocProject/Help/*.HxC
-DocProject/Help/*.hhc
-DocProject/Help/*.hhk
-DocProject/Help/*.hhp
-DocProject/Help/Html2
-DocProject/Help/html
-
 # Click-Once directory
 publish/
 
@@ -129,13 +106,6 @@ publish/
 ## TODO: If you have NuGet Package Restore enabled, uncomment the next line
 #packages/
 
-# Windows Azure Build Output
-csx
-*.build.csdef
-
-# Windows Store app package directory
-AppPackages/
-
 # Others
 sql/
 *.Cache
@@ -149,30 +119,18 @@ ClientBin/
 *.pfx
 *.publishsettings
 
-# RIA/Silverlight projects
-Generated_Code/
-
 # Backup & report files from converting an old project file to a newer
 # Visual Studio version. Backup files are not needed, because we have git ;-)
 _UpgradeReport_Files/
 Backup*/
 UpgradeLog*.XML
 UpgradeLog*.htm
 
-# SQL Server files
-App_Data/*.mdf
-App_Data/*.ldf
-
-# Business Intelligence projects
-*.rdl.data
-*.bim.layout
-*.bim_*.settings
-
 # Microsoft Fakes
 FakesAssemblies/
 
 # =========================
-# Windows detritus
+# Operating System detritus
 # =========================
 
 # Windows image file caches
@@ -188,10 +146,77 @@ $RECYCLE.BIN/
 # Mac crap
 .DS_Store
 
-# Unix build helper scripts
-unix/config/compile
-unix/config/config.guess
-unix/config/config.sub
-unix/config/depcomp
-unix/config/install-sh
-unix/config/missing
+# ===============================
+# POV-Ray Windows build artefacts
+# ===============================
+
+/windows/vs*/.vs/
+/windows/vs*/bin32/
+/windows/vs*/bin64/
+/windows/vs*/build/
+/windows/vs*/ipch/
+
+# ============================
+# POV-Ray Unix build artefacts
+# ============================
+
+# Created by unix/prebuild.sh script
+/AUTHORS
+/COPYING
+/ChangeLog
+/INSTALL
+/Makefile.am
+/Makefile.in
+/NEWS
+/README
+/VERSION
+/aclocal.m4
+/bootstrap
+/config.h.in
+/configure
+/configure.ac
+/kde_install.sh
+/povray.1
+/povray.conf
+/povray.ini.in
+/icons/
+/include/
+/ini/
+/scenes/
+/scripts/
+/source/Makefile.am
+/source/Makefile.in
+/unix/Makefile.am
+/unix/Makefile.in
+/unix/config/config.guess
+/unix/config/config.sub
+/unix/config/depcomp
+/unix/config/install-sh
+/unix/config/missing
+/vfe/Makefile.am
+/vfe/Makefile.in
+
+# Created by configure script
+/Makefile
+/config.h
+/config.status
+/stamp-h1
+/source/jversion.h
+/source/Makefile
+/unix/Makefile
+/vfe/Makefile
+.deps/
+
+# Created by make
+/povray.ini
+/unix/povray
+.dirstamp
+
+# =========================
+# POV-Ray Doxygen artefacts
+# =========================
+
+/tools/doxygen-warnings.log
+/tools/doxygen/html/
+/tools/doxygen/latex/
+/tools/doxygen/pdf/

.travis.yml

@@ -0,0 +1,50 @@
+branches:
+  except:
+  - /^v[0-9]/
+
+os:
+- linux
+# - osx
+
+language: cpp
+
+compiler:
+- gcc
+- clang
+
+matrix:
+  allow_failures:
+  - os: osx
+  - compiler: clang
+
+sudo: false
+
+addons:
+  apt:
+    packages:
+    - libboost-dev
+    - libboost-date-time-dev
+    - libboost-thread-dev
+    - libjpeg8-dev
+    - libopenexr-dev
+    - libpng12-dev
+    - libtiff4-dev
+    - zlib1g-dev
+
+install:
+- cd unix
+- ./prebuild.sh
+- cd ..
+- ./configure COMPILED_BY="Travis CI" --prefix="$(pwd)/build"
+- make check
+- make install
+
+script:
+- true
+
+notifications:
+  email:
+    recipients:
+    - ${NOTIFICATION_EMAIL}
+    on_success: change
+    on_failure: always

appveyor.yml

@@ -0,0 +1,98 @@
+version: 3.7+av{build}
+pull_requests:
+  do_not_increment_build_number: true
+branches:
+  except:
+  - /v[0-9]/
+skip_tags: true
+
+os:
+- Visual Studio 2015
+
+shallow_clone: true
+
+matrix:
+  fast_finish: true
+
+environment:
+  matrix:
+  - configuration: Release
+    platform: Win32
+    bin_dir: bin32
+    artifact_suffix: -Win32
+    PlatformToolset: v100
+  - configuration: Release-SSE2
+    platform: Win32
+    bin_dir: bin32
+    artifact_suffix: -Win32-sse2
+    PlatformToolset: v100
+  - configuration: Release
+    platform: x64
+    bin_dir: bin64
+    artifact_suffix: -Win64
+    PlatformToolset: v140
+
+before_build:
+- ps: |
+    $env:devenv = $env:VS140COMNTOOLS + '\..\IDE\devenv'
+    & $env:devenv windows\vs10\povray.sln /upgrade
+    $env:pov_autobuild_a = '#define POV_RAY_IS_AUTOBUILD 1'
+    $env:pov_autobuild_b = '#define POV_RAY_AUTOBUILD_ID "av' + $env:APPVEYOR_BUILD_NUMBER + '"'
+    (Get-Content source\base\build.h).replace('//{POV_AUTOBUILD_A}', $env:pov_autobuild_a) | Set-Content source\base\build.h
+    (Get-Content source\base\build.h).replace('//{POV_AUTOBUILD_B}', $env:pov_autobuild_b) | Set-Content source\base\build.h
+    (Get-Content source\base\build.h).replace('//{POV_AUTOBUILD_C}', $env:pov_autobuild_c) | Set-Content source\base\build.h
+    (Get-Content source\base\build.h).replace('//{POV_AUTOBUILD_1}', $env:pov_autobuild_1) | Set-Content source\base\build.h
+    (Get-Content source\base\build.h).replace('//{POV_AUTOBUILD_2}', $env:pov_autobuild_2) | Set-Content source\base\build.h
+    (Get-Content source\base\build.h).replace('//{POV_AUTOBUILD_3}', $env:pov_autobuild_3) | Set-Content source\base\build.h
+    (Get-Content source\base\build.h).replace('YOUR NAME (YOUR EMAIL)', $env:pov_authorized_by) | Set-Content source\base\build.h
+    (Get-Content source\base\build.h).replace('#error Please fill in BUILT_BY, then remove this line', '') | Set-Content source\base\build.h
+
+build:
+  project: windows\vs10\povray.sln
+  parallel: true
+  verbosity: minimal
+
+after_build:
+- ps: |
+    $env:pov_exe_version = (Get-Content unix\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 = ''
+    if ($env:pov_exe_version -match '^[0-9.]*-x') {
+      $env:pov_build_type = 'Experimental'
+      $env:pov_build_message += '**EXPERIMENTAL: This version of POV-Ray is not part of the official development branch!**'
+      $env:pov_build_message += "`n`n"
+    } elseif ($env:pov_exe_version -match '^[0-9.]*-') {
+      $env:pov_build_type = 'Development'
+    } else {
+      $env:pov_build_type = 'Automated'
+    }
+    $env:pov_release_type = ($env:pov_build_type).ToLower() + ' release'
+    $env:pov_build_title = $env:pov_build_type + ' build'
+    $env:pov_build_message += '**Note:** This is a binary-only ' + $env:pov_release_type + '; to install, copy the binary into an existing POV-Ray 3.7 installation. (Make sure to backup the original binary first.)'
+    $env:pov_build_message += "`n`n"
+    $env:pov_build_message += 'The 64-bit binary may require Windows Vista or higher. To run this ' + $env:pov_release_type + ' on an earlier 64-bit version of Windows, you may need to use the 32-bit SSE2 binary instead.'
+    $env:pov_zipdir = "povray-" + $env:pov_exe_version + '-av' + $env:APPVEYOR_BUILD_NUMBER + $env:artifact_suffix
+    $env:pov_binary = "Windows\vs10\" + $env:bin_dir + "\pvengine*.exe"
+    $env:pov_zip = "artifacts\" + $env:pov_zipdir + ".7z"
+    New-Item -ItemType directory -Path $env:pov_zipdir | Out-Null
+    New-Item -ItemType directory -Path "artifacts" | Out-Null
+    Copy-Item $env:pov_binary $env:pov_zipdir
+    & "7z" "a" "-r" $env:pov_zip $env:pov_zipdir
+
+test: off
+
+artifacts:
+- path: artifacts\*.7z
+  name: binaryOnly7z
+
+deploy:
+- provider: GitHub
+  tag: $(pov_tag_version)
+  release: $(pov_build_title) $(pov_build_version)
+  description: $(pov_build_message)
+
+  auth_token:
+    secure: WkcFPXyr/SJ9TXixTQyivhfoR9FzlryIbc4deHeQ0eA6YRXL0wQopMYJ6XL1/FJK
+  draft: true
+  prerelease: true