diff options
| author | Andrew Tridgell <tridge@samba.org> | 2010-12-08 11:25:28 +1100 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2010-12-08 05:26:06 +0100 |
| commit | d5bf5255917862f35bb6849a407539c43cde2b04 (patch) | |
| tree | 29c63dea9a6f52bfcde0a2433a4a8eeac5cf7765 /source4 | |
| parent | 18177f1e52e2767e1266f44ea32a8f8d82a17b74 (diff) | |
| download | samba-d5bf5255917862f35bb6849a407539c43cde2b04.tar.gz samba-d5bf5255917862f35bb6849a407539c43cde2b04.tar.bz2 samba-d5bf5255917862f35bb6849a407539c43cde2b04.zip | |
s4-waf: get the version number right on private libraries
use the first digit of the version number for the library version
Pair-Programmed-With: Jelmer Vernooij <jelmer@samba.org>
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/wscript | 22 | ||||
| -rw-r--r-- | source4/wscript_build | 3 |
2 files changed, 8 insertions, 17 deletions
diff --git a/source4/wscript b/source4/wscript index 48f340cf09..145f6b8af8 100644 --- a/source4/wscript +++ b/source4/wscript @@ -8,19 +8,7 @@ VERSION=None import sys, os sys.path.insert(0, srcdir+"/buildtools/wafsamba") -import wafsamba, Options, samba_dist, Scripting, Utils - - -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 env: - env = samba_utils.LOAD_ENVIRONMENT() - - version = wafsamba.samba_version_file("./VERSION", "..", env) - Utils.g_module.VERSION = version.STRING - return version +import wafsamba, Options, samba_dist, Scripting, Utils, samba_version samba_dist.DIST_DIRS('.') @@ -61,7 +49,7 @@ def set_options(opt): def configure(conf): - version = load_version(env=conf.env) + version = samba_version.load_version(env=conf.env) conf.DEFINE('CONFIG_H_IS_FROM_SAMBA', 1) conf.DEFINE('_SAMBA_BUILD_', version.MAJOR, add_to_cflags=True) @@ -152,7 +140,7 @@ def ctags(ctx): # of commands in --help def build(bld): '''build all targets''' - load_version(env=bld.env) + samba_version.load_version(env=bld.env) pass @@ -178,12 +166,12 @@ def wafdocs(ctx): def dist(): '''makes a tarball for distribution''' - load_version(env=None) + samba_version.load_version(env=None) samba_dist.dist() def distcheck(): '''test that distribution tarball builds and installs''' - load_version(env=None) + samba_version.load_version(env=None) import Scripting d = Scripting.distcheck d(subdir='source4') diff --git a/source4/wscript_build b/source4/wscript_build index 474aca686c..27c69328e0 100644 --- a/source4/wscript_build +++ b/source4/wscript_build @@ -5,11 +5,14 @@ import os srcdir = ".." +import samba_version + # create separate build groups for building the asn1 and et compiler, then # building the C from ASN1 and IDL, and finally the main build process bld.SETUP_BUILD_GROUPS() bld.AUTOCLEANUP_STALE_FILES() +samba_version.load_version(bld.env) bld.SAMBA_MKVERSION('version.h') # bld.ENABLE_MAGIC_ORDERING() |