Skip to content

Commit

Permalink
Upgrade to NSIS 3.0b2 and LTS 3.0
Browse files Browse the repository at this point in the history
  • Loading branch information
3noch committed Aug 13, 2015
1 parent 4988244 commit 60e8eca
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 12 deletions.
6 changes: 1 addition & 5 deletions Installer.hs
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,7 @@ installer projRoot arch version = nsis $ do
file [Recursive] "bin/7z.*"
file [Recursive] "bin/minghc-post-install.exe.7z"
file [Recursive] "bin/all-*"
let shortArch =
case arch of
Arch32 -> "32"
Arch64 -> "64"
file [Recursive] $ fromString $ concat ["bin/", shortArch, "-*"]
file [Recursive] $ fromString $ concat ["bin/", showArchAbbr arch, "-*"]

execWait "\"$INSTDIR/bin/7z.exe\" x -y \"-o$INSTDIR/bin\" \"$INSTDIR/bin/minghc-post-install.exe.7z\""
NSIS.delete [] "$INSTDIR/bin/minghc-post-install.exe.7z"
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,9 @@ Users of MinGHC installers do not need to build it themselves. Below are instruc

You need NSIS installed:

* Download [NSIS 3.0b1](http://nsis.sourceforge.net/), install it, and place the installation directory on your `PATH`.
* Patch NSIS with the [large strings build for 3.0b1](http://prdownloads.sourceforge.net/nsis/nsis-3.0b1-strlen_8192.zip?download)
found among its [special builds](http://nsis.sourceforge.net/Special_Builds). (The patch is applied by copying
* Download [NSIS 3.0b2](http://nsis.sourceforge.net/), install it, and place the installation directory on your `PATH`.
* Patch NSIS with the **large strings build for 3.0b2** found among its
[special builds](http://nsis.sourceforge.net/Special_Builds). (The patch is applied by copying
the files in the patch archive over top the NSIS installation.)

### Building Installers
Expand Down
5 changes: 1 addition & 4 deletions stack.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
extra-deps:
- nsis-0.3
resolver: lts-2.20
flags: {}
resolver: lts-3.0
packages:
- '.'

0 comments on commit 60e8eca

Please sign in to comment.