@@ -4,11 +4,10 @@ use strict; # Usage: # -# ./darcs-all [-q] [-s] [--dph] [--nofib] [--testsuite] get [darcs get flags] +# ./darcs-all [-q] [-s] [--nofib] [--testsuite] get [darcs get flags] # This gets the GHC core repos, if they do not already exist. # -q says to be quite, and -s to be silent. -# --dph, --nofib, --testsuite also get the dph library, nofib and -# testsuite repos respectively +# --nofib, --testsuite also get the nofib and testsuite repos respectively # The darcs get flag you are most likely to want is --complete. By # default we pass darcs the --partial flag. # @@ -171,11 +170,6 @@ sub main { elsif ($arg eq "-s") { $verbose = 0; } - # --dph says we grab the dph libs with 'get'. - # It has no effect on the other commands. - elsif ($arg eq "--dph") { - $tags{"dph"} = 1; - } # --nofib tells get to also grab the nofib repo. # It has no effect on the other commands. elsif ($arg eq "--nofib") { darcs-all @@ -320,7 +320,6 @@ endif PACKAGES += haskeline -ifneq "$(wildcard libraries/dph)" "" PACKAGES_STAGE2 += \ dph/dph-base \ dph/dph-prim-interface \ @@ -328,7 +327,6 @@ PACKAGES_STAGE2 += \ dph/dph-prim-par \ dph/dph-seq \ dph/dph-par -endif BOOT_PKGS = Cabal hpc extensible-exceptions @@ -488,6 +486,7 @@ BUILD_DIRS += \ utils/haddock/doc \ $(patsubst %, libraries/%, $(PACKAGES)) \ $(patsubst %, libraries/%, $(PACKAGES_STAGE2)) \ + libraries/dph \ compiler \ $(GHC_HSC2HS_DIR) \ $(GHC_PKG_DIR) \ @@ -531,9 +530,6 @@ $(foreach lib,$(PACKAGES) $(PACKAGES_STAGE2),$(eval \ libraries/$(lib)_dist-install_DISABLE = YES)) endif -ifneq "$(wildcard libraries/dph)" "" -include libraries/dph/ghc.mk -endif include $(patsubst %, %/ghc.mk, $(BUILD_DIRS)) # We need -fno-warn-deprecated-flags to avoid failure with -Werror ghc.mk @@ -26,6 +26,7 @@ libraries/bytestring packages/bytestring darcs libraries/Cabal packages/Cabal darcs libraries/containers packages/containers darcs libraries/directory packages/directory darcs +libraries/dph packages/dph darcs libraries/extensible-exceptions packages/extensible-exceptions darcs libraries/filepath packages/filepath darcs libraries/ghc-prim packages/ghc-prim darcs @@ -46,6 +47,5 @@ libraries/terminfo packages/terminfo darcs libraries/unix packages/unix darcs libraries/utf8-string packages/utf8-string darcs libraries/Win32 packages/Win32 darcs -libraries/dph dph packages/dph darcs testsuite testsuite testsuite darcs nofib nofib nofib darcs packages 39ee8a7d6c6b37c2e6994fa34fe58c0a640d348c Ian Lynagh igloo@earth.li http://github.com/ghc-hq/ghc/commit/d54160f7fa37c00e6835959803ca205fb5d5116c d54160f7fa37c00e6835959803ca205fb5d5116c 2009-05-15T13:51:22-07:00 2009-05-15T13:51:22-07:00 Make dph required 7b60a37ee4d15d76d2e365f556c8faf6bd8e2899 Ian Lynagh igloo@earth.li