Skip to content

Minor mex make fixes #111

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

Closed
jakirkham wants to merge 4 commits into from
Closed

Minor mex make fixes #111

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d8b3a82
messenger/make.py: Changed if to elif in platform check for win32. If…
jakirkham Jan 23, 2015
3c7a825
messenger/make.py: Corrected to decode str as opposed to trying to de…
jakirkham Jan 23, 2015
287d2fb
messenger/make.py: In order to be able to move and replace an existin…
jakirkham Jan 23, 2015
c365c53
messenger/make.py: Use with block instead of explicitly opening and c…
jakirkham Jan 23, 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
51 changes: 27 additions & 24 deletions messenger/make.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
messenger_dir = 'mexa64'
elif platform.startswith('darwin'):
messenger_dir = 'mexmaci64'
if platform.startswith('win32'):
elif platform.startswith('win32'):
# We further need to differniate 32 from 64 bit:
maxint = sys.maxint()
if maxint == 9223372036854775807:
Expand All @@ -23,34 +23,34 @@
messenger_dir = 'mexw32'

# Open the configure file and start parsing
config = open(os.path.join(messenger_dir, 'local.cfg'), 'r')
with open(os.path.join(messenger_dir, 'local.cfg'), 'r') as config:
for line in config:
line = line.decode('utf-8')
path = line.split('=')

for line in config.decode('utf-8'):
path = line.split('=')
if path[0] == "MATLAB_BIN":
print("Searching for Matlab bin folder in local.cfg ...")
matlab_bin = path[1].rstrip('\r\n')
if matlab_bin == "":
raise ValueError("Could not find Matlab bin folder. Please add it to local.cfg")
print("Matlab found in " + matlab_bin)

if path[0] == "MATLAB_BIN":
print("Searching for Matlab bin folder in local.cfg ...")
matlab_bin = path[1].rstrip('\r\n')
if matlab_bin == "":
raise ValueError("Could not find Matlab bin folder. Please add it to local.cfg")
print("Matlab found in " + matlab_bin)
elif path[0] == "HEADER_PATH":
print("Searching for zmq.h in local.cfg ...")
header_path = path[1].rstrip('\r\n')
if header_path == "":
raise ValueError("Could not find zmq.h. Please add its path to local.cfg")
print("zmq.h found in " + header_path)

elif path[0] == "HEADER_PATH":
print("Searching for zmq.h in local.cfg ...")
header_path = path[1].rstrip('\r\n')
if header_path == "":
raise ValueError("Could not find zmq.h. Please add its path to local.cfg")
print("zmq.h found in " + header_path)
elif path[0] == "LIB_PATH":
print("Searching for zmq library in local.cfg ...")
lib_path = path[1].rstrip('\r\n')
if lib_path == "":
raise ValueError("Could not find zmq library. Please add its path to local.cfg")

elif path[0] == "LIB_PATH":
print("Searching for zmq library in local.cfg ...")
lib_path = path[1].rstrip('\r\n')
if lib_path == "":
raise ValueError("Could not find zmq library. Please add its path to local.cfg")
print("zmq library found in " + lib_path)

print("zmq library found in " + lib_path)

config.close()

# Get the extension
if platform == 'win32':
Expand All @@ -72,5 +72,8 @@
make_cmd = '"' + matlab_bin + mex + '"' + " -O -I" + header_path + " -L" + lib_path + " -lzmq ./src/messenger.c"
os.system(make_cmd)

shutil.move('messenger.%s'%extension, messenger_dir)
messenger_exe = 'messenger.%s'%extension
messenger_loc = os.path.join(messenger_dir, messenger_exe)

shutil.move(messenger_exe, messenger_loc)