py2exe-checkins — Commit messages from CVS

[Py2exe-checkins] py2exe/py2exe/samples/pywin32/com_typelib/pre_gen/wscript setup.py, NONE, 1.1 show_info.py, NONE, 1.1 wsh-typelib-stubs.py, NONE, 1.1

[Mark H. <mha...@us...>]

Update of /cvsroot/py2exe/py2exe/py2exe/samples/pywin32/com_typelib/pre_gen/wscript
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31295/com_typelib/pre_gen/wscript

Added Files:
	setup.py show_info.py wsh-typelib-stubs.py 
Log Message:
Samples for the 'typelibs' support, including the new option of 
pre-generating a typelib and specifying the file as an input to py2exe


--- NEW FILE: show_info.py ---
# Print some simple information using the WScript.Network object.
import sys
from win32com.client.gencache import EnsureDispatch

ob = EnsureDispatch('WScript.Network')

# For the sake of ensuring the correct module is used...
mod = sys.modules[ob.__module__]
print "The module hosting the object is", mod

# Now use the object.
print "About this computer:"
print "Domain =", ob.UserDomain
print "Computer Name =", ob.ComputerName
print "User Name =", ob.UserName



--- NEW FILE: setup.py ---
# Execute this as 'setup.py py2exe' to create a .exe from docmaker.py
from distutils.core import setup
import py2exe

py2exe_options = dict(
    typelibs = [
        # typelib for 'Windows Script Host Object Model', which we
        # have pre-generated into wsh-typelib-stubs.py
        ('{F935DC20-1CF0-11D0-ADB9-00C04FD58A0B}', 0, 1, 0, 'wsh-typelib-stubs.py'),
    ]
)

setup(name="SpamBayes",
      console=["show_info.py"],
      options = {"py2exe" : py2exe_options},
)

--- NEW FILE: wsh-typelib-stubs.py ---
# -*- coding: mbcs -*-

# This file is part of the py2exe pywin32\com_typelib\pre_gen\word sample.
# It was generated by the command-line:
# 'makepy.py -o wsh-typelib-stubs.py "Windows Script Host Object Model"'
# It will be included in the py2exe generated library and used by win32com
# at runtime in the generated program.
# The file has not been modified below this line:


# Created by makepy.py version 0.4.95
# By python version 2.4.4 (#71, Feb  5 2007, 15:24:39) [MSC v.1310 32 bit (Intel)]
# From type library 'wshom.ocx'
# On Mon Mar 26 14:31:22 2007
"""Windows Script Host Object Model"""
makepy_version = '0.4.95'
python_version = 0x20404f0

import win32com.client.CLSIDToClass, pythoncom
[...1847 lines suppressed...]
	'ITextStream' : '{53BAD8C1-E718-11CF-893D-00A0C9054228}',
	'IWshURLShortcut' : '{F935DC2B-1CF0-11D0-ADB9-00C04FD58A0B}',
	'IFileSystem' : '{0AB5A3D0-E5B6-11D0-ABF5-00A0C90FFFC0}',
	'IDriveCollection' : '{C7C3F5A1-88A3-11D0-ABCB-00A0C90FFFC0}',
	'IDrive' : '{C7C3F5A0-88A3-11D0-ABCB-00A0C90FFFC0}',
	'IWshNetwork' : '{F935DC25-1CF0-11D0-ADB9-00C04FD58A0B}',
	'IFile' : '{C7C3F5A4-88A3-11D0-ABCB-00A0C90FFFC0}',
	'IWshShell' : '{F935DC21-1CF0-11D0-ADB9-00C04FD58A0B}',
	'IWshNetwork2' : '{24BE5A31-EDFE-11D2-B933-00104B365C9F}',
	'IWshShell3' : '{41904400-BE18-11D3-A28B-00104BD35090}',
	'IFileSystem3' : '{2A0B9D10-4B87-11D3-A97A-00104B365C9F}',
	'IFileCollection' : '{C7C3F5A5-88A3-11D0-ABCB-00A0C90FFFC0}',
	'IWshExec' : '{08FED190-BE19-11D3-A28B-00104BD35090}',
	'IWshCollection' : '{F935DC27-1CF0-11D0-ADB9-00C04FD58A0B}',
	'IWshShortcut' : '{F935DC23-1CF0-11D0-ADB9-00C04FD58A0B}',
	'IWshEnvironment' : '{F935DC29-1CF0-11D0-ADB9-00C04FD58A0B}',
}

win32com.client.constants.__dicts__.append(constants.__dict__)

[Py2exe-checkins] py2exe/py2exe/samples/pywin32/com_typelib README.txt, NONE, 1.1

[Mark H. <mha...@us...>]

Update of /cvsroot/py2exe/py2exe/py2exe/samples/pywin32/com_typelib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31295/com_typelib

Added Files:
	README.txt 
Log Message:
Samples for the 'typelibs' support, including the new option of 
pre-generating a typelib and specifying the file as an input to py2exe


--- NEW FILE: README.txt ---
Some py2exe samples relating to the use of typelibs and pywin32.

pywin32's COM support takes advantage of COM typelibs by generating Python
stubs for the objects in these typelibs.  This generation is often known as
a 'makepy' process, from the name of the script that performs the generation,
but it is not always necessary to explcitly invoke makepy.py - the use of
win32com.client.gencache will often cause implicit generation of these stubs.

This directory contains samples showing how to use these techniques with 
py2exe apps.  It contains the following samples.

build_gen: contains samples that demonstrate how to build a typelib as py2exe
           is run.  This means the machine running py2exe must have the 
           typelibs installed locally, but the target machines need not.
           py2exe generates the typelib stubs as it is run.

           There is currently a single sample which assumes MSWord is 
           installed.  Please contribute samples for other common objects!

pre_gen:   contains samples that demonstrate how to package typelib stubs 
           previously generated.  Such stubs will have come from a previous
           invocation of makepy, possibly on another computer and possibly
           from a source control system.  In this case, the computer running
           py2exe does *not* need to have the relevant typelibs installed.

[Py2exe-checkins] py2exe/py2exe/samples/pywin32/com_typelib/build_gen/word docmaker.py, NONE, 1.1 setup.py, NONE, 1.1

[Mark H. <mha...@us...>]

Update of /cvsroot/py2exe/py2exe/py2exe/samples/pywin32/com_typelib/build_gen/word
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31295/com_typelib/build_gen/word

Added Files:
	docmaker.py setup.py 
Log Message:
Samples for the 'typelibs' support, including the new option of 
pre-generating a typelib and specifying the file as an input to py2exe


--- NEW FILE: setup.py ---
# Execute this as 'setup.py py2exe' to create a .exe from docmaker.py
from distutils.core import setup
import py2exe

py2exe_options = dict(
    typelibs = [
        # typelib for 'Word.Application.8' - execute 
        # 'win32com/client/makepy.py -i' to find a typelib.
        ('{00020905-0000-0000-C000-000000000046}', 0, 8, 1),
    ]
)

setup(name="SpamBayes",
      console=["docmaker.py"],
      options = {"py2exe" : py2exe_options},
)

--- NEW FILE: docmaker.py ---
# A test program that generates a word document.
import sys
import os
from win32com.client import gencache

# When built with py2exe, it assumes 'Word.Application.9' is installed
# on the machine performing the build.  The typelibs from the local machine
# will be used to generate makepy files, and those generated files will
# be included in the py2exe library (generally in a .zip file)

# The resulting application should run without referencing any typelibs on
# the target system.

# It will create a file:
filename = os.path.abspath(
              os.path.join(os.path.dirname(sys.argv[0]), "output.doc"))

word = gencache.EnsureDispatch("Word.Application.9")

# For the sake of ensuring the correct module is used...
mod = sys.modules[word.__module__]
print "The module hosting the object is", mod


word.Visible = 1
doc = word.Documents.Add()
wrange = doc.Range()
for i in range(10):
    wrange.InsertAfter("Hello from py2exe %d\n" % i)
doc.SaveAs(filename)
word.Quit()
print "Done - saved to", os.path.abspath(filename)

[Py2exe-checkins] py2exe/py2exe build_exe.py,1.72,1.73

[Mark H. <mha...@us...>]

Update of /cvsroot/py2exe/py2exe/py2exe
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30527

Modified Files:
	build_exe.py 
Log Message:
Allow the specified typelibs to include an input file, in which case
we skip the generation and just copy the file into the gen_py directory.
Useful so people can check the generated files into source-control and can
avoid installing the COM objects on the build machine.


Index: build_exe.py
===================================================================
RCS file: /cvsroot/py2exe/py2exe/py2exe/build_exe.py,v
retrieving revision 1.72
retrieving revision 1.73
diff -C2 -d -r1.72 -r1.73
*** build_exe.py	22 Nov 2006 08:43:36 -0000	1.72
--- build_exe.py	26 Mar 2007 05:44:21 -0000	1.73
***************
*** 252,256 ****
              mkpath(genpy_temp)
              num_stubs = collect_win32com_genpy(genpy_temp,
!                                                self.typelibs)
              print "collected %d stubs from %d type libraries" \
                    % (num_stubs, len(self.typelibs))
--- 252,258 ----
              mkpath(genpy_temp)
              num_stubs = collect_win32com_genpy(genpy_temp,
!                                                self.typelibs,
!                                                verbose=self.verbose,
!                                                dry_run=self.dry_run)
              print "collected %d stubs from %d type libraries" \
                    % (num_stubs, len(self.typelibs))
***************
*** 1497,1503 ****
  
  # win32com makepy helper.
! def collect_win32com_genpy(path, typelibs):
      import win32com
      from win32com.client import gencache, makepy
      old_gen_path = win32com.__gen_path__
      num = 0
--- 1499,1507 ----
  
  # win32com makepy helper.
! def collect_win32com_genpy(path, typelibs, verbose=0, dry_run=0):
      import win32com
      from win32com.client import gencache, makepy
+     from distutils.file_util import copy_file
+     
      old_gen_path = win32com.__gen_path__
      num = 0
***************
*** 1507,1518 ****
          gencache.__init__()
          for info in typelibs:
              # It seems bForDemand=True generates code which is missing
              # at least sometimes an import of DispatchBaseClass.
              # Until this is resolved, set it to false.
              # What's the purpose of bForDemand=True? Thomas
  ##            makepy.GenerateFromTypeLibSpec(info, bForDemand = True)
!             makepy.GenerateFromTypeLibSpec(info, bForDemand = False)
              # Now get the module, and build all sub-modules.
!             mod = gencache.GetModuleForTypelib(*info)
              for clsid, name in mod.CLSIDToPackageMap.items():
                  try:
--- 1511,1549 ----
          gencache.__init__()
          for info in typelibs:
+             guid, lcid, major, minor = info[:4]
+             # They may provide an input filename in the tuple - in which case
+             # they will have pre-generated it on a machine with the typelibs
+             # installed, and just want us to include it.
+             fname_in = None
+             if len(info) > 4:
+                 fname_in = info[4]
+             if fname_in is not None:
+                 base = gencache.GetGeneratedFileName(guid, lcid, major, minor)
+                 fname_out = os.path.join(path, base) + ".py"
+                 copy_file(fname_in, fname_out, verbose=verbose, dry_run=dry_run)
+                 num += 1
+                 # That's all we gotta do!
+                 continue
+ 
              # It seems bForDemand=True generates code which is missing
              # at least sometimes an import of DispatchBaseClass.
              # Until this is resolved, set it to false.
              # What's the purpose of bForDemand=True? Thomas
+             # bForDemand is supposed to only generate stubs when each
+             # individual object is referenced.  A side-effect of that is
+             # that each object gets its own source file.  The intent of
+             # this code was to set bForDemand=True, meaning we get the
+             # 'file per object' behaviour, but then explicitly walk all
+             # children forcing them to be built - so the entire object model
+             # is included, but not in a huge .pyc.
+             # I'm not sure why its not working :) I'll debug later.
+             # bForDemand=False isn't really important here - the overhead for
+             # monolithic typelib stubs is in the compilation, not the loading
+             # of an existing .pyc. Mark.
  ##            makepy.GenerateFromTypeLibSpec(info, bForDemand = True)
!             tlb_info = (guid, lcid, major, minor)
!             makepy.GenerateFromTypeLibSpec(tlb_info, bForDemand = False)
              # Now get the module, and build all sub-modules.
!             mod = gencache.GetModuleForTypelib(*tlb_info)
              for clsid, name in mod.CLSIDToPackageMap.items():
                  try:

[Py2exe-checkins] py2exe/py2exe/samples/pywin32/com_typelib/pre_gen/wscript - New directory

[Mark H. <mha...@us...>]

Update of /cvsroot/py2exe/py2exe/py2exe/samples/pywin32/com_typelib/pre_gen/wscript
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28036/wscript

Log Message:
Directory /cvsroot/py2exe/py2exe/py2exe/samples/pywin32/com_typelib/pre_gen/wscript added to the repository

[Py2exe-checkins] py2exe/py2exe/samples/pywin32/com_typelib/build_gen/word - New directory

[Mark H. <mha...@us...>]

Update of /cvsroot/py2exe/py2exe/py2exe/samples/pywin32/com_typelib/build_gen/word
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27848/word

Log Message:
Directory /cvsroot/py2exe/py2exe/py2exe/samples/pywin32/com_typelib/build_gen/word added to the repository

[Py2exe-checkins] py2exe/py2exe/samples/pywin32/com_typelib/build_gen - New directory

[Mark H. <mha...@us...>]

Update of /cvsroot/py2exe/py2exe/py2exe/samples/pywin32/com_typelib/build_gen
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27821/build_gen

Log Message:
Directory /cvsroot/py2exe/py2exe/py2exe/samples/pywin32/com_typelib/build_gen added to the repository

[Py2exe-checkins] py2exe/py2exe/samples/pywin32/com_typelib/pre_gen - New directory

[Mark H. <mha...@us...>]

Update of /cvsroot/py2exe/py2exe/py2exe/samples/pywin32/com_typelib/pre_gen
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27821/pre_gen

Log Message:
Directory /cvsroot/py2exe/py2exe/py2exe/samples/pywin32/com_typelib/pre_gen added to the repository

[Py2exe-checkins] py2exe/py2exe/samples/pywin32/com_typelib - New directory

[Mark H. <mha...@us...>]

Update of /cvsroot/py2exe/py2exe/py2exe/samples/pywin32/com_typelib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27805/com_typelib

Log Message:
Directory /cvsroot/py2exe/py2exe/py2exe/samples/pywin32/com_typelib added to the repository

[Py2exe-checkins] py2exe/source run_isapi.c,1.7,1.8

[Mark H. <mha...@us...>]

Update of /cvsroot/py2exe/py2exe/source
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2634

Modified Files:
	run_isapi.c 
Log Message:
* Correct error in previous checkin - check_init() would return False
  if previously initialized.
* If we fail after acquiring the GIL, be sure to release it.


Index: run_isapi.c
===================================================================
RCS file: /cvsroot/py2exe/py2exe/source/run_isapi.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** run_isapi.c	17 Jan 2007 04:35:22 -0000	1.7
--- run_isapi.c	18 Jan 2007 01:33:20 -0000	1.8
***************
*** 130,134 ****
  BOOL check_init()
  {
! 	BOOL ok = FALSE;
  	if (!have_init) {
  		EnterCriticalSection(&csInit);
--- 130,134 ----
  BOOL check_init()
  {
! 	BOOL ok = TRUE; // if already initialized all is good.
  	if (!have_init) {
  		EnterCriticalSection(&csInit);
***************
*** 141,144 ****
--- 141,145 ----
  			char *slash;
  
+ 			ok = FALSE; // must be reset after good init.
  			// We must ensure Python is loaded, and therefore the
  			// function pointers are non-NULL, before we can check
***************
*** 180,185 ****
  				restore_state = PyGILState_Ensure();
  			// a little DLL magic.  Set sys.frozen='dll'
! 			if (init_with_instance(gInstance, "dll") != 0)
  				goto done;
  			init_memimporter();
  			frozen = PyInt_FromLong((LONG)gInstance);
--- 181,188 ----
  				restore_state = PyGILState_Ensure();
  			// a little DLL magic.  Set sys.frozen='dll'
! 			if (init_with_instance(gInstance, "dll") != 0) {
! 				PyGILState_Release(restore_state);
  				goto done;
+ 			}
  			init_memimporter();
  			frozen = PyInt_FromLong((LONG)gInstance);
***************
*** 209,214 ****
  			have_init = TRUE;
  			PyGILState_Release(restore_state);
  		}
- 		ok = TRUE;
  done:
  		LeaveCriticalSection(&csInit);
--- 212,217 ----
  			have_init = TRUE;
  			PyGILState_Release(restore_state);
+ 			ok = TRUE;
  		}
  done:
  		LeaveCriticalSection(&csInit);

[Py2exe-checkins] py2exe/source run_isapi.c,1.6,1.7

[Mark H. <mha...@us...>]

Update of /cvsroot/py2exe/py2exe/source
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26917

Modified Files:
	run_isapi.c 
Log Message:
* Use event log writing built into pywin32 if it exists.
* Ensure failure to initialize releases the lock
* Fix error return values for HttpFilterProc and HttpExtensionProc


Index: run_isapi.c
===================================================================
RCS file: /cvsroot/py2exe/py2exe/source/run_isapi.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** run_isapi.c	24 Oct 2006 06:23:49 -0000	1.6
--- run_isapi.c	17 Jan 2007 04:35:22 -0000	1.7
***************
*** 38,41 ****
--- 38,42 ----
  typedef BOOL (__stdcall *__PROC__TerminateFilter)(DWORD status);
  typedef void (__stdcall *__PROC__PyISAPISetOptions)(const char *modname, BOOL is_frozen);
+ typedef BOOL (__stdcall *__PROC__WriteEventLogMessage)(WORD eventType, DWORD eventID, WORD num_inserts, const char **inserts);
  
  
***************
*** 52,55 ****
--- 53,57 ----
  __PROC__TerminateFilter pTerminateFilter = NULL;
  __PROC__PyISAPISetOptions pPyISAPISetOptions = NULL;
+ __PROC__WriteEventLogMessage pWriteEventLogMessage = NULL;
  
  extern int init_with_instance(HMODULE, char *);
***************
*** 62,65 ****
--- 64,73 ----
  void SystemError(int error, char *msg)
  {
+ 	// From pywin32's pyisapi_messages.h:
+ 	// #define E_PYISAPI_STARTUP_FAILED         ((DWORD)0xC0001100L)
+ 	// 0x1100 == E_PYISAPI_STARTUP_FAILED
+ 	// We use this even when we can't use pyisapi to log the record.
+ 	const DWORD evt_id = (DWORD)0xC0001100L;
+ 
  	char Buffer[1024];
  	int n;
***************
*** 82,99 ****
  	} else
  		Buffer[0] = '\0';
  	n = lstrlen(Buffer);
  	_snprintf(Buffer+n, sizeof(Buffer)-n, msg);
! 	// Can't display messages in a service.  Write to the event log.
  	// We have no message resources, so the message will be somewhat
  	// ugly - but so long as the info is there, that's ok.
  	hEventSource = RegisterEventSource(NULL, "ISAPI Filter or Extension");
  	if (hEventSource) {
! 		TCHAR * inserts[] = {Buffer};
  		ReportEvent(hEventSource, // handle of event source
  		            EVENTLOG_ERROR_TYPE,  // event type
  		            0,                    // event category
! 		            1,                 // event ID
  		            NULL,                 // current user's SID
! 		            1,           // strings in lpszStrings
  		            0,                    // no bytes of raw data
  		            inserts,          // array of error strings
--- 90,124 ----
  	} else
  		Buffer[0] = '\0';
+ 
+ 	// Can't display messages in a service.  Write to the event log.
+ 	// Later pywin32 versions export a function for writing to the
+ 	// event log - useful as it also has the message resources necessary
+ 	// to get reasonable looking messages.
+ 	// If that exists, use it - otherwise write an "ugly" message.
+ 
+ 	if (pWriteEventLogMessage) {
+ 		// Can use the one exported!
+ 		TCHAR * inserts[] = {msg, Buffer};
+ 		pWriteEventLogMessage(EVENTLOG_ERROR_TYPE, evt_id,
+ 		                      2, inserts);
+ 		return; // all done!
+ 	}
+ 
  	n = lstrlen(Buffer);
  	_snprintf(Buffer+n, sizeof(Buffer)-n, msg);
! 
  	// We have no message resources, so the message will be somewhat
  	// ugly - but so long as the info is there, that's ok.
  	hEventSource = RegisterEventSource(NULL, "ISAPI Filter or Extension");
  	if (hEventSource) {
! 		// a big sucky - windows error already in string - so we
! 		// send "see above"
! 		TCHAR * inserts[] = {Buffer, "see above"};
  		ReportEvent(hEventSource, // handle of event source
  		            EVENTLOG_ERROR_TYPE,  // event type
  		            0,                    // event category
! 		            evt_id,                 // event ID
  		            NULL,                 // current user's SID
! 		            2,           // strings in lpszStrings
  		            0,                    // no bytes of raw data
  		            inserts,          // array of error strings
***************
*** 105,108 ****
--- 130,134 ----
  BOOL check_init()
  {
+ 	BOOL ok = FALSE;
  	if (!have_init) {
  		EnterCriticalSection(&csInit);
***************
*** 121,126 ****
  			// before loading our module.
  			if (!_LoadPythonDLL(gInstance))
! 				return FALSE;
! 
  
  			// Find and load the pyisapi DLL.
--- 147,151 ----
  			// before loading our module.
  			if (!_LoadPythonDLL(gInstance))
! 				goto done;
  
  			// Find and load the pyisapi DLL.
***************
*** 144,150 ****
--- 169,178 ----
  					pTerminateFilter = (__PROC__TerminateFilter)GetProcAddress(hmodPyISAPI, "TerminateFilter");
  					pPyISAPISetOptions = (__PROC__PyISAPISetOptions)GetProcAddress(hmodPyISAPI, "PyISAPISetOptions");
+ 					pWriteEventLogMessage = (__PROC__WriteEventLogMessage)GetProcAddress(hmodPyISAPI, "WriteEventLogMessage");
  				} else {
  					SystemError(GetLastError(), "Failed to load the extension DLL");
  				}
+ 			} else {
+ 				SystemError(GetLastError(), "Failed to locate my own DLL");
  			}
  
***************
*** 153,157 ****
  			// a little DLL magic.  Set sys.frozen='dll'
  			if (init_with_instance(gInstance, "dll") != 0)
! 				return FALSE;
  			init_memimporter();
  			frozen = PyInt_FromLong((LONG)gInstance);
--- 181,185 ----
  			// a little DLL magic.  Set sys.frozen='dll'
  			if (init_with_instance(gInstance, "dll") != 0)
! 				goto done;
  			init_memimporter();
  			frozen = PyInt_FromLong((LONG)gInstance);
***************
*** 182,188 ****
  			PyGILState_Release(restore_state);
  		}
  		LeaveCriticalSection(&csInit);
  	}
! 	return TRUE;
  }
  
--- 210,218 ----
  			PyGILState_Release(restore_state);
  		}
+ 		ok = TRUE;
+ done:
  		LeaveCriticalSection(&csInit);
  	}
! 	return ok;
  }
  
***************
*** 214,218 ****
  DWORD WINAPI HttpExtensionProc(EXTENSION_CONTROL_BLOCK *pECB)
  {
! 	if (!check_init() || !pHttpExtensionProc) return FALSE;
  	return (*pHttpExtensionProc)(pECB);
  }
--- 244,248 ----
  DWORD WINAPI HttpExtensionProc(EXTENSION_CONTROL_BLOCK *pECB)
  {
! 	if (!check_init() || !pHttpExtensionProc) return HSE_STATUS_ERROR;
  	return (*pHttpExtensionProc)(pECB);
  }
***************
*** 231,235 ****
  DWORD WINAPI HttpFilterProc(HTTP_FILTER_CONTEXT *phfc, DWORD NotificationType, VOID *pvData)
  {
! 	if (!check_init() || !pHttpFilterProc) return FALSE;
  	return (*pHttpFilterProc)(phfc, NotificationType, pvData);
  }
--- 261,265 ----
  DWORD WINAPI HttpFilterProc(HTTP_FILTER_CONTEXT *phfc, DWORD NotificationType, VOID *pvData)
  {
! 	if (!check_init() || !pHttpFilterProc) return SF_STATUS_REQ_NEXT_NOTIFICATION;
  	return (*pHttpFilterProc)(phfc, NotificationType, pvData);
  }

[Py2exe-checkins] py2exe/source start.c,1.37,1.38

[Mark H. <mha...@us...>]

Update of /cvsroot/py2exe/py2exe/source
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26555

Modified Files:
	start.c 
Log Message:
In some cases, notably ISAPI, GetModuleFileName() may return a string with
a leading "\\?\" - handle that by skipping the prefix if it exists


Index: start.c
===================================================================
RCS file: /cvsroot/py2exe/py2exe/source/start.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** start.c	22 Nov 2006 07:40:13 -0000	1.37
--- start.c	17 Jan 2007 04:34:20 -0000	1.38
***************
*** 80,83 ****
--- 80,85 ----
  BOOL calc_dirname(HMODULE hmod)
  {
+ 	int is_special;
+ 	char *modulename_start;
  	char *cp;
  	// get module filename
***************
*** 86,91 ****
  		return FALSE;
  	}
! 	// get directory of modulename
! 	strcpy(dirname, modulename);
  	cp = strrchr(dirname, '\\');
  	*cp = '\0';
--- 88,101 ----
  		return FALSE;
  	}
! 	// get directory of modulename.  Note that in some cases
! 	// (eg, ISAPI), GetModuleFileName may return a leading "\\?\"
! 	// (which is a special format you can pass to the Unicode API
! 	// to avoid MAX_PATH limitations).  Python currently can't understand
! 	// such names, and as it uses the ANSI API, neither does Windows!
! 	// So fix that up here.
! 	is_special = strlen(modulename) > 4 &&
! 	             strncmp(modulename, "\\\\?\\", 4)==0;
! 	modulename_start = is_special ? modulename + 4 : modulename;
! 	strcpy(dirname, modulename_start);
  	cp = strrchr(dirname, '\\');
  	*cp = '\0';

[Py2exe-checkins] py2exe/docs updateweb.cmd,1.7,1.8

[Jimmy R. <jr...@us...>]

Update of /cvsroot/py2exe/py2exe/docs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11128/docs

Modified Files:
	updateweb.cmd 
Log Message:
Now points to py2exe.org.

Index: updateweb.cmd
===================================================================
RCS file: /cvsroot/py2exe/py2exe/docs/updateweb.cmd,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** updateweb.cmd	9 Oct 2005 12:15:09 -0000	1.7
--- updateweb.cmd	31 Dec 2006 12:50:00 -0000	1.8
***************
*** 1,2 ****
! scp index.html default.css LICENSE.txt py2exe.jpg jr...@py...:~/public_html/py2exe
  scp index.html default.css LICENSE.txt py2exe.jpg jr...@sh...:/home/groups/p/py/py2exe/htdocs
--- 1,2 ----
! scp index.html default.css LICENSE.txt py2exe.jpg jr...@py...:~/py2exe.org/old
  scp index.html default.css LICENSE.txt py2exe.jpg jr...@sh...:/home/groups/p/py/py2exe/htdocs

[Py2exe-checkins] py2exe setup.py,1.50,1.51

[Jimmy R. <jr...@us...>]

Update of /cvsroot/py2exe/py2exe
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23387

Modified Files:
	setup.py 
Log Message:
Include samples (and all their files) with binary distributions.

Index: setup.py
===================================================================
RCS file: /cvsroot/py2exe/py2exe/setup.py,v
retrieving revision 1.50
retrieving revision 1.51
diff -C2 -d -r1.50 -r1.51
*** setup.py	18 Oct 2006 12:23:13 -0000	1.50
--- setup.py	29 Dec 2006 11:56:12 -0000	1.51
***************
*** 36,39 ****
--- 36,40 ----
  from distutils.dist import Distribution
  from distutils.command import build_ext, build
+ from distutils.command.install_data import install_data
  from distutils.sysconfig import customize_compiler
  from distutils.dep_util import newer_group
***************
*** 298,301 ****
--- 299,327 ----
  ############################################################################
  
+ # This ensures that data files are copied into site_packages rather than
+ # the main Python directory.
+ class smart_install_data(install_data):
+     def run(self):
+         #need to change self.install_dir to the library dir
+         install_cmd = self.get_finalized_command('install')
+         self.install_dir = getattr(install_cmd, 'install_lib')
+         return install_data.run(self)
+ 
+ def iter_samples():
+     excludedDirs = ['CVS']
+     for dirpath, dirnames, filenames in os.walk(r'py2exe\samples'):
+         for dir in dirnames:
+             if dir.startswith('.') and dir not in excludedDirs:
+                 excludedDirs.append(dir)
+         for dir in excludedDirs:
+             if dir in dirnames:
+                 dirnames.remove(dir)
+         qualifiedFiles = []
+         for filename in filenames:
+             if not filename.startswith('.'):
+                 qualifiedFiles.append(os.path.join(dirpath, filename))
+         if qualifiedFiles:
+             yield (dirpath, qualifiedFiles)
+ 
  def _is_debug_build():
      import imp
***************
*** 413,418 ****
        distclass = Dist,
        cmdclass = {'build_interpreters': BuildInterpreters,
!                   'deinstall': deinstall},
  
        ext_modules = [_memimporter,
                       Extension("py2exe.py2exe_util",
--- 439,447 ----
        distclass = Dist,
        cmdclass = {'build_interpreters': BuildInterpreters,
!                   'deinstall': deinstall,
!                   'install_data': smart_install_data,
!                  },
  
+       data_files = list(iter_samples()),
        ext_modules = [_memimporter,
                       Extension("py2exe.py2exe_util",
***************
*** 425,434 ****
        packages=['py2exe',
                  'py2exe.resources',
!                 # the following are NOT really packages:
!                 'py2exe.samples.simple',
!                 'py2exe.samples.extending',
!                 'py2exe.samples.advanced',
!                 'py2exe.samples.singlefile.gui',
!                 'py2exe.samples.singlefile.comserver'],
        options = options,
        )
--- 454,458 ----
        packages=['py2exe',
                  'py2exe.resources',
!                ],
        options = options,
        )

[Py2exe-checkins] py2exe MANIFEST.in,1.17,1.18

[Jimmy R. <jr...@us...>]

Update of /cvsroot/py2exe/py2exe
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23370

Modified Files:
	MANIFEST.in 
Log Message:
Include samples (and all their files) with source distributions.

Index: MANIFEST.in
===================================================================
RCS file: /cvsroot/py2exe/py2exe/MANIFEST.in,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** MANIFEST.in	7 Sep 2005 11:11:35 -0000	1.17
--- MANIFEST.in	29 Dec 2006 11:55:50 -0000	1.18
***************
*** 1,3 ****
  include MANIFEST.in ANNOUNCE
  recursive-include source *.h *.c *.ico *.rc *.py *.txt
! recursive-include docs *.txt *.css *.html *.py
\ No newline at end of file
--- 1,4 ----
  include MANIFEST.in ANNOUNCE
+ recursive-include py2exe *.h *.c *.ico *.rc *.py *.txt *.vbs
  recursive-include source *.h *.c *.ico *.rc *.py *.txt
! recursive-include docs *.txt *.css *.html *.py

[Py2exe-checkins] py2exe/test test.cmd,NONE,1.1 test.py,1.4,1.5

[Jimmy R. <jr...@us...>]

Update of /cvsroot/py2exe/py2exe/test
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24830/test

Modified Files:
	test.py 
Added Files:
	test.cmd 
Log Message:
Automate the running of tests on Python 2.3, 2.4, and 2.5.

--- NEW FILE: test.cmd ---
@echo off
C:\Python23\python.exe test.py && C:\Python24\python.exe test.py && C:\Python25\python.exe test.py && echo Success!!!

Index: test.py
===================================================================
RCS file: /cvsroot/py2exe/py2exe/test/test.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** test.py	11 Nov 2006 13:30:52 -0000	1.4
--- test.py	29 Dec 2006 10:31:00 -0000	1.5
***************
*** 51,54 ****
--- 51,55 ----
  def main():
      for test in glob.glob('test_*.py'):
+         print 'Python', sys.version
          print test
  

[Py2exe-checkins] py2exe ChangeLog,1.38,1.39

[Jimmy R. <jr...@us...>]

Update of /cvsroot/py2exe/py2exe
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6191

Modified Files:
	ChangeLog 
Log Message:
Documentation updates for 0.6.6 release.

Index: ChangeLog
===================================================================
RCS file: /cvsroot/py2exe/py2exe/ChangeLog,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** ChangeLog	22 Nov 2006 08:47:34 -0000	1.38
--- ChangeLog	29 Dec 2006 09:40:25 -0000	1.39
***************
*** 1,8 ****
  2006-11-22  Thomas Heller  <th...@py...>
  
  	* py2exe does now work sort-of on win64, with a 64-bit build of
  	Python.
! 	
! 	* On win64, complain if bundle_files > 3.  This is not yet
  	supported since the code in source\MemoryModule.c does not work on
  	win64.
--- 1,13 ----
+ 2006-12-27  Jimmy Retzlaff  <ji...@re...>
+ 
+ 	* boot_common.py: Handle new parameter to fake_getline in Python 2.5
+ 	as suggested by Tim Tucker.
+ 
  2006-11-22  Thomas Heller  <th...@py...>
  
  	* py2exe does now work sort-of on win64, with a 64-bit build of
  	Python.
! 
! 	* On win64, complain if bundle_files < 3.  This is not yet
  	supported since the code in source\MemoryModule.c does not work on
  	win64.
***************
*** 17,20 ****
--- 22,82 ----
  	* build_exe.py: Add gdiplus.dll to the list of excluded dlls.
  
+ 2006-12-27  Jimmy Retzlaff  <ji...@re...>
+ 
+ 	* test:
+ 		* Run all tests with and without the --compression option - this
+ 		  catches the problems zlib problem with Python 2.5.
+ 		* Added a test case that cathces the sys.path regression.
+ 
+ 2006-10-24  Mark Hammond  <mha...@sk...>
+ 
+ 	* start.c:
+ 		* Add calc_dirname() which calculates the dirname global, and call this
+ 		  from _InitPython, so _InitPython can be called externally before
+ 		  init_with_instance
+ 		* My most recent checkin did not update sys.frozen to the new value if
+ 		  Python was already initialized.  Although that is all nasty hackery,
+ 		  it now works as before (ie, sys.frozen is set to the new value)
+ 
+ 	* run_isapi.c:
+ 		* Load Python before the ISAPI extension module, as that module itself
+ 		  depends on Python.
+ 		* Write an event log error when the ISAPI module failed to load.
+ 
+ 2006-10-18  Mark Hammond  <mha...@sk...>
+ 
+ 	* boot_com_servers.py:
+ 
+ 	* zipextimporter.py: Py2.5 doesn't recognize .dll as a module;
+ 	pywintypes/pythoncom now get specital treatment
+ 
+ 	* start.c: If Python is already initialized, assume we have struck 2
+ 	pyexe DLLs in the same process, and adjust sys.path accordingly.
+ 	Its kinda lame, but will work if everyone magically happens to use
+ 	the same version.
+ 
+ 	* run_isapi.c: Replace MessageBox (which will hang an ISAPI app) with
+ 	an event-log entry. Entry is pretty lame; there are no message
+ 	resources in py2exe apps.
+ 
+ 2006-07-02  Mark Hammond  <mha...@sk...>
+ 
+ 	* New isapi and com_server samples
+ 
+ 2006-06-29  Mark Hammond  <mha...@sk...>
+ 
+ 	* py2exe.txt: Add notes re service cmdline handling.
+ 
+ 	* Python-dynload.c: Before doing a LoadLibrary for the Python DLL,
+ 	ensure it isn't already in memory.  This gets the ISAPI stuff working
+ 	again.
+ 
+ 2006-06-20  Mark Hammond  <mha...@sk...>
+ 
+ 	* boot_service.py: Support more 'command-line styles' for services
+ 	(allowing 'pywin32' meaning the same as pywin32 itself, and 'custom'
+ 	meaning the cmdline handler must be provided) and allow the user to
+ 	select it via the 'cmdline_style' option.
+ 
  2006-02-13  Jimmy Retzlaff  <ji...@re...>
  

[Py2exe-checkins] py2exe/docs py2exe.txt,1.18,1.19

[Jimmy R. <jr...@us...>]

Update of /cvsroot/py2exe/py2exe/docs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6191/docs

Modified Files:
	py2exe.txt 
Log Message:
Documentation updates for 0.6.6 release.

Index: py2exe.txt
===================================================================
RCS file: /cvsroot/py2exe/py2exe/docs/py2exe.txt,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** py2exe.txt	29 Jun 2006 00:28:53 -0000	1.18
--- py2exe.txt	29 Dec 2006 09:40:25 -0000	1.19
***************
*** 56,59 ****
--- 56,71 ----
  ----
  
+ **py2exe 0.6.6 released (2006/12/30)**
+ 
+ Better support for Python 2.5.
+ 
+ Experimental support for 64-bit builds of Python on win64.
+ 
+ Better ISAPI support.
+ 
+ New samples for ISAPI and COM servers.
+ 
+ Support for new "command-line styles" when building Windows services.
+ 
  **py2exe 0.6.5 released (2006/03/20)**
  
***************
*** 238,242 ****
  valid values being 'py2exe' (the default), 'pywin32' or 'custom'.  'py2exe'
  specifies the traditional command-line always supported by py2exe.  'pywin32'
! supports the exact same command-line arguments as pywin32 supports (ie, the 
  same arguments supported when running the service from the .py file.)
  'custom' means that your module is expected to provide a 'HandleCommandLine'
--- 250,254 ----
  valid values being 'py2exe' (the default), 'pywin32' or 'custom'.  'py2exe'
  specifies the traditional command-line always supported by py2exe.  'pywin32'
! supports the exact same command-line arguments as pywin32 supports (ie, the
  same arguments supported when running the service from the .py file.)
  'custom' means that your module is expected to provide a 'HandleCommandLine'

[Py2exe-checkins] py2exe/py2exe __init__.py,1.35,1.36

[Jimmy R. <jr...@us...>]

Update of /cvsroot/py2exe/py2exe/py2exe
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30893/py2exe

Modified Files:
	__init__.py 
Log Message:
Changed version number to 0.6.6.

Index: __init__.py
===================================================================
RCS file: /cvsroot/py2exe/py2exe/py2exe/__init__.py,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** __init__.py	20 Mar 2006 11:23:15 -0000	1.35
--- __init__.py	27 Dec 2006 18:23:49 -0000	1.36
***************
*** 63,67 ****
  #
  
! __version__ = "0.6.5"
  
  import distutils.dist, distutils.core, distutils.command, build_exe, sys
--- 63,67 ----
  #
  
! __version__ = "0.6.6"
  
  import distutils.dist, distutils.core, distutils.command, build_exe, sys

[Py2exe-checkins] py2exe/py2exe boot_common.py,1.4,1.5

[Jimmy R. <jr...@us...>]

Update of /cvsroot/py2exe/py2exe/py2exe
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30504/py2exe

Modified Files:
	boot_common.py 
Log Message:
Handle new parameter to fake_getline in Python 2.5 as suggested by Tim Tucker.

Index: boot_common.py
===================================================================
RCS file: /cvsroot/py2exe/py2exe/py2exe/boot_common.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** boot_common.py	10 Dec 2005 22:01:02 -0000	1.4
--- boot_common.py	27 Dec 2006 18:22:51 -0000	1.5
***************
*** 91,95 ****
  # causes it to ask them to insert a disk in that drive.
  import linecache
! def fake_getline(filename, lineno):
      return ''
  linecache.orig_getline = linecache.getline
--- 91,95 ----
  # causes it to ask them to insert a disk in that drive.
  import linecache
! def fake_getline(filename, lineno, module_globals=None):
      return ''
  linecache.orig_getline = linecache.getline

[Py2exe-checkins] py2exe ChangeLog,1.37,1.38

[Thomas H. <th...@us...>]

Update of /cvsroot/py2exe/py2exe
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16941

Modified Files:
	ChangeLog 
Log Message:
Record changes.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/py2exe/py2exe/ChangeLog,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** ChangeLog	22 Nov 2006 07:35:28 -0000	1.37
--- ChangeLog	22 Nov 2006 08:47:34 -0000	1.38
***************
*** 1,4 ****
--- 1,15 ----
  2006-11-22  Thomas Heller  <th...@py...>
  
+ 	* py2exe does now work sort-of on win64, with a 64-bit build of
+ 	Python.
+ 	
+ 	* On win64, complain if bundle_files > 3.  This is not yet
+ 	supported since the code in source\MemoryModule.c does not work on
+ 	win64.
+ 
+ 	* Updated the mktab.py script (which generates import-tab.c and
+ 	import-tab.h) for Py_ssize_t and the definition of PyInit_Module4
+ 	on win64.  Regenerated import-tab.c and import-tab.h.
+ 
  	* build_exe.py: Don't copy w9xpopen.exe if it does not exist (on a
  	64-bit Python installation, for example).

[Py2exe-checkins] py2exe/py2exe build_exe.py,1.71,1.72

[Thomas H. <th...@us...>]

Update of /cvsroot/py2exe/py2exe/py2exe
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15507

Modified Files:
	build_exe.py 
Log Message:
bundle-files < 3 is not yet supported on win64 (since _memimporter
needs to be ported).


Index: build_exe.py
===================================================================
RCS file: /cvsroot/py2exe/py2exe/py2exe/build_exe.py,v
retrieving revision 1.71
retrieving revision 1.72
diff -C2 -d -r1.71 -r1.72
*** build_exe.py	22 Nov 2006 07:35:35 -0000	1.71
--- build_exe.py	22 Nov 2006 08:43:36 -0000	1.72
***************
*** 18,21 ****
--- 18,23 ----
  import struct
  
+ is_win64 = struct.calcsize("P") == 8
+ 
  def _is_debug_build():
      for ext, _, _ in imp.get_suffixes():
***************
*** 191,194 ****
--- 193,199 ----
              raise DistutilsOptionError, \
                    "bundle-files must be 1, 2, or 3, not %s" % self.bundle_files
+         if is_win64 and self.bundle_files < 3:
+             raise DistutilsOptionError, \
+                   "bundle-files %d not yet supported on win64" % self.bundle_files
          if self.skip_archive:
              if self.compressed:

[Py2exe-checkins] py2exe/source mktab.py, 1.5, 1.6 import-tab.h, 1.7, 1.8 import-tab.c, 1.7, 1.8

[Thomas H. <th...@us...>]

Update of /cvsroot/py2exe/py2exe/source
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12247

Modified Files:
	mktab.py import-tab.h import-tab.c 
Log Message:
Updated the mktab.py script (which generates import-tab.c and
import-tab.h) for Py_ssize_t and the definition of PyInit_Module4 on
win64.

Regenerated import-tab.c and import-tab.h.


Index: mktab.py
===================================================================
RCS file: /cvsroot/py2exe/py2exe/source/mktab.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** mktab.py	13 Feb 2006 13:17:22 -0000	1.5
--- mktab.py	22 Nov 2006 08:34:16 -0000	1.6
***************
*** 8,14 ****
  void, Py_SetPythonHome, (char *)
  void, Py_SetProgramName, (char *)
! PyObject *, PyMarshal_ReadObjectFromString, (char *, int)
  PyObject *, PyObject_CallFunction, (PyObject *, char *, ...)
! int, PyString_AsStringAndSize, (PyObject *, char **, int *)
  char *, PyString_AsString, (PyObject *)
  int, PyArg_ParseTuple, (PyObject *, char *, ...)
--- 8,14 ----
  void, Py_SetPythonHome, (char *)
  void, Py_SetProgramName, (char *)
! PyObject *, PyMarshal_ReadObjectFromString, (char *, Py_ssize_t)
  PyObject *, PyObject_CallFunction, (PyObject *, char *, ...)
! int, PyString_AsStringAndSize, (PyObject *, char **, Py_ssize_t *)
  char *, PyString_AsString, (PyObject *)
  int, PyArg_ParseTuple, (PyObject *, char *, ...)
***************
*** 19,24 ****
  PyObject *, PyLong_FromVoidPtr, (void *)
  PyObject *, Py_InitModule4, (char *, PyMethodDef *, char *, PyObject *, int)
! PyObject *, PyTuple_New, (int)
! int, PyTuple_SetItem, (PyObject*, int, PyObject *)
  int, Py_IsInitialized, (void)
  int, PyObject_SetAttrString, (PyObject *, char *, PyObject *)
--- 19,24 ----
  PyObject *, PyLong_FromVoidPtr, (void *)
  PyObject *, Py_InitModule4, (char *, PyMethodDef *, char *, PyObject *, int)
! PyObject *, PyTuple_New, (Py_ssize_t)
! int, PyTuple_SetItem, (PyObject*, Py_ssize_t, PyObject *)
  int, Py_IsInitialized, (void)
  int, PyObject_SetAttrString, (PyObject *, char *, PyObject *)
***************
*** 48,53 ****
  PyObject *, PyImport_AddModule, (char *)
  PyObject *, PyModule_GetDict, (PyObject *)
! int, PySequence_Length, (PyObject *)
! PyObject *, PySequence_GetItem, (PyObject *, int)
  //int, PyCode_Check, (PyObject *)
  PyObject *, PyEval_EvalCode, (PyCodeObject *, PyObject *, PyObject *)
--- 48,53 ----
  PyObject *, PyImport_AddModule, (char *)
  PyObject *, PyModule_GetDict, (PyObject *)
! Py_ssize_t, PySequence_Length, (PyObject *)
! PyObject *, PySequence_GetItem, (PyObject *, Py_ssize_t)
  //int, PyCode_Check, (PyObject *)
  PyObject *, PyEval_EvalCode, (PyCodeObject *, PyObject *, PyObject *)
***************
*** 58,61 ****
--- 58,65 ----
  int, Py_OptimizeFlag
  int, Py_IgnoreEnvironmentFlag
+ PyObject *, PyObject_Str, (PyObject *)
+ PyObject *, PyList_New, (Py_ssize_t)
+ int, PyList_SetItem, (PyObject *, Py_ssize_t, PyObject *)
+ int, PyList_Append, (PyObject *, PyObject *)
  '''.strip().splitlines()
  
***************
*** 84,88 ****
--- 88,96 ----
          print >> cfile, '\t{ "Py_InitModule4TraceRefs", NULL },' % locals()
          print >> cfile, '#else'
+         print >> cfile, '#  if defined (_WIN64)'
+         print >> cfile, '\t{ "Py_InitModule4_64", NULL },' % locals()
+         print >> cfile, '#  else'
          print >> cfile, '\t{ "Py_InitModule4", NULL },' % locals()
+         print >> cfile, '#  endif'
          print >> cfile, '#endif'
      else:

Index: import-tab.c
===================================================================
RCS file: /cvsroot/py2exe/py2exe/source/import-tab.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** import-tab.c	18 Oct 2006 12:20:42 -0000	1.7
--- import-tab.c	22 Nov 2006 08:34:16 -0000	1.8
***************
*** 18,22 ****
--- 18,26 ----
  	{ "Py_InitModule4TraceRefs", NULL },
  #else
+ #  if defined (_WIN64)
+ 	{ "Py_InitModule4_64", NULL },
+ #  else
  	{ "Py_InitModule4", NULL },
+ #  endif
  #endif
  	{ "PyTuple_New", NULL },

Index: import-tab.h
===================================================================
RCS file: /cvsroot/py2exe/py2exe/source/import-tab.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** import-tab.h	18 Oct 2006 12:20:42 -0000	1.7
--- import-tab.h	22 Nov 2006 08:34:16 -0000	1.8
***************
*** 53,56 ****
  #define PyObject_Str ((PyObject *(*)(PyObject *))imports[52].proc)
  #define PyList_New ((PyObject *(*)(Py_ssize_t))imports[53].proc)
! #define PyList_SetItem ((int (*)(PyObject *, Py_ssize_t, PyObject *))imports[54].proc)
! #define PyList_Append ((int (*)(PyObject *, PyObject *))imports[55].proc)
--- 53,56 ----
  #define PyObject_Str ((PyObject *(*)(PyObject *))imports[52].proc)
  #define PyList_New ((PyObject *(*)(Py_ssize_t))imports[53].proc)
! #define PyList_SetItem ((int(*)(PyObject *, Py_ssize_t, PyObject *))imports[54].proc)
! #define PyList_Append ((int(*)(PyObject *, PyObject *))imports[55].proc)

[Py2exe-checkins] py2exe/source Python-version.h,1.1,1.2

[Thomas H. <th...@us...>]

Update of /cvsroot/py2exe/py2exe/source
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1904

Modified Files:
	Python-version.h 
Log Message:
Correct the typedef for Py_ssize_t on both win32 and win64.


Index: Python-version.h
===================================================================
RCS file: /cvsroot/py2exe/py2exe/source/Python-version.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Python-version.h	20 Jun 2006 07:35:06 -0000	1.1
--- Python-version.h	22 Nov 2006 08:04:19 -0000	1.2
***************
*** 5,12 ****
  #else
  #  define PYTHON_API_VERSION 1013
! #  if defined (_WIN32)
!      typedef long Py_ssize_t;
! #  elif defined (_WIN64)
       typedef __int64 Py_ssize_t;
  #  endif
  #endif
--- 5,15 ----
  #else
  #  define PYTHON_API_VERSION 1013
! /* The check for _WIN64 must come first, because on win64 both _WIN64 and
!  *  _WIN32 are defined!
!  */
! #  if defined (_WIN64)
       typedef __int64 Py_ssize_t;
+ #  elif defined (_WIN32)
+      typedef int Py_ssize_t;
  #  endif
  #endif

[Py2exe-checkins] py2exe/source start.c,1.36,1.37

[Thomas H. <th...@us...>]

Update of /cvsroot/py2exe/py2exe/source
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26305

Modified Files:
	start.c 
Log Message:
Fix compiler warning.


Index: start.c
===================================================================
RCS file: /cvsroot/py2exe/py2exe/source/start.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** start.c	22 Nov 2006 07:38:44 -0000	1.36
--- start.c	22 Nov 2006 07:40:13 -0000	1.37
***************
*** 90,93 ****
--- 90,94 ----
  	cp = strrchr(dirname, '\\');
  	*cp = '\0';
+ 	return TRUE;
  }