update hooks and spec files

Author: stephanie

.gitignore

@@ -65,6 +65,5 @@ setup/Output/setup.exe
 Temp
 
 *.app
-*.spec
 
 

make.py

@@ -158,6 +158,7 @@ def run_pyinstaller(console=False):
                 '--icon=%s ' % WIN_ICON_FILE +
                 '--version-file=%s ' % VERSION_FILE +
                 # '--onefile ' +
+                '--exclude=
                 '--noconfirm ' + APP_FILE)
         else:
             ## Non Console Version

setup/Mac/ODMTools.spec

@@ -0,0 +1,37 @@
+# -*- mode: python -*-
+
+block_cipher = None
+
+
+a = Analysis(['/Users/stephanie/DEV/ODMToolsPython/ODMTools.py'],
+             pathex=['../Mac'],
+             binaries=None,
+             datas=None,
+             hiddenimports=[],
+             hookspath=['../hooks'],
+             runtime_hooks=None,
+             excludes=['PyQt4', 'PyQt4.QtCore', 'PyQt4.QtGui'],
+             win_no_prefer_redirects=False,
+             win_private_assemblies=False,
+             cipher=block_cipher)
+pyz = PYZ(a.pure, a.zipped_data,
+             cipher=block_cipher)
+exe = EXE(pyz,
+          a.scripts,
+          exclude_binaries=True,
+          name='ODMTools',
+          debug=False,
+          strip=False,
+          upx=True,
+          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,
+               name='ODMTools')
+app = BUNDLE(coll,
+             name='ODMTools.app',
+             icon='odmtools/common/icons/ODMTools.icns',
+             bundle_identifier=None)

setup/hooks/hook-sqlalchemy.py

@@ -18,7 +18,7 @@
 
 # Contributed by Greg Copeland
 
-from PyInstaller.hooks.hookutils import exec_statement
+from PyInstaller.utils.hooks import exec_statement
 
 # include most common database bindings
 # some database bindings are detected and include some
@@ -48,7 +48,6 @@
     hiddenimports.append("sqlalchemy.orm." + n)
     print "!!", n
 
-
 # sqlalchemy.dialects package from 0.6 and newer sqlachemy versions
 version = exec_statement('import sqlalchemy; print sqlalchemy.__version__')
 is_alch06 = version >= '0.6'

setup/hooks/hook-wx.py

@@ -0,0 +1,7 @@
+import os, sys
+from PyInstaller.utils.hooks import collect_data_files
+
+
+datas = collect_data_files('wx')
+
+#datas += [(os.path.join(os.path.dirname(sys.executable), '../lib/libwx_osx_cocoau-3.0.0.0.0.dylib'), '.')]