From ffe364fb7382a104fda8da82dd9dff1594321199 Mon Sep 17 00:00:00 2001
From: Matt Cieslak <mattcieslak@gmail.com>
Date: Mon, 13 Mar 2017 15:02:58 -0700
Subject: [PATCH] updated windows and mac installers

---
 packaging/MEAPapp.spec   | 2 +-
 packaging/MEAPexe.spec   | 2 ++
 packaging/deps2.py       | 0
 packaging/mac_compile.sh | 1 -
 4 files changed, 3 insertions(+), 2 deletions(-)
 mode change 100644 => 100755 packaging/deps2.py

diff --git a/packaging/MEAPapp.spec b/packaging/MEAPapp.spec
index 7854cd7..2204956 100644
--- a/packaging/MEAPapp.spec
+++ b/packaging/MEAPapp.spec
@@ -21,7 +21,7 @@ a = Analysis(['../MEAPapp.py'],
              
 a.datas += [
           ('resources/logo512x512.png',
-          '/Users/matt/projects/MEAP/meap/resources/logo512x512.png','DATA')
+          '/Users/matt/projects/MEAP/meap/resources/logo512x512.png','DATA'),
           ('resources/meap.png',
           '/Users/matt/projects/MEAP/meap/resources/meap.png','DATA')
 ]
diff --git a/packaging/MEAPexe.spec b/packaging/MEAPexe.spec
index 06a057c..5a4b1a1 100755
--- a/packaging/MEAPexe.spec
+++ b/packaging/MEAPexe.spec
@@ -18,6 +18,8 @@ a = Analysis(['..\\MEAPapp.py'],
              cipher=block_cipher)
              
 a.datas += [
+          ('resources\\meap.png',
+          'C:\\Users\\Conda\\MEAP\\meap\\resources\\meap.png','DATA'),
           ('resources\\logo512x512.png',
           'C:\\Users\\Conda\\MEAP\\meap\\resources\\logo512x512.png','DATA')
 ]
diff --git a/packaging/deps2.py b/packaging/deps2.py
old mode 100644
new mode 100755
diff --git a/packaging/mac_compile.sh b/packaging/mac_compile.sh
index 345cb14..f77561d 100644
--- a/packaging/mac_compile.sh
+++ b/packaging/mac_compile.sh
@@ -3,5 +3,4 @@ rm -rf build dist
 export ETS_TOOLKIT=qt4
 export QT_API=pyqt
 pyinstaller MEAPapp.spec
-builddmg 
 dmgbuild -s build_dmg.py "MEAPInstaller" dist/meap_installer.dmg 
\ No newline at end of file