[Gtk2hs-commit] (main branch): Make checkGtk2hsBuildtools support different check sequence.

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

diffing dir...
Thu Sep 23 20:15:19 EDT 2010  Andy Stewart <laz...@gm...>
  * Make checkGtk2hsBuildtools support different check sequence.
  Ignore-this: 90282d8bc1b1c4c4d156f1b22376ce01
    {
    hunk ./gtk/Gtk2HsSetup.hs 492
    -checkGtk2hsBuildtools :: IO ()
    -checkGtk2hsBuildtools = do
    -  c2hsPath   <- (programFindLocation c2hsLocal) normal [_$_]
    -  typePath   <- (programFindLocation typeGenProgram) normal [_$_]
    -  signalPath <- (programFindLocation signalGenProgram) normal [_$_]
    +checkGtk2hsBuildtools :: [String] -> IO ()
    +checkGtk2hsBuildtools programs = do
    +  programInfos <- mapM (\ name -> do
    +                         location <- programFindLocation (simpleProgram name) normal
    +                         return (name, location)
    +                      ) programs
    hunk ./gtk/Gtk2HsSetup.hs 502
    -  if isNothing c2hsPath
    -     then printError (programName c2hsLocal)
    -     else if isNothing typePath
    -          then printError (programName typeGenProgram)
    -          else when (isNothing signalPath) $
    -                 printError (programName signalGenProgram)
    +  forM_ programInfos $ \ (name, location) ->
    +    when (isNothing location) (printError name) [_$_]
    hunk ./gtk/Setup.hs 8
    -  checkGtk2hsBuildtools
    +  checkGtk2hsBuildtools ["gtk2hsC2hs", "gtk2hsTypeGen", "gtk2hsHookGenerator"]
    }