From ec07d3d4d9ec2245f0b23edf6746f4ae1e5dfce4 Mon Sep 17 00:00:00 2001 From: Thomas Tanner Date: Tue, 13 Oct 2015 15:24:41 +0100 Subject: Updated scons build a bit to produce helpful-ish git tag for organizer. Use r"..." strings in template file to make it easier to copy/paste paths from windows clipboard. Changed organizer.pro to not produce strange messages if you opened it because it couldn't find a .hg directory --- src/organizer.pro | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/organizer.pro') diff --git a/src/organizer.pro b/src/organizer.pro index 5b2c56b1..261e3c1c 100644 --- a/src/organizer.pro +++ b/src/organizer.pro @@ -310,7 +310,9 @@ DEFINES += UNICODE _UNICODE _CRT_SECURE_NO_WARNINGS _SCL_SECURE_NO_WARNINGS NOMI DEFINES += BOOST_DISABLE_ASSERTS NDEBUG QT_MESSAGELOGCONTEXT #DEFINES += QMLJSDEBUGGER -HGID = 'nothing' +# If we are running mercurial get the build ID from that. If we aren't, at least +# don't generate a strange message whenever you open the project +HGID = $$system(if exist $OUT_PWD\\..\\.hg (hg id -i) else (echo 'Unknown')) DEFINES += HGID=\\\"$${HGID}\\\" CONFIG(debug, debug|release) { -- cgit v1.3.1