[project @ 2002-02-12 15:17:13 by simonmar]
authorsimonmar <unknown>
Tue, 12 Feb 2002 15:17:36 +0000 (15:17 +0000)
committersimonmar <unknown>
Tue, 12 Feb 2002 15:17:36 +0000 (15:17 +0000)
commit2cc5b907318f97e19b28b2ad8ed9ff8c1f401dcc
tree2fefe09bc63464ac3a28ea37b61eefc5e506685a
parent239e9471e104fd88ec93bf42623c3a68a496657a
[project @ 2002-02-12 15:17:13 by simonmar]
Switch over to the new hierarchical libraries
---------------------------------------------

This commit reorganises our libraries to use the new hierarchical
module namespace extension.

The basic story is this:

   - fptools/libraries contains the new hierarchical libraries.
     Everything in here is "clean", i.e. most deprecated stuff has
     been removed.

- fptools/libraries/base is the new base package
  (replacing "std") and contains roughly what was previously
  in std, lang, and concurrent, minus deprecated stuff.
  Things that are *not allowed* in libraries/base include:
Addr, ForeignObj, ByteArray, MutableByteArray,
_casm_, _ccall_, ``'', PrimIO

  For ByteArrays and MutableByteArrays we use UArray and
  STUArray/IOUArray respectively now.

  Modules previously called PrelFoo are now under
  fptools/libraries/GHC.  eg. PrelBase is now GHC.Base.

- fptools/libraries/haskell98 provides the Haskell 98 std.
  libraries (Char, IO, Numeric etc.) as a package.  This
  package is enabled by default.

- fptools/libraries/network is a rearranged version of
  the existing net package (the old package net is still
  available; see below).

- Other packages will migrate to fptools/libraries in
  due course.

     NB. you need to checkout fptools/libraries as well as
     fptools/hslibs now.  The nightly build scripts will need to be
     tweaked.

   - fptools/hslibs still contains (almost) the same stuff as before.
     Where libraries have moved into the new hierarchy, the hslibs
     version contains a "stub" that just re-exports the new version.
     The idea is that code will gradually migrate from fptools/hslibs
     into fptools/libraries as it gets cleaned up, and in a version or
     two we can remove the old packages altogether.

   - I've taken the opportunity to make some changes to the build
     system, ripping out the old hslibs Makefile stuff from
     mk/target.mk; the new package building Makefile code is in
     mk/package.mk (auto-included from mk/target.mk).

     The main improvement is that packages now register themselves at
     make boot time using ghc-pkg, and the monolithic package.conf
     in ghc/driver is gone.

     I've updated the standard packages but haven't tested win32,
     graphics, xlib, object-io, or OpenGL yet.  The Makefiles in
     these packages may need some further tweaks, and they'll need
     pkg.conf.in files added.

   - Unfortunately all this rearrangement meant I had to bump the
     interface-file version and create a bunch of .hi-boot-6 files :-(
152 files changed:
ghc/Makefile
ghc/compiler/Makefile
ghc/compiler/basicTypes/DataCon.hi-boot-6 [new file with mode: 0644]
ghc/compiler/basicTypes/IdInfo.hi-boot-6 [new file with mode: 0644]
ghc/compiler/basicTypes/MkId.hi-boot-6 [new file with mode: 0644]
ghc/compiler/basicTypes/Name.hi-boot-6 [new file with mode: 0644]
ghc/compiler/basicTypes/Unique.lhs
ghc/compiler/basicTypes/Var.hi-boot-6 [new file with mode: 0644]
ghc/compiler/codeGen/CgBindery.hi-boot-6 [new file with mode: 0644]
ghc/compiler/codeGen/CgExpr.hi-boot-6 [new file with mode: 0644]
ghc/compiler/codeGen/CgUsages.hi-boot-6 [new file with mode: 0644]
ghc/compiler/codeGen/ClosureInfo.hi-boot-6 [new file with mode: 0644]
ghc/compiler/compMan/CompManager.lhs
ghc/compiler/coreSyn/CoreSyn.hi-boot-6 [new file with mode: 0644]
ghc/compiler/coreSyn/Subst.hi-boot-6 [new file with mode: 0644]
ghc/compiler/deSugar/DsExpr.hi-boot-6 [new file with mode: 0644]
ghc/compiler/deSugar/Match.hi-boot-6 [new file with mode: 0644]
ghc/compiler/ghci/ByteCodeFFI.lhs
ghc/compiler/ghci/ByteCodeGen.lhs
ghc/compiler/ghci/ByteCodeInstr.lhs
ghc/compiler/ghci/ByteCodeLink.lhs
ghc/compiler/ghci/InteractiveUI.hs
ghc/compiler/ghci/Linker.lhs
ghc/compiler/hsSyn/HsExpr.hi-boot-6 [new file with mode: 0644]
ghc/compiler/main/DriverState.hs
ghc/compiler/main/SysTools.lhs
ghc/compiler/nativeGen/MachMisc.hi-boot-6 [new file with mode: 0644]
ghc/compiler/nativeGen/StixInfo.lhs
ghc/compiler/nativeGen/StixPrim.hi-boot-6 [new file with mode: 0644]
ghc/compiler/parser/Ctype.lhs
ghc/compiler/prelude/PrelNames.lhs
ghc/compiler/rename/RnBinds.hi-boot-6 [new file with mode: 0644]
ghc/compiler/rename/RnHiFiles.hi-boot-6 [new file with mode: 0644]
ghc/compiler/simplCore/SimplMonad.lhs
ghc/compiler/typecheck/TcEnv.hi-boot-6 [new file with mode: 0644]
ghc/compiler/typecheck/TcExpr.hi-boot-6 [new file with mode: 0644]
ghc/compiler/typecheck/TcMatches.hi-boot-6 [new file with mode: 0644]
ghc/compiler/typecheck/TcType.hi-boot-6 [new file with mode: 0644]
ghc/compiler/typecheck/TcUnify.hi-boot-6 [new file with mode: 0644]
ghc/compiler/types/Generics.hi-boot-6 [new file with mode: 0644]
ghc/compiler/types/PprType.hi-boot-6 [new file with mode: 0644]
ghc/compiler/types/TyCon.hi-boot-6 [new file with mode: 0644]
ghc/compiler/types/TypeRep.hi-boot-6 [new file with mode: 0644]
ghc/compiler/utils/FastString.lhs
ghc/compiler/utils/PrimPacked.lhs
ghc/compiler/utils/StringBuffer.lhs
ghc/driver/Makefile
ghc/driver/PackageSrc.hs [deleted file]
ghc/driver/Utils.hs [deleted file]
ghc/lib/Makefile [deleted file]
ghc/lib/std/Array.lhs [deleted file]
ghc/lib/std/BigInteger.cs [deleted file]
ghc/lib/std/CPUTime.hsc [deleted file]
ghc/lib/std/Char.lhs [deleted file]
ghc/lib/std/Complex.lhs [deleted file]
ghc/lib/std/Directory.lhs [deleted file]
ghc/lib/std/IO.lhs [deleted file]
ghc/lib/std/Ix.lhs [deleted file]
ghc/lib/std/List.lhs [deleted file]
ghc/lib/std/Locale.lhs [deleted file]
ghc/lib/std/Makefile [deleted file]
ghc/lib/std/Maybe.lhs [deleted file]
ghc/lib/std/Monad.lhs [deleted file]
ghc/lib/std/Numeric.lhs [deleted file]
ghc/lib/std/PrelArr.lhs [deleted file]
ghc/lib/std/PrelArrExtra.lhs [deleted file]
ghc/lib/std/PrelBase.lhs [deleted file]
ghc/lib/std/PrelBits.lhs [deleted file]
ghc/lib/std/PrelByteArr.lhs [deleted file]
ghc/lib/std/PrelCError.lhs [deleted file]
ghc/lib/std/PrelCString.lhs [deleted file]
ghc/lib/std/PrelCTypes.lhs [deleted file]
ghc/lib/std/PrelCTypesISO.lhs [deleted file]
ghc/lib/std/PrelConc.lhs [deleted file]
ghc/lib/std/PrelDynamic.lhs [deleted file]
ghc/lib/std/PrelEnum.lhs [deleted file]
ghc/lib/std/PrelErr.hi-boot [deleted file]
ghc/lib/std/PrelErr.lhs [deleted file]
ghc/lib/std/PrelException.lhs [deleted file]
ghc/lib/std/PrelFloat.lhs [deleted file]
ghc/lib/std/PrelForeign.lhs [deleted file]
ghc/lib/std/PrelGHC.hi-boot.pp [deleted file]
ghc/lib/std/PrelGHC.ilx.pp [deleted file]
ghc/lib/std/PrelHandle.hs [deleted file]
ghc/lib/std/PrelIO.hs [deleted file]
ghc/lib/std/PrelIOBase.lhs [deleted file]
ghc/lib/std/PrelInt.lhs [deleted file]
ghc/lib/std/PrelList.lhs [deleted file]
ghc/lib/std/PrelMarshalAlloc.lhs [deleted file]
ghc/lib/std/PrelMarshalArray.lhs [deleted file]
ghc/lib/std/PrelMarshalError.lhs [deleted file]
ghc/lib/std/PrelMarshalUtils.lhs [deleted file]
ghc/lib/std/PrelMaybe.lhs [deleted file]
ghc/lib/std/PrelNum.hi-boot [deleted file]
ghc/lib/std/PrelNum.lhs [deleted file]
ghc/lib/std/PrelPArr.hs [deleted file]
ghc/lib/std/PrelPack.lhs [deleted file]
ghc/lib/std/PrelPosix.hs [deleted file]
ghc/lib/std/PrelPtr.lhs [deleted file]
ghc/lib/std/PrelRead.lhs [deleted file]
ghc/lib/std/PrelReal.lhs [deleted file]
ghc/lib/std/PrelST.lhs [deleted file]
ghc/lib/std/PrelShow.lhs [deleted file]
ghc/lib/std/PrelSplit.lhs [deleted file]
ghc/lib/std/PrelStable.lhs [deleted file]
ghc/lib/std/PrelStorable.lhs [deleted file]
ghc/lib/std/PrelTopHandler.hs [deleted file]
ghc/lib/std/PrelTup.lhs [deleted file]
ghc/lib/std/PrelWeak.lhs [deleted file]
ghc/lib/std/PrelWord.lhs [deleted file]
ghc/lib/std/Prelude.lhs [deleted file]
ghc/lib/std/Random.lhs [deleted file]
ghc/lib/std/Ratio.lhs [deleted file]
ghc/lib/std/System.lhs [deleted file]
ghc/lib/std/Time.hsc [deleted file]
ghc/lib/std/cbits/CTypes.h [deleted file]
ghc/lib/std/cbits/HsStd.h [deleted file]
ghc/lib/std/cbits/Makefile [deleted file]
ghc/lib/std/cbits/PrelIOUtils.c [deleted file]
ghc/lib/std/cbits/PrelIOUtils.h [deleted file]
ghc/lib/std/cbits/dirUtils.c [deleted file]
ghc/lib/std/cbits/dirUtils.h [deleted file]
ghc/lib/std/cbits/errUtils.h [deleted file]
ghc/lib/std/cbits/errno.c [deleted file]
ghc/lib/std/cbits/ghc_errno.h [deleted file]
ghc/lib/std/cbits/ilxstubs.c [deleted file]
ghc/lib/std/cbits/inputReady.c [deleted file]
ghc/lib/std/cbits/lockFile.c [deleted file]
ghc/lib/std/cbits/lockFile.h [deleted file]
ghc/lib/std/cbits/longlong.c [deleted file]
ghc/lib/std/cbits/system.c [deleted file]
ghc/lib/std/cbits/writeError.c [deleted file]
ghc/mk/paths.mk
ghc/mk/version.mk
ghc/rts/Linker.c
ghc/rts/Makefile
ghc/rts/Prelude.h
ghc/rts/StgMiscClosures.hc
ghc/rts/StgStartup.h
ghc/rts/StgStartup.hc
ghc/rts/rts.conf.in [new file with mode: 0644]
ghc/tests/lib/should_run/Makefile [new file with mode: 0644]
ghc/tests/lib/should_run/uri001.hs [new file with mode: 0644]
ghc/utils/genprimopcode/Main.hs
ghc/utils/ghc-pkg/Main.hs
ghc/utils/ghc-pkg/Makefile
ghc/utils/hsc2hs/Main.hs
glafp-utils/mk/target.mk
mk/config.mk.in
mk/package.mk [new file with mode: 0644]
mk/paths.mk
mk/target.mk