diff options
| -rw-r--r-- | kcc.iss | 12 | ||||
| -rwxr-xr-x | kcc.py | 4 | ||||
| -rwxr-xr-x | other/osx/7za (renamed from other/7za) | bin | 1459896 -> 1459896 bytes | |||
| -rw-r--r-- | other/osx/qt.conf (renamed from other/qt.conf) | 0 | ||||
| -rwxr-xr-x | other/osx/unrar (renamed from other/unrar) | bin | 283000 -> 283000 bytes | |||
| -rw-r--r-- | other/windows/7za.exe (renamed from other/7za.exe) | bin | 587776 -> 587776 bytes | |||
| -rw-r--r-- | other/windows/Additional-LICENSE.txt (renamed from other/Additional-LICENSE.txt) | 0 | ||||
| -rw-r--r-- | other/windows/InstallWarning.rtf (renamed from other/InstallWarning.rtf) | 0 | ||||
| -rw-r--r-- | other/windows/UnRAR.exe (renamed from other/UnRAR.exe) | bin | 310872 -> 310872 bytes | |||
| -rwxr-xr-x | setup.py | 14 |
10 files changed, 17 insertions, 13 deletions
diff --git a/kcc.iss b/kcc.iss index 1b3708d..5cb9e09 100644 --- a/kcc.iss +++ b/kcc.iss @@ -28,7 +28,7 @@ WizardSmallImageFile=icons\Wizard-Small.bmp UninstallDisplayName={#MyAppName} UninstallDisplayIcon={app}\{#MyAppExeName} ChangesAssociations=True -InfoAfterFile=other\InstallWarning.rtf +InfoAfterFile=other\windows\InstallWarning.rtf SignTool=SignTool /d $q{#MyAppName}$q /du $q{#MyAppURL}$q $f MinVersion=0,6.0 @@ -46,17 +46,17 @@ Name: "CB7association"; Description: "CB7"; GroupDescription: "File associations Source: "dist_64\platforms\*"; DestDir: "{app}\platforms\"; Flags: ignoreversion; Check: Is64BitInstallMode Source: "dist_64\{#MyAppExeName}"; DestDir: "{app}"; Flags: ignoreversion; Check: Is64BitInstallMode Source: "dist_64\*.dll"; DestDir: "{app}"; Flags: ignoreversion; Check: Is64BitInstallMode -Source: "other\vcredist_x64.exe"; DestDir: "{tmp}"; Flags: ignoreversion deleteafterinstall; Check: Is64BitInstallMode +Source: "other\windows\vcredist_x64.exe"; DestDir: "{tmp}"; Flags: ignoreversion deleteafterinstall; Check: Is64BitInstallMode ; x86 files Source: "dist\platforms\*"; DestDir: "{app}\platforms\"; Flags: ignoreversion; Check: not Is64BitInstallMode Source: "dist\{#MyAppExeName}"; DestDir: "{app}"; Flags: ignoreversion; Check: not Is64BitInstallMode Source: "dist\*.dll"; DestDir: "{app}"; Flags: ignoreversion; Check: not Is64BitInstallMode -Source: "other\vcredist_x86.exe"; DestDir: "{tmp}"; Flags: ignoreversion deleteafterinstall; Check: not Is64BitInstallMode +Source: "other\windows\vcredist_x86.exe"; DestDir: "{tmp}"; Flags: ignoreversion deleteafterinstall; Check: not Is64BitInstallMode ; Common files Source: "LICENSE.txt"; DestDir: "{app}"; Flags: ignoreversion solidbreak -Source: "other\Additional-LICENSE.txt"; DestDir: "{app}"; Flags: ignoreversion -Source: "other\UnRAR.exe"; DestDir: "{app}"; Flags: ignoreversion -Source: "other\7za.exe"; DestDir: "{app}"; Flags: ignoreversion +Source: "other\windows\Additional-LICENSE.txt"; DestDir: "{app}"; Flags: ignoreversion +Source: "other\windows\UnRAR.exe"; DestDir: "{app}"; Flags: ignoreversion +Source: "other\windows\7za.exe"; DestDir: "{app}"; Flags: ignoreversion [Icons] Name: "{group}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}" diff --git a/kcc.py b/kcc.py index dd245cb..d5238b0 100755 --- a/kcc.py +++ b/kcc.py @@ -27,7 +27,7 @@ if sys.version_info[0] != 3: import os if sys.platform.startswith('darwin'): if 'RESOURCEPATH' not in os.environ: - os.environ['PATH'] = os.path.dirname(os.path.abspath(__file__)) + '/other/:' + os.environ['PATH'] + os.environ['PATH'] = os.path.dirname(os.path.abspath(__file__)) + '/other/osx/:' + os.environ['PATH'] else: os.environ['PATH'] = './../Resources:/usr/local/bin:/usr/bin:/bin' os.system('defaults write com.kindlecomicconverter.KindleComicConverter ApplePersistenceIgnoreState YES') @@ -45,7 +45,7 @@ elif sys.platform.startswith('win'): sys.stdout = FakeSTD() sys.stderr = FakeSTD() else: - os.environ['PATH'] = os.path.dirname(os.path.abspath(__file__)) + '/other/;' + os.environ['PATH'] + os.environ['PATH'] = os.path.dirname(os.path.abspath(__file__)) + '/other/windows/;' + os.environ['PATH'] os.chdir(os.path.dirname(os.path.abspath(__file__))) from kcc.shared import dependencyCheck diff --git a/other/7za b/other/osx/7za index 8669495..8669495 100755 --- a/other/7za +++ b/other/osx/7za Binary files differdiff --git a/other/qt.conf b/other/osx/qt.conf index d9a44c7..d9a44c7 100644 --- a/other/qt.conf +++ b/other/osx/qt.conf diff --git a/other/unrar b/other/osx/unrar index 02e3413..02e3413 100755 --- a/other/unrar +++ b/other/osx/unrar Binary files differdiff --git a/other/7za.exe b/other/windows/7za.exe index 7f6bf86..7f6bf86 100644 --- a/other/7za.exe +++ b/other/windows/7za.exe Binary files differdiff --git a/other/Additional-LICENSE.txt b/other/windows/Additional-LICENSE.txt index 891d453..891d453 100644 --- a/other/Additional-LICENSE.txt +++ b/other/windows/Additional-LICENSE.txt diff --git a/other/InstallWarning.rtf b/other/windows/InstallWarning.rtf index faf6e4d..faf6e4d 100644 --- a/other/InstallWarning.rtf +++ b/other/windows/InstallWarning.rtf diff --git a/other/UnRAR.exe b/other/windows/UnRAR.exe index cfc0c07..cfc0c07 100644 --- a/other/UnRAR.exe +++ b/other/windows/UnRAR.exe Binary files differdiff --git a/setup.py b/setup.py index 52efd13..1490815 100755 --- a/setup.py +++ b/setup.py @@ -34,7 +34,11 @@ if platform == 'darwin': argv_emulation=True, iconfile='icons/comic2ebook.icns', includes=['sip', 'PyQt5.QtPrintSupport'], - resources=['LICENSE.txt', 'other/qt.conf', 'other/Additional-LICENSE.txt', 'other/unrar', 'other/7za'], + resources=['LICENSE.txt', + 'other/osx/qt.conf', + 'other/osx/Additional-LICENSE.txt', + 'other/osx/unrar', + 'other/osx/7za'], plist=dict( CFBundleName='Kindle Comic Converter', CFBundleShortVersionString=VERSION, @@ -70,9 +74,9 @@ elif platform == 'win32': additional_files = [('platforms', ['C:\Python34' + suffix + '\Lib\site-packages\PyQt5\plugins\platforms\qwindows.dll']), ('', ['LICENSE.txt', - 'other\\7za.exe', - 'other\\UnRAR.exe', - 'other\\Additional-LICENSE.txt', + 'other\\windows\\7za.exe', + 'other\\windows\\UnRAR.exe', + 'other\\windows\\Additional-LICENSE.txt', 'C:\Python34' + suffix + '\Lib\site-packages\PyQt5\libGLESv2.dll', 'C:\Python34' + suffix + '\Lib\site-packages\PyQt5\libEGL.dll'])] extra_options = dict( @@ -158,7 +162,7 @@ setup( if platform == 'darwin': makedirs('dist/Kindle Comic Converter.app/Contents/PlugIns/platforms', exist_ok=True) - copyfile('other/libqcocoa.dylib', 'dist/Kindle Comic Converter.app/Contents/PlugIns/platforms/libqcocoa.dylib') + copyfile('other/osx/libqcocoa.dylib', 'dist/Kindle Comic Converter.app/Contents/PlugIns/platforms/libqcocoa.dylib') chmod('dist/Kindle Comic Converter.app/Contents/Resources/unrar', 0o777) chmod('dist/Kindle Comic Converter.app/Contents/Resources/7za', 0o777) system('appdmg setup.json dist/KindleComicConverter_osx_' + VERSION + '.dmg') |