openlp-core team mailing list archive

[Raoul Snyman <raoul.snyman@xxxxxxxxxxxxxxxxxxxxxxxx>]

Raoul Snyman has proposed merging lp:~raoul-snyman/openlp/windows-updates into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)

For more details, see:
https://code.launchpad.net/~raoul-snyman/openlp/windows-updates/+merge/54033

Dropped the registry settings from the installer.
Used our own images (thanks to http://www.sxc.hu/) for the installer.
-- 
https://code.launchpad.net/~raoul-snyman/openlp/windows-updates/+merge/54033
Your team OpenLP Core is requested to review the proposed merge of lp:~raoul-snyman/openlp/windows-updates into lp:openlp.

=== modified file 'resources/windows/OpenLP-2.0.iss'
--- resources/windows/OpenLP-2.0.iss	2011-02-17 19:02:47 +0000
+++ resources/windows/OpenLP-2.0.iss	2011-03-18 16:30:35 +0000
@@ -31,9 +31,9 @@
 OutputBaseFilename=OpenLP-{#RealVersion}-setup
 Compression=lzma
 SolidCompression=true
-SetupIconFile=C:\Program Files\Inno Setup 5\Examples\Setup.ico
-WizardImageFile=C:\Program Files\Inno Setup 5\WizModernImage-IS.bmp
-WizardSmallImageFile=C:\Program Files\Inno Setup 5\WizModernSmallImage-IS.bmp
+SetupIconFile=OpenLP.ico
+WizardImageFile=WizImageBig.bmp
+WizardSmallImageFile=WizImageSmall.bmp
 
 [Languages]
 Name: english; MessagesFile: compiler:Default.isl
@@ -78,15 +78,6 @@
 Filename: {app}\{#AppExeName}; Description: {cm:LaunchProgram,{#AppName}}; Flags: nowait postinstall skipifsilent
 
 [Registry]
-Root: HKCU; SubKey: Software\OpenLP\OpenLP\alerts; ValueType: dword; ValueName: status; ValueData: $00000001
-Root: HKCU; SubKey: Software\OpenLP\OpenLP\bibles; ValueType: dword; ValueName: status; ValueData: $00000001
-Root: HKCU; SubKey: Software\OpenLP\OpenLP\custom; ValueType: dword; ValueName: status; ValueData: $00000001
-Root: HKCU; SubKey: Software\OpenLP\OpenLP\images; ValueType: dword; ValueName: status; ValueData: $00000001
-Root: HKCU; SubKey: Software\OpenLP\OpenLP\media; ValueType: dword; ValueName: status; ValueData: $00000001
-Root: HKCU; SubKey: Software\OpenLP\OpenLP\presentations; ValueType: dword; ValueName: status; ValueData: $00000001
-Root: HKCU; SubKey: Software\OpenLP\OpenLP\remotes; ValueType: dword; ValueName: status; ValueData: $00000000
-Root: HKCU; SubKey: Software\OpenLP\OpenLP\songs; ValueType: dword; ValueName: status; ValueData: $00000001
-Root: HKCU; SubKey: Software\OpenLP\OpenLP\songusage; ValueType: dword; ValueName: status; ValueData: $00000001
 
 [Code]
 function GetUninstallString(): String;

=== added file 'resources/windows/WizImageBig.bmp'
Binary files resources/windows/WizImageBig.bmp	1970-01-01 00:00:00 +0000 and resources/windows/WizImageBig.bmp	2011-03-18 16:30:35 +0000 differ
=== added file 'resources/windows/WizImageSmall.bmp'
Binary files resources/windows/WizImageSmall.bmp	1970-01-01 00:00:00 +0000 and resources/windows/WizImageSmall.bmp	2011-03-18 16:30:35 +0000 differ
=== modified file 'scripts/windows-builder.py'
--- scripts/windows-builder.py	2011-02-24 05:47:38 +0000
+++ scripts/windows-builder.py	2011-03-18 16:30:35 +0000
@@ -116,8 +116,15 @@
 enchant_path = os.path.join(site_packages, u'enchant')
 
 def update_code():
+    os.chdir(branch_path)
+    print u'Reverting any changes to the code...'
+    bzr = Popen((u'bzr', u'revert'), stdout=PIPE)
+    output, error = bzr.communicate()
+    code = bzr.wait()
+    if code != 0:
+       print output
+       raise Exception(u'Error reverting the code')
     print u'Updating the code...'
-    os.chdir(branch_path)
     bzr = Popen((u'bzr', u'update'), stdout=PIPE)
     output, error = bzr.communicate()
     code = bzr.wait()