summaryrefslogtreecommitdiff
path: root/buildtools/wafsamba/samba_patterns.py
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2011-06-17 15:21:39 +1000
committerAndrew Tridgell <tridge@samba.org>2011-06-17 08:37:06 +0200
commitd2bc45e7ffb4e8d47878a6fc53c5f5c90dfd2114 (patch)
tree49dc2098f4f4d1a5e51414465a21cc2aee6eae0e /buildtools/wafsamba/samba_patterns.py
parent0b3b7e3797a9aa0dc8f0922c8cd873b0f0b3231e (diff)
downloadsamba-d2bc45e7ffb4e8d47878a6fc53c5f5c90dfd2114.tar.gz
samba-d2bc45e7ffb4e8d47878a6fc53c5f5c90dfd2114.tar.bz2
samba-d2bc45e7ffb4e8d47878a6fc53c5f5c90dfd2114.zip
build: only use the git version on install, not in the build tree
having the git version in our version.h in the build tree is annoying for developers, as every time you commit or rebase you need to spend several minutes re-linking. This changes it to use the git version only on install, which is much more useful as when you actually install the binaries you may be using them in a way that reporting the version is useful Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org> Autobuild-User: Andrew Tridgell <tridge@samba.org> Autobuild-Date: Fri Jun 17 08:37:06 CEST 2011 on sn-devel-104
Diffstat (limited to 'buildtools/wafsamba/samba_patterns.py')
-rw-r--r--buildtools/wafsamba/samba_patterns.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/buildtools/wafsamba/samba_patterns.py b/buildtools/wafsamba/samba_patterns.py
index 37ef4198a6..f064608f3a 100644
--- a/buildtools/wafsamba/samba_patterns.py
+++ b/buildtools/wafsamba/samba_patterns.py
@@ -10,7 +10,7 @@ def write_version_header(task):
src = task.inputs[0].srcpath(task.env)
tgt = task.outputs[0].bldpath(task.env)
- version = samba_version_file(src, task.env.srcdir, env=task.env)
+ version = samba_version_file(src, task.env.srcdir, env=task.env, is_install=task.env.is_install)
string = str(version)
f = open(tgt, 'w')
@@ -26,4 +26,5 @@ def SAMBA_MKVERSION(bld, target):
source= 'VERSION',
target=target,
always=True)
+ t.env.is_install = bld.is_install
Build.BuildContext.SAMBA_MKVERSION = SAMBA_MKVERSION