From 7ca5927baa6be571a7876b233933dde2b7615cb0 Mon Sep 17 00:00:00 2001 From: Lennart Spitzner Date: Sat, 12 Mar 2016 00:56:20 +0100 Subject: [PATCH] Fix .cabal files - Add source repos - Remove -threaded for library (in accordance with cabal check recommendation) - Copy LICENSE to test package (Fix cabal check error) - Add proper other-modules to test executables (Fixes #88) --- test/LICENSE | 31 +++++++++++++++++++++++++++++++ test/vty-examples.cabal | 16 +++++++++++++++- vty.cabal | 8 ++++++-- 3 files changed, 52 insertions(+), 3 deletions(-) create mode 100644 test/LICENSE diff --git a/test/LICENSE b/test/LICENSE new file mode 100644 index 0000000..e657f31 --- /dev/null +++ b/test/LICENSE @@ -0,0 +1,31 @@ +Copyright Stefan O'Rear 2006, Corey O'Connor 2008, Corey O'Connor 2009 + +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + + * Redistributions in binary form must reproduce the above + copyright notice, this list of conditions and the following + disclaimer in the documentation and/or other materials provided + with the distribution. + + * Neither the name of Stefan O'Rear nor the names of other + contributors may be used to endorse or promote products derived + from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + diff --git a/test/vty-examples.cabal b/test/vty-examples.cabal index 9852837..479b004 100644 --- a/test/vty-examples.cabal +++ b/test/vty-examples.cabal @@ -1,7 +1,7 @@ name: vty-examples version: 5.4.1 license: BSD3 -license-file: ../LICENSE +license-file: LICENSE author: AUTHORS maintainer: Corey O'Connor (coreyoconnor@gmail.com) homepage: https://github.com/coreyoconnor/vty @@ -20,6 +20,10 @@ description: cabal-version: >= 1.18.0 build-type: Simple +source-repository head + type: git + location: https://github.com/coreyoconnor/vty.git + executable vty-interactive-terminal-test main-is: interactive_terminal_test.hs @@ -44,6 +48,9 @@ executable vty-interactive-terminal-test utf8-string, vector + other-modules: Verify.Data.Terminfo.Parse + Verify + executable vty-event-echo main-is: EventEcho.hs @@ -113,3 +120,10 @@ executable vty-benchmark utf8-string, vector + other-modules: BenchImageFuzz + BenchNoDiffOpt + BenchRenderChar + BenchVerticalScroll + Verify.Graphics.Vty.Image + Verify.Graphics.Vty.Attributes + diff --git a/vty.cabal b/vty.cabal index d27cf35..29b196a 100644 --- a/vty.cabal +++ b/vty.cabal @@ -43,6 +43,10 @@ data-files: README.md, LICENSE tested-with: GHC >= 7.6.2 +source-repository head + type: git + location: https://github.com/coreyoconnor/vty.git + library default-language: Haskell2010 build-depends: base >= 4 && < 5, @@ -113,9 +117,9 @@ library default-extensions: ScopedTypeVariables ForeignFunctionInterface - ghc-options: -O2 -funbox-strict-fields -threaded -Wall -fspec-constr -fspec-constr-count=10 + ghc-options: -O2 -funbox-strict-fields -Wall -fspec-constr -fspec-constr-count=10 - ghc-prof-options: -O2 -funbox-strict-fields -threaded -caf-all -Wall -fspec-constr -fspec-constr-count=10 + ghc-prof-options: -O2 -funbox-strict-fields -caf-all -Wall -fspec-constr -fspec-constr-count=10 cc-options: -O2