sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-10 01:18:15 +03:00
Code

ctdb-build: only use ctdb/packaging/mkversion.sh for the standalone build.

Browse Source 
This avoids rebuilding ctdb after each commit, instead we're using
SAMBA_VERSION_STRING, which may contain "4.3.0pre1-DEVELOPERBUILD",
instead of "4.3.0pre1.GIT.4ccdd39" for the non-install build.

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>

Autobuild-User(master): Michael Adam <obnox@samba.org>
Autobuild-Date(master): Mon Jun  8 15:51:46 CEST 2015 on sn-devel-104
This commit is contained in:
Stefan Metzmacher 2015-05-28 16:17:15 +02:00 committed by Michael Adam
parent 3863c0aa71
commit a84e982beb
1 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
ctdb/wscript
View File

@ -225,25 +225,29 @@ def build(bld):
# enable building of public headers in the build tree
bld.env.build_public_headers = 'include/public'
if bld.env.standalone_ctdb:
ctdb_mkversion = '../packaging/mkversion.sh'
else:
ctdb_mkversion = '../ctdb/packaging/mkversion.sh'
t = bld.SAMBA_GENERATOR('ctdb-version-header',
target='include/ctdb_version.h',
rule='%s ${TGT} %s' % (ctdb_mkversion, VERSION),
dep_vars=['VERSION'])
t.env.VERSION = VERSION
version_h = samba_utils.os_path_relpath(os.path.join(Options.launch_dir,
"version.h"),
bld.curdir)
if bld.env.standalone_ctdb:
version_h = samba_utils.os_path_relpath(os.path.join(Options.launch_dir,
"version.h"),
bld.curdir)
ctdb_mkversion = '../packaging/mkversion.sh'
t = bld.SAMBA_GENERATOR('ctdb-version-header',
target='include/ctdb_version.h',
rule='%s ${TGT} %s' % (ctdb_mkversion, VERSION),
dep_vars=['VERSION'])
t.env.VERSION = VERSION
t = bld.SAMBA_GENERATOR('ctdb-samba-version-header',
target=version_h,
rule='printf "#include \\"ctdb_version.h\\" \\n#define SAMBA_VERSION_STRING CTDB_VERSION_STRING\\n" > ${TGT}',
dep_vars=['VERSION'])
t.env.VERSION = VERSION
else:
t = bld.SAMBA_GENERATOR('ctdb-samba-version-header',
target='include/ctdb_version.h',
rule='printf "#include \\"%s\\" \\n#define CTDB_VERSION_STRING SAMBA_VERSION_STRING\\n" > ${TGT}' % version_h,
dep_vars=['VERSION'])
t.env.VERSION = VERSION
bld.RECURSE('lib/replace')
if bld.CHECK_FOR_THIRD_PARTY():