try to update setup file for mac settings

Author: stephanie

setup/Mac/build.sh

@@ -2,11 +2,13 @@
 
 
 echo "Building!!"
+echo "cleanup"
 if [ -d build ] && [ -d dist ]; then
 	echo "Cleaning up old build and dist files"
-	rm -ir build dist
+	rm -r --interactive=once build dist
 fi
-
-
-sudo python setup.py py2app
+echo "activate environment"
+source activate odmtools
+echo "run py2app"
+sudo python ../setuptest.py py2app
 #sudo /usr/local/Cellar/python/2.7.8/bin/python setup.py py2app

setup/setup.py

@@ -26,7 +26,7 @@
 
 NAME = 'ODM2Tools'
 BASE_DIR = os.path.dirname(os.path.dirname(os.path.realpath(__file__)))
-ICON_DIR = os.path.join('odmtools', 'common', "icons")
+ICON_DIR = os.path.join(BASE_DIR, 'odmtools', 'common', "icons")
 WIN_ICON_FILE = os.path.join(ICON_DIR, "ODMTools.ico")
 MAC_ICON_FILE = os.path.join(ICON_DIR, "ODMTools.icns")
 
@@ -55,9 +55,9 @@
         (r'mpl-data', [r'C:\Anaconda3\envs\odmtools\Lib\site-packages\matplotlib\mpl-data\matplotlibrc']),
         (r'mpl-data\images', glob(r'C:\Anaconda3\envs\odmtools\Lib\site-packages\matplotlib\mpl-data\images\*.*')),
         (r'mpl-data\fonts', glob(r'C:\Anaconda3\envs\odmtools\Lib\site-packages\matplotlib\mpl-data\fonts\*.*')),
-        (r'mpl-data\stylelib', glob(r'C:\Anaconda3\envs\odmtools\Lib\site-packages\matplotlib\mpl-data\stylelib\*.*')),
-        ('.', glob('*.dll')),
-        ('.', glob('C:\Windows\system32\OPENGL32.dll'))]
+        (r'mpl-data\stylelib', glob(r'C:\Anaconda3\envs\odmtools\Lib\site-packages\matplotlib\mpl-data\stylelib\*.*'))]
+        # ('.', glob('*.dll')),
+        # ('.', glob('C:\Windows\system32\OPENGL32.dll'))]
         #('.', glob('mkl_p4m.dll')),
         #('.', glob('mkl_p4.dll'))]
 
@@ -69,6 +69,7 @@
                          'MSVCP90.dll', 'WS2_32.dll', 'WINSPOOL.DRV', 'GDI32.dll', 'KERNEL32.dll',
                          'ntdll.dll', 'COMCTL32.dll', 'COMDLG32.dll', 'msvcrt.dll', 'RPCRT4.dll'],
         "optimize": 2,
+        "frameworks": ['C:\Windows\system32\OPENGL32.dll'','','']
         "bundle_files": 3,
         "dist_dir": "dist",
         "xref": False,