Skip to content

Commit

Permalink
Remove the --quick option
Browse files Browse the repository at this point in the history
  • Loading branch information
snoyberg committed May 6, 2015
1 parent 3370989 commit fd38995
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 8 deletions.
5 changes: 2 additions & 3 deletions Installer.hs
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import Development.NSIS
import Development.NSIS.Plugins.EnvVarUpdate


installer :: Arch -> Bool -> (Program -> Version) -> String
installer arch quick version = nsis $ do
installer :: Arch -> (Program -> Version) -> String
installer arch version = nsis $ do
forM_ [minBound..maxBound] $ \prog ->
constant (upper $ show prog) (fromString $ version prog :: Exp String)
constant "ARCH" (fromString $ showArch arch :: Exp String)
Expand All @@ -20,7 +20,6 @@ installer arch quick version = nsis $ do
outFile "minghc-$GHC-$ARCH.exe"
installDir "$APPDATA/minghc-$GHC-$ARCH"
requestExecutionLevel Highest
--unless quick $ setCompressor LZMA [Solid]

page Components
page Directory
Expand Down
8 changes: 3 additions & 5 deletions Main.hs
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,9 @@ import System.Directory.Extra
import Installer
import Config


data Flags = Quick | Flag64 deriving Eq
data Flags = Flag64 deriving Eq
flags =
[ Option "" ["quick"] (NoArg $ Right Quick) "Build without solid compression."
, Option "" ["arch64"] (NoArg $ Right Flag64) "Use 64-bit GHC."
[ Option "" ["arch64"] (NoArg $ Right Flag64) "Use 64-bit GHC."
]

main :: IO ()
Expand Down Expand Up @@ -76,5 +74,5 @@ main = do

"minghc-*.nsi" %> \out -> do
need ["../Installer.hs","../Config.hs"]
writeFile' out $ installer arch (Quick `elem` flags) $
writeFile' out $ installer arch $
\prog -> if prog == GHC then extractVersion out else defaultVersion prog

0 comments on commit fd38995

Please sign in to comment.