src = task.inputs[0].srcpath(task.env)
tgt = task.outputs[0].bldpath(task.env)
- have_git = 'GIT' in task.env
-
- version = samba_version_file(src, task.env.srcdir, have_git=have_git)
+ version = samba_version_file(src, task.env.srcdir, env=task.env)
string = str(version)
f = open(tgt, 'w')
return (ret, fields)
-def git_version_summary(path, have_git):
+def git_version_summary(path, env=None):
# Get version from GIT
- if not have_git:
+ if not 'GIT' in env:
return ("GIT-UNKNOWN", {})
- git = Utils.cmd_output('git show --pretty=format:"%h%n%ct%n%H%n%cd" --stat HEAD', silent=True)
+ os.putenv('GIT_DIR', '%s/.git' % path)
+ git = Utils.cmd_output(env.GIT + ' show --pretty=format:"%h%n%ct%n%H%n%cd" --stat HEAD', silent=True)
lines = git.splitlines()
+ if not lines or len(lines) < 4:
+ return ("GIT-UNKNOWN", {})
+
fields = {
"GIT_COMMIT_ABBREV": lines[0],
"GIT_COMMIT_FULLREV": lines[2],
ret = "GIT-" + fields["GIT_COMMIT_ABBREV"]
- clean = Utils.cmd_output('git diff HEAD | wc -l', silent=True)
- if clean == "0\n":
- fields["COMMIT_IS_CLEAN"] = 1
- else:
- fields["COMMIT_IS_CLEAN"] = 0
- ret += "+"
+ if env.GIT_LOCAL_CHANGES:
+ clean = Utils.cmd_output('git diff HEAD | wc -l', silent=True).strip()
+ if clean == "0":
+ fields["COMMIT_IS_CLEAN"] = 1
+ else:
+ fields["COMMIT_IS_CLEAN"] = 0
+ ret += "+"
+
return (ret, fields)
class SambaVersion(object):
- def __init__(self, version_dict, path, have_git=False):
+ def __init__(self, version_dict, path, env=None):
'''Determine the version number of samba
See VERSION for the format. Entries on that file are
if self.IS_SNAPSHOT:
if os.path.exists(os.path.join(path, ".git")):
- suffix, self.vcs_fields = git_version_summary(path, have_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)
else:
return string
-def samba_version_file(version_file, path, have_git=False):
+def samba_version_file(version_file, path, env=None):
'''Parse the version information from a VERSION file'''
f = open(version_file, 'r')
print("Failed to parse line %s from %s" % (line, version_file))
raise
- return SambaVersion(version_dict, path, have_git=have_git)
+ return SambaVersion(version_dict, path, env=env)
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"),
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',
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
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)
import wafsamba, Options, samba_dist, Scripting, Utils
-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)
Utils.g_module.VERSION = version.STRING
return version
def configure(conf):
- 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)
# of commands in --help
def build(bld):
'''build all targets'''
- load_version()
+ load_version(env=bld.env)
pass
def dist():
'''makes a tarball for distribution'''
- load_version()
+ load_version(env=None)
samba_dist.dist()
def distcheck():
'''test that distribution tarball builds and installs'''
- load_version()
+ load_version(env=None)
import Scripting
d = Scripting.distcheck
d(subdir='source4')