Zengtudor/ccls
1
0
Fork 0
mirror of https://github.com/MaskRay/ccls.git synced 2024-11-22 07:35:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix extracting the tarball every time. (#207) (#208)

Browse Source
This commit is contained in:
scturtle 2017-12-31 15:35:40 +08:00 committed by Fangrui Song
parent 01290a83c5
commit ffd5fc3e38
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
wscript
View File

@ -111,6 +111,10 @@ def download_and_extract(destdir, url, ext):
subprocess.call(['7z', 'x', '-o{0}'.format(destdir), '-xr!$PLUGINSDIR', dest]) subprocess.call(['7z', 'x', '-o{0}'.format(destdir), '-xr!$PLUGINSDIR', dest])
else: else:
subprocess.call(['tar', '-x', '-C', out, '-f', dest]) subprocess.call(['tar', '-x', '-C', out, '-f', dest])
# TODO Remove after migrating to a clang release newer than 5.0.1
# For 5.0.1 Mac OS X, the directory and the tarball have different name
if destdir == 'build/clang+llvm-5.0.1-x86_64-apple-darwin':
os.rename(destdir.replace('5.0.1', '5.0.1-final'), destdir)
else: else:
print('Found extracted at {0}'.format(destdir)) print('Found extracted at {0}'.format(destdir))
@ -201,11 +205,6 @@ def configure(ctx):
print('Checking for clang') print('Checking for clang')
download_and_extract(CLANG_DIRECTORY, CLANG_TARBALL_URL, CLANG_TARBALL_EXT) download_and_extract(CLANG_DIRECTORY, CLANG_TARBALL_URL, CLANG_TARBALL_EXT)
# TODO Remove after migrating to a clang release newer than 5.0.1
# For 5.0.1 Mac OS X, the directory and the tarball have different name
if ctx.options.bundled_clang == '5.0.1' and sys.platform == 'darwin':
CLANG_TARBALL_NAME = 'clang+llvm-5.0.1-final-x86_64-apple-darwin'
bundled_clang_dir = os.path.join(out, ctx.options.variant, 'lib', CLANG_TARBALL_NAME) bundled_clang_dir = os.path.join(out, ctx.options.variant, 'lib', CLANG_TARBALL_NAME)
try: try:
os.makedirs(os.path.dirname(bundled_clang_dir)) os.makedirs(os.path.dirname(bundled_clang_dir))