[project @ 2002-02-07 11:13:29 by simonmar]

Various updates after rearranging the directory structure in the
repository (there wasn't any history worth keeping, and it's better to
do this now before we go 'live').

Packages under 'compat' are backwards-compatibility packages which
should provide an interface equivalent to the current hslibs setup.
There are a few packages still missing.

diff --git a/Data/Array/IO.hs b/Data/Array/IO.hs
index af15696..fcceac1 100644 (file)
--- a/Data/Array/IO.hs
+++ b/Data/Array/IO.hs
@@ -1,4 +1,4 @@
-{-# OPTIONS -#include "HsCore.h" #-}
+{-# OPTIONS -#include "HsBase.h" #-}
 -----------------------------------------------------------------------------
 -- 
 -- Module      :  Data.Array.IO
@@ -9,7 +9,7 @@
 -- Stability   :  experimental
 -- Portability :  non-portable
 --
--- $Id: IO.hs,v 1.4 2002/02/05 17:32:25 simonmar Exp $
+-- $Id: IO.hs,v 1.5 2002/02/07 11:13:29 simonmar Exp $
 --
 -- Mutable boxed/unboxed arrays in the IO monad.
 --

diff --git a/Foreign/C/Error.hs b/Foreign/C/Error.hs
index 77aa36c..a908f0f 100644 (file)
--- a/Foreign/C/Error.hs
+++ b/Foreign/C/Error.hs
@@ -1,4 +1,4 @@
-{-# OPTIONS -fno-implicit-prelude -#include "HsCore.h" #-}
+{-# OPTIONS -fno-implicit-prelude -#include "HsBase.h" #-}
 -----------------------------------------------------------------------------
 -- 
 -- Module      :  Foreign.C.Error
@@ -9,7 +9,7 @@
 -- Stability   :  provisional
 -- Portability :  portable
 --
--- $Id: Error.hs,v 1.5 2002/02/05 17:32:25 simonmar Exp $
+-- $Id: Error.hs,v 1.6 2002/02/07 11:13:30 simonmar Exp $
 --
 -- C-specific Marshalling support: Handling of C "errno" error codes
 --

diff --git a/GHC/Handle.hs b/GHC/Handle.hs
index db9e886..0984ab0 100644 (file)
--- a/GHC/Handle.hs
+++ b/GHC/Handle.hs
@@ -1,10 +1,10 @@
-{-# OPTIONS -fno-implicit-prelude -#include "HsCore.h" #-}
+{-# OPTIONS -fno-implicit-prelude -#include "HsBase.h" #-}
 
 #undef DEBUG_DUMP
 #undef DEBUG
 
 -- -----------------------------------------------------------------------------
--- $Id: Handle.hs,v 1.3 2002/02/05 17:32:26 simonmar Exp $
+-- $Id: Handle.hs,v 1.4 2002/02/07 11:13:30 simonmar Exp $
 --
 -- (c) The University of Glasgow, 1994-2001
 --

diff --git a/GHC/IO.hs b/GHC/IO.hs
index 110ae68..39725a5 100644 (file)
--- a/GHC/IO.hs
+++ b/GHC/IO.hs
@@ -1,9 +1,9 @@
-{-# OPTIONS -fno-implicit-prelude -#include "HsCore.h" #-}
+{-# OPTIONS -fno-implicit-prelude -#include "HsBase.h" #-}
 
 #undef DEBUG_DUMP
 
 -- -----------------------------------------------------------------------------
--- $Id: IO.hs,v 1.3 2002/02/05 17:32:26 simonmar Exp $
+-- $Id: IO.hs,v 1.4 2002/02/07 11:13:30 simonmar Exp $
 --
 -- (c) The University of Glasgow, 1992-2001
 --

diff --git a/cbits/PrelIOUtils.c b/cbits/PrelIOUtils.c
index f9f9e01..f37c4b6 100644 (file)
--- a/cbits/PrelIOUtils.c
+++ b/cbits/PrelIOUtils.c
@@ -5,5 +5,5 @@
  */
 
 #define INLINE
-#include "HsCore.h"
+#include "HsBase.h"
 

diff --git a/cbits/dirUtils.c b/cbits/dirUtils.c
index bad1c0f..d6ca576 100644 (file)
--- a/cbits/dirUtils.c
+++ b/cbits/dirUtils.c
@@ -3,7 +3,7 @@
  *
  * Directory Runtime Support
  */
-#include "HsCore.h"
+#include "HsBase.h"
 
 #if defined(mingw32_TARGET_OS)
 #include <windows.h>

diff --git a/cbits/errno.c b/cbits/errno.c
index d095ee2..f7c513c 100644 (file)
--- a/cbits/errno.c
+++ b/cbits/errno.c
@@ -1,12 +1,12 @@
 /* 
  * (c) The University of Glasgow, 2000-2001
  *
- * $Id: errno.c,v 1.3 2001/12/21 15:07:26 simonmar Exp $
+ * $Id: errno.c,v 1.4 2002/02/07 11:13:30 simonmar Exp $
  *
  * GHC Error Number Conversion
  */
 
-#include "HsCore.h"
+#include "HsBase.h"
 
 /* Raw errno */
 /* Covers up the fact that on Windows this is a function */

diff --git a/cbits/inputReady.c b/cbits/inputReady.c
index 6585de9..63233ec 100644 (file)
--- a/cbits/inputReady.c
+++ b/cbits/inputReady.c
@@ -1,14 +1,14 @@
 /* 
  * (c) The GRASP/AQUA Project, Glasgow University, 1994-1998
  *
- * $Id: inputReady.c,v 1.4 2001/12/21 15:07:26 simonmar Exp $
+ * $Id: inputReady.c,v 1.5 2002/02/07 11:13:30 simonmar Exp $
  *
  * hReady Runtime Support
  */
 
 /* select and supporting types is not Posix */
 /* #include "PosixSource.h" */
-#include "HsCore.h"
+#include "HsBase.h"
 
 /*
  * inputReady(fd) checks to see whether input is available on the file

diff --git a/cbits/lockFile.c b/cbits/lockFile.c
index 0ffad7d..0abfb90 100644 (file)
--- a/cbits/lockFile.c
+++ b/cbits/lockFile.c
@@ -1,12 +1,12 @@
 /* 
  * (c) The GRASP/AQUA Project, Glasgow University, 1994-1998
  *
- * $Id: lockFile.c,v 1.1 2001/06/28 14:15:04 simonmar Exp $
+ * $Id: lockFile.c,v 1.2 2002/02/07 11:13:30 simonmar Exp $
  *
  * stdin/stout/stderr Runtime Support
  */
 
-#include "HsCore.h"
+#include "HsBase.h"
 
 #ifndef FD_SETSIZE
 #define FD_SETSIZE 256

diff --git a/cbits/system.c b/cbits/system.c
index 6534ca8..6c4e7f5 100644 (file)
--- a/cbits/system.c
+++ b/cbits/system.c
@@ -1,7 +1,7 @@
 /* 
- * (c) The GRASP/AQUA Project, Glasgow University, 1994-1998
+ * (c) The University of Glasgow 2002
  *
- * $Id: system.c,v 1.4 2001/12/21 15:07:26 simonmar Exp $
+ * $Id: system.c,v 1.5 2002/02/07 11:13:30 simonmar Exp $
  *
  * system Runtime Support
  */
@@ -9,7 +9,7 @@
 /* The itimer stuff in this module is non-posix */
 // #include "PosixSource.h"
 
-#include "HsCore.h"
+#include "HsBase.h"
 
 #if defined(mingw32_TARGET_OS)
 #include <windows.h>

diff --git a/cbits/writeError.c b/cbits/writeError.c
index 26ce6c2..d3a3b4b 100644 (file)
--- a/cbits/writeError.c
+++ b/cbits/writeError.c
@@ -1,7 +1,7 @@
 /* 
- * (c) The GRASP/AQUA Project, Glasgow University, 1998
+ * (c) The University of Glasgow 2002
  *
- * $Id: writeError.c,v 1.4 2002/01/02 14:40:11 simonmar Exp $
+ * $Id: writeError.c,v 1.5 2002/02/07 11:13:30 simonmar Exp $
  *
  * hPutStr Runtime Support
  */
@@ -18,7 +18,7 @@ implementation in one or two places.)
 
 #include "Rts.h"
 #include "RtsUtils.h"
-#include "HsCore.h"
+#include "HsBase.h"
 
 void
 writeErrString__(HsAddr msg_hdr, HsAddr msg, HsInt len)

diff --git a/include/HsCore.h b/include/HsBase.h
similarity index 99%
rename from include/HsCore.h
rename to include/HsBase.h
index 2a19e49..debf74e 100644 (file)
--- a/include/HsCore.h
+++ b/include/HsBase.h
@@ -1,5 +1,5 @@
 /* -----------------------------------------------------------------------------
- * $Id: HsCore.h,v 1.8 2002/02/06 11:49:32 simonmar Exp $
+ * $Id: HsBase.h,v 1.1 2002/02/07 11:13:30 simonmar Exp $
  *
  * (c) The University of Glasgow 2001-2002
  *