From ae624801ac68b892e612228d70418b575b5c666a Mon Sep 17 00:00:00 2001 From: Alibek Omarov Date: Fri, 11 Oct 2019 03:46:17 +0300 Subject: [PATCH] wscript: proper default showing in help --- engine/wscript | 6 ++---- mainui | 2 +- ref_gl/wscript | 14 +++++++------- vgui_support/wscript | 12 ++++++------ wscript | 12 ++++++------ 5 files changed, 22 insertions(+), 24 deletions(-) diff --git a/engine/wscript b/engine/wscript index 53f1ece5..f7fb7461 100644 --- a/engine/wscript +++ b/engine/wscript @@ -9,11 +9,9 @@ top = '.' def options(opt): grp = opt.add_option_group('Engine options') - grp.add_option('--enable-bsp2', action = 'store_true', dest = 'SUPPORT_BSP2_FORMAT', default = False, - help = 'build engine with BSP2 map support(recommended for Quake, breaks compatibility!)') - grp.add_option('--stdin-input', action = 'store_true', dest = 'USE_SELECT', default = None, - help = 'enable console input from stdin (default for dedicated)') + grp.add_option('--enable-stdin-input', action = 'store_true', dest = 'USE_SELECT', default = False, + help = 'enable console input from stdin (always enabled for dedicated) [default: %default]') opt.load('sdl2') diff --git a/mainui b/mainui index c95b7e59..26fc03f7 160000 --- a/mainui +++ b/mainui @@ -1 +1 @@ -Subproject commit c95b7e59be219dc1acb4ec95fd6fc2b75f4393ab +Subproject commit 26fc03f7a8dc09d446773a7d8224da18089628cd diff --git a/ref_gl/wscript b/ref_gl/wscript index b9697b37..c92f34b3 100644 --- a/ref_gl/wscript +++ b/ref_gl/wscript @@ -10,17 +10,17 @@ top = '.' def options(opt): grp = opt.add_option_group('ref_gl options') - grp.add_option('--enable-static-gl', action='store_true', dest='GL_STATIC', - help = 'don\'t load opengl in runtime, instead link to libGL directly(default: False)') + grp.add_option('--enable-static-gl', action='store_true', dest='GL_STATIC', default=False, + help = 'enable direct linking to opengl [default: %default]') - grp.add_option('--enable-gles1', action='store_true', dest='NANOGL', - help = 'enable gles1 renderer by linking nanogl statically(put source to ref_gl directory)') + grp.add_option('--enable-gles1', action='store_true', dest='NANOGL', default=False, + help = 'enable gles1 renderer [default: %default]') - grp.add_option('--enable-gles2', action='store_true', dest='GLWES', - help = 'enable gles2 renderer by linking gl-wes-v2 statically(put source to ref_gl directory)') + grp.add_option('--enable-gles2', action='store_true', dest='GLWES', default=False, + help = 'enable gles2 renderer [default: %default]') grp.add_option('--disable-gl', action='store_false', dest='GL', default=True, - help = 'disable building OpenGL renderer(default: False)') + help = 'disable opengl [default: %default]') # stub return diff --git a/vgui_support/wscript b/vgui_support/wscript index 430c9fdb..54202c83 100644 --- a/vgui_support/wscript +++ b/vgui_support/wscript @@ -11,14 +11,14 @@ VGUI_SUPPORTED_OS = ['win32', 'darwin', 'linux'] def options(opt): grp = opt.add_option_group('VGUI options') - grp.add_option('--vgui', action = 'store', dest = 'VGUI_DEV', - help = 'path to vgui-dev repo(default: "vgui-dev")', default='' ) + grp.add_option('--vgui', action = 'store', dest = 'VGUI_DEV', default='vgui-dev', + help = 'path to vgui-dev repo [default: %default]') - grp.add_option('--disable-vgui', action = 'store_true', dest = 'NO_VGUI', - help = 'disable vgui_support(default: enabled only on supported platforms)', default=False ) + grp.add_option('--disable-vgui', action = 'store_true', dest = 'NO_VGUI', default = False, + help = 'disable vgui_support [default: %default]') - grp.add_option('--skip-vgui-sanity-check', action = 'store_false', dest = 'VGUI_SANITY_CHECK', - help = 'skip checking VGUI sanity', default=True ) + grp.add_option('--skip-vgui-sanity-check', action = 'store_false', dest = 'VGUI_SANITY_CHECK', default=False, + help = 'skip checking VGUI sanity [default: %default]' ) return def configure(conf): diff --git a/wscript b/wscript index 89f745a5..f9a87465 100644 --- a/wscript +++ b/wscript @@ -44,22 +44,22 @@ def options(opt): help = 'build type: debug, release or none(custom flags)') grp.add_option('-d', '--dedicated', action = 'store_true', dest = 'DEDICATED', default = False, - help = 'build Xash Dedicated Server(XashDS)') + help = 'build Xash Dedicated Server [default: %default]') grp.add_option('--single-binary', action = 'store_true', dest = 'SINGLE_BINARY', default = False, - help = 'build single "xash" binary instead of xash.dll/libxash.so (forced for dedicated)') + help = 'build single "xash" binary [default: %default]') grp.add_option('-8', '--64bits', action = 'store_true', dest = 'ALLOW64', default = False, - help = 'allow targetting 64-bit engine') + help = 'allow targetting 64-bit engine(Linux/Windows/OSX x86 only) [default: %default]') grp.add_option('-W', '--win-style-install', action = 'store_true', dest = 'WIN_INSTALL', default = False, - help = 'install like Windows build, ignore prefix, useful for development') + help = 'install like Windows build, ignore prefix, useful for development [default: %default]') grp.add_option('--enable-bsp2', action = 'store_true', dest = 'SUPPORT_BSP2_FORMAT', default = False, - help = 'build engine and renderers with BSP2 map support(recommended for Quake, breaks compability!)') + help = 'build engine and renderers with BSP2 map support(recommended for Quake, breaks compatibility!) [default: %default]') grp.add_option('--enable-lto', action = 'store_true', dest = 'LTO', default = False, - help = 'enable Link Time Optimization') + help = 'enable Link Time Optimization [default: %default]') opt.load('subproject')