gtk3-mac-integration 0.3.0.2 → 0.3.0.3
raw patch · 4 files changed
+9/−14 lines, 4 files
Files
- Gtk2HsSetup.hs +3/−8
- SetupMain.hs +1/−1
- SetupWrapper.hs +3/−3
- gtk3-mac-integration.cabal +2/−2
Gtk2HsSetup.hs view
@@ -429,15 +429,10 @@ let modDeps = zipWith (ModDep True []) expMods mExpFiles++ zipWith (ModDep False []) othMods mOthFiles modDeps <- mapM extractDeps modDeps- let (expMods, othMods) = span mdExposed $ sortTopological modDeps- badOther = map (fromMaybe "<no file>" . mdLocation) $- filter (not . mdExposed) expMods- unless (null badOther) $- die ("internal chs modules "++intercalate "," badOther++- " depend on exposed chs modules; cabal needs to build internal modules first")+ let (othMods, expMods) = span (not . mdExposed) $ reverse $ sortTopological modDeps return pd { PD.library = Just lib {- PD.exposedModules = map mdOriginal expMods,- PD.libBuildInfo = bi { PD.otherModules = map mdOriginal othMods }+ PD.exposedModules = map mdOriginal (reverse expMods),+ PD.libBuildInfo = bi { PD.otherModules = map mdOriginal (reverse othMods) } }} data ModDep = ModDep {
SetupMain.hs view
@@ -10,4 +10,4 @@ main = do checkGtk2hsBuildtools [typeGenProgram, signalGenProgram, c2hsLocal] defaultMainWithHooks gtk2hsUserHooks- +
SetupWrapper.hs view
@@ -9,7 +9,7 @@ import Distribution.Simple.Program import Distribution.Simple.Compiler import Distribution.Simple.BuildPaths (exeExtension)-import Distribution.Simple.Configure (configCompiler)+import Distribution.Simple.Configure (configCompilerEx) import Distribution.Simple.GHC (getInstalledPackages) import qualified Distribution.Simple.PackageIndex as PackageIndex import Distribution.Version@@ -18,7 +18,7 @@ import System.Environment import System.Process-import System.Exit+import System.Exit (ExitCode(..), exitWith) import System.FilePath import System.Directory import qualified Control.Exception as Exception@@ -115,7 +115,7 @@ when outOfDate $ do debug verbosity "Setup script is out of date, compiling..." - (comp, conf) <- configCompiler (Just GHC) Nothing Nothing+ (comp, _, conf) <- configCompilerEx (Just GHC) Nothing Nothing defaultProgramConfiguration verbosity cabalLibVersion <- cabalLibVersionToUse comp conf let cabalPkgid = PackageIdentifier (PackageName "Cabal") cabalLibVersion
gtk3-mac-integration.cabal view
@@ -1,5 +1,5 @@ Name: gtk3-mac-integration-Version: 0.3.0.2+Version: 0.3.0.3 License: LGPL-2.1 License-file: COPYING Copyright: (c) 2001-2010 The Gtk2Hs Team@@ -62,5 +62,5 @@ x-Signals-Types: marshal.list x-c2hs-Header: hs-gtk-mac-integration.h- pkgconfig-depends: gtk-mac-integration >=2.0.0+ pkgconfig-depends: gtk-mac-integration-gtk3 >=2.0.0