🆙 new setup

persepolisdm · Nov 5, 2019 · 2fab3cf · 2fab3cf
1 parent 570a112
commit 2fab3cf
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 26 deletions.
diff --git a/persepolis.ico b/persepolis.ico
diff --git a/setupX32.iss b/setupX32.iss
@@ -2,14 +2,13 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 #define MyAppName "Persepolis Download Manager"
-#define MyAppVersion "3.0.1"
+#define MyAppVersion "3.2.0.0"
 #define MyAppPublisher "Persepolis Team"
-#define MyAppURL "http://persepolisdm.github.io/"
+#define MyAppURL "https://persepolisdm.github.io"
 #define MyAppExeName "Persepolis Download Manager.exe"
 
 [Setup]
-; NOTE: The value of AppId uniquely identifies this application.
-; Do not use the same AppId value in installers for other applications.
+; NOTE: The value of AppId uniquely identifies this application. Do not use the same AppId value in installers for other applications.
 ; (To generate a new GUID, click Tools | Generate GUID inside the IDE.)
 AppId={{395C9C40-EA8B-4A46-B39F-CA3D60E7F179}
 AppName={#MyAppName}
@@ -19,38 +18,43 @@ AppPublisher={#MyAppPublisher}
 AppPublisherURL={#MyAppURL}
 AppSupportURL={#MyAppURL}
 AppUpdatesURL={#MyAppURL}
-DefaultDirName={pf}\{#MyAppName}
+DefaultDirName={commonpf}\{#MyAppName}
 DisableDirPage=yes
 DisableProgramGroupPage=yes
+; The [Icons] "quicklaunchicon" entry uses {userappdata} but its [Tasks] entry has a proper IsAdminInstallMode Check.
+UsedUserAreasWarning=no
 LicenseFile=C:\Users\mosta\Desktop\persepolisarea\installer\LICENSE.txt
 InfoAfterFile=C:\Users\mosta\Desktop\persepolisarea\installer\afterinstallation.txt
-OutputBaseFilename=Persepolis Download Manager_setupX32
+OutputDir=C:\Users\mosta\Desktop\persepolisarea\installer\Output
+OutputBaseFilename=persepolis_3.2.0.0_windows_32bit
 SetupIconFile=C:\Users\mosta\Desktop\persepolisarea\installer\persepolis.ico
 UninstallDisplayIcon=C:\Users\mosta\Desktop\persepolisarea\installer\persepolis.ico
-Compression=lzma2
+Compression=lzma2/ultra64
 SolidCompression=yes
 CloseApplications=force
 ArchitecturesAllowed=x86
+WizardStyle=modern
 
 [Languages]
 Name: "english"; MessagesFile: "compiler:Default.isl"
 
 [Tasks]
 Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
-Name: "quicklaunchicon"; Description: "{cm:CreateQuickLaunchIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked; OnlyBelowVersion: 0,6.1
+Name: "quicklaunchicon"; Description: "{cm:CreateQuickLaunchIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked; OnlyBelowVersion: 6.1; Check: not IsAdminInstallMode
 
 [Files]
-Source: "C:\Users\mosta\Desktop\persepolisarea\package\dist\32\Persepolis Download Manager.exe"; DestDir: "{app}"; Flags: ignoreversion
+Source: "C:\Users\mosta\Desktop\persepolisarea\installer\bin\32\Persepolis Download Manager.exe"; DestDir: "{app}"; Flags: ignoreversion
 Source: "C:\Users\mosta\Desktop\persepolisarea\installer\aria2\32\aria2c.exe"; DestDir: "{app}"; Flags: ignoreversion
+Source: "C:\Users\mosta\Desktop\persepolisarea\installer\ffmpeg\32\ffmpeg.exe"; DestDir: "{app}"; Flags: ignoreversion
 Source: "C:\Users\mosta\Desktop\persepolisarea\installer\LICENSE.txt"; DestDir: "{app}"; Flags: ignoreversion
 Source: "C:\Users\mosta\Desktop\persepolisarea\installer\README.md"; DestDir: "{app}"; Flags: ignoreversion
-
 ; NOTE: Don't use "Flags: ignoreversion" on any shared system files
 
 [Icons]
-Name: "{commonprograms}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"
-Name: "{commondesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: desktopicon
+Name: "{autoprograms}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"
+Name: "{autodesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: desktopicon
 Name: "{userappdata}\Microsoft\Internet Explorer\Quick Launch\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: quicklaunchicon
 
 [Run]
 Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}"; Flags: nowait postinstall skipifsilent
+
diff --git a/setupX64.iss b/setupX64.iss
@@ -2,56 +2,60 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 #define MyAppName "Persepolis Download Manager"
-#define MyAppVersion "3.0.1.2"
+#define MyAppVersion "3.2.0.1"
 #define MyAppPublisher "Persepolis Team"
-#define MyAppURL "http://persepolisdm.github.io/"
+#define MyAppURL "https://persepolisdm.github.io/"
 #define MyAppExeName "Persepolis Download Manager.exe"
 
 [Setup]
-; NOTE: The value of AppId uniquely identifies this application.
-; Do not use the same AppId value in installers for other applications.
+; NOTE: The value of AppId uniquely identifies this application. Do not use the same AppId value in installers for other applications.
 ; (To generate a new GUID, click Tools | Generate GUID inside the IDE.)
 AppId={{395C9C40-EA8B-4A46-B39F-CA3D60E7F179}
 AppName={#MyAppName}
 AppVersion={#MyAppVersion}
-AppVerName={#MyAppName} {#MyAppVersion}
+;AppVerName={#MyAppName} {#MyAppVersion}
 AppPublisher={#MyAppPublisher}
 AppPublisherURL={#MyAppURL}
 AppSupportURL={#MyAppURL}
 AppUpdatesURL={#MyAppURL}
-DefaultDirName={pf}\{#MyAppName}
+DefaultDirName={commonpf}\{#MyAppName}
 DisableDirPage=yes
 DisableProgramGroupPage=yes
+; The [Icons] "quicklaunchicon" entry uses {userappdata} but its [Tasks] entry has a proper IsAdminInstallMode Check.
+UsedUserAreasWarning=no
 LicenseFile=C:\Users\mosta\Desktop\persepolisarea\installer\LICENSE.txt
 InfoAfterFile=C:\Users\mosta\Desktop\persepolisarea\installer\afterinstallation.txt
-OutputBaseFilename=Persepolis Download Manager_setupX64
+OutputDir=C:\Users\mosta\Desktop\persepolisarea\installer\Output
+OutputBaseFilename=persepolis_3.2.0.0_windows_64bit
 SetupIconFile=C:\Users\mosta\Desktop\persepolisarea\installer\persepolis.ico
 UninstallDisplayIcon=C:\Users\mosta\Desktop\persepolisarea\installer\persepolis.ico
-Compression=lzma2
+Compression=lzma2/ultra64
 SolidCompression=yes
 CloseApplications=force
 ArchitecturesInstallIn64BitMode=x64
 ArchitecturesAllowed=x64
+WizardStyle=modern
 
 [Languages]
 Name: "english"; MessagesFile: "compiler:Default.isl"
 
 [Tasks]
 Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
-Name: "quicklaunchicon"; Description: "{cm:CreateQuickLaunchIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked; OnlyBelowVersion: 0,6.1
+Name: "quicklaunchicon"; Description: "{cm:CreateQuickLaunchIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked; OnlyBelowVersion: 6.1; Check: not IsAdminInstallMode
 
 [Files]
 Source: "C:\Users\mosta\Desktop\persepolisarea\persepolis\dist\Persepolis Download Manager.exe"; DestDir: "{app}"; Flags: ignoreversion
 Source: "C:\Users\mosta\Desktop\persepolisarea\installer\aria2\64\aria2c.exe"; DestDir: "{app}"; Flags: ignoreversion
+Source: "C:\Users\mosta\Desktop\persepolisarea\installer\ffmpeg\64\ffmpeg.exe"; DestDir: "{app}"; Flags: ignoreversion
 Source: "C:\Users\mosta\Desktop\persepolisarea\installer\LICENSE.txt"; DestDir: "{app}"; Flags: ignoreversion
 Source: "C:\Users\mosta\Desktop\persepolisarea\installer\README.md"; DestDir: "{app}"; Flags: ignoreversion
-
 ; NOTE: Don't use "Flags: ignoreversion" on any shared system files
 
 [Icons]
-Name: "{commonprograms}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"
-Name: "{commondesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: desktopicon
+Name: "{autoprograms}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"
+Name: "{autodesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: desktopicon
 Name: "{userappdata}\Microsoft\Internet Explorer\Quick Launch\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: quicklaunchicon
 
 [Run]
 Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}"; Flags: nowait postinstall skipifsilent
+
diff --git a/version.py b/version.py
@@ -1,7 +1,7 @@
 VSVersionInfo(
   ffi=FixedFileInfo(
-    filevers=(3, 0, 1, 2),
-    prodvers=(3, 0, 1, 2),
+    filevers=(3, 2, 0, 0),
+    prodvers=(3, 2, 0, 0),
     mask=0x3f,
     flags=0x0,
     OS=0x40004,