update setup file

Author: sreeder

setup/Windows/ODMTools.spec

@@ -1,44 +1,10 @@
-
-
-a = Analysis(['D:\\DEV\\ODMTools\\ODMTools.py'],
-             pathex=['D:\\DEV\\ODMTools\\setup\\Windows'],
-             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=False,
-          console=True , version='D:\\DEV\\ODMTools\\setup\\version.txt', icon='D:\\DEV\\ODMTools\odmtools\\common\\icons\\ODMTools.ico')
-coll = COLLECT(exe,
-               a.binaries,
-               a.zipfiles,
-               a.datas,
-               strip=False,
-               upx=True,
-               name='ODM2Tools')
-
-
-
-
 # -*- mode: python -*-
 
 block_cipher = None
 
 
-a = Analysis(['ODMTools.py'],
-             pathex=['D:\\DEV\\ODMTools'],
+a = Analysis(['D:\\DEV\\ODMTools\\ODMTools.py'],
+             pathex=['D:\\DEV\\ODMTools\\setup\\Windows'],
              binaries=None,
              datas=None,
              hiddenimports=[],
@@ -56,12 +22,12 @@ exe = EXE(pyz,
           name='ODMTools',
           debug=False,
           strip=False,
-          upx=True,
-          console=True )
+          upx=False,
+          console=True , version='D:\\DEV\\ODMTools\\setup\\version.txt', icon='D:\\DEV\\ODMTools\\odmtools\\common\\icons\\ODMTools.ico')
 coll = COLLECT(exe,
                a.binaries,
                a.zipfiles,
                a.datas,
                strip=False,
-               upx=True,
+               upx=False,
                name='ODMTools')

setup/make.py

@@ -28,7 +28,7 @@
 MAC_WORK_DIR = os.path.join(MAC_DIR, "Temp")
 WORK_DIR = os.path.join(WIN_DIR, "Temp")
 
-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")
 

setup/setup.py

@@ -55,7 +55,11 @@
         (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\*.*'))]
+        (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'))]
 
     OPTIONS = {
         #'excludes': ['_ssl', 'pyreadline', 'difflib', 'doctest', 'optparse', 'pickle', 'calendar'],
@@ -71,7 +75,7 @@
         "skip_archive": False,
         "ascii": False,
         "custom_boot_script": '',
-        "packages": ['wx.lib.pubsub',  'pyodbc', 'numpy', 'scipy', 'sqlalchemy', 'wx', 'geoalchemy2'], #'ObjectListView',
+        "packages": ['wx.lib.pubsub',  'pyodbc', 'numpy', 'scipy', 'sqlalchemy', 'wx', 'pandas'], #'ObjectListView',
     }