X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=base.cabal;h=d222d58722ba43ada4d7f9fd41b3ef8ab3ffb356;hb=cdd30e6640d450835091b8815b42d55bee67df6b;hp=b226581c213cf492aa855844798906176ee070ea;hpb=11fa1cd5391bd38ae6179b35428a68d0c276b067;p=ghc-base.git

diff --git a/base.cabal b/base.cabal
index b226581..d222d58 100644
--- a/base.cabal
+++ b/base.cabal
@@ -1,42 +1,34 @@
-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.
-
-Flag IsGHC {
-    Description: Are we compiling with GHC?
-    Default: True
-}
+cabal-version:  >=1.2
+build-type: Configure
+extra-tmp-files:
+                config.log config.status autom4te.cache
+                include/HsBaseConfig.h
+extra-source-files:
+                config.guess config.sub install-sh
+                aclocal.m4 configure.ac configure
+                include/CTypes.h
 
 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,
-            Data.Generics.Basics,
-            Data.Generics.Instances,
-            Data.Generics.Schemes,
-            Data.Generics.Text,
-            Data.Generics.Twins,
             Foreign.Concurrent,
             GHC.Arr,
             GHC.Base,
+            GHC.Classes,
             GHC.Conc,
             GHC.ConsoleHandler,
-            GHC.Dotnet,
+            GHC.Desugar,
             GHC.Enum,
             GHC.Environment,
             GHC.Err,
@@ -52,8 +44,6 @@ Library {
             GHC.Num,
             GHC.PArr,
             GHC.Pack,
-            GHC.Prim,
-            GHC.PrimopWrappers,
             GHC.Ptr,
             GHC.Read,
             GHC.Real,
@@ -65,25 +55,24 @@ Library {
             GHC.TopHandler,
             GHC.Unicode,
             GHC.Weak,
-            GHC.Word,
-            System.Timeout
+            GHC.Word
+        extensions: MagicHash, ExistentialQuantification, Rank2Types,
+                    ScopedTypeVariables, UnboxedTuples,
+                    ForeignFunctionInterface, UnliftedFFITypes,
+                    DeriveDataTypeable, GeneralizedNewtypeDeriving,
+                    FlexibleInstances, PatternSignatures, StandaloneDeriving,
+                    PatternGuards, EmptyDataDecls
     }
     exposed-modules:
         Control.Applicative,
         Control.Arrow,
-        Control.Concurrent,
-        Control.Concurrent.Chan,
-        Control.Concurrent.MVar,
-        Control.Concurrent.QSem,
-        Control.Concurrent.QSemN,
-        Control.Concurrent.SampleVar,
+        Control.Category,
         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,
@@ -103,14 +92,10 @@ 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,
         Data.Version,
         Data.Word,
         Debug.Trace,
@@ -131,7 +116,6 @@ Library {
         Foreign.Storable,
         Numeric,
         Prelude,
-        System.Console.GetOpt,
         System.CPUTime,
         System.Environment,
         System.Exit,
@@ -159,17 +143,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
 }
-