[Gtk2hs-commit] (main branch): Update Gtk2HsSetup.hs in pango

[Andy S. <And...@co...>]

diffing dir...
Thu Sep 23 20:15:52 EDT 2010  Andy Stewart <laz...@gm...>
  * Update Gtk2HsSetup.hs in pango
  Ignore-this: 14c223f6d20d183b11459b492a09a658
    {
    hunk ./pango/Gtk2HsSetup.hs 35
    -module Gtk2HsSetup ( gtk2hsUserHooks, getPkgConfigPackages ) where
    +module Gtk2HsSetup ( [_$_]
    +  gtk2hsUserHooks, [_$_]
    +  getPkgConfigPackages, [_$_]
    +  checkGtk2hsBuildtools
    +  ) where
    hunk ./pango/Gtk2HsSetup.hs 72
    -  rawSystemProgramConf, rawSystemProgramStdoutConf,
    +  rawSystemProgramConf, rawSystemProgramStdoutConf, programName,
    hunk ./pango/Gtk2HsSetup.hs 90
    -import System.Directory ( doesFileExist )
    +import System.Exit (exitFailure)
    +import System.Directory ( doesFileExist, getDirectoryContents, doesDirectoryExist )
    hunk ./pango/Gtk2HsSetup.hs 94
    -import Control.Monad (when, unless, filterM)
    +import Control.Monad (when, unless, filterM, liftM, forM, forM_)
    hunk ./pango/Gtk2HsSetup.hs 102
    -import System.Directory (getDirectoryContents, doesDirectoryExist)
    hunk ./pango/Gtk2HsSetup.hs 110
    -      confHook simpleUserHooks pd cf >>= return . adjustLocalBuildInfo,
    +      (fmap adjustLocalBuildInfo (confHook simpleUserHooks pd cf)),
    hunk ./pango/Gtk2HsSetup.hs 115
    -                                 (buildHook simpleUserHooks) pd lbi uh bf,
    -    copyHook = \pd lbi uh flags -> (copyHook simpleUserHooks) pd lbi uh flags >>
    +                                 buildHook simpleUserHooks pd lbi uh bf,
    +    copyHook = \pd lbi uh flags -> copyHook simpleUserHooks pd lbi uh flags >>
    hunk ./pango/Gtk2HsSetup.hs 305
    -   ++ [opt | opt@('-':c:_) <- (PD.cppOptions bi ++ PD.ccOptions bi), c `elem` "DIU"]
    +   ++ [opt | opt@('-':c:_) <- PD.cppOptions bi ++ PD.ccOptions bi, c `elem` "DIU"]
    hunk ./pango/Gtk2HsSetup.hs 315
    -  mFiles <- mapM (findFileWithExtension' ["chi"] [buildDir lbi])
    -                 (map toFilePath
    +  mFiles <- mapM (findFileWithExtension' ["chi"] [buildDir lbi] . toFilePath)
    hunk ./pango/Gtk2HsSetup.hs 321
    -                 )
    +                 [_$_]
    hunk ./pango/Gtk2HsSetup.hs 337
    -typeGenProgram = (simpleProgram "gtk2hsTypeGen")
    +typeGenProgram = simpleProgram "gtk2hsTypeGen"
    hunk ./pango/Gtk2HsSetup.hs 340
    -signalGenProgram = (simpleProgram "gtk2hsHookGenerator")
    +signalGenProgram = simpleProgram "gtk2hsHookGenerator"
    hunk ./pango/Gtk2HsSetup.hs 343
    -c2hsLocal = (simpleProgram "gtk2hsC2hs")
    +c2hsLocal = simpleProgram "gtk2hsC2hs"
    hunk ./pango/Gtk2HsSetup.hs 376
    -  (flip mapM_) (filter (\(tag,_) -> "x-types-" `isPrefixOf` tag && "file" `isSuffixOf` tag) xList) $
    +  forM_ (filter (\(tag,_) -> "x-types-" `isPrefixOf` tag && "file" `isSuffixOf` tag) xList) $
    hunk ./pango/Gtk2HsSetup.hs 397
    -           Nothing -> die $ "parsing output of pkg-config --modversion failed"
    +           Nothing -> die "parsing output of pkg-config --modversion failed"
    hunk ./pango/Gtk2HsSetup.hs 462
    -  let findImports acc (('{':'#':xs):xxs) = case (dropWhile ((==) ' ') xs) of
    +  let findImports acc (('{':'#':xs):xxs) = case (dropWhile (' ' ==) xs) of
    hunk ./pango/Gtk2HsSetup.hs 464
    -          case simpleParse (takeWhile ((/=) '#') ys) of
    +          case simpleParse (takeWhile ('#' /=) ys) of
    hunk ./pango/Gtk2HsSetup.hs 490
    +
    +-- Check user whether install gtk2hs-buildtools correctly.
    +checkGtk2hsBuildtools :: [String] -> IO ()
    +checkGtk2hsBuildtools programs = do
    +  programInfos <- mapM (\ name -> do
    +                         location <- programFindLocation (simpleProgram name) normal
    +                         return (name, location)
    +                      ) programs
    +  let printError name = do
    +        putStrLn $ "Cannot find " ++ name ++ "\n" [_$_]
    +                 ++ "Please install `gtk2hs-buildtools` first and check that the install directory is in your PATH (e.g. HOME/.cabal/bin)."
    +        exitFailure
    +  forM_ programInfos $ \ (name, location) ->
    +    when (isNothing location) (printError name) [_$_]
    hunk ./pango/Setup.hs 6
    -import Gtk2HsSetup ( gtk2hsUserHooks, getPkgConfigPackages )
    +import Gtk2HsSetup ( gtk2hsUserHooks, getPkgConfigPackages, checkGtk2hsBuildtools )
    hunk ./pango/Setup.hs 16
    -main = defaultMainWithHooks gtk2hsUserHooks {
    +main = do
    +  checkGtk2hsBuildtools ["gtk2hsC2hs", "gtk2hsTypeGen"]
    +  defaultMainWithHooks gtk2hsUserHooks {
    }