update .iss files for windows executable

Author: sreeder

make.py

@@ -214,8 +214,11 @@ def move_to_dist(filename):
         print (e)
 
 
-def run_inno():
-    os.system(INNO_EXECUTABLE + " " + INNO_SCRIPT)
+def run_inno(script = None):
+    if script is not None:
+        os.system(INNO_EXECUTABLE + " " + script)
+    else:
+        os.system(INNO_EXECUTABLE + " " + INNO_SCRIPT)
 
 def run_no_installer():
     # Need to finish, Not functional
@@ -237,11 +240,13 @@ def main():
 
         print "Creating Windows Executable..."
         if run_pyinstaller():
-            run_inno()
+            scriptpath = os.path.join(WIN_DIR, "odmtools_no_console.iss")
+            run_inno(script= scriptpath)
 
         print "Creating Windows Executable Console..."
         if run_pyinstaller(console=True):
-            run_inno()
+            scriptpath = os.path.join(WIN_DIR, "odmtools_console.iss")
+            run_inno(scriptpath)
 
         print "Create No Installer "
 

setup/Windows/odmtools_console.iss

@@ -5,7 +5,7 @@
 #define MyAppVersion "1.2.2_Beta"
 #define MyAppPublisher "ODM2"
 #define MyAppURL "https://github.com/ODM2/ODMToolsPython"
-#define MyAppExeName "ODMTools_{#MyAppVersion}_win32_x86_64_console.exe"
+#define MyAppExeName "ODMTools_1.2.2_Beta_win32_x86_64_console.exe"
 #define MyAppDir "D:\DEV\ODMToolsPython"
 
 [Setup]
@@ -37,8 +37,8 @@ Name: "english"; MessagesFile: "compiler:Default.isl"
 Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
 
 [Files]
-Source: "{#MyAppDir}\setup\Dist\{#MyAppName}_{#MyAppVersion}_win32_x86_64_console\{#MyAppExeName}"; DestDir: "{app}"; Flags: ignoreversion
-Source: "{#MyAppDir}\setup\Dist\{#MyAppName}_{#MyAppVersion}_win32_x86_64_console\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
+Source: "{#MyAppDir}\setup\Windows\ODMTools\ODMTools.exe"; 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]

setup/Windows/odmtools_no_console.iss

@@ -5,7 +5,7 @@
 #define MyAppVersion "1.2.2_Beta"
 #define MyAppPublisher "ODM2"
 #define MyAppURL "https://github.com/ODM2/ODMToolsPython"
-#define MyAppExeName "{#MyAppName}_{#MyAppVersion}_win32_x86_64.exe"
+#define MyAppExeName "ODMTools_1.2.2_Beta_win32_x86_64.exe"
 #define MyAppDir "D:\DEV\ODMToolsPython"
 
 [Setup]
@@ -37,12 +37,12 @@ Name: "english"; MessagesFile: "compiler:Default.isl"
 Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
 
 [Files]
-Source: "{#MyAppDir}\setup\Dist\{#MyAppName}_{#MyAppVersion}_win32_x86_64\{#MyAppExeName}"; DestDir: "{app}"; Flags: ignoreversion
-Source: "{#MyAppDir}\setup\Dist\{#MyAppName}_{#MyAppVersion}_win32_x86_64\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
+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]
-Name: "{group}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"
+Name: "{group}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"         
 Name: "{group}\{cm:UninstallProgram,{#MyAppName}}"; Filename: "{uninstallexe}"
 Name: "{commondesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: desktopicon