Changeset 16498

Timestamp:

05/22/07 12:40:04 (18 months ago)

Author:

audreyt

Message:

* Pugs.Compat, Pugs.Embed.Parrot: Change the PUGS_HAVE_POSIX

check in .hsc from reading #include <../pugs_config.h> into
using a _PUGS_HAVE_POSIX variable, because relative paths
under .hsc is not reliable (in GHC-HEAD's Cabal, .hsc files
generates dist/build/Pugs/Embed/Parrot.hs rather than the
assumed src/Pugs/Embed/Parrot.hs).

Location:

src/Pugs

Files:

• Compat.hs (modified) (3 diffs)
• Embed/Parrot.hsc (modified) (3 diffs)

src/Pugs/Compat.hs

@@ -16 +16 @@
 
 module Pugs.Compat (
+    _PUGS_HAVE_POSIX,
     createLink,
     createSymbolicLink,
@@ -72 +73 @@
 import qualified System.Posix.Signals
 
+_PUGS_HAVE_POSIX :: Bool
+_PUGS_HAVE_POSIX = True
+
 doesExist :: FilePath -> IO Bool
 doesExist = fileExist
@@ -142 +146 @@
 import System.Posix.Internals
 import Foreign.C.Error
+
+_PUGS_HAVE_POSIX :: Bool
+_PUGS_HAVE_POSIX = False
 
 failWith :: (Monad m) => String -> m a

src/Pugs/Embed/Parrot.hsc

@@ -1 +1 @@
 {-# OPTIONS_GHC -fglasgow-exts -cpp -fvia-C -fno-full-laziness -fno-cse #-}
 #if !defined(PUGS_HAVE_PARROT)
-##undef PUGS_HAVE_POSIX
-##include "../pugs_config.h"
 
 module Pugs.Embed.Parrot where
@@ -13 +11 @@
 import Data.Maybe
 import Control.Monad
-import Pugs.Compat (getEnv)
+import Pugs.Compat (getEnv, _PUGS_HAVE_POSIX)
 import Pugs.Internals (encodeUTF8)
 
@@ -34 +32 @@
 findExecutableInDirectory :: FilePath -> FilePath -> IO (Maybe FilePath)
 findExecutableInDirectory dir cmd = do
-##ifdef PUGS_HAVE_POSIX
-    let file = dir ++ ('/':cmd)
-##else
-    let file = dir ++ ('\\':cmd) ++ ".exe"
-##endif
-    ok  <- doesFileExist file
-    return $ if ok then Just file else Nothing
+    let file | _PUGS_HAVE_POSIX = dir ++ ('/':cmd)
+             | otherwise        = dir ++ ('\\':cmd) ++ ".exe"
+    ok <- doesFileExist file
+    return $ if ok then (Just file) else Nothing
 
 findParrot :: IO FilePath