AuroraMiddleware/lz4
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #620 from lzutao/meson_symlink

Browse Source 
Update meson symlink and man1 extension
This commit is contained in:
Yann Collet 2018-12-17 09:32:01 -08:00 committed by GitHub
commit 6e24ef902a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
contrib/meson/InstallSymlink.py
View File

@ -1,12 +1,13 @@
#!/usr/bin/env python3 #!/usr/bin/env python3
# ############################################################################# # #############################################################################
# Copyright (c) 2018-present lzutao <taolzu(at)gmail.com> # Copyright (c) 2018-present lzutao <taolzu(at)gmail.com>
# All rights reserved. # All rights reserved.
# #
# This source code is licensed under both the BSD-style license (found in the # This source code is licensed under both the BSD-style license (found in the
# LICENSE file in the root directory of this source tree) and the GPLv2 (found # LICENSE file in the root directory of this source tree) and the GPLv2 (found
# in the COPYING file in the root directory of this source tree). # in the COPYING file in the root directory of this source tree).
# ############################################################################# # #############################################################################
# This file should be synced with https://github.com/lzutao/meson-symlink
import os import os
import pathlib # since Python 3.4 import pathlib # since Python 3.4
@ -29,30 +30,25 @@ def install_symlink(src, dst, install_dir, dst_is_dir=False, dir_mode=0o777):
def main(): def main():
import argparse import argparse
parser = argparse.ArgumentParser(description='Install a symlink', parser = argparse.ArgumentParser(description='Install a symlink',
usage='InstallSymlink.py [-h] [-d] [-m MODE] src dst install_dir\n\n' usage='{0} [-h] [-d] [-m MODE] source dest install_dir\n\n'
'example:\n' 'example:\n'
'\tInstallSymlink.py dash sh /bin') ' {0} dash sh /bin'.format(pathlib.Path(__file__).name))
parser.add_argument('src', help='target to link') parser.add_argument('source', help='target to link')
parser.add_argument('dst', help='link name') parser.add_argument('dest', help='link name')
parser.add_argument('install_dir', help='installation directory') parser.add_argument('install_dir', help='installation directory')
parser.add_argument('-d', '--isdir', parser.add_argument('-d', '--isdir',
action='store_true', action='store_true',
help='dst is a directory') help='dest is a directory')
parser.add_argument('-m', '--mode', parser.add_argument('-m', '--mode',
help='directory mode on creating if not exist', help='directory mode on creating if not exist',
default='0o777') default='0o755')
args = parser.parse_args() args = parser.parse_args()
src = args.src
dst = args.dst
dst_is_dir = args.isdir
dir_mode = int(args.mode, 8) dir_mode = int(args.mode, 8)
install_dir = pathlib.Path(args.install_dir)
meson_destdir = os.environ.get('MESON_INSTALL_DESTDIR_PREFIX') meson_destdir = os.environ.get('MESON_INSTALL_DESTDIR_PREFIX', default='')
if meson_destdir: install_dir = pathlib.Path(meson_destdir, args.install_dir)
install_dir = pathlib.Path(meson_destdir).joinpath(install_dir) install_symlink(args.source, args.dest, install_dir, args.isdir, dir_mode)
install_symlink(src, dst, install_dir, dst_is_dir, dir_mode)
if __name__ == '__main__': if __name__ == '__main__':

2
contrib/meson/programs/meson.build
View File

@ -44,7 +44,7 @@ install_man(join_paths(lz4_root_dir, 'programs/lz4.1'))
InstallSymlink_py = '../InstallSymlink.py' InstallSymlink_py = '../InstallSymlink.py'
lz4_man1_dir = join_paths(lz4_mandir, 'man1') lz4_man1_dir = join_paths(lz4_mandir, 'man1')
bin_EXT = host_machine_os == os_windows ? '.exe' : '' bin_EXT = host_machine_os == os_windows ? '.exe' : ''
man1_EXT = '.1.gz' # Meson automatically compresses manpages man1_EXT = meson.version().version_compare('>=0.49.0') ? '.1' : '.1.gz'
foreach f : ['lz4c', 'lz4cat', 'unlz4'] foreach f : ['lz4c', 'lz4cat', 'unlz4']
meson.add_install_script(InstallSymlink_py, 'lz4' + bin_EXT, f + bin_EXT, lz4_bindir) meson.add_install_script(InstallSymlink_py, 'lz4' + bin_EXT, f + bin_EXT, lz4_bindir)