March 2008 - cabal-devel

patch applied (cabal-branches/cabal-1.4): Add *Verbose flags back in with the old type
by Duncan Coutts 27 Mar '08

27 Mar '08

Wed Mar 26 21:24:46 PDT 2008 Duncan Coutts <duncan(a)haskell.org> * Add *Verbose flags back in with the old type Abuse the Monoid instances for the flags types to keep the extra non-Flag type field up-to-date wrt the real Flag Verbosity field. Here's the pattern: copyVerbose = fromFlagOrDefault (copyVerbose a) (copyVerbosity b), copyVerbosity = combine copyVerbosity We update copyVerbosity normally and we transfer the new value of (copyVerbosity b) to the copyVerbose field, unless the new value is NoFlag in which case the old value remains. To make this actually work we have to make sure the set of flags are `mappend`ed to the default set of flag rather than merely accumulated on top of them field by field. So we now accumulate on top of mempty and `mappend` to the default flags. We do this in the command line handling code. M ./Distribution/Simple/Command.hs -2 +4 M ./Distribution/Simple/Setup.hs +41 View patch online: http://darcs.haskell.org/cabal-branches/cabal-1.4/_darcs/patches/2008032704…

1 0

patch applied (cabal-branches/cabal-1.4): Go back to conditionally using Text.ParserCombinators.ReadP
by Duncan Coutts 27 Mar '08

27 Mar '08

Wed Mar 26 21:15:52 PDT 2008 Duncan Coutts <duncan(a)haskell.org> * Go back to conditionally using Text.ParserCombinators.ReadP Some Setup.hs scripts import Text.ParserCombinators.ReadP directly and try to use it with the parsers defined by Cabal. M ./Distribution/Compat/ReadP.hs +13 View patch online: http://darcs.haskell.org/cabal-branches/cabal-1.4/_darcs/patches/2008032704…

1 0

patch applied (cabal-branches/cabal-1.4): Add in a few small functions that some Setup.hs scripts use
by Duncan Coutts 27 Mar '08

27 Mar '08

Wed Mar 26 21:10:49 PDT 2008 Duncan Coutts <duncan(a)haskell.org> * Add in a few small functions that some Setup.hs scripts use All marked as deprecated so hopefully people will stop using them. M ./Distribution/Package.hs -1 +11 M ./Distribution/PackageDescription.hs -2 +14 M ./Distribution/Simple/LocalBuildInfo.hs -1 +11 M ./Distribution/Version.hs -1 +15 View patch online: http://darcs.haskell.org/cabal-branches/cabal-1.4/_darcs/patches/2008032704…

1 0

patch applied (cabal-branches/cabal-1.4): Rename various *Verbose fields to *Verbosity instead
by Duncan Coutts 27 Mar '08

27 Mar '08

Wed Mar 26 20:48:15 PDT 2008 Duncan Coutts <duncan(a)haskell.org> * Rename various *Verbose fields to *Verbosity instead Despite appearances this is actually not completely pointless. For the Cabal-1.4 branch we need the *Verbose fields to have the same types as they did in Cabal-1.2, becuase lots of Setup.hs scripts use them and our change to make them all have type Flag makes many Setup.hs scripts fail. A solution for the 1.4 branch is to rename the real field and to add the old field back in. To keep as much similarity as possible between the HEAD and 1.4 branches I'm applying the name change in both. On the plus side it's a better name anyway. M ./Distribution/Make.hs -12 +12 M ./Distribution/Simple.hs -24 +24 M ./Distribution/Simple/Build.hs -2 +2 M ./Distribution/Simple/Configure.hs -2 +2 M ./Distribution/Simple/GHC.hs -1 +1 M ./Distribution/Simple/Haddock.hs -4 +4 M ./Distribution/Simple/Install.hs -1 +1 M ./Distribution/Simple/Register.hs -3 +3 M ./Distribution/Simple/Setup.hs -71 +71 M ./Distribution/Simple/SrcDist.hs -1 +1 View patch online: http://darcs.haskell.org/cabal-branches/cabal-1.4/_darcs/patches/2008032703…

1 0

patch applied (cabal-branches/cabal-1.4): Make UTF-8 decoding errors in .cabal files non-fatal
by Duncan Coutts 27 Mar '08

27 Mar '08

Wed Mar 26 20:17:40 PDT 2008 Duncan Coutts <duncan(a)haskell.org> * Make UTF-8 decoding errors in .cabal files non-fatal Previously we checked for invalid UTF-8 in the first phase of the parser, which splitting the file up into nested sections and fields. This meant the whole parser falls over if there is invalid UTF-8 anywhere in the file. Sadly there are already packages on hackage with invalid UTF-8 so we would fail when parsing the hackage index. The solution is to move the check into the parsing of the individual fields and making it a warning not an error. We most typically get invalid UTF-8 in free text fields like author name, copyright, description etc so this should work out ok usually. We now get pretty decent error messages, like: Warning: hsx.cabal:5: Invalid UTF-8 text in the 'author' field. The warning type is now structured so that hackage will be able to distinguish general non-fatal warnings from UTF-8 decoding problems which really should be fatal errors for package uploads. M ./Distribution/PackageDescription/Parse.hs -2 +8 M ./Distribution/ParseUtils.hs -20 +19 View patch online: http://darcs.haskell.org/cabal-branches/cabal-1.4/_darcs/patches/2008032703…

1 0

patch applied (cabal-branches/cabal-1.4): Separate the OS/Arch classifiation used for different purposes
by Duncan Coutts 27 Mar '08

27 Mar '08

Wed Mar 26 17:53:21 PDT 2008 Duncan Coutts <duncan(a)haskell.org> * Separate the OS/Arch classifiation used for different purposes We have to classify System.Info.{os,arch} strings into the OS and Arch enums. For that purpose we have to be quite permissive since there are lots of ailases that the various Haskell implementations use. However for parsing os and arch names in .cabal files we'd prefer to use canonical names, though we do have to allow the couple aliases already in common use. M ./Distribution/System.hs -23 +45 View patch online: http://darcs.haskell.org/cabal-branches/cabal-1.4/_darcs/patches/2008032700…

1 0

patch applied (cabal-branches/cabal-1.4): Arch and OS names were previously allowed to contain "_-", restore that.
by Duncan Coutts 27 Mar '08

27 Mar '08

Wed Mar 26 17:46:31 PDT 2008 Duncan Coutts <duncan(a)haskell.org> * Arch and OS names were previously allowed to contain "_-", restore that. That is the arch and os strings in conditionals in .cabal files, like: if arch(x86_64) Previously the parser used isAlphaNum c || (c `elem` "_-"). This is crucial for arch names like "x86_64". So make the new parser for OS and Arch types use the same string parser as before (there is a string parse part and a separate classification of known OS/Arch values). M ./Distribution/System.hs -5 +6 View patch online: http://darcs.haskell.org/cabal-branches/cabal-1.4/_darcs/patches/2008032700…

1 0

patch applied (cabal-branches/cabal-1.4): allow underscores in arch names
by Duncan Coutts 27 Mar '08

27 Mar '08

Wed Mar 26 09:59:12 PDT 2008 Ross Paterson <ross(a)soi.city.ac.uk> * allow underscores in arch names Stops it barfing on arch(x86_64). M ./Distribution/System.hs -1 +2 View patch online: http://darcs.haskell.org/cabal-branches/cabal-1.4/_darcs/patches/2008032616…

1 0

patch applied (cabal-install): Update to recent Cabal lib changes
by Duncan Coutts 27 Mar '08

27 Mar '08

Wed Mar 26 22:34:54 PDT 2008 Duncan Coutts <duncan(a)haskell.org> * Update to recent Cabal lib changes M ./Hackage/Config.hs -3 +4 M ./Hackage/Setup.hs -6 +7 M ./Hackage/SrcDist.hs -1 +1 M ./Main.hs -4 +4 View patch online: http://darcs.haskell.org/cabal-install/_darcs/patches/20080327053454-adfee-…

1 0

patch applied (cabal): Rename various *Verbose fields to *Verbosity instead
by Duncan Coutts 27 Mar '08

27 Mar '08

Wed Mar 26 20:48:15 PDT 2008 Duncan Coutts <duncan(a)haskell.org> * Rename various *Verbose fields to *Verbosity instead Despite appearances this is actually not completely pointless. For the Cabal-1.4 branch we need the *Verbose fields to have the same types as they did in Cabal-1.2, becuase lots of Setup.hs scripts use them and our change to make them all have type Flag makes many Setup.hs scripts fail. A solution for the 1.4 branch is to rename the real field and to add the old field back in. To keep as much similarity as possible between the HEAD and 1.4 branches I'm applying the name change in both. On the plus side it's a better name anyway. M ./Distribution/Make.hs -12 +12 M ./Distribution/Simple.hs -24 +24 M ./Distribution/Simple/Build.hs -2 +2 M ./Distribution/Simple/Configure.hs -2 +2 M ./Distribution/Simple/GHC.hs -1 +1 M ./Distribution/Simple/Haddock.hs -4 +4 M ./Distribution/Simple/Install.hs -1 +1 M ./Distribution/Simple/Register.hs -3 +3 M ./Distribution/Simple/Setup.hs -71 +71 M ./Distribution/Simple/SrcDist.hs -1 +1 View patch online: http://darcs.haskell.org/cabal/_darcs/patches/20080327034815-adfee-d1cadfaf…

1 0