KittyPatch/kitty
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'osx_to_macos' of https://github.com/Luflosi/kitty

Browse Source
This commit is contained in:
Kovid Goyal 2019-01-28 08:44:37 +05:30
commit 4085fe2e8e
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.circleci/config.yml
View File

@ -79,7 +79,7 @@ jobs:
- run: python3 logo/make.py - run: python3 logo/make.py
- run: python3 setup.py build --debug --verbose - run: python3 setup.py build --debug --verbose
- run: python3 test.py - run: python3 test.py
- run: python3 setup.py osx-bundle - run: python3 setup.py macos-bundle
workflows: workflows:

2
build-terminfo
View File

@ -16,7 +16,7 @@ with open('terminfo/kitty.terminfo', 'w') as f:
os.environ['TERMINFO'] = os.path.join(base, 'terminfo') os.environ['TERMINFO'] = os.path.join(base, 'terminfo')
subprocess.check_call(['tic', '-x', 'terminfo/kitty.terminfo']) subprocess.check_call(['tic', '-x', 'terminfo/kitty.terminfo'])
# On OS X tic puts the compiled database into a different directory # On macOS tic puts the compiled database into a different directory
try: try:
os.mkdir('terminfo/78') os.mkdir('terminfo/78')
except FileExistsError: except FileExistsError:

4
kitty/main.py
View File

@ -152,7 +152,7 @@ run_app.first_window_callback = lambda window_handle: None
run_app.initial_window_size_func = initial_window_size_func run_app.initial_window_size_func = initial_window_size_func
def ensure_osx_locale(): def ensure_macos_locale():
# Ensure the LANG env var is set. See # Ensure the LANG env var is set. See
# https://github.com/kovidgoyal/kitty/issues/90 # https://github.com/kovidgoyal/kitty/issues/90
from .fast_data_types import cocoa_get_lang from .fast_data_types import cocoa_get_lang
@ -214,7 +214,7 @@ def _main():
except AttributeError: except AttributeError:
pass # python compiled without threading pass # python compiled without threading
if is_macos: if is_macos:
ensure_osx_locale() ensure_macos_locale()
try: try:
locale.setlocale(locale.LC_ALL, '') locale.setlocale(locale.LC_ALL, '')
except Exception: except Exception:

4
setup.py
View File

@ -768,7 +768,7 @@ def option_parser(): # {{{
'action', 'action',
nargs='?', nargs='?',
default='build', default='build',
choices='build test linux-package kitty.app osx-bundle clean'.split(), choices='build test linux-package kitty.app macos-bundle osx-bundle clean'.split(),
help='Action to perform (default is build)' help='Action to perform (default is build)'
) )
p.add_argument( p.add_argument(
@ -849,7 +849,7 @@ def main():
if not os.path.exists(os.path.join(base, 'docs/_build/html')): if not os.path.exists(os.path.join(base, 'docs/_build/html')):
run_tool(['make', 'docs']) run_tool(['make', 'docs'])
package(args) package(args)
elif args.action == 'osx-bundle': elif args.action in ('macos-bundle', 'osx-bundle'):
build(args, native_optimizations=False) build(args, native_optimizations=False)
package(args, for_bundle=True) package(args, for_bundle=True)
elif args.action == 'kitty.app': elif args.action == 'kitty.app':