Skip to content

Commit 956195a

Browse files
committed
Always explicitly install the messengers for the three platforms.
This is because the release is always built on only one platform, but then installed to all platforms from that one release.
1 parent 6535a15 commit 956195a

File tree

2 files changed

+10
-9
lines changed

2 files changed

+10
-9
lines changed

pymatbridge/version.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Format expected by setup.py and doc/source/conf.py: string of form "X.Y.Z"
44
_version_major = 0
55
_version_minor = 5
6-
_version_micro = 1 #'' # use '' for first of series, number for 1 and above
6+
_version_micro = 2 #'' # use '' for first of series, number for 1 and above
77
#_version_extra = 'dev'
88
_version_extra = '' # Uncomment this for full releases
99

setup.py

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,16 @@
1515

1616
from distutils.core import setup
1717

18-
19-
# Find the messenger binary file(s) and copy it to /matlab folder.
20-
from messenger.make import get_messenger_dir
21-
messenger_dir = get_messenger_dir()
22-
23-
for f in glob.glob("./messenger/%s/messenger.*" % messenger_dir):
18+
# Find the messenger binary files and copy them all to the matlab folder.
19+
# We include all of these, so that when releases are built on travis, they
20+
# include the compiled mex files for all three platforms.
21+
msgrs = ['./messenger/mexa64/messenger.mexa64',
22+
'./messenger/mexmaci64/messenger.mexmaci64',
23+
'./messenger/mexw64/messenger.mexw64']
24+
25+
for f in msgrs:
2426
shutil.copy(f, "./pymatbridge/matlab")
25-
26-
27+
2728
# Get version and release info, which is all stored in pymatbridge/version.py
2829
ver_file = os.path.join('pymatbridge', 'version.py')
2930
exec(open(ver_file).read())

0 commit comments

Comments
 (0)