updated windows and mac installers

mattcieslak · Mar 13, 2017 · ffe364f · ffe364f
1 parent 405071a
commit ffe364f
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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
diff --git 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