Change default path of built executable from build/app to build/release/bin/cquery (installed to $PREFIX/bin/cquery)

This is incompatible, please change your editor configuration:

* LanguageClient-neovim: g:LanguageClient_serverCommands
* Emacs cquery.el: cquery-executable
* VSCode: cquery.launch.workingDirectory cquery.launch.command
This commit is contained in:
Fangrui Song 2017-12-11 21:14:13 -08:00 committed by Jacob Dufault
parent 9b909b3a13
commit cb633541e2
2 changed files with 14 additions and 4 deletions

View File

@ -45,8 +45,19 @@ Building cquery is simple. The external dependencies are few:
$ clang --version # if missing, sudo apt-get install clang $ clang --version # if missing, sudo apt-get install clang
$ git clone https://github.com/jacobdufault/cquery --recursive $ git clone https://github.com/jacobdufault/cquery --recursive
$ cd cquery $ cd cquery
$ ./waf configure $ ./waf configure --prefix ~/.local/stow/cquery
$ ./waf build $ ./waf build
# -g -O3, built build/release/bin/cquery
$ ./waf install
# optional, copies the executable to $PREFIX/bin/cquery
```
For a debug build:
```bash
$ ./waf configure --variant=debug
$ ./waf build --variant=debug
# -g -O0, built build/debug/bin/cquery
``` ```
## Install extension ## Install extension

View File

@ -50,8 +50,7 @@ def options(opt):
help='specify path to llvm-config for automatic configuration [default: %default]') help='specify path to llvm-config for automatic configuration [default: %default]')
grp.add_option('--clang-prefix', dest='clang_prefix', default='', grp.add_option('--clang-prefix', dest='clang_prefix', default='',
help='enable fallback configuration method by specifying a clang installation prefix (e.g. /opt/llvm)') help='enable fallback configuration method by specifying a clang installation prefix (e.g. /opt/llvm)')
# TODO Default to 'release' and disallow empty variant grp.add_option('--variant', default='release',
grp.add_option('--variant', default='',
help='variant name for saving configuration and build results. Variants other than "debug" turn on -O3') help='variant name for saving configuration and build results. Variants other than "debug" turn on -O3')
def download_and_extract(destdir, url): def download_and_extract(destdir, url):
@ -199,7 +198,7 @@ def build(bld):
defines=['LOGURU_WITH_STREAMS=1'], defines=['LOGURU_WITH_STREAMS=1'],
lib=lib, lib=lib,
rpath=[] if bld.env['use_system_clang'] else bld.env['LIBPATH_clang'], rpath=[] if bld.env['use_system_clang'] else bld.env['LIBPATH_clang'],
target='app') target='bin/cquery')
#bld.shlib(source='a.cpp', target='mylib', vnum='9.8.7') #bld.shlib(source='a.cpp', target='mylib', vnum='9.8.7')
#bld.shlib(source='a.cpp', target='mylib2', vnum='9.8.7', cnum='9.8') #bld.shlib(source='a.cpp', target='mylib2', vnum='9.8.7', cnum='9.8')