Commit 106fe0bb authored by ijones's avatar ijones
Browse files

added ModuleTest, made everything compile

parent f9ac3184
......@@ -42,7 +42,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -}
module Distribution.Build where
import Distribution.Package(PackageConfig)
import Distribution.Compiler(Compiler)
import Distribution.Misc(Compiler)
build :: PackageConfig -> Compiler -> IO ()
build _ _ = return ()
-----------------------------------------------------------------------------
-- |
-- Module : Distribution.Compiler
-- Copyright : Isaac Jones 2003-2004
--
-- Maintainer : Isaac Jones <ijones@syntaxpolice.org>
-- Stability : alpha
-- Portability :
--
-- Explanation: <FIX>
-- WHERE DOES THIS MODULE FIT IN AT A HIGH-LEVEL <FIX>
{- Copyright (c) 2003-2004, Isaac Jones
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 Isaac Jones 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. -}
module Distribution.Misc(Compiler, License, Dependency, Extension, Opt)
where
import Distribution.Version(VersionRange)
-- ------------------------------------------------------------
-- * Compiler
-- ------------------------------------------------------------
data Flavor = GHC | NHC | Hugs | HBC | Helium | OtherCompiler String
data Compiler = Compiler {flavor :: Compiler,
path :: FilePath,
packagingTool :: FilePath}
-- ------------------------------------------------------------
-- * Misc
-- ------------------------------------------------------------
data License = GPL | LGPL | BSD3 | BSD4 | PublicDomain | AllRightsReserved
| {- ... | -} OtherLicense FilePath
deriving (Read, Show)
-- |Maybe move to Distribution.Version?
data Dependency = Dependency String VersionRange
deriving (Read, Show)
-- |This represents non-standard compiler extensions which each
-- package might employ. Not yet implemented.
data Extension = Foo | Bar
type Opt = String
-----------------------------------------------------------------------------
-- |
-- Module : Distribution.Compiler
-- Module : Distribution.ModuleTest
-- Copyright : Isaac Jones 2003-2004
--
-- Maintainer : Isaac Jones <ijones@syntaxpolice.org>
-- Stability : alpha
-- Portability :
-- Portability : GHC
--
-- Explanation: <FIX>
-- WHERE DOES THIS MODULE FIT IN AT A HIGH-LEVEL <FIX>
......@@ -41,10 +41,14 @@ 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. -}
module Distribution.Compiler where
module ModuleTest where
data Flavor = GHC | NHC | Hugs | HBC | Helium | OtherCompiler String
-- Import everything, since we want to test the compilation of them:
data Compiler = Compiler {flavor :: Compiler,
path :: FilePath,
packagingTool :: FilePath}
import Distribution.Build()
import Distribution.Version()
import Distribution.UseConfig()
import Distribution.Misc()
main :: IO ()
main = return ()
......@@ -44,7 +44,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -}
module Distribution.Package(PackageIdentifier(..),
PackageDescription(..),
PackageConfig(..))
where
where
import Distribution.Version(Version)
import Distribution.Misc(License, Dependency, Extension, Compiler)
data PackageIdentifier
= PackageIdentifier {pkgName::String, pkgVersion::Version}
......@@ -58,7 +62,7 @@ data PackageDescription
stability :: String}
data PackageConfig
= PackageConfig {packageDescription :: Packagedescription,
= PackageConfig {packageDescription :: PackageDescription,
buildDepends :: [ Dependency ],
sources :: [ FilePath ],
extensions :: [ Extension ],
......
-- This module is meant to be local-only to Distribution...
module UseConfig where
module Distribution.UseConfig where
import Distribution.Misc(License, Dependency, Opt)
import Distribution.Package(PackageIdentifier)
data UseConfig
= UseConfig {
pkgIdent :: PkgIdentifier,
pkgIdent :: PackageIdentifier,
license :: License,
copyright :: String,
maintainer :: String,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment