Refer to "boot" libs, not "core" libs

10 files changed, 21 insertions, 33 deletions

diff --git a/Makefile b/Makefile
index 302c522dd0..d1426c77aa 100644
--- a/Makefile
+++ b/Makefile
@@ -66,10 +66,10 @@ endif
 
 SUBDIRS = gmp includes compat utils driver docs rts libraries compiler
 
-# Sanity check that all the core libraries are in the tree, to catch
+# Sanity check that all the boot libraries are in the tree, to catch
 # failure to run darcs-all.
 check-packages :
-	@for d in `cat libraries/core-packages`; do \
+	@for d in `cat libraries/boot-packages`; do \
 	  if test ! -d libraries/$$d; then \
 	     echo "Looks like you're missing libraries/$$d,"; \
 	     echo "maybe you haven't done './darcs-all get'?"; \
diff --git a/README b/README
index 25122a8830..68a012bb30 100644
--- a/README
+++ b/README
@@ -27,7 +27,7 @@ There are two ways to get a source tree:
       ghc-<version>-src-extralibs.tar.bz2
 
   You only need the first one, which contains GHC itself and
-  the "core" libraries.
+  the "boot" libraries.
 
   The extralibs package contains a bunch of optional libraries.  If
   you want, you can unpack this over the top of your source tree, and
@@ -52,7 +52,7 @@ There are two ways to get a source tree:
      $ chmod +x darcs-all
      $ ./darcs-all get
 
-  This grabs the "core" packages by default.  To get the full set of
+  This grabs the "boot" packages by default.  To get the full set of
   packages, instead say
 
      $ ./darcs-all --extra get
diff --git a/boot b/boot
index f2128de5b9..d554b037bd 100644
--- a/boot
+++ b/boot
@@ -1,8 +1,8 @@
 #! /bin/sh
 set -e
 
-# Check that we have all core packages.
-for dir in `cat libraries/core-packages`
+# Check that we have all boot packages.
+for dir in `cat libraries/boot-packages`
 do
     if test ! -d libraries/$dir
     then
diff --git a/darcs-all b/darcs-all
index 1e773c92f1..24ed6f482a 100644
--- a/darcs-all
+++ b/darcs-all
@@ -71,7 +71,7 @@ sub darcsall {
             message "== $dir not present or not a repository; skipping";
         }
     }
-    for my $pkg (`cat libraries/core-packages libraries/extra-packages`) {
+    for my $pkg (`cat libraries/boot-packages libraries/extra-packages`) {
         chomp $pkg;
         if (-d "libraries/$pkg") {
             darcs (@_, "--repodir", "libraries/$pkg");
@@ -112,10 +112,10 @@ sub darcsget {
 
     my @packages;
     if ($extra) {
-        @packages = `cat core-packages extra-packages`;
+        @packages = `cat boot-packages extra-packages`;
     }
     else {
-        @packages = `cat core-packages`;
+        @packages = `cat boot-packages`;
     }
 
     for my $pkg (@packages) {
diff --git a/libraries/Makefile b/libraries/Makefile
index 240bcc82bc..59b20b485f 100644
--- a/libraries/Makefile
+++ b/libraries/Makefile
@@ -240,7 +240,7 @@ stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).%: %/setup/Setup
 	      && touch $@ || touch $*/unbuildable
 # We don't touch $@ if configure failed as we would prefer to try
 # configuring it next time round, rather than assuming it'll still fail.
-# This is particularly important for corelibs, where failure means the
+# This is particularly important for bootlibs, where failure means the
 # build dies!
 
 # Build the library using 'make'
diff --git a/libraries/core-packages b/libraries/boot-packages
index dde6ff1008..dde6ff1008 100644
--- a/libraries/core-packages
+++ b/libraries/boot-packages
diff --git a/libraries/ifBuildable.hs b/libraries/ifBuildable.hs
index 95bebaf8d3..f163ca22df 100644
--- a/libraries/ifBuildable.hs
+++ b/libraries/ifBuildable.hs
@@ -1,4 +1,4 @@
--- Returns exitcode 0 if the given package is buildable or is a core package,
+-- Returns exitcode 0 if the given package is buildable or is a boot package,
 -- and 1 otherwise.
 
 module Main (main) where
@@ -31,5 +31,5 @@ doit package
 
 getMustBeBuildablePackages :: IO [String]
 getMustBeBuildablePackages
- = do xs <- readFile "../core-packages"
+ = do xs <- readFile "../boot-packages"
       return $ filter ("readline" /=) $ lines xs
diff --git a/mk/config.mk.in b/mk/config.mk.in
index ea2f5d6dee..640f33e45b 100644
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -396,13 +396,7 @@ StripLibraries=NO
 
 # These are the URL patterns that Haddock uses to generate the "Source
 # File" links on each page.
-CorePackageSourceURL = http://darcs.haskell.org/ghc-6.6/packages/$(PACKAGE)/%{FILE}
-ExtraPackageSourceURL = http://darcs.haskell.org/packages/$(PACKAGE)/%{FILE}
-
-# These are the packages required to be present in order to bootstrap GHC
-# NB. must be synced with libraries/core-packages
-CorePackages = base Cabal haskell98 readline regex-base regex-compat \
-	       regex-posix parsec stm template-haskell unix Win32
+PackageSourceURL = http://darcs.haskell.org/packages/$(PACKAGE)/%{FILE}
 
 # ----------------------------------------------------------------------------
 # Object-file splitting
diff --git a/mk/package.mk b/mk/package.mk
index 78c01f285e..094b6a5748 100644
--- a/mk/package.mk
+++ b/mk/package.mk
@@ -279,19 +279,13 @@ html :: $(HTML_DOC)
 extraclean :: 
 	$(RM) -rf $(HTML_DIR)
 
-ifneq "$(findstring $(PACKAGE), $(CorePackages))" ""
-HaddockSourceURL = $(CorePackageSourceURL)
-else
-HaddockSourceURL = $(ExtraPackageSourceURL)
-endif
-
 $(HTML_DOC) : $(HS_PPS)
 	@$(INSTALL_DIR) $(HTML_DIR)
 	$(HADDOCK) $(HADDOCK_OPTS) -h -o $(HTML_DIR) $(HS_PPS) \
 		--package=$(PACKAGE) \
 		--dump-interface=$(PACKAGE).haddock \
 		--use-index=../doc-index.html --use-contents=../index.html \
-		--source-module=$(HaddockSourceURL) \
+		--source-module=$(PackageSourceURL) \
 		$(foreach pkg, $(PACKAGE_DEPS), \
 		   --read-interface=../$(pkg),../$(pkg)/$(pkg).haddock)
 
diff --git a/push-all b/push-all
index e48692397c..3f3515ed23 100644
--- a/push-all
+++ b/push-all
@@ -11,8 +11,8 @@ my $ignore_failure = 0;
 
 # --checked-out says we are pushing to a checked out tree
 my $checked_out = 0;
-# --core-only says we only want to push corelibs, not extralibs
-my $core_only = 0;
+# --boot-only says we only want to push bootlibs, not extralibs
+my $boot_only = 0;
 # --push or --pull?
 my $push_pull = "push";
 
@@ -49,9 +49,9 @@ sub pushall {
             message "== $dir not present or not a repository; skipping";
         }
     }
-    my $library_lists = $core_only
-                      ? "libraries/core-packages"
-                      : "libraries/core-packages libraries/extra-packages";
+    my $library_lists = $boot_only
+                      ? "libraries/boot-packages"
+                      : "libraries/boot-packages libraries/extra-packages";
     for my $pkg (`cat $library_lists`) {
         chomp $pkg;
         $dir = "libraries/$pkg";
@@ -83,8 +83,8 @@ sub main {
             elsif ($arg eq "--checked-out") {
                 $checked_out = 1;
             }
-            elsif ($arg eq "--core-only") {
-                $core_only = 1;
+            elsif ($arg eq "--boot-only") {
+                $boot_only = 1;
             }
             elsif ($arg eq "--push") {
                 $push_pull = "push";