The branch, master has been updated via 92eccf8 waf: add a '+' to the git hash if the working tree isn't clean via a66db2c waf: fix typos in GIT_COMMIT_* strings from 9e058c6 s3-rpcclient: add some winreg commands.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit 92eccf89a188702b79d9f4ac59f2ff4c5c7aeaac Author: Stefan Metzmacher <me...@samba.org> Date: Sat Sep 18 18:45:41 2010 +0200 waf: add a '+' to the git hash if the working tree isn't clean metze commit a66db2cb7897fe0e40e9e520f75cccb14d3a1721 Author: Stefan Metzmacher <me...@samba.org> Date: Sun Sep 19 07:26:54 2010 +0200 waf: fix typos in GIT_COMMIT_* strings metze ----------------------------------------------------------------------- Summary of changes: buildtools/wafsamba/samba_version.py | 15 ++++++++++++--- 1 files changed, 12 insertions(+), 3 deletions(-) Changeset truncated at 500 lines: diff --git a/buildtools/wafsamba/samba_version.py b/buildtools/wafsamba/samba_version.py index 398f6ee..0128670 100644 --- a/buildtools/wafsamba/samba_version.py +++ b/buildtools/wafsamba/samba_version.py @@ -78,6 +78,13 @@ also accepted as dictionary entries here SAMBA_VERSION_STRING += ("-GIT-" + self.GIT_COMMIT_ABBREV) + clean = Utils.cmd_output('git diff HEAD | wc -l', silent=True) + if clean == "0\n": + self.GIT_COMMIT_IS_CLEAN = True + else: + self.GIT_COMMIT_IS_CLEAN = False + SAMBA_VERSION_STRING += "+" + self.OFFICIAL_STRING=SAMBA_VERSION_STRING if self.VENDOR_SUFFIX is not None: @@ -117,10 +124,12 @@ also accepted as dictionary entries here string+="#define SAMBA_VERSION_RC_RELEASE %u\n" % self.RC_RELEASE try: - string+="#define SAMBA_VERSION_GIT_COMMIT_ABBREV " + self.GIT_COMMIT_ABBREV + "\n" + string+="#define SAMBA_VERSION_GIT_COMMIT_ABBREV \"" + self.GIT_COMMIT_ABBREV + "\"\n" + string+="#define SAMBA_VERSION_GIT_COMMIT_FULLREV \"" + self.GIT_COMMIT_FULLREV + "\"\n" + string+="#define SAMBA_VERSION_GIT_COMMIT_DATE \"" + self.GIT_COMMIT_DATE + "\"\n" string+="#define SAMBA_VERSION_GIT_COMMIT_TIME " + self.GIT_COMMIT_TIME + "\n" - string+="#define SAMBA_VERSION_GIT_COMMIT_FULLREV " + self.GIT_COMMIT_TIME + "\n" - string+="#define SAMBA_VERSION_GIT_COMMIT_DATE " + self.GIT_COMMIT_DATA + "\n" + if self.GIT_COMMIT_IS_CLEAN: + string+="#define SAMBA_VERSION_GIT_COMMIT_IS_CLEAN 1\n" except AttributeError: pass -- Samba Shared Repository