diff --git a/.gitignore b/.gitignore deleted file mode 100644 --- a/.gitignore +++ /dev/null @@ -1,9 +0,0 @@ -.hub -.project -dist -build -System -*~ -*.hi -*.o -PACKAGE_ME diff --git a/Hub/Prog.hs b/Hub/Prog.hs --- a/Hub/Prog.hs +++ b/Hub/Prog.hs @@ -40,24 +40,33 @@ | AlexP | HappyP | HaddockP + | GhcModP + | HLintP + | HDevToolsP + | HaskellDocsP + | StylishHaskellP deriving (Eq,Ord,Bounded,Enum,Show) p2prog :: P -> Prog p2prog p = case p of - GhcP -> PROG p "ghc" HcPT - GhciP -> PROG p "ghci" HcPT - Ghc_pkgP -> PROG p "ghc-pkg" HcPT - HaddockP -> PROG p "haddock" HcPT - Hp2psP -> PROG p "hp2ps" HcPT - HpcP -> PROG p "hpc" HcPT - Hsc2hsP -> PROG p "hsc2hs" HcPT - RunghcP -> PROG p "runghc" HcPT - RunhaskellP -> PROG p "runhaskell" HcPT - CabalP -> PROG p "cabal" TlPT - AlexP -> PROG p "alex" TlPT - HappyP -> PROG p "happy" TlPT + GhcP -> PROG p "ghc" HcPT + GhciP -> PROG p "ghci" HcPT + Ghc_pkgP -> PROG p "ghc-pkg" HcPT + HaddockP -> PROG p "haddock" HcPT + Hp2psP -> PROG p "hp2ps" HcPT + HpcP -> PROG p "hpc" HcPT + Hsc2hsP -> PROG p "hsc2hs" HcPT + RunghcP -> PROG p "runghc" HcPT + RunhaskellP -> PROG p "runhaskell" HcPT + CabalP -> PROG p "cabal" TlPT + AlexP -> PROG p "alex" TlPT + HappyP -> PROG p "happy" TlPT + GhcModP -> PROG p "ghc-mod" TlPT + HLintP -> PROG p "hlint" TlPT + HDevToolsP -> PROG p "hdevtools" TlPT + HaskellDocsP -> PROG p "haskell-docs" TlPT + StylishHaskellP -> PROG p "stylish-haskell" TlPT progMap :: Map.Map String Prog progMap = Map.fromList [ (nmePROG pg,pg) | pg<-map p2prog [minBound..maxBound] ] - diff --git a/Hub/System.hs b/Hub/System.hs --- a/Hub/System.hs +++ b/Hub/System.hs @@ -174,7 +174,14 @@ do so <- get_ss $ redirctOutEE ee se <- get_ss $ redirctErrEE ee ev <- get_ev (extendEnvtEE ee) (filterEnvtEE ee) - let cp = (proc pr as) { std_out = so, std_err = se, env=ev, create_group=False } + let cp = + (proc pr as) + { std_out = so + , std_err = se + , env = ev + , create_group = False + , delegate_ctlc = True + } (_,_,_,ph) <- createProcess cp -- i_sh <- installHandler sigINT (Catch $ ppg ph) Nothing -- q_sh <- installHandler sigQUIT (Catch $ ppg ph) Nothing diff --git a/Version.hs b/Version.hs --- a/Version.hs +++ b/Version.hs @@ -13,7 +13,7 @@ version :: String -version = "1.2.0" +version = "1.3.0" main :: IO () diff --git a/build-hub.har b/build-hub.har deleted file mode 100644 --- a/build-hub.har +++ /dev/null @@ -1,11 +0,0 @@ -^=7.4.1 -List-0.4.2 -fgl-5.4.2.4 -hexpat-0.20.1 -mtl-2.1.1 -regex-base-0.93.2 -regex-compat-0.95.1 -regex-posix-0.95.2 -text-0.11.2.1 -transformers-0.3.0.0 -utf8-string-0.3.7 diff --git a/hub.cabal b/hub.cabal --- a/hub.cabal +++ b/hub.cabal @@ -1,5 +1,5 @@ Name: hub -Version: 1.2.0 +Version: 1.3.0 Copyright: Chris Dornan, 2011-2013 Maintainer: Chris Dornan Author: Chris Dornan @@ -7,12 +7,12 @@ License-file: LICENSE Synopsis: For multiplexing GHC installations and providing development sandboxes -Description: This package provides a utility for multiplexing - multiple GHC and Haskell Platform installations, +Description: This package provides a utility for multiplexing + multiple GHC and Haskell Platform installations, each selected by an environment variable or a work-tree configuration file. . - The package also provides flexible development sandboxes + The package also provides flexible development sandboxes (aka /hubs/) into which packages can be installed and subsequently erased. Commands are provided for (re)naming, annotating, replicating, swapping, archiving, @@ -20,15 +20,15 @@ . > hub init . - will create a hub based on the default GHC installation + will create a hub based on the default GHC installation and associate the current directory with it. Any use of /cabal/ or the GHC tools within this directory or it's descendants will work with correct tool chain and the - private user-package database belonging to the hub. + private user-package database belonging to the hub. . The following would (i) download 'hexpat' (ii) install it in a named 'hexpat-test' hub connected to the /2011.2.0.1/ - Haskell Platform, (iii) build the 'hexpat' test suite + Haskell Platform, (iii) build the 'hexpat' test suite with the same hub, and (iv) finally run the test suite. . >cabal unpack hexpat @@ -37,7 +37,7 @@ >cabal install >cd test >cabal install --bindir=. - >./testsuite + >./testsuite . This same 'hexpat-test' hub can be shared with other work trees. @@ -52,7 +52,7 @@ . For installation instructions, introductory material, FAQs, etc., see the home page http:\/\/justhub.org. - + Stability: Beta Category: Development, Distribution Homepage: http://justhub.org @@ -73,7 +73,7 @@ unix, filepath, directory, - process, + process >= 1.2.0.0, bytestring, fgl, utf8-string, diff --git a/hub.manifest b/hub.manifest new file mode 100644 --- /dev/null +++ b/hub.manifest @@ -0,0 +1,5 @@ +^=7.6.3 +List-0.5.1 +hexpat-0.20.5 +process-1.2.0.0 +utf8-string-0.3.7