Permalink
Browse files

use of uhc-util 0.1.0.2, including wrapper around Data.Time and Syste…

…m.Time, choice depending on available directory package
  • Loading branch information...
1 parent a2a7338 commit e4b5bc0d48f823c0927322c475900ff04d54f32f @atzedijkstra atzedijkstra committed Nov 29, 2012
View
@@ -3798,7 +3798,7 @@ HADDOCK_VERSION=$haddockVersion
# GHC version dependencies: packages passed as option, cabal packages
-cabal_base_lib_depends="base mtl fgl directory hashable time uhc-util"
+cabal_base_lib_depends="base mtl fgl directory hashable uhc-util"
if test x$enableClr = "xyes"
then
cabal_base_lib_depends="$cabal_base_lib_depends language-cil"
View
@@ -415,7 +415,7 @@ AC_SUBST(HADDOCK_CMD,$haddockCmd)
AC_SUBST(HADDOCK_VERSION, $haddockVersion)
# GHC version dependencies: packages passed as option, cabal packages
-cabal_base_lib_depends="base mtl fgl directory hashable time uhc-util"
+cabal_base_lib_depends="base mtl fgl directory hashable uhc-util"
if test x$enableClr = "xyes"
then
cabal_base_lib_depends="$cabal_base_lib_depends language-cil"
@@ -28,8 +28,7 @@ Used by all compiler driver code
%%[5050 import(System.Time, System.Directory)
%%]
--- 20121029 the time package cannot be used as System.Directory used old-time, and no conversion to UTCTime (from Data.Time) could be found
-%%[50 import(Data.Time, System.Directory) export(module Data.Time, module System.Directory)
+%%[50 import(UHC.Util.Time, System.Directory)
%%]
%%[1
@@ -12,7 +12,7 @@ Module analysis
%%]
%%[50 import(qualified UHC.Util.Rel as Rel)
%%]
-%%[50 import(Data.Time, System.Directory)
+%%[50 import(UHC.Util.Time, System.Directory)
%%]
%%[50 import({%{EH}EHC.Common})
@@ -12,7 +12,7 @@ Output generation, on stdout or file
%%]
%%[8 import(qualified Data.Map as Map, qualified Data.Set as Set)
%%]
-%%[50 import(Data.Time, System.Directory)
+%%[50 import(UHC.Util.Time, System.Directory)
%%]
%%[8 import({%{EH}EHC.Common})
@@ -12,7 +12,7 @@ An EHC compile run maintains info for one compilation invocation
%%]
%%[8 import(System.IO, System.Exit, System.Environment, System.Process, System.Cmd(rawSystem))
%%]
-%%[99 import(Data.Time, System.CPUTime, System.Locale, Data.IORef, System.IO.Unsafe)
+%%[99 import(UHC.Util.Time, System.CPUTime, System.Locale, Data.IORef, System.IO.Unsafe)
%%]
%%[99 import(System.Directory)
%%]
@@ -49,8 +49,8 @@ An EHC compile unit maintains info for one unit of compilation, a Haskell (HS) m
%%[5050 import(Data.Time, System.Directory)
%%]
--- 20121029 the time package cannot be used as System.Directory used old-time, and no conversion to UTCTime (from Data.Time) could be found
-%%[50 import(Data.Time, Data.Time.Clock, System.Directory) export(ClockTime,diffClockTimes,noTimeDiff,getClockTime)
+%%[50 import(UHC.Util.Time, System.Directory)
+%%]
-- | a for now alias for old-time ClockTime
type ClockTime = UTCTime
@@ -61,7 +61,6 @@ noTimeDiff = toEnum 0
getClockTime :: IO ClockTime
getClockTime = getCurrentTime
-%%]
-- Force evaluation for IO
%%[9999 import({%{EH}Base.ForceEval})

0 comments on commit e4b5bc0

Please sign in to comment.