wrath/shaniqua-plugins
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

first experimental MSYS (no cygwin) support

Browse Source
This commit is contained in:
shelarcy
2005-05-13 11:44:36 +00:00
parent df6e070281
commit 7aefa55fde
4 changed files with 26 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/Plugins/Env.hs
View File

@ -57,7 +57,7 @@ import Data.List ( isPrefixOf, nub )
import System.IO.Unsafe ( unsafePerformIO )
import System.Directory ( doesFileExist )
#ifdef CYGWIN
#if defined(CYGWIN) || defined(__MINGW32__)
import System.Environment ( getEnv )
import Control.Monad ( liftM )
@ -310,7 +310,7 @@ lookupPkg' p = withPkgEnvs env $ \fms -> go fms p
Nothing -> go fms q -- look in other pkgs
Just package -> do
#ifdef CYGWIN
#if defined(CYGWIN) || defined(__MINGW32__)
let libdirs = fix_topdir $ libraryDirs package
#else
let libdirs = libraryDirs package
@ -319,7 +319,7 @@ lookupPkg' p = withPkgEnvs env $ \fms -> go fms p
extras = extraLibraries package
deppkgs = packageDeps package
libs <- mapM (findHSlib libdirs) (hslibs ++ extras)
#ifdef CYGWIN
#if defined(CYGWIN) || defined(__MINGW32__)
syslibdir <- liftM ( \x -> x ++ "/SYSTEM") (getEnv "SYSTEMROOT")
libs' <- mapM (findDLL $ syslibdir : libdirs) extras
#else
@ -330,7 +330,7 @@ lookupPkg' p = withPkgEnvs env $ \fms -> go fms p
-- anything about that.
return (deppkgs, (filterJust libs,filterJust libs') )
#ifdef CYGWIN
#if defined(CYGWIN) || defined(__MINGW32__)
-- replace $topdir
fix_topdir [] = []
fix_topdir (x:xs) = replace_topdir x : fix_topdir xs

4
src/plugins/Plugins/MkTemp.hs
View File

@ -42,7 +42,11 @@ import Control.Monad ( liftM )
import Control.Exception ( handleJust )
import System.Directory ( doesDirectoryExist, doesFileExist, createDirectory )
import System.IO
#ifndef __MINGW32__
import System.IO.Error ( isAlreadyExistsError )
#else
import System.IO.Error ( isAlreadyExistsError, isAlreadyInUseError, isPermissionError )
#endif
import GHC.IOBase ( IOException(IOError),
Exception(IOException),