diff options
| author | Andrew Tridgell <tridge@samba.org> | 2011-06-17 15:21:39 +1000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2011-06-17 08:37:06 +0200 |
| commit | d2bc45e7ffb4e8d47878a6fc53c5f5c90dfd2114 (patch) | |
| tree | 49dc2098f4f4d1a5e51414465a21cc2aee6eae0e /buildtools | |
| parent | 0b3b7e3797a9aa0dc8f0922c8cd873b0f0b3231e (diff) | |
| download | samba-d2bc45e7ffb4e8d47878a6fc53c5f5c90dfd2114.tar.gz samba-d2bc45e7ffb4e8d47878a6fc53c5f5c90dfd2114.tar.xz samba-d2bc45e7ffb4e8d47878a6fc53c5f5c90dfd2114.zip | |
build: only use the git version on install, not in the build tree
having the git version in our version.h in the build tree is annoying
for developers, as every time you commit or rebase you need to spend
several minutes re-linking. This changes it to use the git version
only on install, which is much more useful as when you actually
install the binaries you may be using them in a way that reporting the
version is useful
Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
Autobuild-User: Andrew Tridgell <tridge@samba.org>
Autobuild-Date: Fri Jun 17 08:37:06 CEST 2011 on sn-devel-104
Diffstat (limited to 'buildtools')
| -rw-r--r-- | buildtools/wafsamba/samba_patterns.py | 3 | ||||
| -rw-r--r-- | buildtools/wafsamba/samba_version.py | 15 |
2 files changed, 11 insertions, 7 deletions
diff --git a/buildtools/wafsamba/samba_patterns.py b/buildtools/wafsamba/samba_patterns.py index 37ef4198a68..f064608f3a3 100644 --- a/buildtools/wafsamba/samba_patterns.py +++ b/buildtools/wafsamba/samba_patterns.py @@ -10,7 +10,7 @@ def write_version_header(task): src = task.inputs[0].srcpath(task.env) tgt = task.outputs[0].bldpath(task.env) - version = samba_version_file(src, task.env.srcdir, env=task.env) + version = samba_version_file(src, task.env.srcdir, env=task.env, is_install=task.env.is_install) string = str(version) f = open(tgt, 'w') @@ -26,4 +26,5 @@ def SAMBA_MKVERSION(bld, target): source= 'VERSION', target=target, always=True) + t.env.is_install = bld.is_install Build.BuildContext.SAMBA_MKVERSION = SAMBA_MKVERSION diff --git a/buildtools/wafsamba/samba_version.py b/buildtools/wafsamba/samba_version.py index 0b0c159f55f..0c39ed44ecd 100644 --- a/buildtools/wafsamba/samba_version.py +++ b/buildtools/wafsamba/samba_version.py @@ -90,7 +90,7 @@ def git_version_summary(path, env=None): class SambaVersion(object): - def __init__(self, version_dict, path, env=None): + def __init__(self, version_dict, path, env=None, is_install=True): '''Determine the version number of samba See VERSION for the format. Entries on that file are @@ -152,7 +152,10 @@ also accepted as dictionary entries here SAMBA_VERSION_STRING += ("rc%u" % self.RC_RELEASE) if self.IS_SNAPSHOT: - if os.path.exists(os.path.join(path, ".git")): + if not is_install: + suffix = "DEVELOPERBUILD" + self.vcs_fields = {} + elif os.path.exists(os.path.join(path, ".git")): suffix, self.vcs_fields = git_version_summary(path, env=env) elif os.path.exists(os.path.join(path, ".bzr")): suffix, self.vcs_fields = bzr_version_summary(path) @@ -234,7 +237,7 @@ also accepted as dictionary entries here return string -def samba_version_file(version_file, path, env=None): +def samba_version_file(version_file, path, env=None, is_install=True): '''Parse the version information from a VERSION file''' f = open(version_file, 'r') @@ -254,16 +257,16 @@ def samba_version_file(version_file, path, env=None): print("Failed to parse line %s from %s" % (line, version_file)) raise - return SambaVersion(version_dict, path, env=env) + return SambaVersion(version_dict, path, env=env, is_install=is_install) -def load_version(env=None): +def load_version(env=None, is_install=True): '''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) + version = samba_version_file("./VERSION", ".", env, is_install=is_install) Utils.g_module.VERSION = version.STRING return version |