From c6561b1ca980f9f4d82382635dc229c8bf4bc6c6 Mon Sep 17 00:00:00 2001 From: Mark Lentczner Date: Tue, 16 Oct 2012 22:48:29 -0700 Subject: [PATCH] add README to source tarball, support verbose cabal output tickets 195 & 207 --- NOTES-2012.4.0.0 | 10 +++++-- src/generic/prepare.sh | 5 ++-- src/generic/tarball/README | 59 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 69 insertions(+), 5 deletions(-) create mode 100644 src/generic/tarball/README diff --git a/NOTES-2012.4.0.0 b/NOTES-2012.4.0.0 index 292f073..9c4f4ae 100644 --- a/NOTES-2012.4.0.0 +++ b/NOTES-2012.4.0.0 @@ -33,8 +33,9 @@ TODO [] main .cabal file should not have versions commented out [] this will require a separate list of packages that need to be part of the source release -[] fix to build.hs (ticket #195) -[] build instructions in the tarball (ticket #207) +[x] fix to build.hs (ticket #195) +[x] bugs in build.sh (ticket #197) +[x] build instructions in the tarball (ticket #207) [] merge in shared library patch (ticket #198) MAC TODO @@ -43,7 +44,7 @@ MAC TODO [] If the cabal command is "update" then the wrapper script shouldn't do an update the first time through! [] sign Mac installers (ticket #203) -[] where is the GLUT documents (ticket #202) +[] where are the GLUT documents (ticket #202) WEB TODO @@ -56,3 +57,6 @@ WEB TODO [] make it clear that HP is in some distros package system [] merge in pull request #7 [] pretty up and update release timetable page (ticket #131) + + +[] close tickets: 195, 197, 207 diff --git a/src/generic/prepare.sh b/src/generic/prepare.sh index 78e5839..d087899 100755 --- a/src/generic/prepare.sh +++ b/src/generic/prepare.sh @@ -35,7 +35,7 @@ do done cabal install --dry-run --reinstall ${SRC_PKGS} \ - | tail +3 > "${IMAGE_DIR}/packages/platform.packages" + | tail +3 | cut -d ' ' -f 1 > "${IMAGE_DIR}/packages/platform.packages" PLATFORM_PACKAGE_ID="haskell-platform-${PLATFORM_VERSION}" @@ -48,7 +48,8 @@ packageIDs core > "${IMAGE_DIR}/packages/core.packages" cp tarball/scripts/*.sh "${IMAGE_DIR}/scripts/" cp tarball/scripts/config.* "${IMAGE_DIR}/scripts/" -cp tarball/configure.ac tarball/aclocal.m4 tarball/Makefile "${IMAGE_DIR}/" +cp tarball/configure.ac tarball/aclocal.m4 tarball/Makefile tarball/README \ + "${IMAGE_DIR}/" chmod +x "${IMAGE_DIR}/scripts/"*.sh chmod +x "${IMAGE_DIR}/scripts/config.guess" "${IMAGE_DIR}/scripts/config.sub" diff --git a/src/generic/tarball/README b/src/generic/tarball/README new file mode 100644 index 0000000..6b07a79 --- /dev/null +++ b/src/generic/tarball/README @@ -0,0 +1,59 @@ +Haskell Platform +http://www.haskell.org/platform/ +================================ + +This is the source tarball for Haskell Platform. It contains the source and +build files for all the packages that make up the platform, beyond those that +come with GHC. + +If your OS has a pre-built distribution of Haskell Platform, that is likely to +be a much easier way than building the platform yourself. The Haskell Platform +web site (see above URL) contains builds for Mac OS X and Windows that include +everything you need, including GHC. + +The web site also contains links for those Linux distributions for which there +is a pre-build version. In most cases, that version of the platform is availble +through the normal package manager for the distribution, rather than directly +from the Haskell Platform web site. + + + +Preparation +----------- +You will need to have GHC 7.4.2 installed prior to building the platform. +Please see: + http://www.haskell.org/ghc/download_ghc_7_4_2 + +Note that the warning at top will tell you to consider installing the +platform instead. If you've gotten this far, you can ignore that. + +You can use a different version of GHC, but it may not work. + + +You will also need the developer packages for various standard system libraries, +such as zlib and GLUT. Exactly which packages you need will differ based on +the OS distribution you use. In general, if you get an error during the build +process that a library is missing, look it up in your package manager. You will +need both the library and the development package for the library. + + +Build and Install +----------------- +In this directory, run: + + ./configure + +This is standard autoconf, so options like --prefix will work. Run with --help +to see all the options. In particular, if you are using a different versino of +GHC, you'll need to add --enable-unsupported-ghc-version. + +Now build the packages: + + make + +Finally, to install everything, use + + make install + +Note that you will probably have to run this command 'sudo'. +