openlp-core team mailing list archive

[Raoul Snyman <raoul@xxxxxxxxxxx>]

Raoul Snyman has proposed merging lp:~raoul-snyman/openlp/windows-start-menu-name into lp:openlp/packaging.

Requested reviews:
  OpenLP Core (openlp-core)

For more details, see:
https://code.launchpad.net/~raoul-snyman/openlp/windows-start-menu-name/+merge/274320

[Windows] Rename OpenLP-2.0.iss.default to OpenLP.iss.default and update all references to it.
-- 
Your team OpenLP Core is requested to review the proposed merge of lp:~raoul-snyman/openlp/windows-start-menu-name into lp:openlp/packaging.

=== renamed file 'windows/OpenLP-2.0.iss.default' => 'windows/OpenLP.iss.default'
--- windows/OpenLP-2.0.iss.default	2015-08-25 08:45:08 +0000
+++ windows/OpenLP.iss.default	2015-10-13 20:47:22 +0000
@@ -26,7 +26,7 @@
 AppSupportURL={#AppURL}
 AppUpdatesURL={#AppURL}
 DefaultDirName={pf}\{#AppName}
-DefaultGroupName={#AppVerName}
+DefaultGroupName={#AppName}
 AllowNoIcons=true
 LicenseFile=LICENSE.txt
 OutputDir=%(branch)s\dist\

=== modified file 'windows/windows-builder.py'
--- windows/windows-builder.py	2015-09-28 17:33:21 +0000
+++ windows/windows-builder.py	2015-10-13 20:47:22 +0000
@@ -493,10 +493,10 @@
         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 @@
         """
         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')