build: --vendor-suffix instead of --vendor-patch-revision --vendor-name

In practice there isn't a use for two options, and neither quite
matched what people thought they were doing.

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

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Jo Sutton <josutton@catalyst.net.nz>
(cherry picked from commit 673c8e6ca5994973e4887641c3599707a66a608c)

diff --git a/script/autobuild.py b/script/autobuild.py
index 7777c35cf129f8b8ac2c94b93fb78e46ae6a8d6b..2408bb38db65281f1abc5b76ccb12c108c08da22 100755 (executable)
--- a/script/autobuild.py
+++ b/script/autobuild.py
@@ -888,10 +888,10 @@ tasks = {
             ("ldb-make", "cd lib/ldb && make"),
             ("ldb-install", "cd lib/ldb && make install"),
 
-            ("nondevel-configure", samba_libs_envvars + " ./configure --vendor-name=autobuild-TEST-STRING --vendor-patch-revision=5 ${PREFIX}"),
+            ("nondevel-configure", samba_libs_envvars + " ./configure --vendor-suffix=TEST-STRING~5.1.2 ${PREFIX}"),
             ("nondevel-make", "make -j"),
             ("nondevel-check", "./bin/smbd -b | grep WITH_NTVFS_FILESERVER && exit 1; exit 0"),
-            ("nondevel-check", "./bin/smbd --version | grep -e '-autobuild-TEST-STRING-5' && exit 0; exit 1"),
+            ("nondevel-check", "./bin/smbd --version | grep -F 'TEST-STRING~5.1.2' && exit 0; exit 1"),
             ("nondevel-no-libtalloc", "find ./bin | grep -v 'libtalloc-report' | grep 'libtalloc' && exit 1; exit 0"),
             ("nondevel-no-libtdb", "find ./bin | grep -v 'libtdb-wrap' | grep 'libtdb' && exit 1; exit 0"),
             ("nondevel-no-libtevent", "find ./bin | grep -v 'libtevent-util' | grep 'libtevent' && exit 1; exit 0"),

diff --git a/wscript b/wscript
index 4b183fd375ce9ed634d07e69415a41b45026b023..dab97d13c24e0b92212be0efcb5ed89e9fa6cff8 100644 (file)
--- a/wscript
+++ b/wscript
@@ -140,27 +140,17 @@ def options(opt):
                                dest='with_smb1server',
                                help=("Build smbd with SMB1 support (default=yes)."))
 
-    opt.add_option('--vendor-name',
+    opt.add_option('--vendor-suffix',
                    help=('Specify a vendor (or packager) name to include in the version string'),
                    type="string",
                    dest='SAMBA_VERSION_VENDOR_SUFFIX',
                    default=None)
 
-    opt.add_option('--vendor-patch-revision',
-                   help=('Specify a vendor (or packager) patch revision number include in the version string (requires --vendor-name)'),
-                   type="int",
-                   dest='SAMBA_VERSION_VENDOR_PATCH',
-                   default=None)
 
 def configure(conf):
     if Options.options.SAMBA_VERSION_VENDOR_SUFFIX:
         conf.env.SAMBA_VERSION_VENDOR_SUFFIX = Options.options.SAMBA_VERSION_VENDOR_SUFFIX
 
-    if Options.options.SAMBA_VERSION_VENDOR_PATCH:
-        if not Options.options.SAMBA_VERSION_VENDOR_SUFFIX:
-            raise conf.fatal('--vendor-patch-revision requires --vendor-version')
-        conf.env.SAMBA_VERSION_VENDOR_PATCH = Options.options.SAMBA_VERSION_VENDOR_PATCH
-
     version = samba_version.load_version(env=conf.env)
 
     conf.DEFINE('CONFIG_H_IS_FROM_SAMBA', 1)