summaryrefslogtreecommitdiff
path: root/source3
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 /source3
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 'source3')
-rw-r--r--source3/wscript10
1 files changed, 5 insertions, 5 deletions
diff --git a/source3/wscript b/source3/wscript
index 1164ff1d70..510bed5749 100644
--- a/source3/wscript
+++ b/source3/wscript
@@ -14,14 +14,14 @@ import build.charset
import samba_utils
import samba3
-def load_version(have_git=False):
+def load_version(env=None):
'''load samba versions either from ./VERSION or git
return a version object for detailed breakdown'''
import samba_utils, Utils
- if not have_git:
+ if not env:
env = samba_utils.LOAD_ENVIRONMENT()
- have_git = 'GIT' in env
- version = wafsamba.samba_version_file("./VERSION", "..", have_git=have_git)
+
+ version = wafsamba.samba_version_file("./VERSION", "..", env=env)
Utils.g_module.VERSION = version.STRING
return version
@@ -67,7 +67,7 @@ def set_options(opt):
def configure(conf):
from samba_utils import TO_LIST
- version = load_version(have_git=True)
+ version = load_version(env=conf.env)
conf.DEFINE('CONFIG_H_IS_FROM_SAMBA', 1)
conf.DEFINE('_SAMBA_BUILD_', version.MAJOR, add_to_cflags=True)