From f0b4d46784db782babe8d14f8c081eb3cf82fe88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nils=20O=2E=20Sel=C3=A5sdal?= Date: Tue, 29 Oct 2013 22:23:09 +0100 Subject: [PATCH] Generate the version string in scons, so it doesn't have to be defined several potential places --- SConstruct | 6 ++++++ src/version.c.in | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/SConstruct b/SConstruct index e33447f..246cdf7 100644 --- a/SConstruct +++ b/SConstruct @@ -10,6 +10,12 @@ version_info = { 'version_patch': 0 , 'version_revision': revision, } +version_info['version_str'] = "%d.%d.%d.%s" % ( + version_info['version_major'], + version_info['version_minor'], + version_info['version_patch'], + version_info['version_revision']) + AddOption('--build_type', dest = 'build_type', diff --git a/src/version.c.in b/src/version.c.in index 086b7e7..6f41e8d 100644 --- a/src/version.c.in +++ b/src/version.c.in @@ -5,6 +5,6 @@ const int ucore_version_major = @version_major@; const int ucore_version_minor = @version_minor@; const int ucore_version_patch = @version_patch@; -const char ucore_version_str[] = "@version_major@.@version_minor@.@version_patch@.@version_revision@"; +const char ucore_version_str[] = "@version_str@"; const char ucore_build_host[] = "@build_host@";