From bc976f87806132f4373cddb43c65afe8d40506a7 Mon Sep 17 00:00:00 2001 From: khumba <> Date: Sat, 14 Jan 2017 20:57:00 +0100 Subject: version 0.2.1 diff --git a/Setup.hs b/Setup.hs index 6a6b756..5d851a9 100644 --- a/Setup.hs +++ b/Setup.hs @@ -1,6 +1,6 @@ -- This file is part of Qtah. -- --- Copyright 2016 Bryan Gardiner +-- Copyright 2016-2017 Bryan Gardiner -- -- 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 . -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 maintainer: Bryan Gardiner -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 +-- Copyright 2015-2017 Bryan Gardiner -- -- 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 +-- Copyright 2015-2017 Bryan Gardiner -- -- 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 -- cgit v0.10.2