diff options
| author | don bright <hugh.m.bright@gmail.com> | 2011-10-25 02:47:22 (GMT) |
|---|---|---|
| committer | don bright <hugh.m.bright@gmail.com> | 2011-10-25 02:47:22 (GMT) |
| commit | 36895ff2e50e27206adde0a44dd8c265669eccce (patch) | |
| tree | 629fe0e081dda32ec1a356913c2a977e63a5cb14 | |
| parent | 82ff5a12ec876c80a626357557fa8afdbf0721cc (diff) | |
confine date detection to win32-msvc, set VERSION, hide debug message
| -rw-r--r-- | openscad.pro | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/openscad.pro b/openscad.pro index 40c7d3d..099af35 100644 --- a/openscad.pro +++ b/openscad.pro @@ -16,14 +16,13 @@ win32 { # get VERSION from system date isEmpty(VERSION) { - win32 { + 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) - message("Reading date from Windows date.exe... " $$SYSDATE) SYSDATE = $$replace(SYSDATE,"/",".") SYSDATE ~= s/[A-Za-z]*// # remove name of day DATE_SPLIT=$$split(SYSDATE, ".") @@ -34,13 +33,12 @@ isEmpty(VERSION) { TEST2=$$find(DATE_Z, [0-9]{4} ) QDATE = $$_DATE_ - message("Reading date from QMAKE ..." $$QDATE) QDATE_SPLIT = $$split(QDATE) QDAY = $$member(QDATE_SPLIT,2) !isEmpty(TEST1) { contains( QDAY, $$DATE_Z ) { - message("Assuming YYYY/MM/DD format") + # message("Assuming YYYY/MM/DD format") VERSION_YEAR = $$DATE_X VERSION_MONTH = $$DATE_Y VERSION_DAY = $$DATE_Z @@ -48,12 +46,12 @@ isEmpty(VERSION) { } else { !isEmpty(TEST2) { contains( DATE_X, $$QDAY ) { - message("Assuming DD/MM/YYYY format" $$DATE_X $$DATE_Y $$DATE_Z ) + # 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 ) + # message("Assuming MM/DD/YYYY format" $$DATE_X $$DATE_Y $$DATE_Z ) VERSION_MONTH = $$DATE_X VERSION_DAY = $$DATE_Y VERSION_YEAR = $$DATE_Z @@ -62,8 +60,9 @@ isEmpty(VERSION) { # test1 and test2 both empty error("Couldn't parse Windows date. please run 'qmake VERSION=YYYY.MM.DD' with todays date") } - } - message("YMD version:" $$VERSION_YEAR $$VERSION_MONTH $$VERSION_DAY) + } # isEmpty(TEST1) + VERSION = $$VERSION_YEAR"."$$VERSION_MONTH"."$$VERSION_DAY + # message("YMD Version:" $$VERSION) } else { # Unix/Mac VERSION = $$system(date "+%Y.%m.%d") |