From 64472d749d09b265c84ee8205e36b450cb081613 Mon Sep 17 00:00:00 2001
From: Brian Hoffman <brianchoffman@gmail.com>
Date: Thu, 13 Oct 2016 13:23:57 -0400
Subject: [PATCH] Change Windows filenames

Mac fixes

Fix Windows upload links
---
 .travis.yml                  |  6 ++++--
 .travis/openbazaard.mac.spec | 29 +++++++++++++++++++++++++++++
 travis-linux.sh              |  4 ++--
 travis-linux.sh~             | 12 ------------
 travis-osx.sh                | 11 +++++++++++
 5 files changed, 46 insertions(+), 16 deletions(-)
 create mode 100644 .travis/openbazaard.mac.spec
 delete mode 100755 travis-linux.sh~
 create mode 100755 travis-osx.sh

diff --git a/.travis.yml b/.travis.yml
index 7c08646a..dfb0251b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,6 +13,7 @@ install:
   - pip install -r test_requirements.txt
 script:
   - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo bash travis-linux.sh; fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then sudo bash travis-osx.sh; fi
 after_success:
   - coveralls
 before_deploy:
@@ -24,7 +25,8 @@ deploy:
     file:
       - dist/openbazaard-linux32
       - dist/openbazaard-linux64
-      - dist/openbazaard.exe
+      - dist/openbazaard-windows32.exe
+      - dist/openbazaard-windows64.exe
     skip_cleanup: true
     on:
       all_branches: true
@@ -33,7 +35,7 @@ deploy:
     api_key: "$GITHUB_TOKEN"
     file_glob: true
     file:
-      - dist/openbazaard-osx*
+      - dist/openbazaard-osx
     skip_cleanup: true
     on:
       all_branches: true
diff --git a/.travis/openbazaard.mac.spec b/.travis/openbazaard.mac.spec
new file mode 100644
index 00000000..e7d34a97
--- /dev/null
+++ b/.travis/openbazaard.mac.spec
@@ -0,0 +1,29 @@
+# -*- mode: python -*-
+
+block_cipher = None
+
+
+a = Analysis(['./OpenBazaar-Server/openbazaard.py'],
+             pathex=['./OpenBazaar-Server'],
+             binaries=None,
+             datas=None,
+             hiddenimports=['zmq', 'cryptography', 'cffi', 'packaging'],
+             hookspath=None,
+             runtime_hooks=None,
+             excludes=None,
+             win_no_prefer_redirects=None,
+             win_private_assemblies=None,
+             cipher=block_cipher)
+a.datas += [('ob.cfg', 'ob.cfg', 'DATA'),('bitcointools/english.txt','env/lib/python2.7/site-packages/bitcointools/english.txt','DATA')]
+pyz = PYZ(a.pure, a.zipped_data,
+             cipher=block_cipher)
+exe = EXE(pyz,
+          a.scripts,
+          a.binaries,
+          a.zipfiles,
+          a.datas,
+          name='openbazaard-osx',
+          debug=True,
+          strip=None,
+          upx=True,
+          console=True)
diff --git a/travis-linux.sh b/travis-linux.sh
index 6892d421..e80afab2 100755
--- a/travis-linux.sh
+++ b/travis-linux.sh
@@ -8,5 +8,5 @@ sudo chmod 777 dist/openbazaard-linux32
 sudo chmod a+x dist/openbazaard-linux32
 sudo chmod 777 dist/openbazaard-linux64
 sudo chmod a+x dist/openbazaard-linux64
-ls -alg dist/openbazaard-linux64
-sudo chmod 777 dist/openbazaard.exe
+sudo chmod 777 dist/openbazaard-windows64.exe
+sudo chmod 777 dist/openbazaard-windows32.exe
diff --git a/travis-linux.sh~ b/travis-linux.sh~
deleted file mode 100755
index c487dcc7..00000000
--- a/travis-linux.sh~
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-
-sudo bash build-linux64.sh
-docker run -i -v "${PWD}:/OpenBazaar" toopher/ubuntu-i386:14.04 /bin/bash -c "linux32 --32bit i386 /OpenBazaar/build-linux32.sh"
-sudo bash build-win.sh
-sudo bash build-win64.sh
-sudo chmod 777 dist/openbazaard-linux32
-sudo chmod a+x dist/openbazaard-linux32
-sudo chmod 777 dist/openbazaard-linux64
-sudo chmod a+x dist/openbazaard-linux64
-ls -alg dist/openbazaard-linux64
-sudo chmod 777 dist/openbazaard.exe
diff --git a/travis-osx.sh b/travis-osx.sh
new file mode 100755
index 00000000..5a284d7a
--- /dev/null
+++ b/travis-osx.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+virtualenv env
+. env/bin/activate
+pip install --upgrade pip
+pip install --ignore-installed -r requirements.txt
+pip install --ignore-installed pyinstaller==3.1
+pip install setuptools==19.1
+env/bin/pyinstaller -F -n openbazaard-osx -i osx/tent.icns --osx-bundle-identifier=com.openbazaar.openbazaard .travis/openbazaard.mac.spec
+echo 'Completed building OpenBazaar-Server binary...'
+