Bump version to 2015.03-3

This commit is contained in:
Marius Kintel 2016-02-17 16:12:34 -05:00
parent e316bec7dc
commit 9d8e9b5679
5 changed files with 8 additions and 3 deletions

View file

@ -39,6 +39,8 @@ isEmpty(QT_VERSION) {
}
}
VERSION = 2015.03-3
VERSIONDATE = 2016.02.17
# If VERSION is not set, populate VERSION, VERSION_YEAR, VERSION_MONTH from system date
include(version.pri)

View file

@ -3,6 +3,8 @@
# Usage:
# ./scripts/publish-macosx.sh [buildonly]
#
VERSION=2015.03-3
VERSIONDATE=2016.02.17
export NUMCPU=$(sysctl -n hw.ncpu)

View file

@ -4,7 +4,7 @@
#
if test -z "$VERSION"; then
VERSION=`date "+%Y.%m.%d"`
VERSION=2015.03-3
COMMIT=-c
fi

View file

@ -110,10 +110,10 @@ do
done
if test -z "$VERSIONDATE"; then
VERSIONDATE=`date "+%Y.%m.%d"`
VERSIONDATE=2016.02.17
fi
if test -z "$VERSION"; then
VERSION=$VERSIONDATE
VERSION=2015.03-3
fi
export VERSIONDATE

View file

@ -571,6 +571,7 @@ include_directories(../src ../src/libtess2/Include)
# Handle OpenSCAD version based on VERSION env. variable.
# Use current timestamp if not specified (development builds)
set(ENV{VERSION} "2015.03-3")
if ("$ENV{VERSION}" STREQUAL "")
# Timestamp is only available in cmake >= 2.8.11
if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION}" VERSION_GREATER 2.8.10)