[create new 'jhc' library and move a bunch of 'base' out to it.
John Meacham <john@repetae.net>**20090809171137
 Ignore-this: f5fafbd2b4b6b50545bc6166cefa4e58
] move ./lib/base/Jhc ./lib/jhc/Jhc
adddir ./lib/jhc/Foreign
move ./lib/base/Foreign/Storable.hs ./lib/jhc/Foreign/Storable.hs
move ./lib/base/Foreign/Storable.m4 ./lib/jhc/Foreign/Storable.m4
adddir ./lib/jhc/Data
move ./lib/base/Data/Char.hs ./lib/jhc/Data/Char.hs
move ./lib/base/Data/Int.hs ./lib/jhc/Data/Int.hs
move ./lib/base/Data/Ratio.hs ./lib/jhc/Data/Ratio.hs
move ./lib/base/Data/Word.hs ./lib/jhc/Data/Word.hs
move ./lib/base/Prelude.hs ./lib/jhc/Prelude.hs
adddir ./lib/jhc/Prelude
move ./lib/base/Prelude/CType.hs ./lib/jhc/Prelude/CType.hs
adddir ./lib/jhc/Foreign/C
move ./lib/base/Foreign/C/Error.hs ./lib/jhc/Foreign/C/Error.hs
move ./lib/base/Foreign/C/String.hs ./lib/jhc/Foreign/C/String.hs
move ./lib/base/Foreign/C/Types.hs ./lib/jhc/Foreign/C/Types.hs
move ./lib/base/Numeric.hs ./lib/jhc/Numeric.hs
move ./lib/base/Prelude/Float.hs ./lib/jhc/Prelude/Float.hs
adddir ./lib/jhc/Foreign/Marshal
move ./lib/base/Foreign/Marshal/Alloc.hs ./lib/jhc/Foreign/Marshal/Alloc.hs
move ./lib/base/Foreign/Marshal/Array.hs ./lib/jhc/Foreign/Marshal/Array.hs
move ./lib/base/Foreign/Marshal/Utils.hs ./lib/jhc/Foreign/Marshal/Utils.hs
move ./lib/base/Foreign/Ptr.hs ./lib/jhc/Foreign/Ptr.hs
move ./lib/base/Prelude/IO.hs ./lib/jhc/Prelude/IO.hs
move ./lib/base/Prelude/IOError.hs ./lib/jhc/Prelude/IOError.hs
move ./lib/base/Prelude/Text.hs ./lib/jhc/Prelude/Text.hs
adddir ./lib/jhc/System
adddir ./lib/jhc/System/IO
move ./lib/base/System/IO/Unsafe.hs ./lib/jhc/System/IO/Unsafe.hs
hunk ./Makefile.am 58
-JHC_LIBS =  base-1.0.hl haskell98-1.0.hl applicative-1.0.hl containers-0.2.0.hl
+JHC_LIBS =  jhc-1.0.hl base-1.0.hl haskell98-1.0.hl applicative-1.0.hl containers-0.2.0.hl
hunk ./Makefile.am 62
-             lib/base lib/haskell98 lib/haskell98.cabal $(JHC_LIBS)    \
+             lib/jhc lib/base lib/haskell98 lib/haskell98.cabal $(JHC_LIBS)    \
hunk ./Makefile.am 215
-base-1.0.hl: lib/base/base.cabal
+base-1.0.hl: lib/base/base.cabal jhc-1.0.hl
hunk ./Makefile.am 217
-	./jhc -funboxed-tuples $(RTSOPTS) $(JHC_TEST)  --ho-dir tmp/libho -ilib/base --noauto --build-hl lib/base/base.cabal -o $@
+	./jhc -funboxed-tuples $(RTSOPTS) $(JHC_TEST)  --ho-dir tmp/libho -ilib/base --noauto -L. -pjhc --build-hl lib/base/base.cabal -o $@
+
+jhc-1.0.hl: lib/jhc/jhc.cabal
+	mkdir -p tmp/libho
+	./jhc $(RTSOPTS) $(JHC_TEST)  --ho-dir tmp/libho -ilib/jhc --noauto --build-hl $< -o $@
hunk ./Makefile.am 225
-	./jhc $(RTSOPTS) $(JHC_TEST)  --ho-dir tmp/libho -ilib/applicative  --noauto -L- -L. -p base --build-hl lib/applicative/applicative.cabal -o $@
+	./jhc $(RTSOPTS) $(JHC_TEST)  --ho-dir tmp/libho -ilib/applicative  --noauto -L- -L. -pjhc -p base --build-hl lib/applicative/applicative.cabal -o $@
hunk ./Makefile.am 229
-	./jhc $(RTSOPTS) $(JHC_TEST) -Isrc/data -Ilib/containers/include --ho-dir tmp/libho -ilib/containers  --noauto -L- -L. -p base -p applicative --build-hl lib/containers.cabal -fcpp -o $@
+	./jhc $(RTSOPTS) $(JHC_TEST) -Isrc/data -Ilib/containers/include --ho-dir tmp/libho -ilib/containers  --noauto -L- -L. -pjhc -p base -p applicative --build-hl lib/containers.cabal -fcpp -o $@
hunk ./Makefile.am 233
-	./jhc $(RTSOPTS) $(JHC_TEST) --ho-dir tmp/libho -ilib/haskell98 --noauto -L- -L. -p base --build-hl lib/haskell98.cabal -o $@
+	./jhc $(RTSOPTS) $(JHC_TEST) --ho-dir tmp/libho -ilib/haskell98 --noauto -L- -L. -pjhc -p base --build-hl lib/haskell98.cabal -o $@
hunk ./jhc.spec.in 37
+%{_datadir}/@PACKAGE@-@SHORTVERSION@/jhc-1.0.hl
hunk ./lib/base/base.cabal 5
-                 Control.Monad,
-                 Data.Array,
-                 Data.Char,
-                 Data.Complex,
-                 Data.List,
-                 Data.Word,
-                 Data.Monoid,
-                 Data.Bits,
-                 Data.Int,
-                 Data.IORef,
-                 Data.Ix,
-                 Data.Maybe,
-                 Data.Ratio,
-                 Data.Unicode,
-                 Foreign,
-                 Foreign.C,
-                 Foreign.C.Types,
-                 Foreign.C.String,
-                 Foreign.C.Error,
-                 Foreign.ForeignPtr,
-                 Foreign.Marshal
-                 Foreign.Marshal.Alloc,
-                 Foreign.Marshal.Array,
-                 Foreign.Marshal.Error,
-                 Foreign.Marshal.Pool,
-                 Foreign.Marshal.Utils,
-                 Foreign.Ptr,
-                 Foreign.StablePtr,
-                 Foreign.Storable,
-                 Jhc.Addr,
-                 Jhc.Basics,
-                 Jhc.Float
-                 Jhc.Array,
-                 Data.Array.IO,
-                 Data.Array.Unboxed,
-                 Jhc.Handle,
-                 Jhc.IO,
-                 Jhc.Tuples,
-                 Numeric,
-                 Prelude.Float,
-                 Prelude.IO,
-                 Prelude.IOError,
-                 Prelude.Text,
-                 Prelude,
-                 System.Console.GetOpt,
-                 System.CPUTime,
-                 System.Directory,
-                 System.Info,
-                 System.IO,
-                 System.IO.Error,
-                 System.IO.Unsafe,
-                 System.IO.Binary,
-                 System.Locale,
-                 System.Random,
-                 System.Time,
-                 Control.Monad.Fix,
-                 Data.Function,
-                 System,
-                 Text.Show.Functions,
-                 Data.Typeable,
-                 Text.Printf
+        Control.Monad,
+        Data.Array,
+        Data.Char,
+        Data.Complex,
+        Data.List,
+        Data.Word,
+        Data.Monoid,
+        Data.Bits,
+        Data.Int,
+        Data.IORef,
+        Data.Ix,
+        Data.Maybe,
+        Data.Ratio,
+        Data.Unicode,
+        Foreign,
+        Foreign.C,
+        Foreign.C.Types,
+        Foreign.C.String,
+        Foreign.C.Error,
+        Foreign.ForeignPtr,
+        Foreign.Marshal
+        Foreign.Marshal.Alloc,
+        Foreign.Marshal.Array,
+        Foreign.Marshal.Error,
+        Foreign.Marshal.Pool,
+        Foreign.Marshal.Utils,
+        Foreign.Ptr,
+        Foreign.StablePtr,
+        Foreign.Storable,
+        Data.Array.IO,
+        Data.Array.Unboxed,
+        Numeric,
+        Prelude,
+        System.Console.GetOpt,
+        System.CPUTime,
+        System.Directory,
+        System.Info,
+        System.IO,
+        System.IO.Error,
+        System.IO.Unsafe,
+        System.IO.Binary,
+        System.Locale,
+        System.Random,
+        System.Time,
+        Control.Monad.Fix,
+        Data.Function,
+        System,
+        Text.Show.Functions,
+        Data.Typeable,
+        Control.Monad.Instances,
+        Text.Printf
hunk ./lib/jhc/Jhc/Hole.hs 1
-{-# OPTIONS_JHC -fffi #-}
+{-# OPTIONS_JHC -fffi -funboxed-tuples #-}
hunk ./lib/jhc/jhc.cabal 5
-        Data.Char,
-        Data.Ratio,
-        Data.Word,
-        Foreign.C.String,
-        Foreign.C.Types,
-        Foreign.Marshal.Alloc,
-        Foreign.Marshal.Array,
-        Foreign.Marshal.Utils,
-        Foreign.Ptr,
-        Foreign.Storable,
+	Data.Char,
+	Data.Int,
+	Data.Ratio,
+	Data.Word,
+        Foreign.C.Error,
+	Foreign.C.String,
+	Foreign.C.Types,
+	Foreign.Marshal.Alloc,
+	Foreign.Marshal.Array,
+	Foreign.Marshal.Utils,
+	Foreign.Ptr,
+	Foreign.Storable,
hunk ./lib/jhc/jhc.cabal 18
+        Jhc.Array,
+	Jhc.Basics,
+	Jhc.Enum,
+	Jhc.Float,
+        Jhc.Handle,
hunk ./lib/jhc/jhc.cabal 24
+	Jhc.Inst.Enum,
+	Jhc.Inst.PrimEnum,
+	Jhc.Inst.Read,
+	Jhc.Inst.Show,
+	Jhc.Inst.Storable,
+	Jhc.Int,
hunk ./lib/jhc/jhc.cabal 33
-        Jhc.Tuples,
-        Numeric,
-        Prelude,
-        Prelude.Float,
-        Prelude.IO,
-        Prelude.IOError,
-        Prelude.Text
+	Jhc.Maybe,
+	Jhc.Monad,
+	Jhc.Num,
+	Jhc.Options,
+	Jhc.Order,
+	Jhc.Prim,
+	Jhc.Show,
+	Jhc.String,
+	Jhc.Text.Read,
+        Jhc.Tuples
+	Jhc.Types,
+	Numeric,
+	Prelude,
+	Prelude.CType,
+	Prelude.Float,
+	Prelude.IO,
+	Prelude.IOError,
+	Prelude.Text,
+        System.IO.Unsafe
hunk ./src/Ho/Build.hs 306
+        lmods m = fromMaybe (error $ "modsLookup: " ++ show m) (Map.lookup m mods)
hunk ./src/Ho/Build.hs 308
-            rr <- readIORef (fromJust $ Map.lookup m mods)
+            rr <- readIORef (lmods m)
hunk ./src/Ho/Build.hs 319
-                writeIORef (fromJust $ Map.lookup m mods) (Right mhash)
+                writeIORef (lmods m) (Right mhash)
hunk ./src/Ho/Build.hs 329
-                writeIORef (fromJust $ Map.lookup mg mods) (Right myHash)
+                writeIORef (lmods mg) (Right myHash)
hunk ./src/Ho/Build.hs 365
-    mapM_ f roots
+    mapM_ f (map inject roots)
hunk ./src/Ho/Build.hs 469
+
hunk ./src/Ho/Build.hs 477
-                ctc <- mconcat `fmap` mapM f deps
+                deps' <- randomPermuteIO deps
+                ctc <- mconcat `fmap` mapM f deps'
hunk ./src/Ho/Build.hs 492
-                        let hdep = [ h | CompNode h _ _ <- deps]
hunk ./src/Ho/Build.hs 526
-                cho <- mconcat `fmap` mapM f deps
+                deps' <- randomPermuteIO deps
+                cho <- mconcat `fmap` mapM f deps'
+
hunk ./src/data/targets.ini 20
-autoload=base,haskell98
+autoload=jhc,base,haskell98