vitalif
/
openscad
mirror of https://github.com/vitalif/openscad
1
0
Fork 0
Code Issues Releases Wiki Activity

Revert "Bumped version to 2015.03-1" 

This reverts commit a209035a83.
master
Marius Kintel 2015-04-21 11:09:23 -04:00
parent a209035a83
commit 4d0745d337
5 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openscad.pro
View File

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

2
scripts/publish-macosx.sh
View File

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

2
scripts/publish-mingw-x.sh
View File

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

4
scripts/release-common.sh
View File

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

1
tests/CMakeLists.txt
View File

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