Skip to content
This repository was archived by the owner on May 16, 2019. It is now read-only.

Commit 42bf38d

Browse files
committed
Mac fixes
1 parent b004d9d commit 42bf38d

File tree

5 files changed

+42
-14
lines changed

5 files changed

+42
-14
lines changed

.travis.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ install:
1313
- pip install -r test_requirements.txt
1414
script:
1515
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo bash travis-linux.sh; fi
16+
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then sudo bash travis-osx.sh; fi
1617
after_success:
1718
- coveralls
1819
before_deploy:
@@ -33,7 +34,7 @@ deploy:
3334
api_key: "$GITHUB_TOKEN"
3435
file_glob: true
3536
file:
36-
- dist/openbazaard-osx*
37+
- dist/openbazaard-osx
3738
skip_cleanup: true
3839
on:
3940
all_branches: true

.travis/openbazaard.mac.spec

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
# -*- mode: python -*-
2+
3+
block_cipher = None
4+
5+
6+
a = Analysis(['./OpenBazaar-Server/openbazaard.py'],
7+
pathex=['./OpenBazaar-Server'],
8+
binaries=None,
9+
datas=None,
10+
hiddenimports=['zmq', 'cryptography', 'cffi', 'packaging'],
11+
hookspath=None,
12+
runtime_hooks=None,
13+
excludes=None,
14+
win_no_prefer_redirects=None,
15+
win_private_assemblies=None,
16+
cipher=block_cipher)
17+
a.datas += [('ob.cfg', 'ob.cfg', 'DATA'),('bitcointools/english.txt','env/lib/python2.7/site-packages/bitcointools/english.txt','DATA')]
18+
pyz = PYZ(a.pure, a.zipped_data,
19+
cipher=block_cipher)
20+
exe = EXE(pyz,
21+
a.scripts,
22+
a.binaries,
23+
a.zipfiles,
24+
a.datas,
25+
name='openbazaard-osx',
26+
debug=True,
27+
strip=None,
28+
upx=True,
29+
console=True)

travis-linux.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,5 @@ sudo chmod 777 dist/openbazaard-linux32
88
sudo chmod a+x dist/openbazaard-linux32
99
sudo chmod 777 dist/openbazaard-linux64
1010
sudo chmod a+x dist/openbazaard-linux64
11-
ls -alg dist/openbazaard-linux64
1211
sudo chmod 777 dist/openbazaard-windows64.exe
1312
sudo chmod 777 dist/openbazaard-windows32.exe

travis-linux.sh~

Lines changed: 0 additions & 12 deletions
This file was deleted.

travis-osx.sh

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
#!/bin/bash
2+
3+
virtualenv env
4+
. env/bin/activate
5+
pip install --upgrade pip
6+
pip install --ignore-installed -r requirements.txt
7+
pip install --ignore-installed pyinstaller==3.1
8+
pip install setuptools==19.1
9+
env/bin/pyinstaller -F -n openbazaard-osx -i osx/tent.icns --osx-bundle-identifier=com.openbazaar.openbazaard .travis/openbazaard.mac.spec
10+
echo 'Completed building OpenBazaar-Server binary...'
11+

0 commit comments

Comments
 (0)