Reverted version to master after release

master
Marius Kintel 2015-03-10 10:46:46 -04:00
parent a7bf4fe69b
commit ca72a5ab5d
5 changed files with 4 additions and 9 deletions

View File

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

View File

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

View File

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

View File

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

View File

@ -571,13 +571,12 @@ 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")
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)
string(TIMESTAMP VERSION "%Y.%m.%d")
else()
set(VERSION "2015.03")
set(VERSION "2013.06")
endif()
else()
set(VERSION $ENV{VERSION})