From 4d0745d337b726aad06f94c4cb5614822773df9d Mon Sep 17 00:00:00 2001 From: Marius Kintel Date: Tue, 21 Apr 2015 11:09:23 -0400 Subject: [PATCH] Revert "Bumped version to 2015.03-1" This reverts commit a209035a831688c5e3b6a1c8e02c76d7d11d793a. --- openscad.pro | 2 -- scripts/publish-macosx.sh | 2 -- scripts/publish-mingw-x.sh | 2 +- scripts/release-common.sh | 4 ++-- tests/CMakeLists.txt | 1 - 5 files changed, 3 insertions(+), 8 deletions(-) diff --git a/openscad.pro b/openscad.pro index 7d09a757..23beea7e 100644 --- a/openscad.pro +++ b/openscad.pro @@ -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 include(version.pri) diff --git a/scripts/publish-macosx.sh b/scripts/publish-macosx.sh index 2175eb09..a891e13e 100755 --- a/scripts/publish-macosx.sh +++ b/scripts/publish-macosx.sh @@ -3,8 +3,6 @@ # Usage: # ./scripts/publish-macosx.sh [buildonly] # -VERSION=2015.03-1 -VERSIONDATE=2015.04.21 export NUMCPU=$(sysctl -n hw.ncpu) diff --git a/scripts/publish-mingw-x.sh b/scripts/publish-mingw-x.sh index 462a9fb6..ce27f8ee 100755 --- a/scripts/publish-mingw-x.sh +++ b/scripts/publish-mingw-x.sh @@ -4,7 +4,7 @@ # if test -z "$VERSION"; then - VERSION=2015.03-1 + VERSION=`date "+%Y.%m.%d"` COMMIT=-c fi diff --git a/scripts/release-common.sh b/scripts/release-common.sh index 83e24736..92598eb6 100755 --- a/scripts/release-common.sh +++ b/scripts/release-common.sh @@ -110,10 +110,10 @@ do done if test -z "$VERSIONDATE"; then - VERSIONDATE=2015.04.21 + VERSIONDATE=`date "+%Y.%m.%d"` fi if test -z "$VERSION"; then - VERSION=2015.03-1 + VERSION=$VERSIONDATE fi export VERSIONDATE diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index a7c27a0d..94324721 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -571,7 +571,6 @@ 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-1") 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)