Binary blob cleanup

ciromattia · Sep 30, 2015 · 8a0ba68 · 8a0ba68
1 parent 1a7b6ba
commit 8a0ba68
Show file tree

Hide file tree

Showing 10 changed files with 17 additions and 13 deletions.
diff --git 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
@@ -27,7 +27,7 @@
 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 @@ def flush(self):
         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 → other/osx/7za b/other/7za → other/osx/7za
diff --git a/other/qt.conf → other/osx/qt.conf b/other/qt.conf → other/osx/qt.conf
diff --git a/other/unrar → other/osx/unrar b/other/unrar → other/osx/unrar
diff --git a/other/7za.exe → other/windows/7za.exe b/other/7za.exe → other/windows/7za.exe
diff --git a/other/Additional-LICENSE.txt → other/windows/Additional-LICENSE.txt b/other/Additional-LICENSE.txt → other/windows/Additional-LICENSE.txt
diff --git a/other/InstallWarning.rtf → other/windows/InstallWarning.rtf b/other/InstallWarning.rtf → other/windows/InstallWarning.rtf
diff --git a/other/UnRAR.exe → other/windows/UnRAR.exe b/other/UnRAR.exe → other/windows/UnRAR.exe
diff --git a/setup.py b/setup.py
@@ -34,7 +34,11 @@
                 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 @@
     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 @@
 
 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')