diff options
Diffstat (limited to 'buildtools')
| -rw-r--r-- | buildtools/wafsamba/samba_version.py | 13 | ||||
| -rw-r--r-- | buildtools/wafsamba/wafsamba.py | 2 |
2 files changed, 14 insertions, 1 deletions
diff --git a/buildtools/wafsamba/samba_version.py b/buildtools/wafsamba/samba_version.py index 4f99b2c087..5804afbe4b 100644 --- a/buildtools/wafsamba/samba_version.py +++ b/buildtools/wafsamba/samba_version.py @@ -1,5 +1,6 @@ import os import Utils +import samba_utils def bzr_version_summary(path): try: @@ -246,3 +247,15 @@ def samba_version_file(version_file, path, env=None): raise return SambaVersion(version_dict, path, env=env) + + + +def load_version(env=None): + '''load samba versions either from ./VERSION or git + return a version object for detailed breakdown''' + if not env: + env = samba_utils.LOAD_ENVIRONMENT() + + version = samba_version_file("./VERSION", "..", env) + Utils.g_module.VERSION = version.STRING + return version diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py index 1d3ced13ce..10b7dfe0f4 100644 --- a/buildtools/wafsamba/wafsamba.py +++ b/buildtools/wafsamba/wafsamba.py @@ -192,7 +192,7 @@ def SAMBA_LIBRARY(bld, libname, source, if vnum: Logs.error("vnum is invalid for private libraries") sys.exit(1) - vnum = Utils.g_module.VERSION + vnum = Utils.g_module.VERSION[0] features = 'cc cshlib symlink_lib install_lib' if target_type == 'PYTHON': |