[Pymoul-svn] SF.net SVN: pymoul: [106] pymoul/trunk

[<ti...@us...>]

Revision: 106
          http://pymoul.svn.sourceforge.net/pymoul/?rev=106&view=rev
Author:   tiran
Date:     2007-01-30 19:00:50 -0800 (Tue, 30 Jan 2007)

Log Message:
-----------
minor windows build tweaks

Modified Paths:
--------------
    pymoul/trunk/build.bat
    pymoul/trunk/setup_win32.py

Added Paths:
-----------
    pymoul/trunk/installer.bat

Modified: pymoul/trunk/build.bat
===================================================================
--- pymoul/trunk/build.bat	2007-01-31 02:59:33 UTC (rev 105)
+++ pymoul/trunk/build.bat	2007-01-31 03:00:50 UTC (rev 106)
@@ -1,4 +1,6 @@
 @echo off
 rd /S /Q build
+cls
+set PYTHONPATH=src
 python setup.py py2exe
-pause
\ No newline at end of file
+pause

Added: pymoul/trunk/installer.bat
===================================================================
--- pymoul/trunk/installer.bat	                        (rev 0)
+++ pymoul/trunk/installer.bat	2007-01-31 03:00:50 UTC (rev 106)
@@ -0,0 +1,7 @@
+@echo off
+rd /S /Q build
+cls
+set PYTHONPATH=src
+set INNOSETUP=yes
+python setup.py py2exe
+pause

Modified: pymoul/trunk/setup_win32.py
===================================================================
--- pymoul/trunk/setup_win32.py	2007-01-31 02:59:33 UTC (rev 105)
+++ pymoul/trunk/setup_win32.py	2007-01-31 03:00:50 UTC (rev 106)
@@ -20,24 +20,27 @@
     if len(sys.argv) == 1:
         sys.argv.append("py2exe")
 
-# py2exe's ModuleFinder can't handle runtime changes to __path__,
-# but win32com uses them
-try:
-    import modulefinder
-    import win32com
-    for p in win32com.__path__[1:]:
-        modulefinder.AddPackagePath("win32com", p)
-    for extra in ["win32com.shell"]:
-        __import__(extra)
-        m = sys.modules[extra]
-        for p in m.__path__[1:]:
-            modulefinder.AddPackagePath(extra, p)
-except ImportError:
-    # no build path setup, no worries.
-    pass
+def import_win32com():
+    """py2exe's ModuleFinder can't handle runtime changes to __path__
+       but win32com uses them
+    """
+    try:
+        import modulefinder
+        import win32com
+        for p in win32com.__path__[1:]:
+            modulefinder.AddPackagePath("win32com", p)
+        for extra in ["win32com.shell"]:
+            __import__(extra)
+            m = sys.modules[extra]
+            for p in m.__path__[1:]:
+                modulefinder.AddPackagePath(extra, p)
+    except ImportError:
+        # no build path setup, no worries.
+        pass
 
 # PyTz uses some import magic
 def findPyTz():
+    import pytz
     packages = ['pytz.zoneinfo']
     for tz in ('GMT', 'UTC'):
         packages.append('pytz.zoneinfo.%s' % tz)
@@ -45,7 +48,6 @@
     for tz in ('US',):
         packages.append('pytz.zoneinfo.%s.*' % tz)
     return packages
-#    import pytz
 #    pytz_dir = os.path.dirname(pytz.__file__)
 #    if not os.path.isdir(pytz_dir):
 #        raise ValueError('Install pytz with easy_install -Z pytz')
@@ -68,11 +70,13 @@
     pexe = kw['options'].setdefault('py2exe', {})
     pexe['compressed'] = 100 # compress zip file
     pexe['optimize'] = 0 # 0,1,2
-    pexe['includes'] = ['sip', 'PyQt4', 'encodings', 'encodings.*']
+    pexe['includes'] = ['sip', 'PyQt4'] # 'encodings'] # , 'encodings.*']
     # SSL currently not in use but imported by socket
-    pexe['excludes'] = ['_ssl', 'win32pipe', 'win32evtlog', 'win32file', 'win32api']
-    # added by logging.handlers.SMTPHandler but not yet required
-    pexe['excludes'].append('smtplib')
+    # mail stuff added by logging.handlers.SMTPHandler
+    pexe['excludes'] = ['_ssl', 'doctest', 'smtplib', 'email']
+    # no need for win32 so far
+    pexe['excludes'].extend(['win32pipe', 'win32evtlog', 'win32file', 'win32api',
+                             'win32con', 'winerror'])
     # UPX
     pexe['upx'] = True
     pexe['upx_args'] = '--mono --best'


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.