Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

tweaks to build info -- now builds a release candidate

thanks to Chris Dornan for the fixes in .gitignore, configure.ac, and core.packages
  • Loading branch information...
commit e946f183340f80983099c014859931531498ac3a 1 parent 015a41d
@mzero mzero authored
View
4 .gitignore
@@ -1 +1,5 @@
+*.o
+*.hi
+src/generic/Build
+src/generic/haskell-platform-*
src/macos/dist*
View
45 haskell-platform.cabal
@@ -27,33 +27,34 @@ tested-with: GHC ==7.4.1
library
build-depends:
- -- ghc 7.x
+ -- ghc ==7.4.1,
+
-- Core libraries: provided by every ghc installation
-- We don't include "non-API" packages here.
- -- array ==0.4.0.0
- -- base ==4.5.0.0
- -- bytestring ==0.9.2.1
- -- Cabal ==1.14.0
- -- containers ==0.4.2.1
- -- directory ==1.1.0.2
- -- extensible-exceptions ==0.1.1.4
- -- filepath ==1.3.0.0
- -- haskell2010 ==1.1.0.1
- -- haskell98 ==2.0.0.1
- -- hpc ==0.5.1.1
- -- old-locale ==1.0.0.4
- -- old-time ==1.1.0.0
- -- pretty ==1.1.1.0
- -- process ==1.1.0.1
- -- template-haskell ==2.7.0.0
- -- time ==1.4
- -- unix ==2.5.1.0
- -- Win32 ==2.2.2.0
+ -- array ==0.4.0.0,
+ -- base ==4.5.0.0,
+ -- bytestring ==0.9.2.1,
+ -- Cabal ==1.14.0,
+ -- containers ==0.4.2.1,
+ -- deepseq ==1.3.0.0,
+ -- directory ==1.1.0.2,
+ -- extensible-exceptions ==0.1.1.4,
+ -- filepath ==1.3.0.0,
+ -- haskell2010 ==1.1.0.1,
+ -- haskell98 ==2.0.0.1,
+ -- hpc ==0.5.1.1,
+ -- old-locale ==1.0.0.4,
+ -- old-time ==1.1.0.0,
+ -- pretty ==1.1.1.0,
+ -- process ==1.1.0.1,
+ -- template-haskell ==2.7.0.0,
+ -- time ==1.4,
+ -- unix ==2.5.1.0,
+ -- Win32 ==2.2.2.0,
-- Libraries in addition to what GHC provides:
-- Note: newer versions of cgi need monad-catchio.
cgi ==3001.1.7.4,
- deepseq ==1.3.0.0,
fgl ==5.4.2.4,
GLUT ==2.1.2.1,
haskell-src ==1.0.1.5,
@@ -77,8 +78,6 @@ library
xhtml ==3000.2.0.5,
zlib ==0.5.3.3
- -- 2011.1 proposals:
-
-- Depending on programs does not work, they are not registered
-- We list them to help distro packaging.
build-tools:
View
12 src/generic/Build.hs
@@ -64,20 +64,16 @@ main = do
--
-- Too sleepy. Future: solve this via the cabal library
--
- system $ "cabal install --dry-run --reinstall " ++ (
+ let cmd = "cabal install --dry-run --reinstall " ++ (
intercalate " " [ package
| (_, package) <- urls
] ) ++ " > platform.packages.raw"
+ --writeFile "platform.packages.cmd" cmd
+ system cmd
src <- readFile "platform.packages.raw"
let programs = drop 2 $ lines src
-
- -- happy depends on mtl.
- let ls' = case partition ("happy" `isPrefixOf`) programs of ([h],rest) -> h : rest
- let ls'' = case partition ("mtl" `isPrefixOf`) ls' of ([h],rest) -> h : rest
- let ls = case partition ("transformers" `isPrefixOf`) ls'' of ([h],rest) -> h : rest
-
- writeFile "platform.packages" (unlines ls) -- move happy to top of list.
+ writeFile "platform.packages" (unlines programs)
removeFile "platform.packages.raw"
setCurrentDirectory pwd
View
6 src/generic/tarball/configure.ac
@@ -1,9 +1,9 @@
-AC_INIT([haskell-platform],[2011.4.0.0])
+AC_INIT([haskell-platform],[2012.2.0.0])
AC_CONFIG_AUX_DIR([scripts])
#TODO: have these numbers generated from the .cabal file
-REQUIRED_GHC_VER=7.0.4
-ACCEPTABLE_GHC_VER=7.0.4
+REQUIRED_GHC_VER=7.4.1
+ACCEPTABLE_GHC_VER=7.4.1
echo '**************************************************'
echo '*'
View
4 src/generic/tarball/packages/core.packages
@@ -7,15 +7,13 @@ directory-1.1.0.2
extensible-exceptions-0.1.1.4
filepath-1.3.0.0
ghc-prim-0.2.0.0
-haskell2000-1.1.0.1
+haskell2010-1.1.0.1
haskell98-2.0.0.1
hpc-0.5.1.1
old-locale-1.0.0.4
old-time-1.1.0.0
pretty-1.1.1.0
process-1.1.0.1
-random-1.0.0.3
template-haskell-2.7.0.0
time-1.4
unix-2.5.1.0
-Win32-2.2.2.0
View
4 src/macos/README
@@ -1,8 +1,8 @@
To build the Haskell Platform for Mac OS X:
1) If you have the proper GHC installer package:
- create a subdirectory "dist" here
- move or sym-link the package into dist
+ create a subdirectory "dist-i386" or "dist-x86_64 here
+ move or sym-link the package into it
You should have a file there named seomthing like
GHC-7.0.4-i386.pkg
GHC-7.0.4-x86_64.pkg
Please sign in to comment.
Something went wrong with that request. Please try again.