From a6f9e8425128d5a22143b305c1b933443ec5b46a Mon Sep 17 00:00:00 2001 From: Paweł Jastrzębski Date: Thu, 7 Mar 2019 14:59:04 +0100 Subject: Tweaks for OSX binary --- kcc.py | 1 + other/osx/7z | Bin 684784 -> 438824 bytes other/osx/7z.so | Bin 2381120 -> 1892312 bytes other/osx/Rar.so | Bin 0 -> 92140 bytes setup.py | 2 ++ 5 files changed, 3 insertions(+) mode change 100644 => 100755 other/osx/7z create mode 100644 other/osx/Rar.so diff --git a/kcc.py b/kcc.py index b05e8c1..61a9118 100755 --- a/kcc.py +++ b/kcc.py @@ -29,6 +29,7 @@ if sys.platform.startswith('darwin'): if getattr(sys, 'frozen', False): os.environ['PATH'] = os.path.dirname(os.path.abspath(sys.executable)) + \ '/../Resources:/usr/local/bin:/usr/bin:/bin' + os.chdir(os.path.dirname(os.path.abspath(sys.executable)) + '/../Resources') os.system('defaults write com.kindlecomicconverter.KindleComicConverter ApplePersistenceIgnoreState YES') os.system('defaults write com.kindlecomicconverter.KindleComicConverter NSInitialToolTipDelay -int 1000') else: diff --git a/other/osx/7z b/other/osx/7z old mode 100644 new mode 100755 index 7e7b90b..e0d826b Binary files a/other/osx/7z and b/other/osx/7z differ diff --git a/other/osx/7z.so b/other/osx/7z.so index 80eb496..84d5285 100644 Binary files a/other/osx/7z.so and b/other/osx/7z.so differ diff --git a/other/osx/Rar.so b/other/osx/Rar.so new file mode 100644 index 0000000..bc21ea1 Binary files /dev/null and b/other/osx/Rar.so differ diff --git a/setup.py b/setup.py index 7bc5c8d..0868767 100755 --- a/setup.py +++ b/setup.py @@ -37,8 +37,10 @@ class BuildBinaryCommand(distutils.cmd.Command): VERSION = __version__ if sys.platform == 'darwin': os.system('pyinstaller -y -F -i icons/comic2ebook.icns -n "Kindle Comic Converter" -w -s kcc.py') + os.makedirs('dist/Kindle Comic Converter.app/Contents/Resources/Codecs') shutil.copy('other/osx/7z', 'dist/Kindle Comic Converter.app/Contents/Resources') shutil.copy('other/osx/7z.so', 'dist/Kindle Comic Converter.app/Contents/Resources') + shutil.copy('other/osx/Rar.so', 'dist/Kindle Comic Converter.app/Contents/Resources/Codecs') shutil.copy('other/osx/Info.plist', 'dist/Kindle Comic Converter.app/Contents') shutil.copy('LICENSE.txt', 'dist/Kindle Comic Converter.app/Contents/Resources') shutil.copy('other/windows/Additional-LICENSE.txt', 'dist/Kindle Comic Converter.app/Contents/Resources') -- cgit 1.4.1