X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=base.cabal;h=9792d808f2ae214498fb1d44f157d6ee9696ad78;hb=bf705fb9aeb5c1ef01a8d806374389a703fbb25f;hp=c918a4f973c9701368236ef0f9351e5442859abe;hpb=7de48e78ab0b12be788962faa8ec6270f48c7d00;p=ghc-base.git

diff --git a/base.cabal b/base.cabal
index c918a4f..9792d80 100644
--- a/base.cabal
+++ b/base.cabal
@@ -1,28 +1,26 @@
-name:        base
-version:    2.1
-license:    BSD3
-license-file:    LICENSE
-maintainer:    libraries@haskell.org
-synopsis:    Basic libraries
+name:           base
+version:        3.0
+license:        BSD3
+license-file:   LICENSE
+maintainer:     libraries@haskell.org
+synopsis:       Basic libraries
 description:
     This package contains the Prelude and its support libraries,
     and a large collection of useful libraries ranging from data
     structures to parsing combinators and debugging utilities.
+cabal-version:  >=1.2
+build-type: Custom
+extra-tmp-files:
+                config.log config.status autom4te.cache
+                include/HsBaseConfig.h
 
-Flag IsGHC {
-    Description: Are we compiling with GHC?
-    Default: True
-}
 
 Library {
     -- This is actually something of a hack, as if we are using
     -- GHC and we don't have an rts package for some reason, we
     -- actually ought to fail.
-    if flag(IsGHC) {
+    if impl(ghc) {
         build-depends: rts
-        if os(mingw32) {
-            extra-libraries: wsock32, msvcrt, kernel32, user32, shell32
-        }
         exposed-modules:
             Data.Generics,
             Data.Generics.Aliases,
@@ -36,6 +34,7 @@ Library {
             GHC.Base,
             GHC.Conc,
             GHC.ConsoleHandler,
+            GHC.Desugar,
             GHC.Dotnet,
             GHC.Enum,
             GHC.Environment,
@@ -52,7 +51,6 @@ Library {
             GHC.Num,
             GHC.PArr,
             GHC.Pack,
-            GHC.Prim,
             GHC.PrimopWrappers,
             GHC.Ptr,
             GHC.Read,
@@ -71,6 +69,7 @@ Library {
     exposed-modules:
         Control.Applicative,
         Control.Arrow,
+        Control.Category,
         Control.Concurrent,
         Control.Concurrent.Chan,
         Control.Concurrent.MVar,
@@ -84,15 +83,6 @@ Library {
         Control.Monad.ST,
         Control.Monad.ST.Lazy,
         Control.Monad.ST.Strict,
-        Data.Array,
-        Data.Array.Base,
-        Data.Array.Diff,
-        Data.Array.IArray,
-        Data.Array.IO,
-        Data.Array.MArray,
-        Data.Array.ST,
-        Data.Array.Storable,
-        Data.Array.Unboxed,
         Data.Bits,
         Data.Bool,
         Data.Char,
@@ -100,31 +90,23 @@ Library {
         Data.Dynamic,
         Data.Either,
         Data.Eq,
-        Data.Foldable,
         Data.Fixed,
+        Data.Foldable
         Data.Function,
-        Data.Graph,
         Data.HashTable,
         Data.IORef,
         Data.Int,
-        Data.IntMap,
-        Data.IntSet,
         Data.Ix,
         Data.List,
         Data.Maybe,
-        Data.Map,
         Data.Monoid,
         Data.Ord,
-        Data.PackedString,
         Data.Ratio,
         Data.STRef,
         Data.STRef.Lazy,
         Data.STRef.Strict,
-        Data.Sequence,
-        Data.Set,
         Data.String,
-        Data.Tree,
-        Data.Traversable,
+        Data.Traversable
         Data.Tuple,
         Data.Typeable,
         Data.Unique,
@@ -160,7 +142,6 @@ Library {
         System.Mem.StableName,
         System.Mem.Weak,
         System.Posix.Internals,
-        System.Posix.Signals,
         System.Posix.Types,
         Text.ParserCombinators.ReadP,
         Text.ParserCombinators.ReadPrec,
@@ -170,8 +151,6 @@ Library {
         Text.Show,
         Text.Show.Functions
         Unsafe.Coerce
-    other-modules:
-        Data.Array.IO.Internals
     c-sources:
         cbits/PrelIOUtils.c
         cbits/WCsubst.c
@@ -179,12 +158,14 @@ Library {
         cbits/consUtils.c
         cbits/dirUtils.c
         cbits/inputReady.c
-        cbits/lockFile.c
         cbits/longlong.c
         cbits/selectUtils.c
     include-dirs: include
     includes:    HsBase.h
-    install-includes:    HsBase.h HsBaseConfig.h WCsubst.h dirUtils.h lockFile.h consUtils.h Typeable.h
+    install-includes:    HsBase.h HsBaseConfig.h WCsubst.h dirUtils.h consUtils.h Typeable.h
+    if os(windows) {
+        extra-libraries: wsock32, msvcrt, kernel32, user32, shell32
+    }
     extensions:    CPP
     -- XXX is there an extension for using # in varids?
     -- We need to set the package name to base (without a version number)
@@ -192,4 +173,3 @@ Library {
     ghc-options: -fglasgow-exts -package-name base
     nhc98-options: -H4M -K3M
 }
-