sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-22 13:34:15 +03:00
Code

ctdb-build: use a fixed ctdb_version.h using SAMBA_VERSION_STRING

Browse Source 
This way we don't get constant rebuild as SAMBA_VERSION_STRING
is "4.7.0pre1.DEVELOPERBUILD" for the binaries under bin/
instead of "4.7.0pre1.GIT.59e51f6".

BUG: https://bugzilla.samba.org/show_bug.cgi?id=13789

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Martin Schwenke <martin@meltin.net>
This commit is contained in:
Stefan Metzmacher 2017-06-16 12:15:25 +02:00 committed by Amitay Isaacs
parent 2c3df58132
commit 05c28fee21
3 changed files with 3 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ctdb/.gitignore vendored
View File

@ -27,7 +27,6 @@ tests/takeover/ctdb_takeover.pyc
tests/eventscripts/var
tests/eventscripts/etc/iproute2
tests/eventscripts/etc-ctdb/policy_routing
include/ctdb_version.h
packaging/RPM/ctdb.spec
doc/*.[1-7]
doc/*.[1-7].html

3
ctdb/include/ctdb_version.h Normal file
View File

@ -0,0 +1,3 @@
#include "version.h"
#define CTDB_VERSION_STRING SAMBA_VERSION_STRING

15
ctdb/wscript
View File

@ -340,15 +340,6 @@ def configure(conf):
else:
Logs.info(" %s: no" % (m))
def gen_ctdb_version(task):
fp = open(task.outputs[0].bldpath(task.env), 'w')
fp.write('/* This file is auto-generated from waf */\n')
fp.write('#include "version.h"\n')
fp.write('\n')
fp.write('#define CTDB_VERSION_STRING "%s"\n' % get_version_string())
fp.close()
def build(bld):
if bld.env.standalone_ctdb:
# enable building of public headers in the build tree
@ -357,12 +348,6 @@ def build(bld):
if bld.env.standalone_ctdb:
bld.SAMBA_MKVERSION('version.h', '%s/VERSION' % vdir)
t = bld.SAMBA_GENERATOR('ctdb-version-header',
target='include/ctdb_version.h',
rule=gen_ctdb_version,
dep_vars=['VERSION'])
t.env.VERSION = get_version_string()
bld.env.PKGCONFIGDIR = '${LIBDIR}/pkgconfig'
bld.RECURSE('lib/replace')