packages pyinstaller-1.4.svn20110204-conf.patch
      Pages: < 1 >  DOWNLOAD      
diff -upr trunk.orig/PyInstaller/bindepend.py trunk/PyInstaller/bindepend.py
--- trunk.orig/PyInstaller/bindepend.py	2010-04-28 12:01:38.000000000 +0200
+++ trunk/PyInstaller/bindepend.py	2010-04-28 12:02:18.000000000 +0200
@@ -1,4 +1,5 @@
 #! /usr/bin/env python
+# -*- coding: utf-8 -*-
 #
 # Find external dependencies of binary libraries.
 #
@@ -475,7 +476,7 @@ def getSoname(filename):
 
 if __name__ == "__main__":
     from PyInstaller.lib.pyi_optparse import OptionParser
-    parser = OptionParser(usage="%prog [options] <executable_or_dynamic_library>")
+    parser = OptionParser(usage="%prog [options] <executable_or_dynamic_library>", prog="pyi-bindepend", description="Find external dependencies of binary libraries.")
     parser.add_option('--target-platform', default=sys.platform,
                       help='Target platform, required for cross-bundling (default: current platform)')

diff -upr trunk.orig/PyInstaller/build.py trunk/PyInstaller/build.py
--- trunk.orig/PyInstaller/build.py	2010-04-28 11:51:31.000000000 +0200
+++ trunk/PyInstaller/build.py	2010-04-28 14:43:57.000000000 +0200
@@ -1,4 +1,5 @@
 #!/usr/bin/env python
+# -*- coding: utf-8 -*-
 #
 # Build packages using spec files
 #
@@ -1128,11 +1129,11 @@ def main(specfile, configfilename):
         # _not_ cross compiling
         if config['pythonVersion'] != sys.version:
             print "The current version of Python is not the same with which PyInstaller was configured."
-            print "Please re-run Configure.py with this version."
+            print "Please re-run pyi-Configure with this version."
             sys.exit(1)
 
     if config.setdefault('pythonDebug', None) != __debug__:
-        print "python optimization flags changed: rerun Configure.py with the same [-O] option"
+        print "python optimization flags changed: rerun pyi-Configure with the same [-O] option"
         print "Configure.py optimize=%s, Build.py optimize=%s" % (not config['pythonDebug'], not __debug__)
         sys.exit(1)

diff -upr trunk.orig/PyInstaller/configure.py trunk/PyInstaller/configure.py
--- trunk.orig/PyInstaller/configure.py	2010-04-28 11:54:26.000000000 +0200
+++ trunk/PyInstaller/configure.py	2010-04-28 14:59:16.000000000 +0200
@@ -1,4 +1,5 @@
 #! /usr/bin/env python
+# -*- coding: utf-8 -*-
 #
 # Configure PyInstaller for the current Python installation.
 #

diff -upr trunk.orig/PyInstaller/__init__.py trunk/PyInstaller/__init__.py
--- trunk.orig/PyInstaller/__init__.py	2011-03-13 11:57:18.000000000 +0200
+++ trunk/PyInstaller/__init__.py	2011-03-13 13:48:17.000000000 +0200
@@ -24,8 +24,8 @@
 import sys
 
 HOMEPATH = os.path.abspath(os.path.dirname(os.path.dirname(__file__)))
-CONFIGDIR = HOMEPATH
+CONFIGDIR = "/etc"
-DEFAULT_CONFIGFILE = os.path.join(CONFIGDIR, 'config.dat')
+DEFAULT_CONFIGFILE = os.path.join(CONFIGDIR, 'pyinstaller.conf')
 
 is_py23 = sys.version_info >= (2,3)
 is_py24 = sys.version_info >= (2,4)

diff -upr trunk.orig/PyInstaller/makespec.py trunk/PyInstaller/makespec.py
--- trunk.orig/PyInstaller/makespec.py	2010-04-28 11:57:18.000000000 +0200
+++ trunk/PyInstaller/makespec.py	2010-04-28 13:48:17.000000000 +0200
@@ -1,4 +1,5 @@
 #!/usr/bin/env python
+# -*- coding: utf-8 -*-
 #
 # Automatically build spec files containing a description of the project
 #
@@ -156,7 +157,7 @@
     g.add_option("-o", "--out",
                  dest="workdir", metavar="DIR",
                  help="generate the spec file in the specified directory "
-                      "(default: current directory")
+                      "(default: current directory)")
     g.add_option("-n", "--name",
                  help="name to assign to the project "
                       "(default: first script's basename)")
@@ -229,11 +230,11 @@ def main(scripts, configfile=None, name=
     try:
         config = eval(open(configfile, 'r').read())
     except IOError:
-        raise SystemExit("Configfile is missing or unreadable. Please run Configure.py before building!")
+        raise SystemExit("Configfile is missing or unreadable. Please run pyi-Configure before building!")
 
     if config['pythonVersion'] != sys.version:
         print "The current version of Python is not the same with which PyInstaller was configured."
-        print "Please re-run Configure.py with this version."
+        print "Please re-run pyi-Configure with this version."
         raise SystemExit(1)
 
     if not name: