From 7ce96806a7486ca10916f470adce8de4344341cc Mon Sep 17 00:00:00 2001 From: Jonathan Thomas Date: Wed, 7 Dec 2022 22:30:53 -0600 Subject: [PATCH 1/9] Trying to fix the Windows appID of the installer, so it matches previous releases --- installer/windows-installer.iss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/installer/windows-installer.iss b/installer/windows-installer.iss index b8d386ba5c..89badc404d 100644 --- a/installer/windows-installer.iss +++ b/installer/windows-installer.iss @@ -24,7 +24,7 @@ ; 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={code:GetAppId|4BB0DCDC-BC24-49EC-8937-72956C33A470} +AppId={{code:GetAppId|4BB0DCDC-BC24-49EC-8937-72956C33A470} AppName=OpenShot Video Editor AppVersion={#VERSION} VersionInfoVersion={#VERSION} From cb8afb60afce46e386eb7b1eaaf4b1060811c2ea Mon Sep 17 00:00:00 2001 From: Jonathan Thomas Date: Wed, 7 Dec 2022 22:50:56 -0600 Subject: [PATCH 2/9] Trying again to fix the Windows appID of the installer, so it matches previous releases --- installer/windows-installer.iss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/installer/windows-installer.iss b/installer/windows-installer.iss index 89badc404d..a57a1f592d 100644 --- a/installer/windows-installer.iss +++ b/installer/windows-installer.iss @@ -24,7 +24,7 @@ ; 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={{code:GetAppId|4BB0DCDC-BC24-49EC-8937-72956C33A470} +AppId={code:GetAppId|{4BB0DCDC-BC24-49EC-8937-72956C33A470} AppName=OpenShot Video Editor AppVersion={#VERSION} VersionInfoVersion={#VERSION} From 9873527771717a041b7b33fff63c9ea6e1e23da8 Mon Sep 17 00:00:00 2001 From: Jonathan Thomas Date: Wed, 7 Dec 2022 23:19:32 -0600 Subject: [PATCH 3/9] Trying again to fix the Windows appID of the installer, so it matches previous releases --- installer/windows-installer.iss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/installer/windows-installer.iss b/installer/windows-installer.iss index a57a1f592d..984dbf90ea 100644 --- a/installer/windows-installer.iss +++ b/installer/windows-installer.iss @@ -24,7 +24,7 @@ ; 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={code:GetAppId|{4BB0DCDC-BC24-49EC-8937-72956C33A470} +AppId={code:GetAppId|{{4BB0DCDC-BC24-49EC-8937-72956C33A470} AppName=OpenShot Video Editor AppVersion={#VERSION} VersionInfoVersion={#VERSION} From c71ce8d96d3e4033a4c632e9f7458c236e1aeba2 Mon Sep 17 00:00:00 2001 From: Jonathan Thomas Date: Wed, 7 Dec 2022 23:33:28 -0600 Subject: [PATCH 4/9] Trying 3rd time to fix the Windows appID of the installer, so it matches previous releases --- installer/windows-installer.iss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/installer/windows-installer.iss b/installer/windows-installer.iss index 984dbf90ea..2be20fb551 100644 --- a/installer/windows-installer.iss +++ b/installer/windows-installer.iss @@ -24,7 +24,7 @@ ; 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={code:GetAppId|{{4BB0DCDC-BC24-49EC-8937-72956C33A470} +AppId={code:GetAppId|{{4BB0DCDC-BC24-49EC-8937-72956C33A470}} AppName=OpenShot Video Editor AppVersion={#VERSION} VersionInfoVersion={#VERSION} From 42a71c7cab79942d3288197cda15d7867f68ce12 Mon Sep 17 00:00:00 2001 From: Jonathan Thomas Date: Thu, 8 Dec 2022 00:06:28 -0600 Subject: [PATCH 5/9] Updating name used in Windows uninstaller --- installer/windows-installer.iss | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/installer/windows-installer.iss b/installer/windows-installer.iss index 2be20fb551..db897ef457 100644 --- a/installer/windows-installer.iss +++ b/installer/windows-installer.iss @@ -52,6 +52,10 @@ SignedUninstallerDir=..\build\ PrivilegesRequiredOverridesAllowed=commandline AllowNoIcons=yes +[Messages] +; Format DisplayName shown on Add/Remove Programs +NameAndVersion=%1 %2 + [Languages] Name: "english"; MessagesFile: "compiler:Default.isl" Name: "afrikaans"; MessagesFile: "compiler:Languages\Afrikaans.isl" From 817726ff101f3ae1b916d1fd7076476d76e2e797 Mon Sep 17 00:00:00 2001 From: Jonathan Thomas Date: Thu, 8 Dec 2022 00:18:16 -0600 Subject: [PATCH 6/9] Attempt to clean-up invalid uninstall AppID from previous daily build (experimental) --- installer/windows-installer.iss | 2 ++ 1 file changed, 2 insertions(+) diff --git a/installer/windows-installer.iss b/installer/windows-installer.iss index db897ef457..9af18148b6 100644 --- a/installer/windows-installer.iss +++ b/installer/windows-installer.iss @@ -138,6 +138,8 @@ Root: HKLM; Subkey: "Software\Classes\.osp"; ValueType: string; ValueName: ""; V Root: HKLM; Subkey: "Software\Classes\OpenShotProject"; ValueType: string; ValueName: ""; ValueData: "{#MyAppProjectFileDesc}"; Flags: uninsdeletekey; Tasks: fileassoc ; Launcher association for data files of type OpenShotProject Root: HKLM; Subkey: "Software\Classes\OpenShotProject\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#MyAppExeName}"" ""%1"""; Tasks: fileassoc +; Clean-up old, incorrect AppID Uninstaller (used in 2.6.1-dev builds) +Root: HKLM; Subkey: "Software\Microsoft\Windows\CurrentVersion\Uninstall\4BB0DCDC-BC24-49EC-8937-72956C33A470_is1"; ValueName: ""; ValueType: none; Flags: deletevalue; [Files] ; Add all frozen files from cx_Freeze build From cbc3f19c7fa795d43ee7682c77a6c9acf82ea0ba Mon Sep 17 00:00:00 2001 From: Jonathan Thomas Date: Thu, 8 Dec 2022 00:39:01 -0600 Subject: [PATCH 7/9] Attempt to clean-up invalid uninstall AppID from previous daily build (experimental) - take 2 --- installer/windows-installer.iss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/installer/windows-installer.iss b/installer/windows-installer.iss index 9af18148b6..a9411e529b 100644 --- a/installer/windows-installer.iss +++ b/installer/windows-installer.iss @@ -139,7 +139,7 @@ Root: HKLM; Subkey: "Software\Classes\OpenShotProject"; ValueType: string; Value ; Launcher association for data files of type OpenShotProject Root: HKLM; Subkey: "Software\Classes\OpenShotProject\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#MyAppExeName}"" ""%1"""; Tasks: fileassoc ; Clean-up old, incorrect AppID Uninstaller (used in 2.6.1-dev builds) -Root: HKLM; Subkey: "Software\Microsoft\Windows\CurrentVersion\Uninstall\4BB0DCDC-BC24-49EC-8937-72956C33A470_is1"; ValueName: ""; ValueType: none; Flags: deletevalue; +Root: HKLM; Subkey: "Software\Microsoft\Windows\CurrentVersion\Uninstall\4BB0DCDC-BC24-49EC-8937-72956C33A470_is1"; ValueName: ""; ValueType: none; Flags: deletekey; [Files] ; Add all frozen files from cx_Freeze build From b715f5cfdbaef88c9a74f2f9123980918848e8cb Mon Sep 17 00:00:00 2001 From: Jonathan Thomas Date: Thu, 8 Dec 2022 00:40:01 -0600 Subject: [PATCH 8/9] Attempt to clean-up invalid uninstall AppID from previous daily build (experimental) - take 3 --- installer/windows-installer.iss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/installer/windows-installer.iss b/installer/windows-installer.iss index a9411e529b..36f02322be 100644 --- a/installer/windows-installer.iss +++ b/installer/windows-installer.iss @@ -139,7 +139,7 @@ Root: HKLM; Subkey: "Software\Classes\OpenShotProject"; ValueType: string; Value ; Launcher association for data files of type OpenShotProject Root: HKLM; Subkey: "Software\Classes\OpenShotProject\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#MyAppExeName}"" ""%1"""; Tasks: fileassoc ; Clean-up old, incorrect AppID Uninstaller (used in 2.6.1-dev builds) -Root: HKLM; Subkey: "Software\Microsoft\Windows\CurrentVersion\Uninstall\4BB0DCDC-BC24-49EC-8937-72956C33A470_is1"; ValueName: ""; ValueType: none; Flags: deletekey; +Root: HKLM; Subkey: "Software\Microsoft\Windows\CurrentVersion\Uninstall\4BB0DCDC-BC24-49EC-8937-72956C33A470_is1"; ValueName: ""; Flags: deletekey; [Files] ; Add all frozen files from cx_Freeze build From 2d355cec7fb27be234492b4fe48002d5452b5bb6 Mon Sep 17 00:00:00 2001 From: Jonathan Thomas Date: Thu, 8 Dec 2022 01:13:56 -0600 Subject: [PATCH 9/9] Updating AppVerName, used on welcome screen of windows installer, and uninstall screens --- installer/windows-installer.iss | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/installer/windows-installer.iss b/installer/windows-installer.iss index 36f02322be..44f5772981 100644 --- a/installer/windows-installer.iss +++ b/installer/windows-installer.iss @@ -27,6 +27,7 @@ AppId={code:GetAppId|{{4BB0DCDC-BC24-49EC-8937-72956C33A470}} AppName=OpenShot Video Editor AppVersion={#VERSION} +AppVerName={#MyAppName} {#VERSION} VersionInfoVersion={#VERSION} AppPublisher={#MyAppPublisher} AppPublisherURL={#MyPublisherURL} @@ -52,10 +53,6 @@ SignedUninstallerDir=..\build\ PrivilegesRequiredOverridesAllowed=commandline AllowNoIcons=yes -[Messages] -; Format DisplayName shown on Add/Remove Programs -NameAndVersion=%1 %2 - [Languages] Name: "english"; MessagesFile: "compiler:Default.isl" Name: "afrikaans"; MessagesFile: "compiler:Languages\Afrikaans.isl"