summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarius Kintel <marius@kintel.net>2011-10-30 01:15:25 (GMT)
committerMarius Kintel <marius@kintel.net>2011-10-30 01:15:25 (GMT)
commit696c061eeca02f3d6f16728cf6c1bc81ac2f9d73 (patch)
tree696674fb435a6db4677c9f373139b98a45a1adac
parent0c0b261e4041d9e5fc0b3aef86cc870d39914ab2 (diff)
extracted version config to separate .pri file
-rw-r--r--openscad.pro63
-rw-r--r--version.pri59
2 files changed, 62 insertions, 60 deletions
diff --git a/openscad.pro b/openscad.pro
index fbe0fa7..c507ab9 100644
--- a/openscad.pro
+++ b/openscad.pro
@@ -8,71 +8,14 @@
}
}
+# Populate VERSION, VERSION_YEAR, VERSION_MONTH, VERSION_DATE from system date
+include(version.pri)
+
# for debugging link problems (use nmake -f Makefile.Release > log.txt)
win32 {
# QMAKE_LFLAGS += -VERBOSE
}
-# get VERSION from system date
-
-isEmpty(VERSION) {
- win32-msvc*: {
- #
- # Windows XP date command only has one argument, /t
- # and it can print the date in various localized formats.
- # This code will detect MM/DD/YYYY, YYYY/MM/DD, and DD/MM/YYYY
- #
- SYSDATE = $$system(date /t)
- SYSDATE = $$replace(SYSDATE,"/",".")
- SYSDATE ~= s/[A-Za-z]*// # remove name of day
- DATE_SPLIT=$$split(SYSDATE, ".")
- DATE_X=$$member(DATE_SPLIT, 0)
- DATE_Y=$$member(DATE_SPLIT, 1)
- DATE_Z=$$member(DATE_SPLIT, 2)
- TEST1=$$find(DATE_X, [0-9]{4} )
- TEST2=$$find(DATE_Z, [0-9]{4} )
-
- QDATE = $$_DATE_
- QDATE_SPLIT = $$split(QDATE)
- QDAY = $$member(QDATE_SPLIT,2)
-
- !isEmpty(TEST1) {
- contains( QDAY, $$DATE_Z ) {
- # message("Assuming YYYY/MM/DD format")
- VERSION_YEAR = $$DATE_X
- VERSION_MONTH = $$DATE_Y
- VERSION_DAY = $$DATE_Z
- }
- } else {
- !isEmpty(TEST2) {
- contains( DATE_X, $$QDAY ) {
- # message("Assuming DD/MM/YYYY format" $$DATE_X $$DATE_Y $$DATE_Z )
- VERSION_DAY = $$DATE_X
- VERSION_MONTH = $$DATE_Y
- VERSION_YEAR = $$DATE_Z
- } else {
- # message("Assuming MM/DD/YYYY format" $$DATE_X $$DATE_Y $$DATE_Z )
- VERSION_MONTH = $$DATE_X
- VERSION_DAY = $$DATE_Y
- VERSION_YEAR = $$DATE_Z
- }
- } else {
- # test1 and test2 both empty
- error("Couldn't parse Windows date. please run 'qmake VERSION=YYYY.MM.DD' with todays date")
- }
- } # isEmpty(TEST1)
- VERSION = $$VERSION_YEAR"."$$VERSION_MONTH"."$$VERSION_DAY
- # message("YMD Version:" $$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)
- }
-}
-
# cross compilation unix->win32
CONFIG(mingw-cross-env) {
diff --git a/version.pri b/version.pri
new file mode 100644
index 0000000..5cce3d5
--- /dev/null
+++ b/version.pri
@@ -0,0 +1,59 @@
+# get VERSION from system date
+
+isEmpty(VERSION) {
+ win32-msvc*: {
+ #
+ # Windows XP date command only has one argument, /t
+ # and it can print the date in various localized formats.
+ # This code will detect MM/DD/YYYY, YYYY/MM/DD, and DD/MM/YYYY
+ #
+ SYSDATE = $$system(date /t)
+ SYSDATE = $$replace(SYSDATE,"/",".")
+ SYSDATE ~= s/[A-Za-z]*// # remove name of day
+ DATE_SPLIT=$$split(SYSDATE, ".")
+ DATE_X=$$member(DATE_SPLIT, 0)
+ DATE_Y=$$member(DATE_SPLIT, 1)
+ DATE_Z=$$member(DATE_SPLIT, 2)
+ TEST1=$$find(DATE_X, [0-9]{4} )
+ TEST2=$$find(DATE_Z, [0-9]{4} )
+
+ QDATE = $$_DATE_
+ QDATE_SPLIT = $$split(QDATE)
+ QDAY = $$member(QDATE_SPLIT,2)
+
+ !isEmpty(TEST1) {
+ contains( QDAY, $$DATE_Z ) {
+ # message("Assuming YYYY/MM/DD format")
+ VERSION_YEAR = $$DATE_X
+ VERSION_MONTH = $$DATE_Y
+ VERSION_DAY = $$DATE_Z
+ }
+ } else {
+ !isEmpty(TEST2) {
+ contains( DATE_X, $$QDAY ) {
+ # message("Assuming DD/MM/YYYY format" $$DATE_X $$DATE_Y $$DATE_Z )
+ VERSION_DAY = $$DATE_X
+ VERSION_MONTH = $$DATE_Y
+ VERSION_YEAR = $$DATE_Z
+ } else {
+ # message("Assuming MM/DD/YYYY format" $$DATE_X $$DATE_Y $$DATE_Z )
+ VERSION_MONTH = $$DATE_X
+ VERSION_DAY = $$DATE_Y
+ VERSION_YEAR = $$DATE_Z
+ }
+ } else {
+ # test1 and test2 both empty
+ error("Couldn't parse Windows date. please run 'qmake VERSION=YYYY.MM.DD' with todays date")
+ }
+ } # isEmpty(TEST1)
+ VERSION = $$VERSION_YEAR"."$$VERSION_MONTH"."$$VERSION_DAY
+ # message("YMD Version:" $$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)
+ }
+}
contact: Jan Huwald // Impressum