summaryrefslogtreecommitdiff
path: root/buildtools/wafsamba/samba_patterns.py
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2010-11-16 12:05:14 +1100
committerAndrew Tridgell <tridge@samba.org>2010-11-16 01:51:54 +0000
commitfe5c48cbed29b669f17370436d0cf18ca0ccb474 (patch)
treeddb320fca8458d2b1f89edf96614d623f0ffbf91 /buildtools/wafsamba/samba_patterns.py
parent96bdcf7ea9d06e4681af012974458d67d264cfda (diff)
downloadsamba-fe5c48cbed29b669f17370436d0cf18ca0ccb474.tar.gz
samba-fe5c48cbed29b669f17370436d0cf18ca0ccb474.tar.bz2
samba-fe5c48cbed29b669f17370436d0cf18ca0ccb474.zip
waf: added --git-local-changes configure option
if you use --git-local-changes then the version number that waf extracts from git will have a '+' on the end if you have local changes, as determined by running 'git diff'. This used to be the default, but unfortunately it is far too slow on some systems. On a NFS build system I was using the first line of configure took about 2 minutes. Autobuild-User: Andrew Tridgell <tridge@samba.org> Autobuild-Date: Tue Nov 16 01:51:54 UTC 2010 on sn-devel-104
Diffstat (limited to 'buildtools/wafsamba/samba_patterns.py')
-rw-r--r--buildtools/wafsamba/samba_patterns.py4
1 files changed, 1 insertions, 3 deletions
diff --git a/buildtools/wafsamba/samba_patterns.py b/buildtools/wafsamba/samba_patterns.py
index 9693c5965e..37ef4198a6 100644
--- a/buildtools/wafsamba/samba_patterns.py
+++ b/buildtools/wafsamba/samba_patterns.py
@@ -10,9 +10,7 @@ def write_version_header(task):
src = task.inputs[0].srcpath(task.env)
tgt = task.outputs[0].bldpath(task.env)
- have_git = 'GIT' in task.env
-
- version = samba_version_file(src, task.env.srcdir, have_git=have_git)
+ version = samba_version_file(src, task.env.srcdir, env=task.env)
string = str(version)
f = open(tgt, 'w')