diff --git a/.circleci/config.yml b/.circleci/config.yml index 29a5c8f4d..6ca1aaec1 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -65,7 +65,6 @@ jobs: - run: mkdir -p $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: python3 logo/make.py - run: python3 setup.py build --debug --verbose - run: ./kitty/launcher/kitty +launch test.py @@ -78,7 +77,6 @@ jobs: steps: - checkout - run: brew bundle - - run: python3 logo/make.py - run: python3 setup.py build --debug --verbose - run: ./kitty/launcher/kitty +launch test.py - run: echo "export PATH=/usr/local/opt/sphinx-doc/bin:$PATH" >> $BASH_ENV diff --git a/.gitignore b/.gitignore index 26413017e..80c7a6428 100644 --- a/.gitignore +++ b/.gitignore @@ -5,7 +5,6 @@ tags build linux-package kitty.app -logo/*.iconset compile_commands.json glad/out kitty/launcher diff --git a/Brewfile b/Brewfile index aedec545f..f38beba66 100644 --- a/Brewfile +++ b/Brewfile @@ -1,7 +1,5 @@ brew 'pkg-config' brew 'imagemagick' -brew 'optipng' -brew 'librsvg' brew 'harfbuzz' brew 'python' brew 'sphinx-doc' diff --git a/docs/build.rst b/docs/build.rst index f9555d376..c7cd2f2e0 100644 --- a/docs/build.rst +++ b/docs/build.rst @@ -54,8 +54,7 @@ just ``kitty``. Building kitty.app on macOS from source ------------------------------------------- -Install `imagemagick`, `optipng` and `librsvg` using `brew` or similar (needed -for the logo generation step). And run:: +Run:: make app diff --git a/logo/kitty.iconset/icon_128x128.png b/logo/kitty.iconset/icon_128x128.png new file mode 100644 index 000000000..4bc917f2c Binary files /dev/null and b/logo/kitty.iconset/icon_128x128.png differ diff --git a/logo/kitty.iconset/icon_128x128@2x.png b/logo/kitty.iconset/icon_128x128@2x.png new file mode 100644 index 000000000..9a48e0a14 Binary files /dev/null and b/logo/kitty.iconset/icon_128x128@2x.png differ diff --git a/logo/kitty.iconset/icon_16x16.png b/logo/kitty.iconset/icon_16x16.png new file mode 100644 index 000000000..180a0cbe5 Binary files /dev/null and b/logo/kitty.iconset/icon_16x16.png differ diff --git a/logo/kitty.iconset/icon_16x16@2x.png b/logo/kitty.iconset/icon_16x16@2x.png new file mode 100644 index 000000000..90a61a818 Binary files /dev/null and b/logo/kitty.iconset/icon_16x16@2x.png differ diff --git a/logo/kitty.iconset/icon_256x256.png b/logo/kitty.iconset/icon_256x256.png new file mode 100644 index 000000000..9a48e0a14 Binary files /dev/null and b/logo/kitty.iconset/icon_256x256.png differ diff --git a/logo/kitty.iconset/icon_256x256@2x.png b/logo/kitty.iconset/icon_256x256@2x.png new file mode 100644 index 000000000..6d7387e14 Binary files /dev/null and b/logo/kitty.iconset/icon_256x256@2x.png differ diff --git a/logo/kitty.iconset/icon_32x32.png b/logo/kitty.iconset/icon_32x32.png new file mode 100644 index 000000000..90a61a818 Binary files /dev/null and b/logo/kitty.iconset/icon_32x32.png differ diff --git a/logo/kitty.iconset/icon_32x32@2x.png b/logo/kitty.iconset/icon_32x32@2x.png new file mode 100644 index 000000000..7928ba0d4 Binary files /dev/null and b/logo/kitty.iconset/icon_32x32@2x.png differ diff --git a/logo/kitty.iconset/icon_512x512.png b/logo/kitty.iconset/icon_512x512.png new file mode 100644 index 000000000..6d7387e14 Binary files /dev/null and b/logo/kitty.iconset/icon_512x512.png differ diff --git a/logo/kitty.iconset/icon_512x512@2x.png b/logo/kitty.iconset/icon_512x512@2x.png new file mode 100644 index 000000000..2cb80cecc Binary files /dev/null and b/logo/kitty.iconset/icon_512x512@2x.png differ diff --git a/setup.py b/setup.py index 1ee732415..82d8fed25 100755 --- a/setup.py +++ b/setup.py @@ -749,8 +749,6 @@ def macos_info_plist(): def create_macos_app_icon(where='Resources'): 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([ 'iconutil', '-c', 'icns', logo_dir, '-o', os.path.join(where, os.path.basename(logo_dir).partition('.')[0] + '.icns')