diff --git a/Graphics/UI/Gtk/OSX/Application.chs b/Graphics/UI/Gtk/OSX/Application.chs --- a/Graphics/UI/Gtk/OSX/Application.chs +++ b/Graphics/UI/Gtk/OSX/Application.chs @@ -185,34 +185,34 @@ -- | -- -applicationGetBundlePath :: ApplicationClass self => self -> IO String -applicationGetBundlePath self = - {#call unsafe gtk_osxapplication_get_bundle_path#} (toApplication self) >>= peekCString +applicationGetBundlePath :: IO String +applicationGetBundlePath = + {#call unsafe quartz_application_get_bundle_path#} >>= peekCString -- | -- -applicationGetResourcePath :: ApplicationClass self => self -> IO String -applicationGetResourcePath self = - {#call unsafe gtk_osxapplication_get_resource_path#} (toApplication self) >>= peekCString +applicationGetResourcePath :: IO String +applicationGetResourcePath = + {#call unsafe quartz_application_get_resource_path#} >>= peekCString -- | -- -applicationGetExecutablePath :: ApplicationClass self => self -> IO String -applicationGetExecutablePath self = - {#call unsafe gtk_osxapplication_get_executable_path#} (toApplication self) >>= peekCString +applicationGetExecutablePath :: IO String +applicationGetExecutablePath = + {#call unsafe quartz_application_get_executable_path#} >>= peekCString -- | -- -applicationGetBundleId :: ApplicationClass self => self -> IO String -applicationGetBundleId self = - {#call unsafe gtk_osxapplication_get_bundle_id#} (toApplication self) >>= peekCString +applicationGetBundleId :: IO String +applicationGetBundleId = + {#call unsafe quartz_application_get_bundle_id#} >>= peekCString -- | -- -applicationGetBundleInfo :: ApplicationClass self => self -> String -> IO String -applicationGetBundleInfo self key = +applicationGetBundleInfo :: String -> IO String +applicationGetBundleInfo key = withCString key $ \keyPtr -> - {#call unsafe gtk_osxapplication_get_bundle_info#} (toApplication self) keyPtr >>= peekCString + {#call unsafe quartz_application_get_bundle_info#} keyPtr >>= peekCString -- | -- diff --git a/Graphics/UI/Gtk/OSX/Signals.chs b/Graphics/UI/Gtk/OSX/Signals.chs --- a/Graphics/UI/Gtk/OSX/Signals.chs +++ b/Graphics/UI/Gtk/OSX/Signals.chs @@ -50,7 +50,7 @@ import Control.Monad (liftM) import System.Glib.FFI -import System.Glib.UTFString (peekUTFString) +import System.Glib.UTFString (peekUTFString,maybePeekUTFString) import System.Glib.GError (failOnGError) {#import System.Glib.Signals#} {#import System.Glib.GObject#} diff --git a/Gtk2HsSetup.hs b/Gtk2HsSetup.hs --- a/Gtk2HsSetup.hs +++ b/Gtk2HsSetup.hs @@ -23,16 +23,24 @@ CABAL_VERSION_MICRO) #else #warning Setup.hs is guessing the version of Cabal. If compilation of Setup.hs fails use -DCABAL_VERSION_MINOR=x for Cabal version 1.x.0 when building (prefixed by --ghc-option= when using the 'cabal' command) +#if (__GLASGOW_HASKELL__ >= 700) +#define CABAL_VERSION CABAL_VERSION_ENCODE(1,10,0) +#else #if (__GLASGOW_HASKELL__ >= 612) #define CABAL_VERSION CABAL_VERSION_ENCODE(1,8,0) #else #define CABAL_VERSION CABAL_VERSION_ENCODE(1,6,0) #endif #endif +#endif -- | Build a Gtk2hs package. -- -module Gtk2HsSetup ( gtk2hsUserHooks, getPkgConfigPackages ) where +module Gtk2HsSetup ( + gtk2hsUserHooks, + getPkgConfigPackages, + checkGtk2hsBuildtools + ) where import Distribution.Simple import Distribution.Simple.PreProcess @@ -65,7 +73,7 @@ import Distribution.Simple.Compiler ( Compiler(..) ) import Distribution.Simple.Program ( Program(..), ConfiguredProgram(..), - rawSystemProgramConf, rawSystemProgramStdoutConf, + rawSystemProgramConf, rawSystemProgramStdoutConf, programName, c2hsProgram, pkgConfigProgram, requireProgram, ghcPkgProgram, simpleProgram, lookupProgram, rawSystemProgramStdout, ProgArg) import Distribution.ModuleName ( ModuleName, components, toFilePath ) @@ -83,10 +91,11 @@ #endif import Distribution.Text ( simpleParse, display ) import System.FilePath -import System.Directory ( doesFileExist ) +import System.Exit (exitFailure) +import System.Directory ( doesFileExist, getDirectoryContents, doesDirectoryExist ) import Distribution.Version (Version(..)) import Distribution.Verbosity -import Control.Monad (when, unless, filterM) +import Control.Monad (when, unless, filterM, liftM, forM, forM_) import Data.Maybe ( isJust, isNothing, fromMaybe, maybeToList ) import Data.List (isPrefixOf, isSuffixOf, nub) import Data.Char (isAlpha) @@ -94,7 +103,6 @@ import qualified Data.Set as S import Control.Applicative ((<$>)) -import System.Directory (getDirectoryContents, doesDirectoryExist) -- the name of the c2hs pre-compiled header file precompFile = "precompchs.bin" @@ -103,13 +111,13 @@ hookedPrograms = [typeGenProgram, signalGenProgram, c2hsLocal], hookedPreProcessors = [("chs", ourC2hs)], confHook = \pd cf -> - confHook simpleUserHooks pd cf >>= return . adjustLocalBuildInfo, + (fmap adjustLocalBuildInfo (confHook simpleUserHooks pd cf)), postConf = \args cf pd lbi -> do genSynthezisedFiles (fromFlag (configVerbosity cf)) pd lbi postConf simpleUserHooks args cf pd lbi, buildHook = \pd lbi uh bf -> fixDeps pd >>= \pd -> - (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 >> installCHI pd lbi (fromFlag (copyVerbosity flags)) (fromFlag (copyDest flags)), instHook = \pd lbi uh flags -> #if defined(mingw32_HOST_OS) || defined(__MINGW32__) @@ -187,7 +195,11 @@ _ | modeGenerateRegFile -> die "Generate Reg File not supported" | modeGenerateRegScript -> die "Generate Reg Script not supported" | otherwise -> registerPackage verbosity +#if CABAL_VERSION_CHECK(1,10,0) + installedPkgInfo pkg lbi inplace [packageDb] +#else installedPkgInfo pkg lbi inplace packageDb +#endif where modeGenerateRegFile = isJust (flagToMaybe (regGenPkgConf regFlags)) @@ -298,7 +310,7 @@ getCppOptions bi lbi = nub $ ["-I" ++ dir | dir <- PD.includeDirs bi] - ++ [opt | opt@('-':c:_) <- (PD.cppOptions bi ++ PD.ccOptions bi), c `elem` "DIU"] + ++ [opt | opt@('-':c:_) <- PD.cppOptions bi ++ PD.ccOptions bi, c `elem` "DIU"] installCHI :: PackageDescription -- ^information from the .cabal file -> LocalBuildInfo -- ^information from the configure step @@ -308,14 +320,13 @@ let InstallDirs { libdir = libPref } = absoluteInstallDirs pkg lbi copydest -- cannot use the recommended 'findModuleFiles' since it fails if there exists -- a modules that does not have a .chi file - mFiles <- mapM (findFileWithExtension' ["chi"] [buildDir lbi]) - (map toFilePath + mFiles <- mapM (findFileWithExtension' ["chi"] [buildDir lbi] . toFilePath) #if CABAL_VERSION_CHECK(1,8,0) (PD.libModules lib) #else (PD.libModules pkg) #endif - ) + let files = [ f | Just f <- mFiles ] #if CABAL_VERSION_CHECK(1,8,0) installOrdinaryFiles verbosity libPref files @@ -331,13 +342,13 @@ ------------------------------------------------------------------------------ typeGenProgram :: Program -typeGenProgram = (simpleProgram "gtk2hsTypeGen") +typeGenProgram = simpleProgram "gtk2hsTypeGen" signalGenProgram :: Program -signalGenProgram = (simpleProgram "gtk2hsHookGenerator") +signalGenProgram = simpleProgram "gtk2hsHookGenerator" c2hsLocal :: Program -c2hsLocal = (simpleProgram "gtk2hsC2hs") +c2hsLocal = simpleProgram "gtk2hsC2hs" genSynthezisedFiles :: Verbosity -> PackageDescription -> LocalBuildInfo -> IO () genSynthezisedFiles verb pd lbi = do @@ -370,7 +381,7 @@ res <- rawSystemProgramStdoutConf verb prog (withPrograms lbi) args rewriteFile outFile res - (flip mapM_) (filter (\(tag,_) -> "x-types-" `isPrefixOf` tag && "file" `isSuffixOf` tag) xList) $ + forM_ (filter (\(tag,_) -> "x-types-" `isPrefixOf` tag && "file" `isSuffixOf` tag) xList) $ \(fileTag, f) -> do let tag = reverse (drop 4 (reverse fileTag)) info verb ("Ensuring that class hierarchy in "++f++" is up-to-date.") @@ -391,7 +402,7 @@ sequence [ do version <- pkgconfig ["--modversion", display pkgname] case simpleParse version of - Nothing -> die $ "parsing output of pkg-config --modversion failed" + Nothing -> die "parsing output of pkg-config --modversion failed" Just v -> return (PackageIdentifier pkgname v) | Dependency pkgname _ <- concatMap pkgconfigDepends (allBuildInfo pkg) ] where @@ -456,9 +467,9 @@ extractDeps :: ModDep -> IO ModDep extractDeps md@ModDep { mdLocation = Nothing } = return md extractDeps md@ModDep { mdLocation = Just f } = withUTF8FileContents f $ \con -> do - let findImports acc (('{':'#':xs):xxs) = case (dropWhile ((==) ' ') xs) of + let findImports acc (('{':'#':xs):xxs) = case (dropWhile (' ' ==) xs) of ('i':'m':'p':'o':'r':'t':' ':ys) -> - case simpleParse (takeWhile ((/=) '#') ys) of + case simpleParse (takeWhile ('#' /=) ys) of Just m -> findImports (m:acc) xxs Nothing -> die ("cannot parse chs import in "++f++":\n"++ "offending line is {#"++xs) @@ -484,3 +495,17 @@ Just md -> (md:out', visited') where (out',visited') = foldl visit (out, m `S.insert` visited) (mdRequires md) + +-- 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) diff --git a/ige-mac-integration.cabal b/ige-mac-integration.cabal --- a/ige-mac-integration.cabal +++ b/ige-mac-integration.cabal @@ -1,5 +1,5 @@ Name: ige-mac-integration -Version: 0.0.0.2 +Version: 0.1.0.1 License: LGPL-2.1 License-file: COPYING Copyright: (c) 2001-2010 The Gtk2Hs Team @@ -13,6 +13,7 @@ Synopsis: Bindings for the Gtk/OS X integration library. Description: ige-mac-integration helps integrate Gtk applications with the native Mac desktop and make it feel more like a Mac application. + http://sourceforge.net/apps/trac/gtk-osx/wiki/Integrate Category: Graphics Tested-With: GHC == 6.12.1 @@ -38,8 +39,8 @@ Library build-depends: base >= 4 && < 5, array, containers, haskell98, mtl, - glib >= 0.11 && < 0.12, - gtk >= 0.11 && < 0.12 + glib >= 0.11 && < 0.13, + gtk >= 0.11 && < 0.13 build-tools: gtk2hsC2hs, gtk2hsHookGenerator, gtk2hsTypeGen @@ -49,7 +50,7 @@ other-modules: Graphics.UI.Gtk.OSX.Types Graphics.UI.Gtk.OSX.Signals - + extensions: ForeignFunctionInterface x-Signals-File: Graphics/UI/Gtk/OSX/Signals.chs @@ -57,5 +58,5 @@ x-Signals-Types: marshal.list x-c2hs-Header: hs-ige-mac-integration.h - pkgconfig-depends: ige-mac-integration >= 0.9.3 + pkgconfig-depends: ige-mac-integration >= 0.9.6