diff options
author | Andrew Tridgell <tridge@samba.org> | 2010-11-16 12:05:14 +1100 |
---|---|---|
committer | Andrew Tridgell <tridge@samba.org> | 2010-11-16 01:51:54 +0000 |
commit | fe5c48cbed29b669f17370436d0cf18ca0ccb474 (patch) | |
tree | ddb320fca8458d2b1f89edf96614d623f0ffbf91 /buildtools/wafsamba/wscript | |
parent | 96bdcf7ea9d06e4681af012974458d67d264cfda (diff) | |
download | samba-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/wscript')
-rw-r--r-- | buildtools/wafsamba/wscript | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/buildtools/wafsamba/wscript b/buildtools/wafsamba/wscript index 6913f63c91..0d91237d48 100644 --- a/buildtools/wafsamba/wscript +++ b/buildtools/wafsamba/wscript @@ -96,6 +96,9 @@ def set_options(opt): gr.add_option('--pedantic', help=("Enable even more compiler warnings"), action='store_true', dest='pedantic', default=False) + gr.add_option('--git-local-changes', + help=("mark version with + if local git changes"), + action='store_true', dest='GIT_LOCAL_CHANGES', default=False) gr.add_option('--abi-check', help=("Check ABI signatures for libraries"), @@ -244,6 +247,8 @@ def configure(conf): except: conf.env.ABI_CHECK = False + conf.env.GIT_LOCAL_CHANGES = Options.options.GIT_LOCAL_CHANGES + conf.CHECK_COMMAND(['uname', '-a'], msg='Checking build system', define='BUILD_SYSTEM', |