From eb36ab1965250809cac9973b253b7508df09aab8 Mon Sep 17 00:00:00 2001 From: arokem Date: Mon, 16 Feb 2015 09:09:11 -0800 Subject: [PATCH 1/2] BF: Still need the `splatform` variable in `make.py`. --- messenger/get_messenger_dir.py | 6 +++--- messenger/make.py | 6 +++--- messenger/make_octave.py | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/messenger/get_messenger_dir.py b/messenger/get_messenger_dir.py index 50f482a..1a77024 100644 --- a/messenger/get_messenger_dir.py +++ b/messenger/get_messenger_dir.py @@ -12,8 +12,8 @@ def get_messenger_dir(): messenger_dir = 'mexmaci64' elif splatform.startswith('win32'): if splatform == "win32": - # We have a win64 messenger, so we need to figure out if this is 32 or 64 - # bit Windows: + # We have a win64 messenger, so we need to figure out if this is 32 + # or 64 bit Windows: if not platform.machine().endswith('64'): raise ValueError("pymatbridge does not work on win32") @@ -23,4 +23,4 @@ def get_messenger_dir(): messenger_dir = 'mexw64' elif maxint == 2147483647: messenger_dir = 'mexw32' - return messenger_dir + return messenger_dir, splatform diff --git a/messenger/make.py b/messenger/make.py index 9962a3c..4f053dd 100755 --- a/messenger/make.py +++ b/messenger/make.py @@ -5,7 +5,7 @@ import subprocess import shutil -messenger_dir = get_messenger_dir() +messenger_dir, splatform = get_messenger_dir() # Open the configure file and start parsing with open(os.path.join(messenger_dir, 'local.cfg'), 'r') as config: @@ -44,7 +44,7 @@ # Get the extension -if platform == 'win32': +if splatform == 'win32': extcmd = '"' + matlab_bin + "\\mexext.bat" + '"' else: extcmd = matlab_bin + "/mexext" @@ -56,7 +56,7 @@ print("Building messenger." + extension + " ...") # Build the mex file -if platform == 'win32': +if splatform == 'win32': mex = "\\mex.bat" else: mex = "/mex" diff --git a/messenger/make_octave.py b/messenger/make_octave.py index 107ff85..36ae996 100644 --- a/messenger/make_octave.py +++ b/messenger/make_octave.py @@ -5,7 +5,7 @@ import shutil import subprocess -messenger_dir = get_messenger_dir() +messenger_dir, splatform = get_messenger_dir() with open(os.path.join(messenger_dir, 'local_octave.cfg')) as fid: lines = fid.readlines() From 3ba965a9e6b09be21f003e3e8ae25df13f90a9ce Mon Sep 17 00:00:00 2001 From: arokem Date: Mon, 16 Feb 2015 09:20:08 -0800 Subject: [PATCH 2/2] BF: Accomodate setup.py to the change in outputs. --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index ca6e07e..d9d7aa5 100755 --- a/setup.py +++ b/setup.py @@ -18,7 +18,7 @@ # Find the messenger binary file(s) and copy it to /matlab folder. from messenger.get_messenger_dir import get_messenger_dir -messenger_dir = get_messenger_dir() +messenger_dir, splatform = get_messenger_dir() for f in glob.glob("./messenger/%s/messenger.*" % messenger_dir): shutil.copy(f, "./pymatbridge/matlab")