diff options
author | khumba <> | 2017-01-14 19:57:00 (GMT) |
---|---|---|
committer | hdiff <hdiff@hdiff.luite.com> | 2017-01-14 19:57:00 (GMT) |
commit | bc976f87806132f4373cddb43c65afe8d40506a7 (patch) | |
tree | ce5827e2522e20b98459332640450c00033b4a38 | |
parent | 3b584a35e6ff18155721f7c061d8087d288c8bf0 (diff) |
version 0.2.10.2.1
-rw-r--r-- | Setup.hs | 24 | ||||
-rw-r--r-- | qtah-examples.cabal | 6 | ||||
-rw-r--r-- | src/Graphics/UI/Qtah/Example/Notepad.hs | 2 | ||||
-rw-r--r-- | src/Main.hs | 2 |
4 files changed, 26 insertions, 8 deletions
@@ -1,6 +1,6 @@ -- This file is part of Qtah. -- --- Copyright 2016 Bryan Gardiner <bog@khumba.net> +-- Copyright 2016-2017 Bryan Gardiner <bog@khumba.net> -- -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by @@ -15,7 +15,25 @@ -- You should have received a copy of the GNU Lesser General Public License -- along with this program. If not, see <http://www.gnu.org/licenses/>. -import Distribution.Simple (defaultMain) +import Control.Monad (unless) +import Distribution.Simple (defaultMainWithHooks, simpleUserHooks) +import Distribution.Simple.Setup (ConfigFlags, configDynExe, configVerbosity, fromFlagOrDefault) +import Distribution.Simple.UserHooks (UserHooks (postConf)) +import Distribution.Simple.Utils (warn) +import Distribution.Verbosity (normal) main :: IO () -main = defaultMain +main = defaultMainWithHooks qtahHooks + +qtahHooks :: UserHooks +qtahHooks = simpleUserHooks + { postConf = \_ cf _ _ -> warnAboutDynExe cf + } + +warnAboutDynExe :: ConfigFlags -> IO () +warnAboutDynExe configFlags = do + let verbosity = fromFlagOrDefault normal $ configVerbosity configFlags + unless (fromFlagOrDefault False $ configDynExe configFlags) $ + warn verbosity $ + "qtah-examples needs to be a dynamically linked executable; " ++ + "please pass --enable-executable-dynamic to 'cabal install'." diff --git a/qtah-examples.cabal b/qtah-examples.cabal index 7e04adc..7339cb4 100644 --- a/qtah-examples.cabal +++ b/qtah-examples.cabal @@ -1,14 +1,14 @@ name: qtah-examples -version: 0.2.0 +version: 0.2.1 synopsis: Example programs for Qtah Qt bindings homepage: http://khumba.net/projects/qtah license: LGPL-3 license-files: LICENSE.GPL, LICENSE.LGPL author: Bryan Gardiner <bog@khumba.net> maintainer: Bryan Gardiner <bog@khumba.net> -copyright: Copyright 2015-2016 Bryan Gardiner +copyright: Copyright 2015-2017 Bryan Gardiner category: Graphics -build-type: Simple +build-type: Custom cabal-version: >=1.10 description: Qtah is a set of Qt bindings for Haskell. This package contains example diff --git a/src/Graphics/UI/Qtah/Example/Notepad.hs b/src/Graphics/UI/Qtah/Example/Notepad.hs index d65ac4d..7676e27 100644 --- a/src/Graphics/UI/Qtah/Example/Notepad.hs +++ b/src/Graphics/UI/Qtah/Example/Notepad.hs @@ -1,6 +1,6 @@ -- This file is part of Qtah. -- --- Copyright 2015-2016 Bryan Gardiner <bog@khumba.net> +-- Copyright 2015-2017 Bryan Gardiner <bog@khumba.net> -- -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by diff --git a/src/Main.hs b/src/Main.hs index 4db2d30..d7db97a 100644 --- a/src/Main.hs +++ b/src/Main.hs @@ -1,6 +1,6 @@ -- This file is part of Qtah. -- --- Copyright 2015-2016 Bryan Gardiner <bog@khumba.net> +-- Copyright 2015-2017 Bryan Gardiner <bog@khumba.net> -- -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by |