X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=base.cabal;h=973cae3762e9f46d74034b4f438b0707fdce2c36;hb=ce19fc7bcb1fddde18fa73fc8121529787dbec3f;hp=e425f53da0206a64c9c7dcdf87fe81e870f6bdd1;hpb=2b3b83d94a6ed3969cc01dc9ce7b1994f6b9e9cd;p=ghc-base.git

diff --git a/base.cabal b/base.cabal
index e425f53..973cae3 100644
--- a/base.cabal
+++ b/base.cabal
@@ -1,28 +1,23 @@
-name:        base
-version:    2.1
-license:    BSD3
-license-file:    LICENSE
-maintainer:    libraries@haskell.org
-synopsis:    Basic libraries
+name:           base
+version:        4.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: Configure
+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) {
-        build-depends: rts
-        if os(mingw32) {
-            extra-libraries: wsock32, msvcrt, kernel32, user32, shell32
-        }
+    if impl(ghc) {
+        build-depends: rts, ghc-prim, integer
         exposed-modules:
             Data.Generics,
             Data.Generics.Aliases,
@@ -34,9 +29,10 @@ Library {
             Foreign.Concurrent,
             GHC.Arr,
             GHC.Base,
+            GHC.Classes,
             GHC.Conc,
             GHC.ConsoleHandler,
-            GHC.Dotnet,
+            GHC.Desugar,
             GHC.Enum,
             GHC.Environment,
             GHC.Err,
@@ -52,8 +48,6 @@ Library {
             GHC.Num,
             GHC.PArr,
             GHC.Pack,
-            GHC.Prim,
-            GHC.PrimopWrappers,
             GHC.Ptr,
             GHC.Read,
             GHC.Real,
@@ -67,10 +61,17 @@ Library {
             GHC.Weak,
             GHC.Word,
             System.Timeout
+        extensions: MagicHash, ExistentialQuantification, Rank2Types,
+                    ScopedTypeVariables, UnboxedTuples,
+                    ForeignFunctionInterface, UnliftedFFITypes,
+                    DeriveDataTypeable, GeneralizedNewtypeDeriving,
+                    FlexibleInstances, PatternSignatures, StandaloneDeriving,
+                    PatternGuards, EmptyDataDecls
     }
     exposed-modules:
         Control.Applicative,
         Control.Arrow,
+        Control.Category,
         Control.Concurrent,
         Control.Concurrent.Chan,
         Control.Concurrent.MVar,
@@ -78,12 +79,11 @@ Library {
         Control.Concurrent.QSemN,
         Control.Concurrent.SampleVar,
         Control.Exception,
+        Control.Exception.Base
+        Control.OldException,
         Control.Monad,
         Control.Monad.Fix,
         Control.Monad.Instances,
-        Control.Monad.ST,
-        Control.Monad.ST.Lazy,
-        Control.Monad.ST.Strict,
         Data.Bits,
         Data.Bool,
         Data.Char,
@@ -92,6 +92,7 @@ Library {
         Data.Either,
         Data.Eq,
         Data.Fixed,
+        Data.Foldable
         Data.Function,
         Data.HashTable,
         Data.IORef,
@@ -102,10 +103,8 @@ Library {
         Data.Monoid,
         Data.Ord,
         Data.Ratio,
-        Data.STRef,
-        Data.STRef.Lazy,
-        Data.STRef.Strict,
         Data.String,
+        Data.Traversable
         Data.Tuple,
         Data.Typeable,
         Data.Unique,
@@ -129,7 +128,6 @@ Library {
         Foreign.Storable,
         Numeric,
         Prelude,
-        System.Console.GetOpt,
         System.CPUTime,
         System.Environment,
         System.Exit,
@@ -157,17 +155,16 @@ 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
-    extensions:    CPP
-    -- XXX is there an extension for using # in varids?
+    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
     -- We need to set the package name to base (without a version number)
     -- as it's magic.
-    ghc-options: -fglasgow-exts -package-name base
+    ghc-options: -package-name base
     nhc98-options: -H4M -K3M
 }
-