openlp-core team mailing list archive

[Raoul Snyman <raoul.snyman@xxxxxxxxxxxxxxxxxxxxxxxx>]

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

Requested reviews:
  OpenLP Core (openlp-core)


Some changes to the InnoSetup file, plus a few other fixes.
-- 
https://code.launchpad.net/~raoul-snyman/openlp/windows-fixes/+merge/25847
Your team OpenLP Core is requested to review the proposed merge of lp:~raoul-snyman/openlp/windows-fixes into lp:openlp.

=== modified file 'OpenLP.spec'
--- OpenLP.spec	2010-03-01 18:37:10 +0000
+++ OpenLP.spec	2010-05-23 15:52:27 +0000
@@ -1,6 +1,6 @@
 # -*- mode: python -*-
 a = Analysis([os.path.join(HOMEPATH,'support\\_mountzlib.py'), os.path.join(HOMEPATH,'support\\useUnicode.py'), 'openlp.pyw'],
-             pathex=['c:\\Documents and Settings\\raoul\\My Documents\\My Projects\\openlp\\pyinstaller'])
+             pathex=['C:\\Documents and Settings\\raoul\\My Documents\\My Projects\\openlp\\trunk'])
 pyz = PYZ(a.pure)
 exe = EXE(pyz,
           a.scripts,

=== modified file 'openlp/.version'
--- openlp/.version	2010-03-27 12:37:21 +0000
+++ openlp/.version	2010-05-23 15:52:27 +0000
@@ -1,1 +1,1 @@
-1.9.0
+1.9.1-bzr821

=== modified file 'resources/innosetup/OpenLP-2.0.iss'
--- resources/innosetup/OpenLP-2.0.iss	2010-03-13 22:35:17 +0000
+++ resources/innosetup/OpenLP-2.0.iss	2010-05-23 15:52:27 +0000
@@ -1,28 +1,33 @@
 ; Script generated by the Inno Setup Script Wizard.
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
-#define MyAppName "OpenLP"
-#define MyAppVerName "OpenLP 2.0"
-#define MyAppPublisher "OpenLP Developers"
-#define MyAppURL "http://openlp.org/";
-#define MyAppExeName "OpenLP.exe"
+#define AppName "OpenLP"
+#define AppVerName "OpenLP 2.0"
+#define AppPublisher "OpenLP Developers"
+#define AppURL "http://openlp.org/";
+#define AppExeName "OpenLP.exe"
+
+#define FileHandle FileOpen("..\..\dist\OpenLP\.version")
+#define FileLine FileRead(FileHandle)
+#define RealVersion FileLine
+#expr FileClose(FileHandle)
 
 [Setup]
 ; 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={{AA7699FA-B2D2-43F4-8A70-D497D03C9485}
-AppName={#MyAppName}
-AppVerName={#MyAppVerName}
-AppPublisher={#MyAppPublisher}
-AppPublisherURL={#MyAppURL}
-AppSupportURL={#MyAppURL}
-AppUpdatesURL={#MyAppURL}
-DefaultDirName={pf}\{#MyAppName}
-DefaultGroupName=OpenLP 2.0
+AppName={#AppName}
+AppVerName={#AppVerName}
+AppPublisher={#AppPublisher}
+AppPublisherURL={#AppURL}
+AppSupportURL={#AppURL}
+AppUpdatesURL={#AppURL}
+DefaultDirName={pf}\{#AppName}
+DefaultGroupName={#AppVerName}
 AllowNoIcons=true
 LicenseFile=LICENSE.txt
-OutputBaseFilename=OpenLP-1.9.0-bzr739-setup
+OutputBaseFilename=OpenLP-{#RealVersion}-setup
 Compression=lzma
 SolidCompression=true
 SetupIconFile=C:\Program Files\Inno Setup 5\Examples\Setup.ico
@@ -57,20 +62,26 @@
 Name: quicklaunchicon; Description: {cm:CreateQuickLaunchIcon}; GroupDescription: {cm:AdditionalIcons}
 
 [Files]
-Source: ..\..\dist\OpenLP\*; DestDir: {app}; Flags: ignoreversion
-Source: ..\..\dist\OpenLP\plugins\*; DestDir: {app}\plugins; Flags: ignoreversion recursesubdirs createallsubdirs
-Source: ..\..\dist\OpenLP\Microsoft.VC90.CRT\*; DestDir: {app}\Microsoft.VC90.CRT; Flags: ignoreversion recursesubdirs createallsubdirs
-Source: ..\..\dist\OpenLP\qt4_plugins\*; DestDir: {app}\qt4_plugins; Flags: ignoreversion recursesubdirs createallsubdirs
-Source: ..\..\dist\OpenLP\eggs\*; DestDir: {app}\eggs; Flags: ignoreversion recursesubdirs createallsubdirs
-Source: openlp.conf; DestDir: {userappdata}\openlp; Flags: ignoreversion onlyifdoesntexist
+Source: ..\..\dist\OpenLP\*; DestDir: {app}; Flags: ignoreversion recursesubdirs createallsubdirs
 ; NOTE: Don't use "Flags: ignoreversion" on any shared system files
 
 [Icons]
-Name: {group}\{#MyAppName}; Filename: {app}\{#MyAppExeName}
-Name: {group}\{cm:ProgramOnTheWeb,{#MyAppName}}; Filename: {#MyAppURL}
-Name: {group}\{cm:UninstallProgram,{#MyAppName}}; Filename: {uninstallexe}
-Name: {commondesktop}\{#MyAppName}; Filename: {app}\{#MyAppExeName}; Tasks: desktopicon
-Name: {userappdata}\Microsoft\Internet Explorer\Quick Launch\{#MyAppName}; Filename: {app}\{#MyAppExeName}; Tasks: quicklaunchicon
+Name: {group}\{#AppName}; Filename: {app}\{#AppExeName}
+Name: {group}\{cm:ProgramOnTheWeb,{#AppName}}; Filename: {#AppURL}
+Name: {group}\{cm:UninstallProgram,{#AppName}}; Filename: {uninstallexe}
+Name: {commondesktop}\{#AppName}; Filename: {app}\{#AppExeName}; Tasks: desktopicon
+Name: {userappdata}\Microsoft\Internet Explorer\Quick Launch\{#AppName}; Filename: {app}\{#AppExeName}; Tasks: quicklaunchicon
 
 [Run]
-Filename: {app}\{#MyAppExeName}; Description: {cm:LaunchProgram,{#MyAppName}}; Flags: nowait postinstall skipifsilent
+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: $00000001
+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

=== added file 'resources/innosetup/OpenLP.reg'
Binary files resources/innosetup/OpenLP.reg	1970-01-01 00:00:00 +0000 and resources/innosetup/OpenLP.reg	2010-05-23 15:52:27 +0000 differ
=== modified file 'scripts/openlp-1to2-converter.py'
--- scripts/openlp-1to2-converter.py	2010-04-09 17:36:10 +0000
+++ scripts/openlp-1to2-converter.py	2010-05-23 15:52:27 +0000
@@ -97,7 +97,7 @@
 ]
 
 def prepare_string(dirty):
-    return dirty_chars.sub(u'', dirty.replace(u'\r\n', ' ').replace(u'\n', ' '))
+    return dirty_chars.sub(u'', dirty.replace(u'\r\n', u' ').replace(u'\n', u' '))
 
 def display_sql(sql, params):
     prepared_params = []