Skip to content

Commit

Permalink
Use Cabal 1.24
Browse files Browse the repository at this point in the history
  • Loading branch information
hamishmack committed May 22, 2016
1 parent 81a8daa commit 4b979e8
Show file tree
Hide file tree
Showing 7 changed files with 26 additions and 690 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
/dist/
/dist-newstyle/
500 changes: 0 additions & 500 deletions Gtk2HsSetup.hs

This file was deleted.

16 changes: 9 additions & 7 deletions Setup.hs
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
-- Standard setup file for a Gtk2Hs module.
-- Adjustments specific to this package,
-- all Gtk2Hs-specific boilerplate is kept in
-- gtk2hs-buildtools:Gtk2HsSetup
--
-- See also:
-- * SetupMain.hs : the real Setup script for this package
-- * Gtk2HsSetup.hs : Gtk2Hs-specific boilerplate
-- * SetupWrapper.hs : wrapper for compat with various ghc/cabal versions
import Gtk2HsSetup ( gtk2hsUserHooks, checkGtk2hsBuildtools,
typeGenProgram, signalGenProgram, c2hsLocal)
import Distribution.Simple ( defaultMainWithHooks )

import SetupWrapper ( setupWrapper )
main = do
checkGtk2hsBuildtools [typeGenProgram, signalGenProgram, c2hsLocal]
defaultMainWithHooks gtk2hsUserHooks

main = setupWrapper "SetupMain.hs"
13 changes: 0 additions & 13 deletions SetupMain.hs

This file was deleted.

164 changes: 0 additions & 164 deletions SetupWrapper.hs

This file was deleted.

11 changes: 8 additions & 3 deletions gtk-mac-integration.cabal-renamed
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Copyright: (c) 2001-2010 The Gtk2Hs Team
Author: Duncan Coutts, Peter Gavin, Axel Simon, Hamish Mackenzie
Maintainer: [email protected]
Build-Type: Custom
Cabal-Version: >= 1.8.0
Cabal-Version: >= 1.24
Stability: provisional
homepage: http://www.haskell.org/gtk2hs/
bug-reports: http://hackage.haskell.org/trac/gtk2hs/
Expand All @@ -18,7 +18,6 @@ Description: gtk-mac-integration helps integrate Gtk applications with the na
Category: Graphics
Tested-With: GHC == 7.2.2
Extra-Source-Files: hs-gtk-mac-integration.h
SetupWrapper.hs SetupMain.hs Gtk2HsSetup.hs
marshal.list
hierarchy.list

Expand All @@ -37,6 +36,11 @@ Source-Repository head
type: git
location: https://github.com/gtk2hs/gtk-mac-integration.git

custom-setup
setup-depends: base >= 4.6,
Cabal >= 1.24 && < 1.25,
gtk2hs-buildtools >= 0.13.1.0 && < 0.14

Library
build-depends: base >= 4 && < 5, array -any, containers -any, mtl -any,
glib >=0.13.0.0 && <0.14,
Expand All @@ -53,7 +57,8 @@ Library
Graphics.UI.Gtk.OSX.Types
Graphics.UI.Gtk.OSX.Signals

extensions: ForeignFunctionInterface
default-language: Haskell2010
default-extensions: ForeignFunctionInterface

include-dirs: .
cpp-options: -DDISABLE_DEPRECATED -U__BLOCKS__ -D__attribute__(A)=
Expand Down
11 changes: 8 additions & 3 deletions gtk3-mac-integration.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Copyright: (c) 2001-2010 The Gtk2Hs Team
Author: Duncan Coutts, Peter Gavin, Axel Simon, Hamish Mackenzie
Maintainer: [email protected]
Build-Type: Custom
Cabal-Version: >= 1.8.0
Cabal-Version: >= 1.24
Stability: provisional
homepage: http://www.haskell.org/gtk2hs/
bug-reports: http://hackage.haskell.org/trac/gtk2hs/
Expand All @@ -18,7 +18,6 @@ Description: gtk-mac-integration helps integrate Gtk applications with the na
Category: Graphics
Tested-With: GHC == 7.2.2
Extra-Source-Files: hs-gtk-mac-integration.h
SetupWrapper.hs SetupMain.hs Gtk2HsSetup.hs
marshal.list
hierarchy.list

Expand All @@ -37,6 +36,11 @@ Source-Repository head
type: git
location: https://github.com/gtk2hs/gtk-mac-integration.git

custom-setup
setup-depends: base >= 4.6,
Cabal >= 1.24 && < 1.25,
gtk2hs-buildtools >= 0.13.1.0 && < 0.14

Library
build-depends: base >= 4 && < 5, array -any, containers -any, mtl -any,
glib >=0.13.0.0 && <0.14,
Expand All @@ -53,7 +57,8 @@ Library
Graphics.UI.Gtk.OSX.Types
Graphics.UI.Gtk.OSX.Signals

extensions: ForeignFunctionInterface
default-language: Haskell2010
default-extensions: ForeignFunctionInterface

include-dirs: .
cpp-options: -DDISABLE_DEPRECATED -U__BLOCKS__ -D__attribute__(A)=
Expand Down

0 comments on commit 4b979e8

Please sign in to comment.