Skip to content

BF: Still need the splatform variable in make.py. #141

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
blink1073 merged 2 commits into from
Feb 16, 2015
Merged

BF: Still need the splatform variable in make.py. #141

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eb36ab1
BF: Still need the `splatform` variable in `make.py`.
arokem Feb 16, 2015
3ba965a
BF: Accomodate setup.py to the change in outputs.
arokem Feb 16, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions messenger/get_messenger_dir.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")

Expand All @@ -23,4 +23,4 @@ def get_messenger_dir():
messenger_dir = 'mexw64'
elif maxint == 2147483647:
messenger_dir = 'mexw32'
return messenger_dir
return messenger_dir, splatform
6 changes: 3 additions & 3 deletions messenger/make.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -44,7 +44,7 @@


# Get the extension
if platform == 'win32':
if splatform == 'win32':
extcmd = '"' + matlab_bin + "\\mexext.bat" + '"'
else:
extcmd = matlab_bin + "/mexext"
Expand All @@ -56,7 +56,7 @@
print("Building messenger." + extension + " ...")

# Build the mex file
if platform == 'win32':
if splatform == 'win32':
mex = "\\mex.bat"
else:
mex = "/mex"
Expand Down
2 changes: 1 addition & 1 deletion messenger/make_octave.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down