[commit: hadrian] master: Revert "Preliminary bindist rule (#555)" (#557) (8c2817a)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/hadrian

On branch  : master
Link       : http://git.haskell.org/hadrian.git/commitdiff/8c2817a37ec2fdc347a6ee90957f0119a8faa105

>---------------------------------------------------------------

commit 8c2817a37ec2fdc347a6ee90957f0119a8faa105
Author: Andrey Mokhov <andrey.mokhov at gmail.com>
Date:   Tue Apr 3 17:53:28 2018 +0100

    Revert "Preliminary bindist rule (#555)" (#557)
    
    This reverts commit 15797302751614fba8da15f59de588be7841dd27.


>---------------------------------------------------------------

8c2817a37ec2fdc347a6ee90957f0119a8faa105
 README.md               | 13 +------------
 cfg/system.config.in    |  1 -
 hadrian.cabal           |  1 -
 src/Builder.hs          |  4 ----
 src/Builder.hs-boot     |  1 -
 src/Rules.hs            |  6 ++----
 src/Rules/SourceDist.hs |  2 +-
 7 files changed, 4 insertions(+), 24 deletions(-)

diff --git a/README.md b/README.md
index 2509dae..620d405 100644
--- a/README.md
+++ b/README.md
@@ -125,18 +125,7 @@ are currently not supported.
 
 #### Source distribution
 
-To build a GHC source distribution tarball, run `build source-dist`.
-
-#### Binary distribution
-
-To build a GHC binary distribution, run `build binary-dist`. The resulting
-tarball contains just enough to support the
-
-``` sh
-$ ./configure [--prefix=PATH] && make install
-```
-
-workflow, for now.
+To build a GHC source distribution tarball, run `build sdist-ghc`.
 
 #### Testing
 
diff --git a/cfg/system.config.in b/cfg/system.config.in
index 72bef12..c983ae4 100644
--- a/cfg/system.config.in
+++ b/cfg/system.config.in
@@ -7,7 +7,6 @@
 
 alex           = @AlexCmd@
 ar             = @ArCmd@
-autoreconf     = autoreconf
 cc             = @CC@
 happy          = @HappyCmd@
 hs-cpp         = @HaskellCPPCmd@
diff --git a/hadrian.cabal b/hadrian.cabal
index ca339fb..486148f 100644
--- a/hadrian.cabal
+++ b/hadrian.cabal
@@ -51,7 +51,6 @@ executable hadrian
                        , Oracles.Setting
                        , Oracles.ModuleFiles
                        , Rules
-                       , Rules.BinaryDist
                        , Rules.Clean
                        , Rules.Compile
                        , Rules.Configure
diff --git a/src/Builder.hs b/src/Builder.hs
index 0fb8be5..5ca6c20 100644
--- a/src/Builder.hs
+++ b/src/Builder.hs
@@ -89,7 +89,6 @@ instance NFData   HaddockMode
 -- @GhcPkg Stage1@ is the one built in Stage0.
 data Builder = Alex
              | Ar ArMode Stage
-             | Autoreconf FilePath
              | DeriveConstants
              | Cc CcMode Stage
              | Configure FilePath
@@ -175,7 +174,6 @@ instance H.Builder Builder where
 
     runtimeDependencies :: Builder -> Action [FilePath]
     runtimeDependencies = \case
-        Autoreconf dir -> return [dir -/- "configure.ac"]
         Configure dir -> return [dir -/- "configure"]
 
         Ghc _ Stage0 -> return []
@@ -234,7 +232,6 @@ instance H.Builder Builder where
 
                 Ar Unpack _ -> cmd echo [Cwd output] [path] buildArgs
 
-                Autoreconf dir -> cmd echo [Cwd dir] [path] buildArgs
                 Configure dir -> do
                     -- Inject /bin/bash into `libtool`, instead of /bin/sh,
                     -- otherwise Windows breaks. TODO: Figure out why.
@@ -290,7 +287,6 @@ systemBuilderPath builder = case builder of
     Alex            -> fromKey "alex"
     Ar _ Stage0     -> fromKey "system-ar"
     Ar _ _          -> fromKey "ar"
-    Autoreconf _    -> fromKey "autoreconf"
     Cc  _  Stage0   -> fromKey "system-cc"
     Cc  _  _        -> fromKey "cc"
     -- We can't ask configure for the path to configure!
diff --git a/src/Builder.hs-boot b/src/Builder.hs-boot
index 1d10434..bd38891 100644
--- a/src/Builder.hs-boot
+++ b/src/Builder.hs-boot
@@ -13,7 +13,6 @@ data HaddockMode = BuildPackage | BuildIndex
 
 data Builder = Alex
              | Ar ArMode Stage
-	     | Autoreconf FilePath
              | DeriveConstants
              | Cc CcMode Stage
              | Configure FilePath
diff --git a/src/Rules.hs b/src/Rules.hs
index 100720f..982d249 100644
--- a/src/Rules.hs
+++ b/src/Rules.hs
@@ -8,16 +8,15 @@ import qualified Hadrian.Oracles.TextFile
 import Expression
 import GHC
 import qualified Oracles.ModuleFiles
-import qualified Rules.BinaryDist
 import qualified Rules.Compile
-import qualified Rules.Configure
+import qualified Rules.PackageData
 import qualified Rules.Dependencies
 import qualified Rules.Documentation
 import qualified Rules.Generate
+import qualified Rules.Configure
 import qualified Rules.Gmp
 import qualified Rules.Libffi
 import qualified Rules.Library
-import qualified Rules.PackageData
 import qualified Rules.Program
 import qualified Rules.Register
 import Settings
@@ -123,7 +122,6 @@ packageRules = do
 
 buildRules :: Rules ()
 buildRules = do
-    Rules.BinaryDist.bindistRules
     Rules.Configure.configureRules
     Rules.Generate.copyRules
     Rules.Generate.generateRules
diff --git a/src/Rules/SourceDist.hs b/src/Rules/SourceDist.hs
index 8bec3f3..6ef7929 100644
--- a/src/Rules/SourceDist.hs
+++ b/src/Rules/SourceDist.hs
@@ -9,7 +9,7 @@ import Rules.Clean
 
 sourceDistRules :: Rules ()
 sourceDistRules = do
-    "source-dist" ~> do
+    "sdist-ghc" ~> do
         -- We clean the source tree first.
         -- See https://github.com/snowleopard/hadrian/issues/384.
         -- TODO: Do we still need to clean the tree?