diff options
| author | Stefan Metzmacher <metze@samba.org> | 2017-06-16 12:15:25 +0200 |
|---|---|---|
| committer | Amitay Isaacs <amitay@samba.org> | 2019-03-15 05:17:14 +0000 |
| commit | 05c28fee21c0cc986cb8301f4199595cdb13faee (patch) | |
| tree | 81590adcf0efb226915b6ce3aab57abe7354fcad /ctdb | |
| parent | 2c3df58132939bbb17a448ef12d5f376244b7545 (diff) | |
| download | samba-05c28fee21c0cc986cb8301f4199595cdb13faee.tar.gz | |
ctdb-build: use a fixed ctdb_version.h using SAMBA_VERSION_STRING
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>
Diffstat (limited to 'ctdb')
| -rw-r--r-- | ctdb/.gitignore | 1 | ||||
| -rw-r--r-- | ctdb/include/ctdb_version.h | 3 | ||||
| -rw-r--r-- | ctdb/wscript | 15 |
3 files changed, 3 insertions, 16 deletions
diff --git a/ctdb/.gitignore b/ctdb/.gitignore index a634aeb8b45..f0534b3afd1 100644 --- a/ctdb/.gitignore +++ b/ctdb/.gitignore @@ -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 diff --git a/ctdb/include/ctdb_version.h b/ctdb/include/ctdb_version.h new file mode 100644 index 00000000000..cf27179aff8 --- /dev/null +++ b/ctdb/include/ctdb_version.h @@ -0,0 +1,3 @@ +#include "version.h" + +#define CTDB_VERSION_STRING SAMBA_VERSION_STRING diff --git a/ctdb/wscript b/ctdb/wscript index c2f1956a916..975235941cb 100644 --- a/ctdb/wscript +++ b/ctdb/wscript @@ -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') |