diff options
| author | Andrew Tridgell <tridge@samba.org> | 2010-12-08 14:58:12 +1100 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2010-12-08 05:26:06 +0100 |
| commit | 16c36a8cb56f3a74927cdb7c46dfb6158f328beb (patch) | |
| tree | 8aae03c30aa01d8fe1e0c590a554a2429222c4d5 /source3 | |
| parent | 4debe69b731b69aebd95386c2f1a36bb2a53d047 (diff) | |
| download | samba-16c36a8cb56f3a74927cdb7c46dfb6158f328beb.tar.gz | |
s3-waf: fixed version number handling
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/wscript | 15 | ||||
| -rw-r--r-- | source3/wscript_build | 3 |
2 files changed, 5 insertions, 13 deletions
diff --git a/source3/wscript b/source3/wscript index da9a9db4b89..2bf6fb8f4e0 100644 --- a/source3/wscript +++ b/source3/wscript @@ -11,20 +11,9 @@ from optparse import SUPPRESS_HELP sys.path.insert(0, srcdir+"/buildtools/wafsamba") import wafsamba, Options import build.charset -import samba_utils +import samba_utils, samba_version import samba3 -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 env: - env = samba_utils.LOAD_ENVIRONMENT() - - version = wafsamba.samba_version_file("./VERSION", "..", env=env) - Utils.g_module.VERSION = version.STRING - return version - def set_options(opt): opt.BUILTIN_DEFAULT('NONE') opt.PRIVATE_EXTENSION_DEFAULT('s3') @@ -68,7 +57,7 @@ def set_options(opt): def configure(conf): from samba_utils import TO_LIST - version = load_version(env=conf.env) + version = samba_version.load_version(env=conf.env) conf.DEFINE('CONFIG_H_IS_FROM_SAMBA', 1) conf.DEFINE('_SAMBA_BUILD_', version.MAJOR, add_to_cflags=True) diff --git a/source3/wscript_build b/source3/wscript_build index 983b67039c8..cf5293bd789 100644 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -1,6 +1,7 @@ #!/usr/bin/env python from samba_utils import * +import samba_version TDB_LIB_SRC = '''lib/util_tdb.c ../lib/util/util_tdb.c lib/dbwrap.c lib/dbwrap_tdb.c @@ -735,6 +736,8 @@ t.env.BUILDDIR = bld.path.abspath() bld.SETUP_BUILD_GROUPS() +samba_version.load_version(bld.env) + bld.SAMBA_MKVERSION('include/version.h') bld.RECURSE('../lib/replace') |