Zengtudor/ccls
1
0
Fork 0
mirror of https://github.com/MaskRay/ccls.git synced 2025-02-19 15:10:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove dependency on builtin clang_resource_dir.

Browse Source
This commit is contained in:
Riatre Foo 2017-12-24 02:37:37 +08:00 committed by Fangrui Song
parent f9f4020f3c
commit 1056869ffa
2 changed files with 25 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.appveyor.yml
View File

@ -14,12 +14,10 @@ build_script:
- ps: | - ps: |
$dir = "cquery-${env:appveyor_build_version}-win64" $dir = "cquery-${env:appveyor_build_version}-win64"
cd C:\projects\cquery cd C:\projects\cquery
mkdir "${dir}" mkdir "${dir}\build\release\bin" -ea 0
mkdir "${dir}\build" mkdir "${dir}\build\release\lib\LLVM-4.0.0-win64\lib\clang\4.0.0\"
mkdir "${dir}\build\release"
mkdir "${dir}\build\release\bin"
copy "build\release\bin\*" "${dir}\build\release\bin" copy "build\release\bin\*" "${dir}\build\release\bin"
copy -recurse "clang_resource_dir" "${dir}\clang_resource_dir" copy -recurse "build\LLVM-4.0.0-win64\lib\clang\4.0.0\include" "${dir}\build\release\lib\LLVM-4.0.0-win64\lib\clang\4.0.0\"
7z a -tzip "C:\projects\cquery\${dir}.zip" "${dir}" 7z a -tzip "C:\projects\cquery\${dir}.zip" "${dir}"
artifacts: artifacts:

16
wscript
View File

@ -227,9 +227,6 @@ def build(bld):
elif sys.platform == 'darwin': elif sys.platform == 'darwin':
lib.append('pthread') lib.append('pthread')
clang_tarball_name = None
# Fallback for windows
default_resource_directory = os.path.join(os.getcwd(), 'clang_resource_dir')
if bld.env['use_system_clang']: if bld.env['use_system_clang']:
if sys.platform == 'darwin': if sys.platform == 'darwin':
rpath = bld.env['LIBPATH_clang'][0] rpath = bld.env['LIBPATH_clang'][0]
@ -242,15 +239,16 @@ def build(bld):
if match: if match:
default_resource_directory = match.group(1) default_resource_directory = match.group(1)
else: else:
print("Failed to found system clang resource directory. Falling back.") bld.fatal("Failed to found system clang resource directory.")
elif sys.platform.startswith('freebsd') or sys.platform.startswith('linux'):
else:
clang_tarball_name = os.path.basename(os.path.dirname(bld.env['LIBPATH_clang'][0])) clang_tarball_name = os.path.basename(os.path.dirname(bld.env['LIBPATH_clang'][0]))
default_resource_directory = '../lib/{}/lib/clang/{}'.format(clang_tarball_name, bld.env['bundled_clang'])
if sys.platform.startswith('freebsd') or sys.platform.startswith('linux'):
rpath = '$ORIGIN/../lib/' + clang_tarball_name + '/lib' rpath = '$ORIGIN/../lib/' + clang_tarball_name + '/lib'
default_resource_directory = '../lib/{}/lib/clang/{}'.format(clang_tarball_name, bld.env['bundled_clang'])
elif sys.platform == 'darwin': elif sys.platform == 'darwin':
clang_tarball_name = os.path.basename(os.path.dirname(bld.env['LIBPATH_clang'][0]))
rpath = '@loader_path/../lib/' + clang_tarball_name + '/lib' rpath = '@loader_path/../lib/' + clang_tarball_name + '/lib'
default_resource_directory = '../lib/{}/lib/clang/{}'.format(clang_tarball_name, bld.env['bundled_clang'])
elif sys.platform == 'win32': elif sys.platform == 'win32':
rpath = [] # Unsupported rpath = [] # Unsupported
name = os.path.basename(os.path.dirname(bld.env['LIBPATH_clang'][0])) name = os.path.basename(os.path.dirname(bld.env['LIBPATH_clang'][0]))
@ -279,7 +277,7 @@ def build(bld):
rpath=rpath, rpath=rpath,
target='bin/cquery') target='bin/cquery')
if clang_tarball_name is not None: if not bld.env['use_system_clang'] and sys.platform != 'win32':
bld.install_files('${PREFIX}/lib/' + clang_tarball_name + '/lib', bld.path.get_bld().ant_glob('lib/' + clang_tarball_name + '/lib/libclang.(dylib|so.[4-9])', quiet=True)) bld.install_files('${PREFIX}/lib/' + clang_tarball_name + '/lib', bld.path.get_bld().ant_glob('lib/' + clang_tarball_name + '/lib/libclang.(dylib|so.[4-9])', quiet=True))
if bld.cmd == 'install': if bld.cmd == 'install':
# TODO This may be cached and cannot be re-triggered. Use proper shell escape. # TODO This may be cached and cannot be re-triggered. Use proper shell escape.