Ditching the idea of having unique version numbers for every commit.

Author: c-lipka

README.md

@@ -8,12 +8,7 @@ This document is still a work in progress. While the POV-Ray project itself
 has existed for more than 20 years, this is the first time we have done a
 release on github, so please bear with us - it's a little bare at the moment.
 
-Please also be aware that we are in the process of actually doing the 3.7
-release right now, and this document may refer to things that have not happened
-yet on the main website (e.g. the release of the binaries, updating of pages,
-and so forth).
-
-Last edit: 2013-11-06
+Last edit: 2016-09-30
 
 License
 --------------------------------------
@@ -37,35 +32,36 @@ Bug Reports
 
 It's generally a good idea to mention a bug in the forums prior to lodging a formal
 report; this can save you some time if it's a non-bug or a solution is known. You
-should also check our bug tracker at http://bugs.povray.org/ first to see if it's
-been reported.
-
-If you're sure something is a bug then please do lodge a bugreport on the tracker.
-While we are aware that github has its own tracker, please keep in mind that POV-Ray
-is a long-established project (more than 20 years) and we prefer to use our own tracker.
-We do not do our primary develoment on github (at least, not at this point). Our RCS
-for the past 15 or so years has been Perforce. We will be pulling patches from here
-into perforce, and pushing changes out to github from time to time. At some point we
-will switch to using Perforce's Git Fusion product and this process will become
-automatic.
+should also first check the [known issues](https://github.com/POV-Ray/povray/issues)
+to see if it has been reported already.
+
+If you're sure something is a bug then please do lodge a bug report on the GitHub issues tracker.
 
 Official Binaries
 --------------------------------------
 
-At this point in time, the only platform for which the project distributes pre-
-built 'official' (i.e. supported) binaries is Microsoft Windows. These may be
+At this point in time, the only platform for which the project distributes pre-built
+'official' (i.e. supported) binaries is Microsoft Windows. These may be
 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).
 
 Building POV-Ray
 --------------------------------------
 
-At this point in time we recommend building from the 3.7-stable branch. POV-Ray
-should compile on any POSIX-compliant system with the required tools (please see
+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,
+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.
+
+_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,
-otherwise your build *will not work*), and also on Mac systems (console mode only, using
+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
@@ -94,7 +90,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
-windows only (due to its use of MFC). Nevertheless we will be adding the source
+Windows only (due to its use of MFC). Nevertheless we will be adding the source
 to the repository at a future date.
 
 Authors of open-source modellers with a compatible licence wishing to directly

appveyor.yml

@@ -3,9 +3,7 @@ pull_requests:
   do_not_increment_build_number: true
 branches:
   except:
-  - /v[0-9]/
   - coverity_scan
-skip_tags: true
 
 image: Visual Studio 2015
 
@@ -54,15 +52,28 @@ build:
 
 after_build:
 - ps: |
-    $env:pov_exe_version = (Get-Content unix\VERSION)
+    $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
+    }
     $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') {
+    if ($prerelease -match '^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.]*-') {
+    } elseif ($prerelease) {
       $env:pov_build_type = 'Development'
     } else {
       $env:pov_build_type = 'Automated'
@@ -99,3 +110,5 @@ deploy:
     secure: WkcFPXyr/SJ9TXixTQyivhfoR9FzlryIbc4deHeQ0eA6YRXL0wQopMYJ6XL1/FJK
   draft: true
   prerelease: true
+  on:
+    appveyor_repo_tag: true

source/base/version.h

@@ -45,7 +45,7 @@
 #define OFFICIAL_VERSION_STRING "3.7.1"
 #define OFFICIAL_VERSION_NUMBER 371
 
-#define POV_RAY_PRERELEASE "alpha.8803356"
+#define POV_RAY_PRERELEASE "alpha"
 
 #if (POV_RAY_IS_AUTOBUILD == 1) && ((POV_RAY_IS_OFFICIAL == 1) || (POV_RAY_IS_SEMI_OFFICIAL == 1))
 #ifdef POV_RAY_PRERELEASE

tools/git/create-tag.sh

@@ -0,0 +1,87 @@
+#!/bin/sh
+
+# Run this script to tag the current revision (intended to trigger a development build).
+
+tab=`echo -e '\t'`
+nl='
+'
+
+########################################################################################################################
+#
+# Workarounds for quirks of particular runtime environments.
+
+# A single sed expression to fix line endings, passed to sed via the '-e' option as the last expression to process.
+# By default, this is a no-op expression.
+sed_newline_fix=''
+
+# A function to fix quirky behaviour of 'sed -i', called with a list of all files previously processed by 'sed -i'.
+# By default, this is a no-op function.
+sed_i_fix() { : ; }
+
+case "$(uname -s)" in
+
+   Darwin)
+     echo 'Running on Mac OS X'
+     # no known quirks to work around
+     ;;
+
+   Linux)
+     echo 'Running on Linux'
+     # no known quirks to work around
+     ;;
+
+   CYGWIN*|MINGW32*|MSYS*)
+     echo 'Running on MS Windows'
+     # 'sed' output has LF line endings, but we want CR+LF for consistency.
+     sed_newline_fix='s/$/\r/g'
+     # 'sed -i' sets the edited file to read-only.
+     sed_i_fix() { chmod u+w "$@" ; }
+     ;;
+
+   *)
+     echo 'Running on unidentified OS' 
+     # no known quirks to work around
+     ;;
+
+esac
+
+########################################################################################################################
+#
+# Update prerelease id (trailing numeric portion).
+# We're setting the prerelease id to the number of minutes since 2000-01-01 00:00.
+
+if [ -f source/base/version.h ]
+then
+  versionfile=source/base/version.h
+else
+  versionfile=source/backend/povray.h
+fi
+
+ver_povray_h=`sed -n 's/#define [ ]*OFFICIAL_VERSION_STRING [ ]*"\([0-9]*\.[0-9]*\.[0-9]*\)"/\1/p' "$versionfile"`
+ver_povray_h_int=`sed -n 's/#define [ ]*OFFICIAL_VERSION_NUMBER [ ]*\([0-9]*\)/\1/p' "$versionfile"`
+ver_povray_h_hex=`sed -n 's/#define [ ]*OFFICIAL_VERSION_NUMBER_HEX [ ]*\(0x[0]*[0-9]*\)/\1/p' "$versionfile"`
+prerelease_povray_h=`sed -n 's/^.*#define [ ]*POV_RAY_PRERELEASE [ ]*"\([^"]*\)".*$/\1/p' "$versionfile"`
+
+if [ x"$prerelease_povray_h" = x"" ]
+then
+  echo "Identified as final release '$ver_povray_h'."
+  tag="v$ver_povray_h"
+else
+  echo "Identified as pre-release '$ver_povray_h-$prerelease_povray_h'."
+  if ! echo $prerelease_povray_h | grep -e '[0-9][0-9]$' >/dev/null
+  then
+    echo "Pre-release looks suspiciously non-unique; please tag manually!"
+    exit 1
+  fi
+  tag="v$ver_povray_h-$prerelease_povray_h"
+fi
+
+echo "Tagging as '$tag'."
+
+git tag "$tag"
+
+########################################################################################################################
+#
+# Done.
+
+exit 0

unix/VERSION

@@ -1 +1 @@
-3.7.1-alpha.8803356
+3.7.1-alpha