update installer creation

Author: sreeder

Diff for: make.py

@@ -149,36 +149,22 @@ def run_pyinstaller(console=False):
     try:
         if console:
             ## Console Version
-            os.system('pyinstaller '
-                '--clean '
-                '--distpath=%s ' % WIN_DIR +
-                '--workpath=%s ' % WORK_DIR +
-                '--specpath=%s ' % WIN_DIR +
-                #'--upx-dir=%s ' % BASE_DIR +
-                '--noupx '
-                '--icon=%s ' % WIN_ICON_FILE +
-                '--version-file=%s ' % VERSION_FILE +
-                '--onedir '
-                # '--onefile ' +
-                '--exclude=
-                '--noconfirm ' + APP_FILE)
+            command = """pyinstaller --clean --distpath=%s --workpath=%s --specpath=%s --noupx --icon=%s --version-file=%s --onefile --noconfirm  %s""" % (WIN_DIR, WORK_DIR, WIN_DIR, WIN_ICON_FILE, VERSION_FILE, APP_FILE)
+            os.system(command)
         else:
             ## Non Console Version
-            val = os.system('pyinstaller '
-                '--clean '
-                '--distpath=%s ' % WIN_DIR +
-                '--workpath=%s ' % WORK_DIR +
-                '--specpath=%s ' % WIN_DIR +
-                #'--upx-dir=%s ' % BASE_DIR +
-                '--noupx '
-                '--icon=%s ' % WIN_ICON_FILE +
-                '--onedir '
-                # '--onefile ' +
-                '--version-file=%s ' % VERSION_FILE +
-                '--noconsole '
-                '--noconfirm ' + APP_FILE)
-
-        return True
+            command = """pyinstaller
+                        --clean
+                        --distpath=%s
+                        --workpath=%s
+                        --specpath=%s
+                        --noupx
+                        --icon=%s
+                        --version-file=%s
+                        --onefile
+                        --noconsole
+                        --noconfirm  %s""" % (WIN_DIR, WORK_DIR, WIN_DIR, WIN_ICON_FILE, VERSION_FILE, APP_FILE)
+            os.system(command)
     except Exception as e:
         print (e)
         return False

Diff for: setup/Windows/ODMTools.spec

@@ -1,46 +1,12 @@
-
-
-a = Analysis(['D:\\DEV\\ODMTools\\ODMTools.py'],
-             pathex=['D:\\DEV\\ODMTools\\setup\\Windows'],
-             binaries=None,
-             datas=None,
-             hiddenimports=[],
-             hookspath=['../hooks'],
-             runtime_hooks=None,
-             excludes=['PyQt4', 'PyQt4.QtCore', 'PyQt4.QtGui'],
-             win_no_prefer_redirects=False,
-             win_private_assemblies=False,
-             cipher=block_cipher)
-pyz = PYZ(a.pure, a.zipped_data,
-             cipher=block_cipher)
-exe = EXE(pyz,
-          a.scripts,
-          exclude_binaries=True,
-          name='ODMTools',
-          debug=False,
-          strip=False,
-          upx=False,
-          console=True , version='D:\\DEV\\ODMTools\\setup\\version.txt', icon='D:\\DEV\\ODMTools\odmtools\\common\\icons\\ODMTools.ico')
-coll = COLLECT(exe,
-               a.binaries,
-               a.zipfiles,
-               a.datas,
-               strip=False,
-               upx=True,
-               name='ODMTools')
-
-
-
-
 # -*- mode: python -*-
 
 block_cipher = None
 
 
-a = Analysis(['ODMTools.py'],
-             pathex=['D:\\DEV\\ODMTools'],
-             binaries=None,
-             datas=None,
+a = Analysis(['D:\\DEV\\ODMTools\\ODMTools.py'],
+             pathex=['D:\\DEV\\ODMTools\\setup\\Windows'],
+             binaries=[],
+             datas=[],
              hiddenimports=[],
              hookspath=[],
              runtime_hooks=[],
@@ -52,16 +18,11 @@ pyz = PYZ(a.pure, a.zipped_data,
              cipher=block_cipher)
 exe = EXE(pyz,
           a.scripts,
-          exclude_binaries=True,
+          a.binaries,
+          a.zipfiles,
+          a.datas,
           name='ODMTools',
           debug=False,
           strip=False,
-          upx=True,
-          console=True )
-coll = COLLECT(exe,
-               a.binaries,
-               a.zipfiles,
-               a.datas,
-               strip=False,
-               upx=True,
-               name='ODMTools')
+          upx=False,
+          console=True , version='D:\\DEV\\ODMTools\\setup\\version.txt', icon='odmtools\\common\\icons\\ODMTools.ico')

Diff for: setup/Windows/odmtools_console.iss

@@ -3,8 +3,8 @@
 
 #define MyAppName "ODMTools"
 
-#define MyAppVersion "1.2.8_Beta"
-#define MyAppExeLongName "ODMTools_1.2.8_Beta_win32_x86_64_console.exe"
+#define MyAppVersion "1.2.9_Beta"
+#define MyAppExeLongName "ODMTools_1.2._Beta_win32_x86_64_console.exe"
 #define MyAppPublisher "ODM2"
 #define MyAppURL "https://github.com/ODM2/ODMToolsPython"
 #define MyAppExeName "ODMTools.exe"
@@ -39,8 +39,9 @@ Name: "english"; MessagesFile: "compiler:Default.isl"
 Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
 
 [Files]
-Source: "{#MyAppDir}\setup\Windows\ODMTools\{#MyAppExeName}"; DestDir: "{app}"; Flags: ignoreversion
-Source: "{#MyAppDir}\setup\Windows\ODMTools\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
+Source: "{#MyAppDir}\setup\Windows\{#MyAppExeName}"; DestDir: "{app}"; Flags: ignoreversion
+; Source: "{#MyAppDir}\setup\Windows\ODMTools\{#MyAppExeName}"; DestDir: "{app}"; Flags: ignoreversion
+; Source: "{#MyAppDir}\setup\Windows\ODMTools\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
 ; NOTE: Don't use "Flags: ignoreversion" on any shared system files
 
 [Icons]