diff --git a/LICENSE b/LICENSE --- a/LICENSE +++ b/LICENSE @@ -1,5 +1,5 @@ Copyright (c) 2017, Commonwealth Scientific and Industrial Research Organisation -(CSIRO) ABN 41 687 119 230. +Copyright (c) 2019-2021, Tony Morris Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: @@ -16,8 +16,8 @@ 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 HOLDER 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; +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 diff --git a/Setup.hs b/Setup.hs new file mode 100644 --- /dev/null +++ b/Setup.hs @@ -0,0 +1,2 @@ +import Distribution.Simple +main = defaultMain diff --git a/Setup.lhs b/Setup.lhs deleted file mode 100644 --- a/Setup.lhs +++ /dev/null @@ -1,44 +0,0 @@ -#!/usr/bin/env runhaskell -\begin{code} -{-# OPTIONS_GHC -Wall #-} -module Main (main) where - -import Data.List ( nub ) -import Data.Version ( showVersion ) -import Distribution.Package ( PackageName(PackageName), PackageId, InstalledPackageId, packageVersion, packageName ) -import Distribution.PackageDescription ( PackageDescription(), TestSuite(..) ) -import Distribution.Simple ( defaultMainWithHooks, UserHooks(..), simpleUserHooks ) -import Distribution.Simple.Utils ( rewriteFile, createDirectoryIfMissingVerbose ) -import Distribution.Simple.BuildPaths ( autogenModulesDir ) -import Distribution.Simple.Setup ( BuildFlags(buildVerbosity), fromFlag ) -import Distribution.Simple.LocalBuildInfo ( withLibLBI, withTestLBI, LocalBuildInfo(), ComponentLocalBuildInfo(componentPackageDeps) ) -import Distribution.Verbosity ( Verbosity ) -import System.FilePath ( () ) - -main :: IO () -main = defaultMainWithHooks simpleUserHooks - { buildHook = \pkg lbi hooks flags -> do - generateBuildModule (fromFlag (buildVerbosity flags)) pkg lbi - buildHook simpleUserHooks pkg lbi hooks flags - } - -generateBuildModule :: Verbosity -> PackageDescription -> LocalBuildInfo -> IO () -generateBuildModule verbosity pkg lbi = do - let dir = autogenModulesDir lbi - createDirectoryIfMissingVerbose verbosity True dir - withLibLBI pkg lbi $ \_ libcfg -> do - withTestLBI pkg lbi $ \suite suitecfg -> do - rewriteFile (dir "Build_" ++ testName suite ++ ".hs") $ unlines - [ "module Build_" ++ testName suite ++ " where" - , "deps :: [String]" - , "deps = " ++ (show $ formatdeps (testDeps libcfg suitecfg)) - ] - where - formatdeps = map (formatone . snd) - formatone p = case packageName p of - PackageName n -> n ++ "-" ++ showVersion (packageVersion p) - -testDeps :: ComponentLocalBuildInfo -> ComponentLocalBuildInfo -> [(InstalledPackageId, PackageId)] -testDeps xs ys = nub $ componentPackageDeps xs ++ componentPackageDeps ys - -\end{code} diff --git a/aviation-cessna172-diagrams.cabal b/aviation-cessna172-diagrams.cabal --- a/aviation-cessna172-diagrams.cabal +++ b/aviation-cessna172-diagrams.cabal @@ -1,5 +1,5 @@ name: aviation-cessna172-diagrams -version: 0.0.2 +version: 0.0.3 license: OtherLicense license-file: LICENSE author: Tony Morris <ʇǝu˙sıɹɹoɯʇ@ןןǝʞsɐɥ>, Joshua Morris <ɯoɔ˙lᴉɐɯƃ@llǝʞsɐɥ+sᴉɹɹoɯuɥoɾɐnɥsoɾ> @@ -7,23 +7,17 @@ copyright: Copyright (c) 2017, Commonwealth Scientific and Industrial Research Organisation (CSIRO) ABN 41 687 119 230. synopsis: Diagrams for the Cessna 172 aircraft in aviation. category: Aviation -description: - <> - . +description: Diagrams for the Cessna 172 aircraft in aviation. - -homepage: https://github.com/data61/aviation-cessna172-diagrams -bug-reports: https://github.com/data61/aviation-cessna172-diagrams/issues +homepage: https://gitlab.com/tonymorris/aviation-cessna172-diagrams +bug-reports: https://gitlab.com/tonymorris/aviation-cessna172-diagrams/issues cabal-version: >= 1.10 -build-type: Custom +build-type: Simple extra-source-files: changelog source-repository head type: git - location: git@github.com:data61/aviation-cessna172-diagrams.git - -flag small_base - description: Choose the new, split-up base package. + location: git@gitlab.com:tonymorris/aviation-cessna172-diagrams.git library default-language: @@ -32,53 +26,25 @@ build-depends: base >= 4.8 && < 5 , lens >= 4.15 && < 5 - , aviation-units >= 0.0.1 && < 1 - , aviation-weight-balance >= 0.0.1 && < 1 - , aviation-cessna172-weight-balance >= 0.0.1 && < 1 - , diagrams-cairo >= 1.4 && < 2 - , diagrams-core >= 1.4 && < 2 - , diagrams-lib >= 1.4 && < 2 - , mtl >= 2.2 && < 3 - , plots >= 0.1 && < 1 - , hgeometry >= 0.6.0.0 && < 0.7 - , colour >= 2.3 && < 3 - + , diagrams-cairo >= 1.4 && < 1.5 + , diagrams-core >= 1.4 && < 1.5 + , diagrams-lib >= 1.4 && < 1.5 + , mtl >= 2.2 && < 2.3 + , plots >= 0.1 && < 0.2 + , colour >= 2.3 && < 2.4 + , hgeometry == 0.10.0.0 + , hgeometry-combinatorial == 0.10.0.0 + , aviation-units >= 0.0.2 && < 1 + , aviation-weight-balance >= 0.0.2 && < 1 + , aviation-cessna172-weight-balance >= 0.0.2 && < 1 ghc-options: -Wall default-extensions: - + NoImplicitPrelude hs-source-dirs: src - exposed-modules: Data.Aviation.C172.Diagrams - -test-suite doctests - type: - exitcode-stdio-1.0 - - main-is: - doctests.hs - - default-language: - Haskell2010 - - build-depends: - base < 5 && >= 3 - , doctest >= 0.9.7 - , filepath >= 1.3 - , directory >= 1.1 - , QuickCheck >= 2.0 - , template-haskell >= 2.8 - , parsec >= 3.1 - , quickcheck-text - - ghc-options: - -Wall - -threaded - - hs-source-dirs: - test diff --git a/changelog b/changelog --- a/changelog +++ b/changelog @@ -1,3 +1,7 @@ +0.0.3 + +* Update GHC + 0.0.2 * Update to newer hgeometry. @@ -5,4 +9,3 @@ 0.0.1 * Initial release - diff --git a/src/Data/Aviation/C172/Diagrams.hs b/src/Data/Aviation/C172/Diagrams.hs --- a/src/Data/Aviation/C172/Diagrams.hs +++ b/src/Data/Aviation/C172/Diagrams.hs @@ -49,7 +49,7 @@ import Data.Function(($)) import Data.Functor(fmap) import Data.Geometry.Boundary(PointLocationResult(Inside, Outside, OnBoundary)) -import Data.Geometry.Point(Point, point2, _point2, xCoord, yCoord) +import Data.Geometry.Point(Point(Point, toVec), xCoord, yCoord) import Data.Geometry.Polygon(SimplePolygon, Polygon, inPolygon, fromPoints, outerBoundary) import Data.Maybe(Maybe(Just), maybe) import Data.Monoid(Any) @@ -81,6 +81,20 @@ import Prelude(Rational, Double, Int, Fractional((/)), fromRational, (*), (+), (-), show, round, subtract) import System.IO(IO) import Text.Printf(printf) +import Data.Geometry.Vector.VectorFamily hiding(snoc) + +point2 :: + r + -> r + -> Point 2 r +point2 x y = + Point $ Vector2 x y + +_point2 :: + Point 2 b + -> (b, b) +_point2 = + (\(Vector2 x y) -> (x,y)) . toVec dejavuSansMono :: HasStyle a => diff --git a/test/doctests.hs b/test/doctests.hs deleted file mode 100644 --- a/test/doctests.hs +++ /dev/null @@ -1,32 +0,0 @@ -module Main where - -import Build_doctests (deps) -import Control.Applicative -import Control.Monad -import Data.List -import System.Directory -import System.FilePath -import Test.DocTest - -main :: - IO () -main = - getSources >>= \sources -> doctest $ - "-isrc" - : "-idist/build/autogen" - : "-optP-include" - : "-optPdist/build/autogen/cabal_macros.h" - : "-hide-all-packages" - : map ("-package="++) deps ++ sources - -getSources :: IO [FilePath] -getSources = filter (isSuffixOf ".hs") <$> go "src" - where - go dir = do - (dirs, files) <- getFilesAndDirectories dir - (files ++) . concat <$> mapM go dirs - -getFilesAndDirectories :: FilePath -> IO ([FilePath], [FilePath]) -getFilesAndDirectories dir = do - c <- map (dir ) . filter (`notElem` ["..", "."]) <$> getDirectoryContents dir - (,) <$> filterM doesDirectoryExist c <*> filterM doesFileExist c