[Gtk2hs-commit] (0.9.12 branch): Updated windows installer script

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Tue Jul  3 13:36:50 PDT 2007  Duncan Coutts <du...@ha...>
  * Updated windows installer script
  updated for latest Gtk2Hs version
  use a build for only a single ghc version (ghc 6.6.1)
  we previously included builds for both ghc 6.4.2 and 6.6
  include the sourceview component

    hunk ./tools/win32/gtk2hs.iss 7
    -AppVerName=Gtk2Hs 0.9.10.6[_^M_][_$_]
    -AppVersion=0.9.10.6[_^M_][_$_]
    +AppVerName=Gtk2Hs 0.9.11.3[_^M_][_$_]
    +AppVersion=0.9.11.3[_^M_][_$_]
    hunk ./tools/win32/gtk2hs.iss 15
    -OutputBaseFilename=gtk2hs-0.9.10.6[_^M_][_$_]
    +OutputBaseFilename=gtk2hs-0.9.11.3[_^M_][_$_]
    hunk ./tools/win32/gtk2hs.iss 17
    -VersionInfoVersion=0.9.10.6[_^M_][_$_]
    +VersionInfoVersion=0.9.11.3[_^M_][_$_]
    hunk ./tools/win32/gtk2hs.iss 27
    -Name: "gtk2hs1"; Description: "Gtk2Hs libraries for GHC 6.4.2"; Check: UseWithGhcVersion('6.4.2'); Types: full compact custom; Flags: fixed[_^M_][_$_]
    -Name: "gtk2hs2"; Description: "Gtk2Hs libraries for GHC 6.6"; Check: UseWithGhcVersion('6.6'); Types: full compact custom; Flags: fixed[_^M_][_$_]
    +;Name: "gtk2hs1"; Description: "Gtk2Hs libraries for GHC 6.4.2"; Check: UseWithGhcVersion('6.4.2'); Types: full compact custom; Flags: fixed[_^M_][_$_]
    +Name: "gtk2hs2"; Description: "Gtk2Hs libraries for GHC 6.6.1"; Check: UseWithGhcVersion('6.6.1'); Types: full compact custom; Flags: fixed[_^M_][_$_]
    hunk ./tools/win32/gtk2hs.iss 33
    -Source: "gtk+-2.10.9\*";                        DestDir: "{app}";       Components: gtk;     Flags: ignoreversion recursesubdirs createallsubdirs;[_^M_][_$_]
    -Source: "gtk2hs-0.9.10.6-ghc-6.4.2-gtk-2.10\*"; DestDir: "{app}";       Components: gtk2hs1; Flags: ignoreversion recursesubdirs createallsubdirs; AfterInstall: AfterPkgInstall;[_^M_][_$_]
    -Source: "gtk2hs-0.9.10.6-ghc-6.6-gtk-2.10\*";   DestDir: "{app}";       Components: gtk2hs2; Flags: ignoreversion recursesubdirs createallsubdirs; AfterInstall: AfterPkgInstall;[_^M_][_$_]
    -Source: "gtk2hs-0.9.10.6-demo\*";               DestDir: "{app}\demos"; Components: demos;   Flags: ignoreversion recursesubdirs createallsubdirs;[_^M_][_$_]
    -Source: "gtk2hs-0.9.10.6-docs\*";               DestDir: "{app}\docs";  Components: docs;    Flags: ignoreversion recursesubdirs createallsubdirs;[_^M_][_$_]
    +Source: "gtk+-2.10.13\*";                        DestDir: "{app}";       Components: gtk;     Flags: ignoreversion recursesubdirs createallsubdirs;[_^M_][_$_]
    +;Source: "gtk2hs-0.9.11.3-ghc-6.4.2-gtk-2.10\*"; DestDir: "{app}";       Components: gtk2hs1; Flags: ignoreversion recursesubdirs createallsubdirs; AfterInstall: AfterPkgInstall;[_^M_][_$_]
    +Source: "gtk2hs-0.9.11.3-ghc-6.6.1-gtk-2.10\*"; DestDir: "{app}";       Components: gtk2hs2; Flags: ignoreversion recursesubdirs createallsubdirs; AfterInstall: AfterPkgInstall;[_^M_][_$_]
    +Source: "gtk2hs-0.9.11.3-demo\*";               DestDir: "{app}\demos"; Components: demos;   Flags: ignoreversion recursesubdirs createallsubdirs;[_^M_][_$_]
    +Source: "gtk2hs-0.9.11.3-docs\*";               DestDir: "{app}\docs";  Components: docs;    Flags: ignoreversion recursesubdirs createallsubdirs;[_^M_][_$_]
    hunk ./tools/win32/gtk2hs.iss 52
    -[_^M_][_$_]
    +Filename: "{code:ghcpkg}"; Parameters: "update ""{app}\sourceview.package.conf"""; StatusMsg: "Registering sourceview package..."; Flags: runhidden[_^M_][_$_]
    hunk ./tools/win32/gtk2hs.iss 54
    -Filename: "{code:ghcpkg}"; Parameters: "unregister gtkglext-0.9.10.6"; RunOnceId: "gtkglext"; Flags: runhidden[_^M_][_$_]
    -Filename: "{code:ghcpkg}"; Parameters: "unregister soegtk-0.9.10.6";   RunOnceId: "soegtk";   Flags: runhidden[_^M_][_$_]
    -Filename: "{code:ghcpkg}"; Parameters: "unregister glade-0.9.10.6";    RunOnceId: "glade";    Flags: runhidden[_^M_][_$_]
    -Filename: "{code:ghcpkg}"; Parameters: "unregister gtk-0.9.10.6";      RunOnceId: "gtk";      Flags: runhidden[_^M_][_$_]
    -Filename: "{code:ghcpkg}"; Parameters: "unregister svgcairo-0.9.10.6"; RunOnceId: "svgcairo"; Flags: runhidden[_^M_][_$_]
    -Filename: "{code:ghcpkg}"; Parameters: "unregister cairo-0.9.10.6";    RunOnceId: "cairo";    Flags: runhidden[_^M_][_$_]
    -Filename: "{code:ghcpkg}"; Parameters: "unregister glib-0.9.10.6";     RunOnceId: "glib";     Flags: runhidden[_^M_][_$_]
    +Filename: "{code:ghcpkg}"; Parameters: "unregister sourceview-0.9.11.3"; RunOnceId: "gtkglext"; Flags: runhidden[_^M_][_$_]
    +Filename: "{code:ghcpkg}"; Parameters: "unregister gtkglext-0.9.11.3";   RunOnceId: "gtkglext"; Flags: runhidden[_^M_][_$_]
    +Filename: "{code:ghcpkg}"; Parameters: "unregister soegtk-0.9.11.3";     RunOnceId: "soegtk";   Flags: runhidden[_^M_][_$_]
    +Filename: "{code:ghcpkg}"; Parameters: "unregister glade-0.9.11.3";      RunOnceId: "glade";    Flags: runhidden[_^M_][_$_]
    +Filename: "{code:ghcpkg}"; Parameters: "unregister gtk-0.9.11.3";        RunOnceId: "gtk";      Flags: runhidden[_^M_][_$_]
    +Filename: "{code:ghcpkg}"; Parameters: "unregister svgcairo-0.9.11.3";   RunOnceId: "svgcairo"; Flags: runhidden[_^M_][_$_]
    +Filename: "{code:ghcpkg}"; Parameters: "unregister cairo-0.9.11.3";      RunOnceId: "cairo";    Flags: runhidden[_^M_][_$_]
    +Filename: "{code:ghcpkg}"; Parameters: "unregister glib-0.9.11.3";       RunOnceId: "glib";     Flags: runhidden[_^M_][_$_]
    hunk ./tools/win32/gtk2hs.iss 137
    -  Result := (Version = '6.4.2')[_^M_][_$_]
    -         or (Version = '6.6');[_^M_][_$_]
    +  Result := {-(Version = '6.4.2')[_^M_][_$_]
    +           or-} (Version = '6.6.1');[_^M_][_$_]
    hunk ./tools/win32/gtk2hs.iss 174
    -    RegQueryStringValue(HKEY_CURRENT_USER, 'Software\Haskell\GHC\ghc-6.6', 'InstallDir', GhcInstallDir);[_^M_][_$_]
    +    RegQueryStringValue(HKEY_CURRENT_USER, 'Software\Haskell\GHC\ghc-6.6.1', 'InstallDir', GhcInstallDir);[_^M_][_$_]
    hunk ./tools/win32/gtk2hs.iss 177
    -[_^M_][_$_]
    +{-[_^M_][_$_]
    hunk ./tools/win32/gtk2hs.iss 185
    -[_^M_][_$_]
    +-}[_^M_][_$_]
    hunk ./tools/win32/gtk2hs.iss 190
    -    RegQueryStringValue(HKEY_LOCAL_MACHINE, 'SOFTWARE\Haskell\GHC\ghc-6.6', 'InstallDir', GhcInstallDir);[_^M_][_$_]
    +    RegQueryStringValue(HKEY_LOCAL_MACHINE, 'SOFTWARE\Haskell\GHC\ghc-6.6.1', 'InstallDir', GhcInstallDir);[_^M_][_$_]
    hunk ./tools/win32/gtk2hs.iss 193
    -[_^M_][_$_]
    +{-[_^M_][_$_]
    hunk ./tools/win32/gtk2hs.iss 201
    -[_^M_][_$_]
    +-}[_^M_][_$_]
    hunk ./tools/win32/gtk2hs.iss 208
    -    InstallationErrorMessage := 'This version of Gtk2Hs requires GHC version 6.6 or 6.4.2.' #13#10 #13#10[_^M_][_$_]
    +    InstallationErrorMessage := 'This version of Gtk2Hs requires GHC version 6.6.1.' #13#10 #13#10[_^M_][_$_]
    hunk ./tools/win32/gtk2hs.iss 216
    -    InstallationErrorMessage := 'GHC does not appear to be installed correctly, try reinstalling GHC version 6.6 or 6.4.2' #13#10 #13#10[_^M_][_$_]
    +    InstallationErrorMessage := 'GHC does not appear to be installed correctly, try reinstalling GHC version 6.6.1' #13#10 #13#10[_^M_][_$_]
    hunk ./tools/win32/gtk2hs.iss 224
    -    InstallationErrorMessage := 'GHC does not appear to be installed (or the installation is corrupted), please install GHC version 6.6 or 6.4.2';[_^M_][_$_]
    +    InstallationErrorMessage := 'GHC does not appear to be installed (or the installation is corrupted), please install GHC version 6.6.1';[_^M_][_$_]
    hunk ./tools/win32/gtk2hs.iss 230
    -    InstallationErrorMessage := 'Gtk2Hs requires GHC to be installed first, please install GHC version 6.6 or 6.4.2' #13#10 #13#10[_^M_][_$_]
    +    InstallationErrorMessage := 'Gtk2Hs requires GHC to be installed first, please install GHC version 6.6.1' #13#10 #13#10[_^M_][_$_]