From 87364a9c7aeabecc0b2a5086ecd3920f77db6258 Mon Sep 17 00:00:00 2001 From: Raoul Snyman Date: Tue, 13 Oct 2015 14:13:29 +0200 Subject: [PATCH 1/2] Move and update InnoSetup file -> make the Start Menu group name just 'OpenLP' --- windows/{OpenLP-2.0.iss.default => OpenLP.iss.default} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename windows/{OpenLP-2.0.iss.default => OpenLP.iss.default} (96%) diff --git a/windows/OpenLP-2.0.iss.default b/windows/OpenLP.iss.default similarity index 96% rename from windows/OpenLP-2.0.iss.default rename to windows/OpenLP.iss.default index 215a9bb..b8b6af9 100644 --- a/windows/OpenLP-2.0.iss.default +++ b/windows/OpenLP.iss.default @@ -26,7 +26,7 @@ AppPublisherURL={#AppURL} AppSupportURL={#AppURL} AppUpdatesURL={#AppURL} DefaultDirName={pf}\{#AppName} -DefaultGroupName={#AppVerName} +DefaultGroupName={#AppName} AllowNoIcons=true LicenseFile=LICENSE.txt OutputDir=%(branch)s\dist\ From fa3832de1f827f9959753a2cce4dbcab794c35fd Mon Sep 17 00:00:00 2001 From: Raoul Snyman Date: Tue, 13 Oct 2015 21:56:37 +0200 Subject: [PATCH 2/2] [Windows] Update all references to the ISS file after renaming it --- windows/windows-builder.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/windows/windows-builder.py b/windows/windows-builder.py index 2217f75..7a241b8 100644 --- a/windows/windows-builder.py +++ b/windows/windows-builder.py @@ -493,10 +493,10 @@ class WindowsBuilder(object): Create an InnoSetup file pointing to the branch being built. """ self._print('Creating Inno Setup file...') - input = open(os.path.join(self.script_path, 'OpenLP-2.0.iss.default'), 'r').read() + input = open(os.path.join(self.script_path, 'OpenLP.iss.default'), 'r').read() output = input.replace('%(branch)s', self.branch_path) output = output.replace('%(display_version)s', self.version) - outfile = open(os.path.join(self.script_path, 'OpenLP-2.0.iss'), 'w') + outfile = open(os.path.join(self.script_path, 'OpenLP.iss'), 'w') outfile.write(output) outfile.close() @@ -532,7 +532,7 @@ class WindowsBuilder(object): """ self._print('Running Inno Setup...') os.chdir(self.script_path) - innosetup = Popen((self.innosetup, os.path.join(self.script_path, 'OpenLP-2.0.iss'), '/q')) + innosetup = Popen((self.innosetup, os.path.join(self.script_path, 'OpenLP.iss'), '/q')) code = innosetup.wait() if code != 0: raise Exception('Error running Inno Setup')