From d77ee0479820e582e2878cee6f102b4e2553d41b Mon Sep 17 00:00:00 2001 From: Bob Ippolito Date: Sun, 15 Feb 2015 09:54:00 -0800 Subject: [PATCH] update to 7.8.4 --- GHC/GHC.xcodeproj/project.pbxproj | 4 ++-- GHC/GHC/html/main.js | 4 ++-- Main.hs | 28 ++++++++++++++-------------- README.md | 10 +++++----- 4 files changed, 23 insertions(+), 23 deletions(-) diff --git a/GHC/GHC.xcodeproj/project.pbxproj b/GHC/GHC.xcodeproj/project.pbxproj index d63bc92..f865884 100644 --- a/GHC/GHC.xcodeproj/project.pbxproj +++ b/GHC/GHC.xcodeproj/project.pbxproj @@ -400,7 +400,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - GHC_VERSION = 7.8.3; + GHC_VERSION = 7.8.4; MACOSX_DEPLOYMENT_TARGET = 10.9; ONLY_ACTIVE_ARCH = YES; SDKROOT = macosx; @@ -435,7 +435,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - GHC_VERSION = 7.8.3; + GHC_VERSION = 7.8.4; MACOSX_DEPLOYMENT_TARGET = 10.9; SDKROOT = macosx; }; diff --git a/GHC/GHC/html/main.js b/GHC/GHC/html/main.js index 4e5a660..2401a42 100644 --- a/GHC/GHC/html/main.js +++ b/GHC/GHC/html/main.js @@ -2,8 +2,8 @@ var defaultInfo = { bundlePath: '/Applications/GHC.app', bundleName: 'GHC', - bundleVersion: '7.8.3', - appName: 'ghc-7.8.3', + bundleVersion: '7.8.4', + appName: 'ghc-7.8.4', inDownloadsDir: false, isBash: false, environment: {SHELL: "/bin/bash"}, diff --git a/Main.hs b/Main.hs index deb4bac..99c46e6 100644 --- a/Main.hs +++ b/Main.hs @@ -3,8 +3,8 @@ {- -This builds a relocatable ghc-7.8.3.app in dist/build, -including cabal-install 1.20.0.3 +This builds a relocatable ghc-7.8.4.app in dist/build, +including cabal-install 1.22.0.0 TODO: @@ -43,9 +43,9 @@ import System.Console.GetOpt -- Layout: -- --- dist/download/[ghc-7.8.3-*.tar.xz] --- dist/unpack/ghc-7.8.3 --- dist/build/ghc-[7.8.3].app/Contents/{lib,bin}/ +-- dist/download/[ghc-7.8.4-*.tar.bz2] +-- dist/unpack/ghc-7.8.4 +-- dist/build/ghc-[7.8.4].app/Contents/{lib,bin}/ -- data BuildState = BuildState @@ -121,18 +121,18 @@ defRule = Rule latestGhc :: Release latestGhc = Release - { releaseVersion = "7.8.3" - , releaseUrl = "https://www.haskell.org/ghc/dist/7.8.3/ghc-7.8.3-x86_64-apple-darwin.tar.xz" - , releaseSha1 = "d55a671482614cbd3c12e4594437aedfd78f47de" - , releaseSize = 69371660 + { releaseVersion = "7.8.4" + , releaseUrl = "http://www.ozonehouse.com/mark/platform/ghc-7.8.4-x86_64-apple-darwin.tar.bz2" + , releaseSha1 = "b7aff3983e9005b74d90c5a4fd7c837f9e752923" + , releaseSize = 129602990 } latestCabal :: Release latestCabal = Release - { releaseVersion = "1.20.0.3" - , releaseUrl = "http://www.haskell.org/cabal/release/cabal-install-1.20.0.3/cabal-1.20.0.3-x86_64-apple-darwin-mavericks.tar.gz" - , releaseSha1 = "e64789827dbc1b32db05a9e6cdb9366d8cc7f4da" - , releaseSize = 2961724 + { releaseVersion = "1.22.0.0" + , releaseUrl = "https://www.haskell.org/cabal/release/cabal-install-1.22.0.0/cabal-1.22.0.0-x86_64-apple-darwin-mavericks.tar.gz" + , releaseSha1 = "f290db731fec9679f60228bc77cb1a9693d0719a" + , releaseSize = 3988319 } latestReleases :: Releases @@ -314,7 +314,7 @@ installCabal bs@(BuildState { buildUnpackDir, buildBinDir }) = defRule , ruleRun = copyFile cabalSrc cabalDest } where - cabalSrc = buildUnpackDir "dist" "build" "cabal" "cabal" + cabalSrc = buildUnpackDir "cabal" cabalDest = buildBinDir "cabal" buildApp :: BuildState -> Rule diff --git a/README.md b/README.md index 74f7dd4..0712fcc 100644 --- a/README.md +++ b/README.md @@ -3,12 +3,12 @@ Want to try Haskell on your Mac without having to use homebrew or even install anything globally? Download a self-contained GHC release here! -* [ghc-7.8.3-r1.zip](https://github.com/etrepum/ghc-dot-app/releases/download/v7.8.3-r1/ghc-7.8.3-r1.zip) +* [ghc-7.8.4-r0.zip](https://github.com/etrepum/ghc-dot-app/releases/download/v7.8.4-r0/ghc-7.8.4-r0.zip) # What it includes -* GHC 7.8.3 -* cabal-install 1.20.0.3 (just the binary) +* GHC 7.8.4 +* cabal-install 1.22.0.0 (just the binary) * HTML documentation * man pages @@ -25,7 +25,7 @@ $ cabal install text ## Minimal (no GUI helper) -This will build a relocatable ghc-7.8.3.app in ./dist/build using +This will build a relocatable ghc-7.8.4.app in ./dist/build using the binaries of GHC and cabal-install from haskell.org. This does not include the GUI helper. @@ -44,7 +44,7 @@ $ rm -rf ./dist/ Add this GHC to your PATH (assuming it has moved to /Applications): ```bash -export PATH=$HOME/.cabal/bin:/Applications/ghc-7.8.3.app/Contents/bin:$PATH +export PATH=$HOME/.cabal/bin:/Applications/ghc-7.8.4.app/Contents/bin:$PATH ``` # Full (GUI helper with code signing)