Skip to content

Working towards a better build experience. #73

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
arokem merged 2 commits into from
Jun 25, 2014
Merged

Working towards a better build experience. #73

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
fafcb39
Working towards a better build experience.
arokem Jun 20, 2014
af6e365
Use maxint to differentiate 32 bit from 64 bit Windows.
arokem Jun 22, 2014
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
19 changes: 17 additions & 2 deletions messenger/mexmaci64/make.py → messenger/make.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,26 @@
import sys
import fnmatch
import subprocess
import shutil

# Check the system platform first
platform = sys.platform
print "This is a " + platform + " system"

if platform.startswith('linux'):
messenger_dir = 'mexa64'
elif platform.startswith('darwin'):
messenger_dir = 'mexmaci64'
if platform.startswith('win32'):
# We further need to differniate 32 from 64 bit:
maxint = sys.maxint()
if maxint == 9223372036854775807:
messenger_dir = 'mexw64'
elif maxint == 2147483647:
messenger_dir = 'mexw32'

# Open the configure file and start parsing
config = open('local.cfg', 'r')
config = open(os.path.join(messenger_dir, 'local.cfg'), 'r')

for line in config:
path = line.split('=')
Expand Down Expand Up @@ -56,6 +69,8 @@
mex = "\\mex.bat"
else:
mex = "/mex"
make_cmd = '"' + matlab_bin + mex + '"' + " -O -I" + header_path + " -L" + lib_path + " -lzmq ../src/messenger.c"
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)

61 changes: 0 additions & 61 deletions messenger/mexa64/make.py
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion messenger/mexmaci64/local.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
MATLAB_BIN=/Applications/MATLAB_R2012a.app/bin
MATLAB_BIN=/Applications/MATLAB_R2012b.app/bin
HEADER_PATH=/usr/include
LIB_PATH=/usr/local/lib