Remove configure script and improve Windows compatability

Author: bmsherman

Foreign/Matlab/Array.hsc

@@ -271,19 +271,18 @@ createNumericArray :: MXClass -> Bool -> MWSize -> Ptr MWSize -> IO MXArrayPtr
 createNumericArray t c n s = mxCreateNumericArray n s (hs2mx t) (if c then (#const mxCOMPLEX) else (#const mxREAL))
 
 #let numarray t = "\
-foreign import ccall unsafe mxIs%1$s :: MXArrayPtr -> IO CBool\n\
-instance MXArrayComponent M%1$s where\n\
-  isMXArray a = boolC =.< withMXArray a mxIs%1$s\n\
-  createMXArray s = withNDims s (uncurry $ createNumericArray (mxClassOf (undefined :: M%1$s)) False) >>= mkMXArray\n\
+foreign import ccall unsafe mxIs%s :: MXArrayPtr -> IO CBool\n\
+instance MXArrayComponent M%s where\n\
+  isMXArray a = boolC =.< withMXArray a mxIs%s\n\
+  createMXArray s = withNDims s (uncurry $ createNumericArray (mxClassOf (undefined :: M%s)) False) >>= mkMXArray\n\
   \
 mxArrayGetOffset = arrayDataGet ;\
 mxArraySetOffset = arrayDataSet ;\
 mxArrayGetOffsetList = arrayDataGetList ;\
 mxArraySetOffsetList = arrayDataSetList\
   \n\
-instance MXArrayData MX%1$s M%1$s\
-", #t
---"
+instance MXArrayData MX%s M%s\
+", #t, #t, #t, #t, #t, #t
 
 foreign import ccall unsafe mxIsDouble :: MXArrayPtr -> IO CBool
 foreign import ccall unsafe mxCreateDoubleScalar :: MXDouble -> IO MXArrayPtr

Foreign/Matlab/Internal.hsc

@@ -136,21 +136,20 @@ instance MType MXSingle MSingle where
   mx2hs = id
   mxClassOf _ = MXClassSingle
 
-#let inttype u, n = "\
-type MX%2$s%1$u = %3$s%1$u\n\
-type M%2$s%1$u = %3$s%1$u\n\
-instance MType MX%2$s%1$u M%2$s%1$u where { hs2mx = id ; mx2hs = id ; mxClassOf _ = MXClass%2$s%1$u }\
-", n, u ? "Uint" : "Int", u ? "Word" : "Int"
---"
-
-#inttype 0, 8
-#inttype 0, 16
-#inttype 0, 32
-#inttype 0, 64
-#inttype 1, 8
-#inttype 1, 16
-#inttype 1, 32
-#inttype 1, 64
+#let inttype u, v, n = "\
+type MX%s%u = %s%u\r\n\
+type M%s%u = %s%u\r\n\
+instance MType MX%s%u M%s%u where { hs2mx = id ; mx2hs = id ; mxClassOf _ = MXClass%s%u }\
+", u, n, v, n, u, n, v, n, u, n, u, n, u, n
+
+#inttype "Int", "Int", 8
+#inttype "Int", "Int", 16
+#inttype "Int", "Int", 32
+#inttype "Int", "Int", 64
+#inttype "Uint", "Word", 8
+#inttype "Uint", "Word", 16
+#inttype "Uint", "Word", 32
+#inttype "Uint", "Word", 64
 
 data MXArrayType
 type MXArrayPtr = Ptr MXArrayType

Foreign/Matlab/Runtime.hsc

@@ -19,7 +19,7 @@ module Foreign.Matlab.Runtime (
 import Foreign hiding (unsafePerformIO)
 import Foreign.C.String
 import Foreign.C.Types
-import System.Posix.DynamicLinker
+import System.Posix.DynamicLinker (DL, RTLDFlags (RTLD_NOW), dlopen, dlclose, dlsym)
 import Data.List
 import qualified Data.Char
 import Distribution.Simple.BuildPaths (dllExtension)

README

@@ -0,0 +1,4 @@
+You will probably need to some arguments that point Cabal to your MATLAB installation.
+For example,
+
+cabal install --extra-lib-dirs="/usr/local/MATLAB/R2014a/bin/glnxa64/" --extra-include-dirs="/usr/local/MATLAB/R2014a/extern/include/"

Setup.hs

@@ -10,29 +10,13 @@ import Data.Maybe
 import System.Directory
 import System.FilePath
 
-defhooks = autoconfUserHooks
+defhooks = simpleUserHooks
 
-programs =
-  [ simpleProgram "matlab" 
-  , (simpleProgram "mcr") { programFindLocation =
-            \_ -> return (return Nothing) }
-  ]
+programs = [ simpleProgram "mcc" ]
 
 runtime desc = maybe False (elem ["Foreign","Matlab","Runtime"] 
   . map components . exposedModules) $ library desc
 
-postconf args flags desc build = do
-  confExists <- doesFileExist "configure"
-  unless confExists $ rawSystemExit verb "autoconf" []
-  postConf defhooks args flags{ configConfigureArgs = configConfigureArgs flags ++ confargs } desc build
-  where 
-    verb = fromFlag $ configVerbosity flags
-    confargs = ("--" ++ (if runtime desc then "enable" else "disable") ++ "-runtime") 
-      : map pconfarg pconf
-    pconfarg p = "--with-" ++ programId p ++ "=" ++ programPath p 
-      -- ++ " " ++ unwords (programArgs p)
-    pconf = mapMaybe (\p -> lookupProgram p (withPrograms build)) programs
-
 build desc binfo hooks flags = do
   when (runtime desc) $ 
     rawSystemExit (fromFlag $ buildVerbosity flags) "make" ["-Csrc"]
@@ -50,23 +34,23 @@ install desc binfo hooks flags = do
       copyFileVerbose (fromFlag $ installVerbosity flags) 
 	("src" </> f) 
 	(libdir (absoluteInstallDirs desc binfo NoCopyDest) </> f))
-    ["libhsmatlab.so"{-,"libhsmatlab.ctf"-}]
+    ["libhsmatlab.so"]
 
 reg desc binfo hooks flags = do
   pwd <- getCurrentDirectory
   let
     desc' = desc{ library = fmap lm (library desc) }
     lm l = l { libBuildInfo = (libBuildInfo l)
-	{ ldOptions = ("-Wl,-rpath," ++ lib) : ldOptions (libBuildInfo l),
-          extraLibDirs = (pwd </> "src") : extraLibDirs (libBuildInfo l) } }
+	{ ldOptions = map ("-Wl,-rpath," ++) (lib : extraLibDirs (libBuildInfo l) )
+                      ++ ldOptions (libBuildInfo l),
+          extraLibDirs = (pwd </> "src") : extraLibDirs (libBuildInfo l)  } }
     lib
       | fromFlag $ regInPlace flags = pwd </> "src"
       | otherwise = libdir (absoluteInstallDirs desc binfo NoCopyDest)
   regHook defhooks desc' binfo hooks flags
 
 hooks = defhooks {
     hookedPrograms = programs,
-    postConf = postconf,
     buildHook = build,
     cleanHook = clean,
     instHook = install,