Changeset 391 for python/trunk/Tools/freeze

Timestamp:

Mar 19, 2014, 11:31:01 PM (11 years ago)

Author:

dmik

Message:

python: Merge vendor 2.7.6 to trunk.

Location:

python/trunk

Files:

• . (modified) (1 prop)
• Tools/freeze/checkextensions_win32.py (modified) (2 diffs)
• Tools/freeze/makeconfig.py (modified) (2 diffs)
• Tools/freeze/makefreeze.py (modified) (1 diff)
• Tools/freeze/winmakemakefile.py (modified) (1 diff)

python/trunk/Tools/freeze/checkextensions_win32.py

@@ -4 +4 @@
 are needed (primarily to toggle the behavior of "public" symbols.
 
-I dont consider it worth parsing the MSVC makefiles for compiler options.  Even if
+I don't consider it worth parsing the MSVC makefiles for compiler options.  Even if
 we get it just right, a specific freeze application may have specific compiler
 options anyway (eg, to enable or disable specific functionality)
 
-So my basic stragtegy is:
+So my basic strategy is:
 
 * Have some Windows INI files which "describe" one or more extension modules.
@@ -15 +15 @@
 * This description can include:
   - The MSVC .dsp file for the extension.  The .c source file names
-    are extraced from there.
+    are extracted from there.
   - Specific compiler/linker options
   - Flag to indicate if Unicode compilation is expected.

python/trunk/Tools/freeze/makeconfig.py

@@ -1 +1 @@
 import re
-
+import sys
 
 # Write the config.c file
 
-never = ['marshal', '__main__', '__builtin__', 'sys', 'exceptions']
+never = ['marshal', '__main__', '__builtin__', 'sys', 'exceptions', '_warnings']
 
 def makeconfig(infp, outfp, modules, with_ifdef=0):
@@ -39 +39 @@
 
 def test():
-    import sys
     if not sys.argv[3:]:
         print 'usage: python makeconfig.py config.c.in outputfile',

python/trunk/Tools/freeze/makefreeze.py

@@ -63 +63 @@
     outfp.write('\n')
     # The following modules have a NULL code pointer, indicating
-    # that the prozen program should not search for them on the host
+    # that the frozen program should not search for them on the host
     # system. Importing them will *always* raise an ImportError.
     # The zero value size is never used.

python/trunk/Tools/freeze/winmakemakefile.py

@@ -135 +135 @@
 
     print "$(target)$(debug_suffix)%s: $(temp_dir) $(OBJS)" % (target_ext)
-    print "\tlink -out:$(target)$(debug_suffix)%s %s" % (target_ext, target_link_flags),
-    print "\t$(OBJS) \\"
-    print "\t$(LIBS) \\"
-    print "\t$(ADDN_LINK_FILES) \\"
-    print "\t$(pythonlib) $(lcustom) $(l_debug)\\"
+    print "\tlink -out:$(target)$(debug_suffix)%s %s" % (target_ext, target_link_flags), "@<<"
+    print "\t$(OBJS)"
+    print "\t$(LIBS)"
+    print "\t$(ADDN_LINK_FILES)"
+    print "\t$(pythonlib) $(lcustom) $(l_debug)"
     print "\t$(resources)"
+    print "<<"
     print
     print "clean:"