Add conditional compilation for different operating systems.

Author: bmsherman

Foreign/Matlab/Internal.hsc

@@ -177,18 +177,27 @@ type MAnyArray = MXArray MAny
 
 -- |Tag for a NULL array
 data MNull 
-instance MType MNull MNull where mxClassOf _ = MXClassNull
+instance MType MNull MNull where
+  hs2mx = id
+  mx2hs = id
+  mxClassOf _ = MXClassNull
 
 mNullArray :: MXArray MNull
 mNullArray = MXArray nullPtr
 
 -- |A wrapper for a member of a cell array, which itself simply any other array
 newtype MCell = MCell { mCell :: MAnyArray }
-instance MType MCell MCell where mxClassOf _ = MXClassCell
+instance MType MCell MCell where
+  hs2mx = id
+  mx2hs = id
+  mxClassOf _ = MXClassCell
 
 -- |A single struct in an array, represented by an (ordered) list of key-value pairs
 newtype MStruct = MStruct { mStruct :: [(String,MAnyArray)] }
-instance MType MStruct MStruct where mxClassOf _ = MXClassStruct
+instance MType MStruct MStruct where
+  hs2mx = id
+  mx2hs = id
+  mxClassOf _ = MXClassStruct
 
 type MXFun = CInt -> Ptr MXArrayPtr -> CInt -> Ptr MXArrayPtr -> IO ()
 -- |A Matlab function
@@ -208,6 +217,12 @@ instance MType MXFun MFun where
     map MXArray =.< peekArray no outp
   mxClassOf _ = MXClassFun
 
+#ifdef mingw32_HOST_OS
+type MWSize = Word32
+type MWIndex = Word32
+type MWSignedIndex = Int32
+#else
 type MWSize = #type mwSize
 type MWIndex = #type mwIndex
 type MWSignedIndex = #type mwSignedIndex
+#endif

Foreign/Matlab/MAT.hsc

@@ -21,7 +21,6 @@ import Foreign.C.String
 import Foreign.C.Error
 import Foreign.Matlab.Util
 import Foreign.Matlab.Internal
-import Foreign.Matlab.Types
 
 #include <mat.h>
 

LICENSE

@@ -0,0 +1,24 @@
+Copyright (c) [2008..2015] Dylan Simon, Ben Sherman.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the names of the contributors nor of their affiliations may 
+      be used to endorse or promote products derived from this software 
+      without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ''AS IS'' AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL COPYRIGHT HOLDERS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+

README.md

@@ -3,15 +3,25 @@ This is an updated version of Dylan Simon's
 available on Hackage. I made changes primarily to allow the package to work
 with newer versions of GHC and MATLAB.
 
-You will probably need to some arguments that point Cabal to your MATLAB
-installation. For example,
+## Installation
+
+You will probably need to add some arguments that point Cabal to your MATLAB
+installation. For example, on a Linux system with MATLAB R2014a,
+it may look like this:
 ```
 cabal install --extra-lib-dirs="/usr/local/MATLAB/R2014a/bin/glnxa64/" --extra-include-dirs="/usr/local/MATLAB/R2014a/extern/include/"
 ```
 
-I have successfully used package with GHC 7.8.3, cabal-install 1.20.0.3, and
-MATLAB R2014a on Ubuntu 14.10. To use the package on Windows, please check out
-the 
-[Windows branch](https://github.com/bmsherman/haskell-matlab/tree/windows32bit),
-which has a hack which fixes errors which occur otherwise
-(see [this issue](https://github.com/bmsherman/haskell-matlab/issues/1)).
+On a Windows system with the MATLAB Compiler Runtime, it might look like this:
+```
+cabal install --extra-lib-dirs="C:\Program Files\MATLAB\MATLAB Compiler Runtime\v83\extern\include" --extra-lib-dirs="C:\Program Files\MATLAB\MATLAB Compiler Runtime\v83\bin\win64"
+```
+
+## Test platforms
+
+This package has been confirmed to work on the following systems:
+
+GHC version | cabal-install version | Operating System | MATLAB
+7.8.3         1.20.0.3                Ubuntu 14.10       MATLAB R2014a
+7.8.3         1.18.0.5                Windows 7          MCR R2014a
+

matlab.cabal

@@ -1,16 +1,24 @@
 Name:                matlab
-Version:             0.1.1.2
+Version:             0.1.1.3
 Cabal-Version:       >= 1.10
 Author:              Dylan Simon, Ben Sherman
 Maintainer:          Ben Sherman <[email protected]>
 License:             BSD3
+License-file:        LICENSE
 Synopsis:            Matlab bindings and interface
-Description:         This package aims to provide a comprehensive interface to the 
-                     MathWorks MATLAB(R) libraries and native data structures, including
-                     complete matrix access, MAT-format files, linking and execution of 
-                     runtime libraries and engine.  Requires MATLAB for full functionality 
-                     or an installed Matlab Component Runtime (MCR). This has been tested
-                     with MATLAB R2014a and might work with others.
+Description:
+  This package aims to provide a comprehensive interface to the 
+  MathWorks MATLAB(R) libraries and native data structures, including
+  complete matrix access, MAT-format files, linking and execution of 
+  runtime libraries and engine.  Requires MATLAB for full functionality 
+  or an installed Matlab Component Runtime (MCR). This has been tested
+  with MATLAB R2014a and might work with others.
+  .
+  [/Installation/]
+  You will probably need add some arguments that point Cabal to your MATLAB
+  installation. For example, on a Linux system, it may look like this:
+  .
+  > cabal install --extra-lib-dirs="/usr/local/MATLAB/R2014a/bin/glnxa64/" --extra-include-dirs="/usr/local/MATLAB/R2014a/extern/include/"
 Category:            Foreign,Math
 build-type:          Custom
 tested-with:         GHC == 7.8.3