Add the generated macOS icons to git

Removes the need for optipng/librsvg when building kitty.
This commit is contained in:
Kovid Goyal 2019-06-28 13:48:09 +05:30
parent a56475e32f
commit 6f8214c15c
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
15 changed files with 1 additions and 9 deletions

View File

@ -65,7 +65,6 @@ jobs:
- run: mkdir -p $SW - run: mkdir -p $SW
- run: curl https://download.calibre-ebook.com/travis/kitty/osx.tar.xz | tar xJ -C $SW - run: curl https://download.calibre-ebook.com/travis/kitty/osx.tar.xz | tar xJ -C $SW
- run: echo "export PATH=$SW/bin:$PATH" >> $BASH_ENV - run: echo "export PATH=$SW/bin:$PATH" >> $BASH_ENV
- run: python3 logo/make.py
- run: python3 setup.py build --debug --verbose - run: python3 setup.py build --debug --verbose
- run: ./kitty/launcher/kitty +launch test.py - run: ./kitty/launcher/kitty +launch test.py
@ -78,7 +77,6 @@ jobs:
steps: steps:
- checkout - checkout
- run: brew bundle - run: brew bundle
- run: python3 logo/make.py
- run: python3 setup.py build --debug --verbose - run: python3 setup.py build --debug --verbose
- run: ./kitty/launcher/kitty +launch test.py - run: ./kitty/launcher/kitty +launch test.py
- run: echo "export PATH=/usr/local/opt/sphinx-doc/bin:$PATH" >> $BASH_ENV - run: echo "export PATH=/usr/local/opt/sphinx-doc/bin:$PATH" >> $BASH_ENV

1
.gitignore vendored
View File

@ -5,7 +5,6 @@ tags
build build
linux-package linux-package
kitty.app kitty.app
logo/*.iconset
compile_commands.json compile_commands.json
glad/out glad/out
kitty/launcher kitty/launcher

View File

@ -1,7 +1,5 @@
brew 'pkg-config' brew 'pkg-config'
brew 'imagemagick' brew 'imagemagick'
brew 'optipng'
brew 'librsvg'
brew 'harfbuzz' brew 'harfbuzz'
brew 'python' brew 'python'
brew 'sphinx-doc' brew 'sphinx-doc'

View File

@ -54,8 +54,7 @@ just ``kitty``.
Building kitty.app on macOS from source Building kitty.app on macOS from source
------------------------------------------- -------------------------------------------
Install `imagemagick`, `optipng` and `librsvg` using `brew` or similar (needed Run::
for the logo generation step). And run::
make app make app

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 552 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 17 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 17 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 39 KiB

View File

@ -749,8 +749,6 @@ def macos_info_plist():
def create_macos_app_icon(where='Resources'): def create_macos_app_icon(where='Resources'):
logo_dir = os.path.abspath(os.path.join('logo', appname + '.iconset')) logo_dir = os.path.abspath(os.path.join('logo', appname + '.iconset'))
if not os.path.exists(logo_dir):
raise SystemExit('The kitty logo has not been generated, you need to run logo/make.py')
subprocess.check_call([ subprocess.check_call([
'iconutil', '-c', 'icns', logo_dir, '-o', 'iconutil', '-c', 'icns', logo_dir, '-o',
os.path.join(where, os.path.basename(logo_dir).partition('.')[0] + '.icns') os.path.join(where, os.path.basename(logo_dir).partition('.')[0] + '.icns')