update setup

Author: stephanie

setup/Mac/ODMTools.spec

@@ -5,33 +5,29 @@ block_cipher = None
 
 a = Analysis(['/Users/stephanie/DEV/ODMToolsPython/ODMTools.py'],
              pathex=['/Users/stephanie/DEV/ODMToolsPython/setup/Mac'],
-             binaries=None,
-             datas=None,
              hiddenimports=[],
-             hookspath=['/Users/stephanie/DEV/ODMToolsPython/setup/hooks'],
+             hookspath=None,
              runtime_hooks=None,
-             excludes=['PyQt4', 'PyQt4.QtCore', 'PyQt4.QtGui'],
-             win_no_prefer_redirects=False,
-             win_private_assemblies=False,
+             excludes=None,
              cipher=block_cipher)
-pyz = PYZ(a.pure, a.zipped_data,
+pyz = PYZ(a.pure,
              cipher=block_cipher)
 exe = EXE(pyz,
           a.scripts,
           exclude_binaries=True,
           name='ODMTools',
           debug=False,
-          strip=False,
+          strip=None,
           upx=True,
-          console=False , version='/Users/stephanie/DEV/ODMToolsPython/setup/version.txt', icon='/Users/stephanie/DEV/ODMToolsPython/odmtools/common/icons/ODMTools.icns')
+          console=False , version='/Users/stephanie/DEV/ODMToolsPython/setup/version.txt', icon='odmtools/common/icons/ODMTools.icns')
 coll = COLLECT(exe,
                a.binaries,
                a.zipfiles,
                a.datas,
-               strip=False,
-               upx=False,
+               strip=None,
+               upx=True,
                name='ODMTools')
 app = BUNDLE(coll,
              name='ODMTools.app',
-             icon='/Users/stephanie/DEV/ODMToolsPython/odmtools/common/icons/ODMTools.icns',
+             icon='odmtools/common/icons/ODMTools.icns',
              bundle_identifier=None)

setup/Mac/build.sh

@@ -7,5 +7,6 @@ if [ -d build ] && [ -d dist ]; then
 	rm -ir build dist
 fi
 
+
 sudo python setup.py py2app
 #sudo /usr/local/Cellar/python/2.7.8/bin/python setup.py py2app

setup/make.py

@@ -16,7 +16,7 @@
 ## Update odmtools.meta.data whenever creating a release
 from odmtools.meta import data
 
-BASE_DIR = os.path.dirname(os.path.realpath(__file__))
+BASE_DIR = os.path.dirname(os.path.dirname(os.path.realpath(__file__)))
 SETUP_DIR = os.path.join(BASE_DIR, 'setup')
 WIN_DIR = os.path.join(SETUP_DIR, "Windows")
 MAC_DIR = os.path.join(SETUP_DIR, "Mac")
@@ -32,7 +32,7 @@
 WIN_ICON_FILE = os.path.join(ICON_DIR, "ODMTools.ico")
 MAC_ICON_FILE = os.path.join(ICON_DIR, "ODMTools.icns")
 
-APP_DIR = os.path.join(MAC_DIR, 'Dist', "ODMTools.app")
+APP_DIR = os.path.join(MAC_DIR, 'Dist', "ODM2Tools.app")
 # Location of Windows files
 APP_FILE = os.path.join(BASE_DIR, "ODMTools.py")
 MAKE_FILE = os.path.realpath(__file__)
@@ -94,7 +94,7 @@ def zipdir(basedir, archivename):
                 z.write(absfn, zfn)
 def printInfo():
     print "============================================================="
-    print "=             ODMTools Installer                             "
+    print "=             ODM2Tools Installer                             "
     print "= Be sure to update odmtools/meta/data with every release    "
     print "= Building release: {version}".format(version=data.version),
     print "\n= Platform: {platform}, {architecture}".format(platform=sys.platform, architecture=platform.architecture()), "\n="

setup/setup.py

@@ -13,6 +13,7 @@
 
 
 import sys
+import os
 '''
 from setuptools import setup
 
@@ -23,23 +24,29 @@
 
 
 
-NAME = 'ODMTools'
+NAME = 'ODM2Tools'
+BASE_DIR = os.path.dirname(os.path.dirname(os.path.realpath(__file__)))
+ICON_DIR = os.path.join('odmtools', 'common', "icons")
+WIN_ICON_FILE = os.path.join(ICON_DIR, "ODMTools.ico")
+MAC_ICON_FILE = os.path.join(ICON_DIR, "ODMTools.icns")
 
+#APP = ['/Users/stephanie/DEV/ODMToolsPython/ODMTools.py']
+APP = os.path.join(BASE_DIR, 'ODMTools.py')
 extra_options = None
 sys.setrecursionlimit(2000)
 if sys.platform == 'darwin':
     sys.argv.append('py2app')
     from setuptools import setup
-    APP = ['/Users/stephanie/DEV/ODMToolsPython/ODMTools.py']
+    # APP = ['/Users/stephanie/DEV/ODMToolsPython/ODMTools.py']
     LIBS = ['/usr/X11/lib/libfreetype.6.dylib', '/usr/X11/lib/libstdc++.6.dylib', '/usr/X11/lib/libpng15.15.dylib']
-    OPTIONS = {'iconfile': '/Users/stephanie/DEV/ODMToolsPython/odmtools/common/icons/ODMTools.icns',
+    OPTIONS = {'iconfile': MAC_ICON_FILE,
                'includes': ['pymysql', 'sqlalchemy', 'dateutil'], 'frameworks': LIBS}
     extra_options = dict(app=APP, setup_requires=['py2app'], options={'py2app': OPTIONS})
 
 elif sys.platform == 'win32':
     sys.argv.append('py2exe')
     from distutils.core import setup
-    APP = ['C:\Users\Jacob\Documents\ODMToolsPython\ODMTools.py']
+    #APP = ['C:\Users\Jacob\Documents\ODMToolsPython\ODMTools.py']
     import numpy
     import py2exe
     from glob import glob
@@ -68,7 +75,7 @@
 
 
     sys.path.append("C:\\Program Files (x86)\\Microsoft Visual Studio 10.0\\VC\\Microsoft.VC90.CRT")
-    sys.path.append("C:\\Users\\Jacob\\Documents\\ODMToolsPython")
+    sys.path.append(BASE_DIR)
     extra_options = dict(console=APP, data_files=data_files, options={'py2exe': OPTIONS})
 
 setup(name=NAME, **extra_options)