Merge pull request #37 from miketvo/feature-multiplatform-builds

Feature multiplatform builds

.gitignore

@@ -126,7 +126,6 @@ dist/
 downloads/
 eggs/
 .eggs/
-lib/
 lib64/
 parts/
 sdist/
@@ -142,7 +141,6 @@ MANIFEST
 #  Usually these files are written by a python script from a template
 #  before PyInstaller builds the exe, so as to inject date/other infos into it.
 *.manifest
-*.spec
 
 # Installer logs
 pip-log.txt
@@ -718,3 +716,8 @@ FodyWeavers.xsd
 # Additional files built by Visual Studio
 
 # End of https://www.toptal.com/developers/gitignore/api/python,jupyternotebooks,pythonvanilla,circuitpython,pycharm+all,visualstudiocode,visualstudio
+
+# Included libraries
+!src/lib/**/[Aa][Rr][Mm]/
+!src/lib/**/x64/
+!src/lib/**/x86/

build.py

@@ -1,15 +1,21 @@
+from sys import platform
 import PyInstaller.__main__
 
 
-def build():
+def build(specfile: str = None):
     PyInstaller.__main__.run([
-        'src/imdupes/imdupes.py',
-        '--onefile',
-        '--icon', 'icon.png',
-        '--console',
-        '--clean'
+        '--clean',
+        f'{specfile}',
     ])
 
 
 if __name__ == '__main__':
-    build()
+    print(f'Detected platform: "{platform}".', end='')
+    if platform.startswith('win'):
+        print('\n')
+        build('windows-build.spec')
+    elif platform.startswith('linux'):
+        print('\n')
+        build('linux-build.spec')
+    else:
+        print(f'Platform not supported!')

linux-build.spec

@@ -0,0 +1,45 @@
+# -*- mode: python ; coding: utf-8 -*-
+
+
+block_cipher = None
+
+
+a = Analysis(
+    ['src/imdupes/imdupes.py'],
+    pathex=[],
+    binaries=[],
+    datas=[],
+    hiddenimports=[],
+    hookspath=[],
+    hooksconfig={},
+    runtime_hooks=[],
+    excludes=[],
+    win_no_prefer_redirects=False,
+    win_private_assemblies=False,
+    cipher=block_cipher,
+    noarchive=False,
+)
+pyz = PYZ(a.pure, a.zipped_data, cipher=block_cipher)
+
+exe = EXE(
+    pyz,
+    a.scripts,
+    a.binaries,
+    a.zipfiles,
+    a.datas,
+    [],
+    name='imdupes',
+    debug=False,
+    bootloader_ignore_signals=False,
+    strip=False,
+    upx=False,
+    upx_exclude=[],
+    runtime_tmpdir=None,
+    console=True,
+    disable_windowed_traceback=False,
+    argv_emulation=False,
+    target_arch=None,
+    codesign_identity=None,
+    entitlements_file=None,
+    icon=['icon.png'],
+)

src/imdupes/_version.py

@@ -1,4 +1,4 @@
-__version__ = '0.2.3'
+__version__ = '0.2.4'
 __app_name__ = 'imdupes'
 
 __prog_usage__ = f'{__app_name__} {{info,scan,clean}} ...'

windows-build.spec

@@ -0,0 +1,45 @@
+# -*- mode: python ; coding: utf-8 -*-
+
+
+block_cipher = None
+
+
+a = Analysis(
+    ['src\\imdupes\\imdupes.py'],
+    pathex=[],
+    binaries=[ ('src\\lib\\ucrt', 'lib') ],
+    datas=[],
+    hiddenimports=[],
+    hookspath=[],
+    hooksconfig={},
+    runtime_hooks=[],
+    excludes=[],
+    win_no_prefer_redirects=False,
+    win_private_assemblies=False,
+    cipher=block_cipher,
+    noarchive=False,
+)
+pyz = PYZ(a.pure, a.zipped_data, cipher=block_cipher)
+
+exe = EXE(
+    pyz,
+    a.scripts,
+    a.binaries,
+    a.zipfiles,
+    a.datas,
+    [],
+    name='imdupes',
+    debug=False,
+    bootloader_ignore_signals=False,
+    strip=False,
+    upx=False,
+    upx_exclude=[],
+    runtime_tmpdir=None,
+    console=True,
+    disable_windowed_traceback=False,
+    argv_emulation=False,
+    target_arch=None,
+    codesign_identity=None,
+    entitlements_file=None,
+    icon=['icon.png'],
+)