Merge branch 'master' into feature/advanced_diffuse

Author: c-lipka

.gitattributes

@@ -1,3 +1,14 @@
+# Override language auto-detection on GitHub.
 libraries/*             linguist-vendored
 distribution/**/*.inc   linguist-language=POV-Ray
+distribution/platform-specific/windows/Insert?Menu/*.txt linguist-language=POV-Ray
 **/*.pov                linguist-language=POV-Ray
+**/*.h                  linguist-language=C++
+source/povms/povms.h    linguist-language=C
+libraries/**/*.h        linguist-language=C
+libraries/boost/*.h     linguist-language=C++
+libraries/ilmbase/*.h   linguist-language=C++
+libraries/openexr/*.h   linguist-language=C++
+
+# Do not auto-merge version number file.
+source/base/version.h   -merge

.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,128 @@
+<!-- -----------------------------------------------------------------------------------------------
+NOTE: THIS IS NOT A QUESTIONNAIRE, but rather a collection of building blocks to help you write a
+good issue report. PLEASE DISCARD any portions you don't understand or deem irrelevant for your type
+of report, and CHANGE OR ADD whatever you deem helpful.
+------------------------------------------------------------------------------------------------ -->
+
+### Summary
+
+<!-- Briefly describe your issue here. -->
+
+### Environment
+
+<!-- Describe the environment you're using: -->
+<!-- PLEASE DELETE ENTRIES if not applicable. -->
+  - Source code Git tag: <!-- e.g. v3.7.0.0 -->
+  - POV-Ray version: <!-- e.g. v3.7.1-beta.9+msvc14.win64 -->
+  - Operating system: <!-- e.g. Windows 10, Ubuntu 14.04 -->
+  - Hardware platform: <!-- e.g. x86, x86-64, ARM -->
+  - Compiler: <!-- e.g. Visual Studio 2015 SP2, GNU g++ 5.3 -->
+  - Regression from: <!-- known ok version, e.g. v3.6.2.msvc9.win64 -->
+
+
+<!-- Build Problems Only ----------------------------------------------------------------------- -->
+<!-- PLEASE DELETE THIS ENTIRE SECTION if reporting a non-build issue. -->
+
+### Windows Build Settings
+
+<!-- Describe the settings you were using to compile POV-Ray for Windows: -->
+<!-- PLEASE DELETE THIS SUBSECTION for non-Windows builds. -->
+  - Configuration: <!-- e.g. Debug, Release, Release-SSE2 -->
+  - Platform: <!-- e.g. Win32, x64 -->
+ 
+### Unix Build Command Sequence
+
+<!-- Replace the following example with the actual command sequence you're using to build POV-Ray
+for Unix: -->
+<!-- PLEASE DELETE THIS SUBSECTION for non-Unix/Mac builds. -->
+~~~
+cd unix ; prebuild.sh ; cd ..
+./configure COMPILED_BY="John Doe <[email protected]>"
+make check
+sudo make install
+~~~
+
+### Unix Pre-Build Output
+
+<!-- If you experience errors in `./configure`, or suspect the root cause to be in `prebuild.sh`,
+copy the _complete_ output of `prebuild.sh` between the tilde lines (Otherwise, please strip this
+subsection): -->
+<!-- PLEASE DELETE THIS SUBSECTION for non-Unix/Mac builds or if not applicable. -->
+~~~
+~~~
+
+### Unix Configure Output
+
+<!-- Copy the complete output of `./configure` between the tilde lines: -->
+<!-- PLEASE DELETE THIS SUBSECTION for non-Unix/Mac builds. -->
+~~~
+~~~
+
+### Compiler/Linker Output
+
+<!-- Copy any compiler/linker errors and other relevant messages between the tilde lines: -->
+<!-- PLEASE DELETE THIS SUBSECTION for non-Unix/Mac builds. -->
+~~~
+~~~
+
+
+<!-- Non-Build Problems Only ------------------------------------------------------------------- -->
+<!-- PLEASE DELETE THIS ENTIRE SECTION if reporting a build issue. -->
+
+### Steps to Reproduce
+
+<!-- Describe the steps you took that led to the issue: -->
+<!-- PLEASE DELETE OR ADD steps as applicable. -->
+ 1. <!-- First step -->
+ 2. <!-- Second step -->
+ 3. <!-- Third step -->
+
+### Expected Behavior
+
+<!-- Describe what you expected to happen. -->
+
+### Actual Behavior
+
+<!-- Describe what actually happened. -->
+
+
+<!-- Render Problems Only ---------------------------------------------------------------------- -->
+<!-- PLEASE DELETE THIS ENTIRE SECTION if reporting a non-render issue. -->
+
+### Render Settings
+
+<!-- Copy your INI options / command-line settings between the tilde lines: -->
+<!-- PLEASE DELETE THIS SUBSECTION if not applicable. -->
+~~~
+~~~
+
+### Scene
+
+<!-- Copy a minimal sample scene between the tilde lines: -->
+<!-- PLEASE DELETE THIS SUBSECTION if not applicable. -->
+~~~
+~~~
+
+### Output
+
+<!-- Copy the render output / message pane contents between the tilde lines: -->
+<!-- PLEASE DELETE THIS SUBSECTION if not applicable. -->
+~~~
+~~~
+
+
+<!-- All Problems ------------------------------------------------------------------------------ -->
+
+### Workaround
+
+<!-- If you have managed to work around the issue, describe that workaround here. -->
+<!-- PLEASE DELETE THIS SUBSECTION if not applicable. -->
+
+### Suggested Solution
+
+<!-- If you have an idea how to solve the issue for good, describe it here. -->
+<!-- PLEASE DELETE THIS SUBSECTION if not applicable. -->
+
+<!-- -----------------------------------------------------------------------------------------------
+NOTE: Please take a moment to PREVIEW YOUR REPORT before submitting it.
+------------------------------------------------------------------------------------------------ -->

.gitignore

@@ -160,7 +160,7 @@ $RECYCLE.BIN/
 # POV-Ray Unix build artefacts
 # ============================
 
-# Created by unix/prebuild.sh script
+# Files created by unix/prebuild.sh script in main directory
 /AUTHORS
 /COPYING
 /ChangeLog
@@ -179,44 +179,75 @@ $RECYCLE.BIN/
 /povray.1
 /povray.conf
 /povray.ini.in
-/icons/
-/include/
-/ini/
-/scenes/
-/scripts/
+# Files created by unix/prebuild.sh script in specific subdirectories
+/platform/Makefile.am
+/platform/Makefile.in
 /source/Makefile.am
 /source/Makefile.in
 /unix/Makefile.am
 /unix/Makefile.in
+/unix/config/ar-lib
+/unix/config/compile
 /unix/config/config.guess
 /unix/config/config.sub
 /unix/config/depcomp
 /unix/config/install-sh
 /unix/config/missing
 /vfe/Makefile.am
 /vfe/Makefile.in
+# Subdirectories created by unix/prebuild.sh script
+/icons/
+/include/
+/ini/
+/scenes/
+/scripts/
 
-# Created by configure script
+# Files created by configure script in main directory
 /Makefile
 /config.h
 /config.status
 /stamp-h1
-/source/jversion.h
+# Files created by configure script in specific subdirectories
+/platform/Makefile
 /source/Makefile
 /unix/Makefile
 /vfe/Makefile
+# Directories created by configure script
 .deps/
 
-# Created by make
+# Files created by make in main directory
 /povray.ini
+# Files created by make in specific subdirectories
 /unix/povray
+# Files created by make in various subdirectories
 .dirstamp
 
+# ===========================
+# POV-Ray meta-build detritus
+# ===========================
+
+# Byte-compiled python modules
+*.pyc
+
+# =====================
+# POV-Ray Miscellaneous
+# =====================
+
+/internal/
+/legacy-license/
+
 # =========================
 # POV-Ray Doxygen artefacts
 # =========================
 
 /tools/doxygen-warnings.log
-/tools/doxygen/html/
-/tools/doxygen/latex/
-/tools/doxygen/pdf/
+/tools/doxygen/source-doc/
+
+# ==========================
+# POV-Ray HTMLHelp artefacts
+# ==========================
+
+/tools/windows/htmlhelp/input
+/tools/windows/htmlhelp/output
+/tools/windows/htmlhelp/debug.txt
+/tools/windows/htmlhelp/filelist.txt

.travis.yml

@@ -1,23 +1,23 @@
+env:
+  global:
+   # Required for clang.
+   - CXXFLAGS="-fno-fast-math"
+
 branches:
   except:
   - /^v[0-9]/
 
-os:
-- linux
-# - osx
-
 language: cpp
 
-compiler:
-- gcc
-- clang
-
 matrix:
-  allow_failures:
+  include:
+  - os: linux
+    compiler: gcc
   - os: osx
-  - compiler: clang
+    compiler: clang
 
 sudo: false
+dist: trusty
 
 addons:
   apt:
@@ -32,9 +32,7 @@ addons:
     - zlib1g-dev
 
 install:
-- cd unix
-- ./prebuild.sh
-- cd ..
+- unix/prebuild.sh
 - ./configure COMPILED_BY="Travis CI" --prefix="$(pwd)/build"
 - make check
 - make install