From 58b5e1a9df5b90a5e5e454f2edbf1052f7e675e4 Mon Sep 17 00:00:00 2001 From: Alibek Omarov Date: Tue, 26 Mar 2019 16:25:54 +0300 Subject: [PATCH] wscript: introduce shortened frequently used configuration options --- scripts/waflib/sdl2.py | 2 +- wscript | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/scripts/waflib/sdl2.py b/scripts/waflib/sdl2.py index d3679726..368eecc1 100644 --- a/scripts/waflib/sdl2.py +++ b/scripts/waflib/sdl2.py @@ -15,7 +15,7 @@ import os def options(opt): grp = opt.add_option_group('SDL2 options') - grp.add_option('--sdl2', action='store', dest = 'SDL2_PATH', default = None, + grp.add_option('-s', '--sdl2', action='store', dest = 'SDL2_PATH', default = None, help = 'path to precompiled SDL2 library(required for Windows)') grp.add_option('--skip-sdl2-sanity-check', action='store_false', default = True, dest='SDL2_SANITY_CHECK', diff --git a/wscript b/wscript index 1de88b11..63692cb3 100644 --- a/wscript +++ b/wscript @@ -41,16 +41,16 @@ def subdirs(): def options(opt): grp = opt.add_option_group('Common options') - grp.add_option('--build-type', action='store', dest='BUILD_TYPE', default = None, + grp.add_option('-T', '--build-type', action='store', dest='BUILD_TYPE', default = None, help = 'build type: debug, release or none(custom flags)') - grp.add_option('--dedicated', action = 'store_true', dest = 'DEDICATED', default = False, + grp.add_option('-d', '--dedicated', action = 'store_true', dest = 'DEDICATED', default = False, help = 'build Xash Dedicated Server(XashDS)') - grp.add_option( '--single-binary', action = 'store_true', dest = 'SINGLE_BINARY', default = False, + 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)') - grp.add_option('--64bits', action = 'store_true', dest = 'ALLOW64', default = False, + grp.add_option('-8', '--64bits', action = 'store_true', dest = 'ALLOW64', default = False, help = 'allow targetting 64-bit engine') grp.add_option('--win-style-install', action = 'store_true', dest = 'WIN_INSTALL', default = False, @@ -59,7 +59,7 @@ def options(opt): 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!)') - grp.add_option('--skip-subprojects', action='store', dest = 'SKIP_SUBDIRS', default=None, + grp.add_option('-S', '--skip-subprojects', action='store', dest = 'SKIP_SUBDIRS', default=None, help = 'don\'t recurse into specified subprojects. Current subdirs: ' + str(subdirs())) for i in SUBDIRS: @@ -85,7 +85,7 @@ def configure(conf): conf.start_msg('Build type') if conf.options.BUILD_TYPE == None: conf.end_msg('not set', color='RED') - conf.fatal('Please set a build type, for example "--build-type=release"') + conf.fatal('Please set a build type, for example "-T release"') elif not conf.options.BUILD_TYPE in ['release', 'debug', 'none']: conf.end_msg(conf.options.BUILD_TYPE, color='RED') conf.fatal('Invalid build type. Valid are "debug", "release" or "none"')