diff options
| -rw-r--r-- | RELEASE_NOTES | 1 | ||||
| -rw-r--r-- | doc/release-checklist.txt | 4 | ||||
| -rw-r--r-- | version.pri | 19 |
3 files changed, 13 insertions, 11 deletions
diff --git a/RELEASE_NOTES b/RELEASE_NOTES index b9648d2..a954c45 100644 --- a/RELEASE_NOTES +++ b/RELEASE_NOTES @@ -13,6 +13,7 @@ o New import() statement reads the correct file format based on the filename ext (.stl, .dxf and .off is supported) o The color() statement now supports an alpha parameter, e.g. color(c=[1,0,0], alpha=0.4) o The color() statement now supports specifying colors as strings, e.g. color("Red") +o The color() statement now overrides colors specified further down in the tree o if()/else() and the ternary operator can now take any value type as parameter. false, 0, empty string and empty vector or illegal value type will evaluate as false, everything else as true. o Strings can now be lexographically compared using the <, <=, >, >= operators o Added PI constant. diff --git a/doc/release-checklist.txt b/doc/release-checklist.txt index 2ff9593..01e4988 100644 --- a/doc/release-checklist.txt +++ b/doc/release-checklist.txt @@ -2,8 +2,8 @@ OpenSCAD Release Checklist -------------------------- o Update version - release-linux.sh - publish-macosx.sh + scripts/release-linux.sh + scripts/publish-macosx.sh FIXME: Windows o Update RELEASE_NOTES diff --git a/version.pri b/version.pri index 89a0dc9..6b91ecd 100644 --- a/version.pri +++ b/version.pri @@ -51,17 +51,18 @@ isEmpty(VERSION) { } else { # Unix/Mac VERSION = $$system(date "+%Y.%m.%d") - VERSION_SPLIT=$$split(VERSION, ".") - VERSION_YEAR=$$member(VERSION_SPLIT, 0) - VERSION_MONTH=$$member(VERSION_SPLIT, 1) - VERSION_DAY=$$member(VERSION_SPLIT, 2) } - # Fix for problem with integers with leading zeros - # being interpreted by C++ as octals. Now they're doubles. - VERSION_YEAR=$${VERSION_YEAR}.0 - VERSION_MONTH=$${VERSION_MONTH}.0 - VERSION_DAY=$${VERSION_DAY}.0 } +VERSION_SPLIT=$$split(VERSION, ".") +VERSION_YEAR=$$member(VERSION_SPLIT, 0) +VERSION_MONTH=$$member(VERSION_SPLIT, 1) +VERSION_DAY=$$member(VERSION_SPLIT, 2) +# Fix for problem with integers with leading zeros +# being interpreted by C++ as octals. Now they're doubles. +VERSION_YEAR=$${VERSION_YEAR}.0 +VERSION_MONTH=$${VERSION_MONTH}.0 +VERSION_DAY=$${VERSION_DAY}.0 + DEFINES += OPENSCAD_VERSION=$$VERSION OPENSCAD_YEAR=$$VERSION_YEAR OPENSCAD_MONTH=$$VERSION_MONTH !isEmpty(VERSION_DAY): DEFINES += OPENSCAD_DAY=$$VERSION_DAY |