X-Git-Url: https://git.novaco.in/?p=p2pool.git;a=blobdiff_plain;f=setup.py;h=95547831bddcd871ab8a229156c7254e9ceeabdf;hp=631a401503d1ebb8a1834512a71ebf3f52a0f814;hb=HEAD;hpb=0d89424c274aafc54eb65e0a70afd1e4f6cac3a1

diff --git a/setup.py b/setup.py
index 631a401..9554783 100644
--- a/setup.py
+++ b/setup.py
@@ -2,18 +2,25 @@ import os
 import shutil
 import sys
 import zipfile
+import platform
 
 from distutils.core import setup
+from distutils.sysconfig import get_python_lib
 import py2exe
 
 version = __import__('p2pool').__version__
+im64 = '64' in platform.architecture()[0]
 
 if os.path.exists('INITBAK'):
     os.remove('INITBAK')
 os.rename(os.path.join('p2pool', '__init__.py'), 'INITBAK')
 try:
     open(os.path.join('p2pool', '__init__.py'), 'wb').write('__version__ = %r%s%sDEBUG = False%s' % (version, os.linesep, os.linesep, os.linesep))
-    
+    mfcdir = get_python_lib() + '\pythonwin\\'
+    mfcfiles = [os.path.join(mfcdir, i) for i in ["mfc90.dll", "mfc90u.dll", "mfcm90.dll", "mfcm90u.dll", "Microsoft.VC90.MFC.manifest"]]
+    bundle = 1
+    if im64:
+        bundle = bundle + 2
     sys.argv[1:] = ['py2exe']
     setup(name='p2pool',
         version=version,
@@ -22,19 +29,21 @@ try:
         author_email='forrest@forre.st',
         url='http://p2pool.forre.st/',
         data_files=[
-            ('', ['README']),
+            ('', ['README.md']),
+            ("Microsoft.VC90.MFC", mfcfiles),
             ('web-static', [
                 'web-static/d3.v2.min.js',
+                'web-static/favicon.ico',
                 'web-static/graphs.html',
                 'web-static/index.html',
                 'web-static/share.html',
             ]),
         ],
-        
+
         console=['run_p2pool.py'],
         options=dict(py2exe=dict(
-            bundle_files=1,
-            dll_excludes=['w9xpopen.exe'],
+            bundle_files=bundle,
+            dll_excludes=['w9xpopen.exe', "mswsock.dll", "MSWSOCK.dll"],
             includes=['twisted.web.resource', 'ltc_scrypt'],
         )),
         zipfile=None,
@@ -43,7 +52,11 @@ finally:
     os.remove(os.path.join('p2pool', '__init__.py'))
     os.rename('INITBAK', os.path.join('p2pool', '__init__.py'))
 
-dir_name = 'p2pool_win32_' + version
+win = '32'
+if im64:
+    win = '64'
+
+dir_name = 'p2pool_win' + win + '_' + version
 
 if os.path.exists(dir_name):
     shutil.rmtree(dir_name)