[hoc-cvs] hoc/Tools HOCWrap.hs,1.4,1.5

[Wolfgang T. <wth...@us...>]

Update of /cvsroot/hoc/hoc/Tools
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11561

Modified Files:
	HOCWrap.hs 
Log Message:
Assume ghc-6.4 from now on.
TODO: Don't hard-code ghc path


Index: HOCWrap.hs
===================================================================
RCS file: /cvsroot/hoc/hoc/Tools/HOCWrap.hs,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- HOCWrap.hs	24 Feb 2004 11:56:03 -0000	1.4
+++ HOCWrap.hs	18 Apr 2005 01:36:34 -0000	1.5
@@ -142,25 +142,14 @@
 wrapApp executable appName contents =
     wrapApp' False True executable appName contents
 
--- for GHC >= 6.2
-forkProcess' action = forkProcess action
--- for GHC < 6.2
-{-
-forkProcess' action = do
-    mbPid <- forkProcess
-    case mbPid of
-        Just pid -> return pid
-        Nothing -> action >> exitWith ExitSuccess
--}
-
 runApp ghciArgs appName contents runNow = withAutoreleasePool $ do
     fm <- _NSFileManager # defaultManager
 
     let executableInApp = take (length appName - length ".app") appName
          
     
-    let ghcLib = "/usr/local/lib/ghc-6.2"
-        ghcExecutable = ghcLib ++ "/ghc-6.2"
+    let ghcLib = "/usr/local/lib/ghc-6.4"
+        ghcExecutable = ghcLib ++ "/ghc-6.4"
     
     wrapApp' True False ghcExecutable appName contents
 
@@ -171,7 +160,7 @@
                 then fmap Just createPipe
                 else return Nothing
 
-    pid <- forkProcess' $ do
+    pid <- forkProcess $ do
         case pipes of
             Just (readEnd, _) ->
                 dupTo readEnd stdInput >> return ()