[Python-checkins] r41943 - in python/branches/ssize_t: Doc/lib/libcookielib.tex Doc/lib/libos.tex Doc/lib/libsys.tex Include/patchlevel.h Include/pythonrun.h Lib/platform.py Lib/test/test_compiler.py Lib/test/test_curses.py Lib/test/test_linuxaudiodev.py Lib/test/test_ossaudiodev.py Makefile.pre.in Misc/NEWS Misc/build.sh Modules/_bsddb.c Modules/getbuildinfo.c Modules/getpath.c Modules/zlib Objects/unicodeobject.c PC/config.c PCbuild/_bsddb.vcproj PCbuild/_socket.vcproj PCbuild/_testcapi.vcproj PCbuild/_tkinter.vcproj PCbuild/bz2.vcproj PCbuild/make_versioninfo.vcproj PCbuild/pcbuild.sln PCbuild/pyexpat.vcproj PCbuild/python.vcproj PCbuild/pythoncore.vcproj PCbuild/pythonw.vcproj PCbuild/readme.txt PCbuild/select.vcproj PCbuild/unicodedata.vcproj PCbuild/w9xpopen.vcproj PCbuild/winsound.vcproj PCbuild/zlib.vcproj Python/dynload_shlib.c Python/sysmodule.c Tools/msi/msi.py configure configure.in
martin.v.loewis
python-checkins at python.org
Sat Jan 7 04:49:39 CET 2006
Author: martin.v.loewis
Date: Sat Jan 7 04:49:32 2006
New Revision: 41943
Added:
python/branches/ssize_t/Misc/build.sh
- copied unchanged from r41942, python/trunk/Misc/build.sh
python/branches/ssize_t/Modules/zlib/
- copied from r41942, python/trunk/Modules/zlib/
Removed:
python/branches/ssize_t/PCbuild/zlib.vcproj
Modified:
python/branches/ssize_t/ (props changed)
python/branches/ssize_t/Doc/lib/libcookielib.tex
python/branches/ssize_t/Doc/lib/libos.tex
python/branches/ssize_t/Doc/lib/libsys.tex
python/branches/ssize_t/Include/patchlevel.h
python/branches/ssize_t/Include/pythonrun.h
python/branches/ssize_t/Lib/platform.py
python/branches/ssize_t/Lib/test/test_compiler.py
python/branches/ssize_t/Lib/test/test_curses.py
python/branches/ssize_t/Lib/test/test_linuxaudiodev.py
python/branches/ssize_t/Lib/test/test_ossaudiodev.py
python/branches/ssize_t/Makefile.pre.in
python/branches/ssize_t/Misc/NEWS
python/branches/ssize_t/Modules/_bsddb.c
python/branches/ssize_t/Modules/getbuildinfo.c (contents, props changed)
python/branches/ssize_t/Modules/getpath.c
python/branches/ssize_t/Objects/unicodeobject.c
python/branches/ssize_t/PC/config.c
python/branches/ssize_t/PCbuild/_bsddb.vcproj
python/branches/ssize_t/PCbuild/_socket.vcproj
python/branches/ssize_t/PCbuild/_testcapi.vcproj
python/branches/ssize_t/PCbuild/_tkinter.vcproj
python/branches/ssize_t/PCbuild/bz2.vcproj
python/branches/ssize_t/PCbuild/make_versioninfo.vcproj
python/branches/ssize_t/PCbuild/pcbuild.sln
python/branches/ssize_t/PCbuild/pyexpat.vcproj
python/branches/ssize_t/PCbuild/python.vcproj
python/branches/ssize_t/PCbuild/pythoncore.vcproj
python/branches/ssize_t/PCbuild/pythonw.vcproj
python/branches/ssize_t/PCbuild/readme.txt
python/branches/ssize_t/PCbuild/select.vcproj
python/branches/ssize_t/PCbuild/unicodedata.vcproj
python/branches/ssize_t/PCbuild/w9xpopen.vcproj
python/branches/ssize_t/PCbuild/winsound.vcproj
python/branches/ssize_t/Python/dynload_shlib.c
python/branches/ssize_t/Python/sysmodule.c (contents, props changed)
python/branches/ssize_t/Tools/msi/msi.py
python/branches/ssize_t/configure
python/branches/ssize_t/configure.in
Log:
Merge with trunk:41942.
Modified: python/branches/ssize_t/Doc/lib/libcookielib.tex
==============================================================================
--- python/branches/ssize_t/Doc/lib/libcookielib.tex (original)
+++ python/branches/ssize_t/Doc/lib/libcookielib.tex Sat Jan 7 04:49:32 2006
@@ -36,7 +36,9 @@
\begin{excdesc}{LoadError}
Instances of \class{FileCookieJar} raise this exception on failure to
-load cookies from a file.
+load cookies from a file. \note{For backwards-compatibility
+with Python 2.4 (which raised an \exception{IOError}),
+\exception{LoadError} is a subclass of \exception{IOError}}.
\end{excdesc}
@@ -273,16 +275,19 @@
Arguments are as for \method{save()}.
The named file must be in the format understood by the class, or
-\exception{LoadError} will be raised.
+\exception{LoadError} will be raised. Also, \exception{IOError} may
+be raised, for example if the file does not exist. \note{For
+backwards-compatibility with Python 2.4 (which raised
+an \exception{IOError}), \exception{LoadError} is a subclass
+of \exception{IOError}.}
\end{methoddesc}
\begin{methoddesc}[FileCookieJar]{revert}{filename=\constant{None},
ignore_discard=\constant{False}, ignore_expires=\constant{False}}
Clear all cookies and reload cookies from a saved file.
-Raises \exception{cookielib.LoadError} or \exception{IOError} if
-reversion is not successful; the object's state will not be altered if
-this happens.
+\method{revert()} can raise the same exceptions as \method{load()}.
+If there is a failure, the object's state will not be altered.
\end{methoddesc}
\class{FileCookieJar} instances have the following public attributes:
@@ -579,7 +584,7 @@
\end{memberdesc}
-\subsection{Cookie Objects \label{cookie-jar-objects}}
+\subsection{Cookie Objects \label{cookie-objects}}
\class{Cookie} instances have Python attributes roughly corresponding
to the standard cookie-attributes specified in the various cookie
Modified: python/branches/ssize_t/Doc/lib/libos.tex
==============================================================================
--- python/branches/ssize_t/Doc/lib/libos.tex (original)
+++ python/branches/ssize_t/Doc/lib/libos.tex Sat Jan 7 04:49:32 2006
@@ -832,9 +832,9 @@
doesn't open the FIFO --- it just creates the rendezvous point.
\end{funcdesc}
-\begin{funcdesc}{mknod}{path\optional{, mode=0600, device}}
+\begin{funcdesc}{mknod}{filename\optional{, mode=0600, device}}
Create a filesystem node (file, device special file or named pipe)
-named filename. \var{mode} specifies both the permissions to use and
+named \var{filename}. \var{mode} specifies both the permissions to use and
the type of node to be created, being combined (bitwise OR) with one
of S_IFREG, S_IFCHR, S_IFBLK, and S_IFIFO (those constants are
available in \module{stat}). For S_IFCHR and S_IFBLK, \var{device}
Modified: python/branches/ssize_t/Doc/lib/libsys.tex
==============================================================================
--- python/branches/ssize_t/Doc/lib/libsys.tex (original)
+++ python/branches/ssize_t/Doc/lib/libsys.tex Sat Jan 7 04:49:32 2006
@@ -27,10 +27,19 @@
\versionadded{2.0}
\end{datadesc}
-\begin{datadesc}{build_number}
- A string representing the Subversion revision that this Python executable
- was built from. This number is a string because it may contain a trailing
- 'M' if Python was built from a mixed revision source tree.
+\begin{datadesc}{subversion}
+ A triple (repo, branch, version) representing the Subversion
+ information of the Python interpreter.
+ \var{repo} is the name of the repository, \code{'CPython'}.
+ \var{branch} is a string of one of the forms \code{'trunk'},
+ \code{'branches/name'} or \code{'tags/name'}.
+ \var{version} is the output of \code{svnversion}, if the
+ interpreter was built from a Subversion checkout; it contains
+ the revision number (range) and possibly a trailing 'M' if
+ there were local modifications. If the tree was exported
+ (or svnversion was not available), it is the revision of
+ \code{Include/patchlevel.h} if the branch is a tag. Otherwise,
+ it is \code{None}.
\versionadded{2.5}
\end{datadesc}
Modified: python/branches/ssize_t/Include/patchlevel.h
==============================================================================
--- python/branches/ssize_t/Include/patchlevel.h (original)
+++ python/branches/ssize_t/Include/patchlevel.h Sat Jan 7 04:49:32 2006
@@ -28,6 +28,9 @@
/* Version as a string */
#define PY_VERSION "2.5a0"
+/* Subversion Revision number of this file (not of the repository) */
+#define PY_PATCHLEVEL_REVISION "$Revision$"
+
/* Version as a single 4-byte hex number, e.g. 0x010502B2 == 1.5.2b2.
Use this for numeric comparisons, e.g. #if PY_VERSION_HEX >= ... */
#define PY_VERSION_HEX ((PY_MAJOR_VERSION << 24) | \
Modified: python/branches/ssize_t/Include/pythonrun.h
==============================================================================
--- python/branches/ssize_t/Include/pythonrun.h (original)
+++ python/branches/ssize_t/Include/pythonrun.h Sat Jan 7 04:49:32 2006
@@ -108,7 +108,9 @@
PyAPI_FUNC(const char *) Py_GetCopyright(void);
PyAPI_FUNC(const char *) Py_GetCompiler(void);
PyAPI_FUNC(const char *) Py_GetBuildInfo(void);
-PyAPI_FUNC(const char *) Py_GetBuildNumber(void);
+PyAPI_FUNC(const char *) _Py_svnversion(void);
+PyAPI_FUNC(const char *) Py_SubversionRevision(void);
+PyAPI_FUNC(const char *) Py_SubversionShortBranch(void);
/* Internal -- various one-time initializations */
PyAPI_FUNC(PyObject *) _PyBuiltin_Init(void);
Modified: python/branches/ssize_t/Lib/platform.py
==============================================================================
--- python/branches/ssize_t/Lib/platform.py (original)
+++ python/branches/ssize_t/Lib/platform.py Sat Jan 7 04:49:32 2006
@@ -1092,7 +1092,7 @@
### Various APIs for extracting information from sys.version
_sys_version_parser = re.compile(r'([\w.+]+)\s*'
- '\(#?(\d+:?\d+M?),\s*([\w ]+),\s*([\w :]+)\)\s*'
+ '\(#?([^,]+),\s*([\w ]+),\s*([\w :]+)\)\s*'
'\[([^\]]+)\]?')
_sys_version_cache = None
Modified: python/branches/ssize_t/Lib/test/test_compiler.py
==============================================================================
--- python/branches/ssize_t/Lib/test/test_compiler.py (original)
+++ python/branches/ssize_t/Lib/test/test_compiler.py Sat Jan 7 04:49:32 2006
@@ -12,7 +12,6 @@
# standard library and its test suite. This doesn't verify
# that any of the code is correct, merely the compiler is able
# to generate some kind of code for it.
-
libdir = os.path.dirname(unittest.__file__)
testdir = os.path.dirname(test.test_support.__file__)
@@ -36,6 +35,10 @@
def testNewClassSyntax(self):
compiler.compile("class foo():pass\n\n","<string>","exec")
+
+ def testSyntaxErrors(self):
+ self.assertRaises(SyntaxError, compiler.compile,
+ "def foo(a=1,b):pass\n\n", "<string>", "exec")
def testLineNo(self):
# Test that all nodes except Module have a correct lineno attribute.
Modified: python/branches/ssize_t/Lib/test/test_curses.py
==============================================================================
--- python/branches/ssize_t/Lib/test/test_curses.py (original)
+++ python/branches/ssize_t/Lib/test/test_curses.py Sat Jan 7 04:49:32 2006
@@ -8,14 +8,19 @@
# getmouse(), ungetmouse(), init_color()
#
-import curses, sys, tempfile
+import curses, sys, tempfile, os
# Optionally test curses module. This currently requires that the
# 'curses' resource be given on the regrtest command line using the -u
# option. If not available, nothing after this line will be executed.
-from test import test_support
-test_support.requires('curses')
+from test.test_support import requires, TestSkipped
+requires('curses')
+
+# XXX: if newterm was supported we could use it instead of initscr and not exit
+term = os.environ.get('TERM')
+if not term or term == 'unknown':
+ raise TestSkipped, "$TERM=%r, calling initscr() may cause exit" % term
def window_funcs(stdscr):
"Test the methods of windows"
Modified: python/branches/ssize_t/Lib/test/test_linuxaudiodev.py
==============================================================================
--- python/branches/ssize_t/Lib/test/test_linuxaudiodev.py (original)
+++ python/branches/ssize_t/Lib/test/test_linuxaudiodev.py Sat Jan 7 04:49:32 2006
@@ -28,7 +28,7 @@
try:
a = linuxaudiodev.open('w')
except linuxaudiodev.error, msg:
- if msg[0] in (errno.EACCES, errno.ENODEV, errno.EBUSY):
+ if msg[0] in (errno.EACCES, errno.ENOENT, errno.ENODEV, errno.EBUSY):
raise TestSkipped, msg
raise TestFailed, msg
Modified: python/branches/ssize_t/Lib/test/test_ossaudiodev.py
==============================================================================
--- python/branches/ssize_t/Lib/test/test_ossaudiodev.py (original)
+++ python/branches/ssize_t/Lib/test/test_ossaudiodev.py Sat Jan 7 04:49:32 2006
@@ -45,7 +45,7 @@
try:
dsp = ossaudiodev.open('w')
except IOError, msg:
- if msg[0] in (errno.EACCES, errno.ENODEV, errno.EBUSY):
+ if msg[0] in (errno.EACCES, errno.ENOENT, errno.ENODEV, errno.EBUSY):
raise TestSkipped, msg
raise TestFailed, msg
Modified: python/branches/ssize_t/Makefile.pre.in
==============================================================================
--- python/branches/ssize_t/Makefile.pre.in (original)
+++ python/branches/ssize_t/Makefile.pre.in Sat Jan 7 04:49:32 2006
@@ -33,6 +33,7 @@
LINKCC= @LINKCC@
AR= @AR@
RANLIB= @RANLIB@
+SVNVERSION= @SVNVERSION@
# Shell used by make (some versions default to the login shell, which is bad)
SHELL= /bin/sh
@@ -341,21 +342,6 @@
*) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py build;; \
esac
-# buildno should really depend on something like LIBRARY_SRC
-buildno: $(PARSER_OBJS) \
- $(OBJECT_OBJS) \
- $(PYTHON_OBJS) \
- $(MODULE_OBJS) \
- $(SIGNAL_OBJS) \
- $(MODOBJS) \
- $(srcdir)/Modules/getbuildinfo.c
- if test -d $(srcdir)/.svn; then \
- svnversion $(srcdir) >buildno; \
- elif test -f buildno; then \
- expr `cat buildno` + 1 >buildno1; \
- mv -f buildno1 buildno; \
- else echo 1 >buildno; fi
-
# Build static library
# avoid long command lines, same as LIBRARY_OBJS
$(LIBRARY): $(LIBRARY_OBJS)
@@ -445,8 +431,14 @@
############################################################################
# Special rules for object files
-Modules/getbuildinfo.o: $(srcdir)/Modules/getbuildinfo.c buildno
- $(CC) -c $(PY_CFLAGS) -DBUILD=\"`cat buildno`\" -o $@ $(srcdir)/Modules/getbuildinfo.c
+Modules/getbuildinfo.o: $(PARSER_OBJS) \
+ $(OBJECT_OBJS) \
+ $(PYTHON_OBJS) \
+ $(MODULE_OBJS) \
+ $(SIGNAL_OBJS) \
+ $(MODOBJS) \
+ $(srcdir)/Modules/getbuildinfo.c
+ $(CC) -c $(PY_CFLAGS) -DSVNVERSION=\"`LANG=C $(SVNVERSION)`\" -o $@ $(srcdir)/Modules/getbuildinfo.c
Modules/getpath.o: $(srcdir)/Modules/getpath.c Makefile
$(CC) -c $(PY_CFLAGS) -DPYTHONPATH='"$(PYTHONPATH)"' \
@@ -988,10 +980,10 @@
# Make things extra clean, before making a distribution:
# remove all generated files, even Makefile[.pre]
+# Keep configure and Python-ast.[ch], it's possible they can't be generated
distclean: clobber
- -rm -f core Makefile Makefile.pre buildno config.status \
+ -rm -f core Makefile Makefile.pre config.status \
Modules/Setup Modules/Setup.local Modules/Setup.config
- -rm -f $(AST_H) $(AST_C)
find $(srcdir) '(' -name '*.fdc' -o -name '*~' \
-o -name '[@,#]*' -o -name '*.old' \
-o -name '*.orig' -o -name '*.rej' \
Modified: python/branches/ssize_t/Misc/NEWS
==============================================================================
--- python/branches/ssize_t/Misc/NEWS (original)
+++ python/branches/ssize_t/Misc/NEWS Sat Jan 7 04:49:32 2006
@@ -209,6 +209,8 @@
Extension Modules
-----------------
+- Fix 64-bit problems in bsddb.
+
- Patch #1365916: fix some unsafe 64-bit mmap methods.
- Bug #1290333: Added a workaround for cjkcodecs' _codecs_cn build
@@ -631,6 +633,9 @@
Build
-----
+- The sources of zlib are now part of the Python distribution (zlib 1.2.3).
+ The zlib module is now builtin on Windows.
+
- Use -xcode=pic32 for CCSHARED on Solaris with SunPro.
- Bug #1189330: configure did not correctly determine the necessary
Modified: python/branches/ssize_t/Modules/_bsddb.c
==============================================================================
--- python/branches/ssize_t/Modules/_bsddb.c (original)
+++ python/branches/ssize_t/Modules/_bsddb.c Sat Jan 7 04:49:32 2006
@@ -1522,7 +1522,7 @@
if (self->primaryDBType == DB_RECNO ||
self->primaryDBType == DB_QUEUE)
- pkeyObj = PyInt_FromLong(*(long *)pkey.data);
+ pkeyObj = PyInt_FromLong(*(int *)pkey.data);
else
pkeyObj = PyString_FromStringAndSize(pkey.data, pkey.size);
@@ -1531,7 +1531,7 @@
PyObject *keyObj;
int type = _DB_get_type(self);
if (type == DB_RECNO || type == DB_QUEUE)
- keyObj = PyInt_FromLong(*(long *)key.data);
+ keyObj = PyInt_FromLong(*(int *)key.data);
else
keyObj = PyString_FromStringAndSize(key.data, key.size);
retval = Py_BuildValue("OOO", keyObj, pkeyObj, dataObj);
@@ -3172,7 +3172,7 @@
if (self->mydb->primaryDBType == DB_RECNO ||
self->mydb->primaryDBType == DB_QUEUE)
- pkeyObj = PyInt_FromLong(*(long *)pkey.data);
+ pkeyObj = PyInt_FromLong(*(int *)pkey.data);
else
pkeyObj = PyString_FromStringAndSize(pkey.data, pkey.size);
@@ -3181,7 +3181,7 @@
PyObject *keyObj;
int type = _DB_get_type(self->mydb);
if (type == DB_RECNO || type == DB_QUEUE)
- keyObj = PyInt_FromLong(*(long *)key.data);
+ keyObj = PyInt_FromLong(*(int *)key.data);
else
keyObj = PyString_FromStringAndSize(key.data, key.size);
retval = Py_BuildValue("OOO", keyObj, pkeyObj, dataObj);
Modified: python/branches/ssize_t/Modules/getbuildinfo.c
==============================================================================
--- python/branches/ssize_t/Modules/getbuildinfo.c (original)
+++ python/branches/ssize_t/Modules/getbuildinfo.c Sat Jan 7 04:49:32 2006
@@ -20,21 +20,25 @@
#endif
#endif
-#ifndef BUILD
-#define BUILD "0"
-#endif
-
const char *
Py_GetBuildInfo(void)
{
static char buildinfo[50];
+ const char *revision = Py_SubversionRevision();
+ const char *sep = *revision ? ":" : "";
+ const char *branch = Py_SubversionShortBranch();
PyOS_snprintf(buildinfo, sizeof(buildinfo),
- "%s, %.20s, %.9s", BUILD, DATE, TIME);
+ "%s%s%s, %.20s, %.9s", branch, sep, revision,
+ DATE, TIME);
return buildinfo;
}
const char *
-Py_GetBuildNumber(void)
+_Py_svnversion(void)
{
- return BUILD;
+#ifdef SVNVERSION
+ return SVNVERSION;
+#else
+ return "exported";
+#endif
}
Modified: python/branches/ssize_t/Modules/getpath.c
==============================================================================
--- python/branches/ssize_t/Modules/getpath.c (original)
+++ python/branches/ssize_t/Modules/getpath.c Sat Jan 7 04:49:32 2006
@@ -381,7 +381,11 @@
NSModule pythonModule;
#endif
#ifdef __APPLE__
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4
uint32_t nsexeclength = MAXPATHLEN;
+#else
+ unsigned long nsexeclength = MAXPATHLEN;
+#endif
#endif
/* If there is no slash in the argv0 path, then we have to
Modified: python/branches/ssize_t/Objects/unicodeobject.c
==============================================================================
--- python/branches/ssize_t/Objects/unicodeobject.c (original)
+++ python/branches/ssize_t/Objects/unicodeobject.c Sat Jan 7 04:49:32 2006
@@ -5369,7 +5369,7 @@
return PyBool_FromLong(Py_UNICODE_ISLOWER(*p));
/* Special case for empty strings */
- if (PyString_GET_SIZE(self) == 0)
+ if (PyUnicode_GET_SIZE(self) == 0)
return PyBool_FromLong(0);
e = p + PyUnicode_GET_SIZE(self);
@@ -5403,7 +5403,7 @@
return PyBool_FromLong(Py_UNICODE_ISUPPER(*p) != 0);
/* Special case for empty strings */
- if (PyString_GET_SIZE(self) == 0)
+ if (PyUnicode_GET_SIZE(self) == 0)
return PyBool_FromLong(0);
e = p + PyUnicode_GET_SIZE(self);
@@ -5440,7 +5440,7 @@
(Py_UNICODE_ISUPPER(*p) != 0));
/* Special case for empty strings */
- if (PyString_GET_SIZE(self) == 0)
+ if (PyUnicode_GET_SIZE(self) == 0)
return PyBool_FromLong(0);
e = p + PyUnicode_GET_SIZE(self);
@@ -5485,7 +5485,7 @@
return PyBool_FromLong(1);
/* Special case for empty strings */
- if (PyString_GET_SIZE(self) == 0)
+ if (PyUnicode_GET_SIZE(self) == 0)
return PyBool_FromLong(0);
e = p + PyUnicode_GET_SIZE(self);
@@ -5514,7 +5514,7 @@
return PyBool_FromLong(1);
/* Special case for empty strings */
- if (PyString_GET_SIZE(self) == 0)
+ if (PyUnicode_GET_SIZE(self) == 0)
return PyBool_FromLong(0);
e = p + PyUnicode_GET_SIZE(self);
@@ -5543,7 +5543,7 @@
return PyBool_FromLong(1);
/* Special case for empty strings */
- if (PyString_GET_SIZE(self) == 0)
+ if (PyUnicode_GET_SIZE(self) == 0)
return PyBool_FromLong(0);
e = p + PyUnicode_GET_SIZE(self);
@@ -5572,7 +5572,7 @@
return PyBool_FromLong(1);
/* Special case for empty strings */
- if (PyString_GET_SIZE(self) == 0)
+ if (PyUnicode_GET_SIZE(self) == 0)
return PyBool_FromLong(0);
e = p + PyUnicode_GET_SIZE(self);
@@ -5601,7 +5601,7 @@
return PyBool_FromLong(1);
/* Special case for empty strings */
- if (PyString_GET_SIZE(self) == 0)
+ if (PyUnicode_GET_SIZE(self) == 0)
return PyBool_FromLong(0);
e = p + PyUnicode_GET_SIZE(self);
@@ -5630,7 +5630,7 @@
return PyBool_FromLong(1);
/* Special case for empty strings */
- if (PyString_GET_SIZE(self) == 0)
+ if (PyUnicode_GET_SIZE(self) == 0)
return PyBool_FromLong(0);
e = p + PyUnicode_GET_SIZE(self);
@@ -6467,7 +6467,7 @@
if (i == -1 && PyErr_Occurred())
return NULL;
if (i < 0)
- i += PyString_GET_SIZE(self);
+ i += PyUnicode_GET_SIZE(self);
return unicode_getitem(self, i);
} else if (PySlice_Check(item)) {
Py_ssize_t start, stop, step, slicelength, cur, i;
@@ -6475,7 +6475,7 @@
Py_UNICODE* result_buf;
PyObject* result;
- if (PySlice_GetIndicesEx((PySliceObject*)item, PyString_GET_SIZE(self),
+ if (PySlice_GetIndicesEx((PySliceObject*)item, PyUnicode_GET_SIZE(self),
&start, &stop, &step, &slicelength) < 0) {
return NULL;
}
@@ -6485,6 +6485,9 @@
} else {
source_buf = PyUnicode_AS_UNICODE((PyObject*)self);
result_buf = PyMem_MALLOC(slicelength*sizeof(Py_UNICODE));
+
+ if (result_buf == NULL)
+ return PyErr_NoMemory();
for (cur = start, i = 0; i < slicelength; cur += step, i++) {
result_buf[i] = source_buf[cur];
Modified: python/branches/ssize_t/PC/config.c
==============================================================================
--- python/branches/ssize_t/PC/config.c (original)
+++ python/branches/ssize_t/PC/config.c Sat Jan 7 04:49:32 2006
@@ -56,6 +56,7 @@
extern void init_winreg(void);
extern void initdatetime(void);
extern void initfunctional(void);
+extern void initzlib(void);
extern void init_multibytecodec(void);
extern void init_codecs_cn(void);
@@ -133,7 +134,8 @@
{"xxsubtype", initxxsubtype},
{"zipimport", initzipimport},
-
+ {"zlib", initzlib},
+
/* CJK codecs */
{"_multibytecodec", init_multibytecodec},
{"_codecs_cn", init_codecs_cn},
Modified: python/branches/ssize_t/PCbuild/_bsddb.vcproj
==============================================================================
--- python/branches/ssize_t/PCbuild/_bsddb.vcproj (original)
+++ python/branches/ssize_t/PCbuild/_bsddb.vcproj Sat Jan 7 04:49:32 2006
@@ -24,10 +24,6 @@
PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS"
RuntimeLibrary="3"
UsePrecompiledHeader="2"
- PrecompiledHeaderFile=".\x86-temp-debug\_bsddb/_bsddb.pch"
- AssemblerListingLocation=".\x86-temp-debug\_bsddb/"
- ObjectFile=".\x86-temp-debug\_bsddb/"
- ProgramDataBaseFileName=".\x86-temp-debug\_bsddb/"
WarningLevel="3"
SuppressStartupBanner="TRUE"
DebugInformationFormat="3"
@@ -48,13 +44,7 @@
ImportLibrary=".\./_bsddb_d.lib"
TargetMachine="1"/>
<Tool
- Name="VCMIDLTool"
- PreprocessorDefinitions="_DEBUG"
- MkTypLibCompatible="TRUE"
- SuppressStartupBanner="TRUE"
- TargetEnvironment="1"
- TypeLibraryName=".\./_bsddb.tlb"
- HeaderFileName=""/>
+ Name="VCMIDLTool"/>
<Tool
Name="VCPostBuildEventTool"/>
<Tool
@@ -62,9 +52,7 @@
<Tool
Name="VCPreLinkEventTool"/>
<Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
- Culture="1033"/>
+ Name="VCResourceCompilerTool"/>
<Tool
Name="VCWebServiceProxyGeneratorTool"/>
<Tool
@@ -93,10 +81,6 @@
RuntimeLibrary="2"
EnableFunctionLevelLinking="TRUE"
UsePrecompiledHeader="2"
- PrecompiledHeaderFile=".\x86-temp-release\_bsddb/_bsddb.pch"
- AssemblerListingLocation=".\x86-temp-release\_bsddb/"
- ObjectFile=".\x86-temp-release\_bsddb/"
- ProgramDataBaseFileName=".\x86-temp-release\_bsddb/"
WarningLevel="3"
SuppressStartupBanner="TRUE"
DebugInformationFormat="3"
@@ -117,13 +101,7 @@
ImportLibrary=".\./_bsddb.lib"
TargetMachine="1"/>
<Tool
- Name="VCMIDLTool"
- PreprocessorDefinitions="NDEBUG"
- MkTypLibCompatible="TRUE"
- SuppressStartupBanner="TRUE"
- TargetEnvironment="1"
- TypeLibraryName=".\./_bsddb.tlb"
- HeaderFileName=""/>
+ Name="VCMIDLTool"/>
<Tool
Name="VCPostBuildEventTool"/>
<Tool
@@ -131,9 +109,7 @@
<Tool
Name="VCPreLinkEventTool"/>
<Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- Culture="1033"/>
+ Name="VCResourceCompilerTool"/>
<Tool
Name="VCWebServiceProxyGeneratorTool"/>
<Tool
@@ -165,10 +141,6 @@
BufferSecurityCheck="FALSE"
EnableFunctionLevelLinking="TRUE"
UsePrecompiledHeader="2"
- PrecompiledHeaderFile=".\ia64-temp-release\_bsddb/_bsddb.pch"
- AssemblerListingLocation=".\ia64-temp-release\_bsddb/"
- ObjectFile=".\ia64-temp-release\_bsddb/"
- ProgramDataBaseFileName=".\ia64-temp-release\_bsddb/"
WarningLevel="3"
SuppressStartupBanner="TRUE"
Detect64BitPortabilityProblems="TRUE"
@@ -191,13 +163,7 @@
ImportLibrary=".\./_bsddb.lib"
TargetMachine="0"/>
<Tool
- Name="VCMIDLTool"
- PreprocessorDefinitions="NDEBUG"
- MkTypLibCompatible="TRUE"
- SuppressStartupBanner="TRUE"
- TargetEnvironment="1"
- TypeLibraryName=".\./_bsddb.tlb"
- HeaderFileName=""/>
+ Name="VCMIDLTool"/>
<Tool
Name="VCPostBuildEventTool"/>
<Tool
@@ -205,9 +171,7 @@
<Tool
Name="VCPreLinkEventTool"/>
<Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- Culture="1033"/>
+ Name="VCResourceCompilerTool"/>
<Tool
Name="VCWebServiceProxyGeneratorTool"/>
<Tool
@@ -225,30 +189,6 @@
<Files>
<File
RelativePath="..\Modules\_bsddb.c">
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;$(NoInherit)"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;$(NoInherit)"/>
- </FileConfiguration>
- <FileConfiguration
- Name="ReleaseItanium|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;$(NoInherit)"/>
- </FileConfiguration>
</File>
</Files>
<Globals>
Modified: python/branches/ssize_t/PCbuild/_socket.vcproj
==============================================================================
--- python/branches/ssize_t/PCbuild/_socket.vcproj (original)
+++ python/branches/ssize_t/PCbuild/_socket.vcproj Sat Jan 7 04:49:32 2006
@@ -24,10 +24,6 @@
PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS"
RuntimeLibrary="3"
UsePrecompiledHeader="2"
- PrecompiledHeaderFile=".\x86-temp-debug\_socket/_socket.pch"
- AssemblerListingLocation=".\x86-temp-debug\_socket/"
- ObjectFile=".\x86-temp-debug\_socket/"
- ProgramDataBaseFileName=".\x86-temp-debug\_socket/"
WarningLevel="3"
SuppressStartupBanner="TRUE"
DebugInformationFormat="3"
@@ -47,13 +43,7 @@
ImportLibrary=".\./_socket_d.lib"
TargetMachine="1"/>
<Tool
- Name="VCMIDLTool"
- PreprocessorDefinitions="_DEBUG"
- MkTypLibCompatible="TRUE"
- SuppressStartupBanner="TRUE"
- TargetEnvironment="1"
- TypeLibraryName=".\./_socket.tlb"
- HeaderFileName=""/>
+ Name="VCMIDLTool"/>
<Tool
Name="VCPostBuildEventTool"/>
<Tool
@@ -61,9 +51,7 @@
<Tool
Name="VCPreLinkEventTool"/>
<Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
- Culture="1033"/>
+ Name="VCResourceCompilerTool"/>
<Tool
Name="VCWebServiceProxyGeneratorTool"/>
<Tool
@@ -92,10 +80,6 @@
RuntimeLibrary="2"
EnableFunctionLevelLinking="TRUE"
UsePrecompiledHeader="2"
- PrecompiledHeaderFile=".\x86-temp-release\_socket/_socket.pch"
- AssemblerListingLocation=".\x86-temp-release\_socket/"
- ObjectFile=".\x86-temp-release\_socket/"
- ProgramDataBaseFileName=".\x86-temp-release\_socket/"
WarningLevel="3"
SuppressStartupBanner="TRUE"
DebugInformationFormat="3"
@@ -115,13 +99,7 @@
ImportLibrary=".\./_socket.lib"
TargetMachine="1"/>
<Tool
- Name="VCMIDLTool"
- PreprocessorDefinitions="NDEBUG"
- MkTypLibCompatible="TRUE"
- SuppressStartupBanner="TRUE"
- TargetEnvironment="1"
- TypeLibraryName=".\./_socket.tlb"
- HeaderFileName=""/>
+ Name="VCMIDLTool"/>
<Tool
Name="VCPostBuildEventTool"/>
<Tool
@@ -129,9 +107,7 @@
<Tool
Name="VCPreLinkEventTool"/>
<Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- Culture="1033"/>
+ Name="VCResourceCompilerTool"/>
<Tool
Name="VCWebServiceProxyGeneratorTool"/>
<Tool
@@ -163,10 +139,6 @@
BufferSecurityCheck="FALSE"
EnableFunctionLevelLinking="TRUE"
UsePrecompiledHeader="2"
- PrecompiledHeaderFile=".\ia64-temp-release\_socket/_socket.pch"
- AssemblerListingLocation=".\ia64-temp-release\_socket/"
- ObjectFile=".\ia64-temp-release\_socket/"
- ProgramDataBaseFileName=".\ia64-temp-release\_socket/"
WarningLevel="3"
SuppressStartupBanner="TRUE"
Detect64BitPortabilityProblems="TRUE"
@@ -188,13 +160,7 @@
ImportLibrary=".\./_socket.lib"
TargetMachine="0"/>
<Tool
- Name="VCMIDLTool"
- PreprocessorDefinitions="NDEBUG"
- MkTypLibCompatible="TRUE"
- SuppressStartupBanner="TRUE"
- TargetEnvironment="1"
- TypeLibraryName=".\./_socket.tlb"
- HeaderFileName=""/>
+ Name="VCMIDLTool"/>
<Tool
Name="VCPostBuildEventTool"/>
<Tool
@@ -202,9 +168,7 @@
<Tool
Name="VCPreLinkEventTool"/>
<Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- Culture="1033"/>
+ Name="VCResourceCompilerTool"/>
<Tool
Name="VCWebServiceProxyGeneratorTool"/>
<Tool
@@ -222,30 +186,6 @@
<Files>
<File
RelativePath="..\Modules\socketmodule.c">
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;$(NoInherit)"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;$(NoInherit)"/>
- </FileConfiguration>
- <FileConfiguration
- Name="ReleaseItanium|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;$(NoInherit)"/>
- </FileConfiguration>
</File>
</Files>
<Globals>
Modified: python/branches/ssize_t/PCbuild/_testcapi.vcproj
==============================================================================
--- python/branches/ssize_t/PCbuild/_testcapi.vcproj (original)
+++ python/branches/ssize_t/PCbuild/_testcapi.vcproj Sat Jan 7 04:49:32 2006
@@ -28,10 +28,6 @@
RuntimeLibrary="2"
EnableFunctionLevelLinking="TRUE"
UsePrecompiledHeader="2"
- PrecompiledHeaderFile=".\x86-temp-release\_testcapi/_testcapi.pch"
- AssemblerListingLocation=".\x86-temp-release\_testcapi/"
- ObjectFile=".\x86-temp-release\_testcapi/"
- ProgramDataBaseFileName=".\x86-temp-release\_testcapi/"
WarningLevel="3"
SuppressStartupBanner="TRUE"
CompileAs="0"/>
@@ -47,13 +43,7 @@
ImportLibrary=".\./_testcapi.lib"
TargetMachine="1"/>
<Tool
- Name="VCMIDLTool"
- PreprocessorDefinitions="NDEBUG"
- MkTypLibCompatible="TRUE"
- SuppressStartupBanner="TRUE"
- TargetEnvironment="1"
- TypeLibraryName=".\./_testcapi.tlb"
- HeaderFileName=""/>
+ Name="VCMIDLTool"/>
<Tool
Name="VCPostBuildEventTool"/>
<Tool
@@ -61,9 +51,7 @@
<Tool
Name="VCPreLinkEventTool"/>
<Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- Culture="3081"/>
+ Name="VCResourceCompilerTool"/>
<Tool
Name="VCWebServiceProxyGeneratorTool"/>
<Tool
@@ -91,10 +79,6 @@
BasicRuntimeChecks="3"
RuntimeLibrary="3"
UsePrecompiledHeader="2"
- PrecompiledHeaderFile=".\x86-temp-debug\_testcapi/_testcapi.pch"
- AssemblerListingLocation=".\x86-temp-debug\_testcapi/"
- ObjectFile=".\x86-temp-debug\_testcapi/"
- ProgramDataBaseFileName=".\x86-temp-debug\_testcapi/"
WarningLevel="3"
SuppressStartupBanner="TRUE"
DebugInformationFormat="3"
@@ -112,13 +96,7 @@
ImportLibrary=".\./_testcapi_d.lib"
TargetMachine="1"/>
<Tool
- Name="VCMIDLTool"
- PreprocessorDefinitions="_DEBUG"
- MkTypLibCompatible="TRUE"
- SuppressStartupBanner="TRUE"
- TargetEnvironment="1"
- TypeLibraryName=".\./_testcapi.tlb"
- HeaderFileName=""/>
+ Name="VCMIDLTool"/>
<Tool
Name="VCPostBuildEventTool"/>
<Tool
@@ -126,9 +104,7 @@
<Tool
Name="VCPreLinkEventTool"/>
<Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
- Culture="3081"/>
+ Name="VCResourceCompilerTool"/>
<Tool
Name="VCWebServiceProxyGeneratorTool"/>
<Tool
@@ -161,10 +137,6 @@
BufferSecurityCheck="FALSE"
EnableFunctionLevelLinking="TRUE"
UsePrecompiledHeader="2"
- PrecompiledHeaderFile=".\ia64-temp-release\_testcapi/_testcapi.pch"
- AssemblerListingLocation=".\ia64-temp-release\_testcapi/"
- ObjectFile=".\ia64-temp-release\_testcapi/"
- ProgramDataBaseFileName=".\ia64-temp-release\_testcapi/"
WarningLevel="3"
SuppressStartupBanner="TRUE"
Detect64BitPortabilityProblems="TRUE"
@@ -183,13 +155,7 @@
ImportLibrary=".\./_testcapi.lib"
TargetMachine="0"/>
<Tool
- Name="VCMIDLTool"
- PreprocessorDefinitions="NDEBUG"
- MkTypLibCompatible="TRUE"
- SuppressStartupBanner="TRUE"
- TargetEnvironment="1"
- TypeLibraryName=".\./_testcapi.tlb"
- HeaderFileName=""/>
+ Name="VCMIDLTool"/>
<Tool
Name="VCPostBuildEventTool"/>
<Tool
@@ -197,9 +163,7 @@
<Tool
Name="VCPreLinkEventTool"/>
<Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- Culture="3081"/>
+ Name="VCResourceCompilerTool"/>
<Tool
Name="VCWebServiceProxyGeneratorTool"/>
<Tool
@@ -217,31 +181,6 @@
<Files>
<File
RelativePath="..\Modules\_testcapimodule.c">
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;MMAP_EXPORTS;$(NoInherit)"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;MMAP_EXPORTS;$(NoInherit)"
- BasicRuntimeChecks="3"/>
- </FileConfiguration>
- <FileConfiguration
- Name="ReleaseItanium|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;MMAP_EXPORTS;$(NoInherit)"/>
- </FileConfiguration>
</File>
</Files>
<Globals>
Modified: python/branches/ssize_t/PCbuild/_tkinter.vcproj
==============================================================================
--- python/branches/ssize_t/PCbuild/_tkinter.vcproj (original)
+++ python/branches/ssize_t/PCbuild/_tkinter.vcproj Sat Jan 7 04:49:32 2006
@@ -27,10 +27,6 @@
RuntimeLibrary="2"
EnableFunctionLevelLinking="TRUE"
UsePrecompiledHeader="2"
- PrecompiledHeaderFile=".\x86-temp-release\_tkinter/_tkinter.pch"
- AssemblerListingLocation=".\x86-temp-release\_tkinter/"
- ObjectFile=".\x86-temp-release\_tkinter/"
- ProgramDataBaseFileName=".\x86-temp-release\_tkinter/"
WarningLevel="3"
SuppressStartupBanner="TRUE"
DebugInformationFormat="3"
@@ -51,13 +47,7 @@
ImportLibrary=".\./_tkinter.lib"
TargetMachine="1"/>
<Tool
- Name="VCMIDLTool"
- PreprocessorDefinitions="NDEBUG"
- MkTypLibCompatible="TRUE"
- SuppressStartupBanner="TRUE"
- TargetEnvironment="1"
- TypeLibraryName=".\./_tkinter.tlb"
- HeaderFileName=""/>
+ Name="VCMIDLTool"/>
<Tool
Name="VCPostBuildEventTool"/>
<Tool
@@ -65,9 +55,7 @@
<Tool
Name="VCPreLinkEventTool"/>
<Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- Culture="1033"/>
+ Name="VCResourceCompilerTool"/>
<Tool
Name="VCWebServiceProxyGeneratorTool"/>
<Tool
@@ -93,10 +81,6 @@
PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;WITH_APPINIT"
RuntimeLibrary="3"
UsePrecompiledHeader="2"
- PrecompiledHeaderFile=".\x86-temp-debug\_tkinter/_tkinter.pch"
- AssemblerListingLocation=".\x86-temp-debug\_tkinter/"
- ObjectFile=".\x86-temp-debug\_tkinter/"
- ProgramDataBaseFileName=".\x86-temp-debug\_tkinter/"
WarningLevel="3"
SuppressStartupBanner="TRUE"
DebugInformationFormat="3"
@@ -117,13 +101,7 @@
ImportLibrary=".\./_tkinter_d.lib"
TargetMachine="1"/>
<Tool
- Name="VCMIDLTool"
- PreprocessorDefinitions="_DEBUG"
- MkTypLibCompatible="TRUE"
- SuppressStartupBanner="TRUE"
- TargetEnvironment="1"
- TypeLibraryName=".\./_tkinter.tlb"
- HeaderFileName=""/>
+ Name="VCMIDLTool"/>
<Tool
Name="VCPostBuildEventTool"/>
<Tool
@@ -131,9 +109,7 @@
<Tool
Name="VCPreLinkEventTool"/>
<Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
- Culture="1033"/>
+ Name="VCResourceCompilerTool"/>
<Tool
Name="VCWebServiceProxyGeneratorTool"/>
<Tool
@@ -165,10 +141,6 @@
BufferSecurityCheck="FALSE"
EnableFunctionLevelLinking="TRUE"
UsePrecompiledHeader="2"
- PrecompiledHeaderFile=".\ia64-temp-release\_tkinter/_tkinter.pch"
- AssemblerListingLocation=".\ia64-temp-release\_tkinter/"
- ObjectFile=".\ia64-temp-release\_tkinter/"
- ProgramDataBaseFileName=".\ia64-temp-release\_tkinter/"
WarningLevel="3"
SuppressStartupBanner="TRUE"
Detect64BitPortabilityProblems="TRUE"
@@ -191,13 +163,7 @@
ImportLibrary=".\./_tkinter.lib"
TargetMachine="0"/>
<Tool
- Name="VCMIDLTool"
- PreprocessorDefinitions="NDEBUG"
- MkTypLibCompatible="TRUE"
- SuppressStartupBanner="TRUE"
- TargetEnvironment="1"
- TypeLibraryName=".\./_tkinter.tlb"
- HeaderFileName=""/>
+ Name="VCMIDLTool"/>
<Tool
Name="VCPostBuildEventTool"/>
<Tool
@@ -205,9 +171,7 @@
<Tool
Name="VCPreLinkEventTool"/>
<Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- Culture="1033"/>
+ Name="VCResourceCompilerTool"/>
<Tool
Name="VCWebServiceProxyGeneratorTool"/>
<Tool
@@ -225,57 +189,9 @@
<Files>
<File
RelativePath="..\Modules\_tkinter.c">
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WITH_APPINIT;$(NoInherit)"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;WITH_APPINIT;$(NoInherit)"/>
- </FileConfiguration>
- <FileConfiguration
- Name="ReleaseItanium|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WITH_APPINIT;$(NoInherit)"/>
- </FileConfiguration>
</File>
<File
RelativePath="..\Modules\tkappinit.c">
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WITH_APPINIT;$(NoInherit)"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;WITH_APPINIT;$(NoInherit)"/>
- </FileConfiguration>
- <FileConfiguration
- Name="ReleaseItanium|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WITH_APPINIT;$(NoInherit)"/>
- </FileConfiguration>
</File>
</Files>
<Globals>
Modified: python/branches/ssize_t/PCbuild/bz2.vcproj
==============================================================================
--- python/branches/ssize_t/PCbuild/bz2.vcproj (original)
+++ python/branches/ssize_t/PCbuild/bz2.vcproj Sat Jan 7 04:49:32 2006
@@ -25,10 +25,6 @@
PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS"
RuntimeLibrary="3"
UsePrecompiledHeader="2"
- PrecompiledHeaderFile=".\x86-temp-debug\bz2/bz2.pch"
- AssemblerListingLocation=".\x86-temp-debug\bz2/"
- ObjectFile=".\x86-temp-debug\bz2/"
- ProgramDataBaseFileName=".\x86-temp-debug\bz2/"
WarningLevel="3"
SuppressStartupBanner="TRUE"
DebugInformationFormat="3"
@@ -49,13 +45,7 @@
ImportLibrary=".\./bz2_d.lib"
TargetMachine="1"/>
<Tool
- Name="VCMIDLTool"
- PreprocessorDefinitions="_DEBUG"
- MkTypLibCompatible="TRUE"
- SuppressStartupBanner="TRUE"
- TargetEnvironment="1"
- TypeLibraryName=".\./bz2.tlb"
- HeaderFileName=""/>
+ Name="VCMIDLTool"/>
<Tool
Name="VCPostBuildEventTool"/>
<Tool
@@ -66,9 +56,7 @@
nmake /nologo /f makefile.msc
"/>
<Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
- Culture="1033"/>
+ Name="VCResourceCompilerTool"/>
<Tool
Name="VCWebServiceProxyGeneratorTool"/>
<Tool
@@ -97,10 +85,6 @@
RuntimeLibrary="2"
EnableFunctionLevelLinking="TRUE"
UsePrecompiledHeader="2"
- PrecompiledHeaderFile=".\x86-temp-release\bz2/bz2.pch"
- AssemblerListingLocation=".\x86-temp-release\bz2/"
- ObjectFile=".\x86-temp-release\bz2/"
- ProgramDataBaseFileName=".\x86-temp-release\bz2/"
WarningLevel="3"
SuppressStartupBanner="TRUE"
DebugInformationFormat="3"
@@ -121,13 +105,7 @@
ImportLibrary=".\./bz2.lib"
TargetMachine="1"/>
<Tool
- Name="VCMIDLTool"
- PreprocessorDefinitions="NDEBUG"
- MkTypLibCompatible="TRUE"
- SuppressStartupBanner="TRUE"
- TargetEnvironment="1"
- TypeLibraryName=".\./bz2.tlb"
- HeaderFileName=""/>
+ Name="VCMIDLTool"/>
<Tool
Name="VCPostBuildEventTool"/>
<Tool
@@ -138,9 +116,7 @@
nmake /nologo /f makefile.msc lib
"/>
<Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- Culture="1033"/>
+ Name="VCResourceCompilerTool"/>
<Tool
Name="VCWebServiceProxyGeneratorTool"/>
<Tool
@@ -172,10 +148,6 @@
BufferSecurityCheck="FALSE"
EnableFunctionLevelLinking="TRUE"
UsePrecompiledHeader="2"
- PrecompiledHeaderFile=".\ia64-temp-release\bz2/bz2.pch"
- AssemblerListingLocation=".\ia64-temp-release\bz2/"
- ObjectFile=".\ia64-temp-release\bz2/"
- ProgramDataBaseFileName=".\ia64-temp-release\bz2/"
WarningLevel="3"
SuppressStartupBanner="TRUE"
Detect64BitPortabilityProblems="TRUE"
@@ -198,13 +170,7 @@
ImportLibrary=".\./bz2.lib"
TargetMachine="0"/>
<Tool
- Name="VCMIDLTool"
- PreprocessorDefinitions="NDEBUG"
- MkTypLibCompatible="TRUE"
- SuppressStartupBanner="TRUE"
- TargetEnvironment="1"
- TypeLibraryName=".\./bz2.tlb"
- HeaderFileName=""/>
+ Name="VCMIDLTool"/>
<Tool
Name="VCPostBuildEventTool"/>
<Tool
@@ -215,9 +181,7 @@
nmake /nologo /f makefile.msc lib
"/>
<Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- Culture="1033"/>
+ Name="VCResourceCompilerTool"/>
<Tool
Name="VCWebServiceProxyGeneratorTool"/>
<Tool
@@ -235,30 +199,6 @@
<Files>
<File
RelativePath="..\Modules\bz2module.c">
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;$(NoInherit)"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;$(NoInherit)"/>
- </FileConfiguration>
- <FileConfiguration
- Name="ReleaseItanium|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;$(NoInherit)"/>
- </FileConfiguration>
</File>
</Files>
<Globals>
Modified: python/branches/ssize_t/PCbuild/make_versioninfo.vcproj
==============================================================================
--- python/branches/ssize_t/PCbuild/make_versioninfo.vcproj (original)
+++ python/branches/ssize_t/PCbuild/make_versioninfo.vcproj Sat Jan 7 04:49:32 2006
@@ -29,10 +29,6 @@
RuntimeLibrary="2"
EnableFunctionLevelLinking="TRUE"
UsePrecompiledHeader="2"
- PrecompiledHeaderFile=".\x86-temp-release\make_versioninfo/make_versioninfo.pch"
- AssemblerListingLocation=".\x86-temp-release\make_versioninfo/"
- ObjectFile=".\x86-temp-release\make_versioninfo/"
- ProgramDataBaseFileName=".\x86-temp-release\make_versioninfo/"
WarningLevel="3"
SuppressStartupBanner="TRUE"
DebugInformationFormat="3"
@@ -54,9 +50,7 @@
BaseAddress="0x1d000000"
TargetMachine="1"/>
<Tool
- Name="VCMIDLTool"
- TypeLibraryName=".\./make_versioninfo.tlb"
- HeaderFileName=""/>
+ Name="VCMIDLTool"/>
<Tool
Name="VCPostBuildEventTool"
CommandLine="$(TargetFileName) > ..\PC\python_nt.h"/>
@@ -65,9 +59,7 @@
<Tool
Name="VCPreLinkEventTool"/>
<Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- Culture="1033"/>
+ Name="VCResourceCompilerTool"/>
<Tool
Name="VCWebServiceProxyGeneratorTool"/>
<Tool
@@ -94,10 +86,6 @@
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
RuntimeLibrary="3"
UsePrecompiledHeader="2"
- PrecompiledHeaderFile=".\x86-temp-debug\make_versioninfo/make_versioninfo.pch"
- AssemblerListingLocation=".\x86-temp-debug\make_versioninfo/"
- ObjectFile=".\x86-temp-debug\make_versioninfo/"
- ProgramDataBaseFileName=".\x86-temp-debug\make_versioninfo/"
BrowseInformation="1"
WarningLevel="3"
SuppressStartupBanner="TRUE"
@@ -120,9 +108,7 @@
BaseAddress="0x1d000000"
TargetMachine="1"/>
<Tool
- Name="VCMIDLTool"
- TypeLibraryName=".\./make_versioninfo.tlb"
- HeaderFileName=""/>
+ Name="VCMIDLTool"/>
<Tool
Name="VCPostBuildEventTool"
CommandLine="$(TargetFileName) > ..\PC\python_nt_d.h"/>
@@ -131,10 +117,7 @@
<Tool
Name="VCPreLinkEventTool"/>
<Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
- Culture="1033"
- AdditionalIncludeDirectories="..\Include"/>
+ Name="VCResourceCompilerTool"/>
<Tool
Name="VCWebServiceProxyGeneratorTool"/>
<Tool
@@ -152,23 +135,6 @@
<Files>
<File
RelativePath="..\PC\make_versioninfo.c">
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"/>
- </FileConfiguration>
</File>
</Files>
<Globals>
Modified: python/branches/ssize_t/PCbuild/pcbuild.sln
==============================================================================
Binary files. No diff available.
Modified: python/branches/ssize_t/PCbuild/pyexpat.vcproj
==============================================================================
--- python/branches/ssize_t/PCbuild/pyexpat.vcproj (original)
+++ python/branches/ssize_t/PCbuild/pyexpat.vcproj Sat Jan 7 04:49:32 2006
@@ -24,10 +24,6 @@
PreprocessorDefinitions="_DEBUG;HAVE_EXPAT_H;WIN32;_WINDOWS;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;XML_STATIC;HAVE_MEMMOVE"
RuntimeLibrary="3"
UsePrecompiledHeader="2"
- PrecompiledHeaderFile=".\x86-temp-debug\pyexpat/pyexpat.pch"
- AssemblerListingLocation=".\x86-temp-debug\pyexpat/"
- ObjectFile=".\x86-temp-debug\pyexpat/"
- ProgramDataBaseFileName=".\x86-temp-debug\pyexpat/"
WarningLevel="3"
SuppressStartupBanner="TRUE"
DebugInformationFormat="3"
@@ -47,13 +43,7 @@
ImportLibrary=".\./pyexpat_d.lib"
TargetMachine="1"/>
<Tool
- Name="VCMIDLTool"
- PreprocessorDefinitions="_DEBUG"
- MkTypLibCompatible="TRUE"
- SuppressStartupBanner="TRUE"
- TargetEnvironment="1"
- TypeLibraryName=".\./pyexpat.tlb"
- HeaderFileName=""/>
+ Name="VCMIDLTool"/>
<Tool
Name="VCPostBuildEventTool"/>
<Tool
@@ -61,9 +51,7 @@
<Tool
Name="VCPreLinkEventTool"/>
<Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
- Culture="1033"/>
+ Name="VCResourceCompilerTool"/>
<Tool
Name="VCWebServiceProxyGeneratorTool"/>
<Tool
@@ -92,10 +80,6 @@
RuntimeLibrary="2"
EnableFunctionLevelLinking="TRUE"
UsePrecompiledHeader="2"
- PrecompiledHeaderFile=".\x86-temp-release\pyexpat/pyexpat.pch"
- AssemblerListingLocation=".\x86-temp-release\pyexpat/"
- ObjectFile=".\x86-temp-release\pyexpat/"
- ProgramDataBaseFileName=".\x86-temp-release\pyexpat/"
WarningLevel="3"
SuppressStartupBanner="TRUE"
DebugInformationFormat="3"
@@ -115,13 +99,7 @@
ImportLibrary=".\./pyexpat.lib"
TargetMachine="1"/>
<Tool
- Name="VCMIDLTool"
- PreprocessorDefinitions="NDEBUG"
- MkTypLibCompatible="TRUE"
- SuppressStartupBanner="TRUE"
- TargetEnvironment="1"
- TypeLibraryName=".\./pyexpat.tlb"
- HeaderFileName=""/>
+ Name="VCMIDLTool"/>
<Tool
Name="VCPostBuildEventTool"/>
<Tool
@@ -129,9 +107,7 @@
<Tool
Name="VCPreLinkEventTool"/>
<Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- Culture="1033"/>
+ Name="VCResourceCompilerTool"/>
<Tool
Name="VCWebServiceProxyGeneratorTool"/>
<Tool
@@ -163,10 +139,6 @@
BufferSecurityCheck="FALSE"
EnableFunctionLevelLinking="TRUE"
UsePrecompiledHeader="2"
- PrecompiledHeaderFile=".\ia64-temp-release\pyexpat/pyexpat.pch"
- AssemblerListingLocation=".\ia64-temp-release\pyexpat/"
- ObjectFile=".\ia64-temp-release\pyexpat/"
- ProgramDataBaseFileName=".\ia64-temp-release\pyexpat/"
WarningLevel="3"
SuppressStartupBanner="TRUE"
Detect64BitPortabilityProblems="TRUE"
@@ -188,13 +160,7 @@
ImportLibrary=".\./pyexpat.lib"
TargetMachine="0"/>
<Tool
- Name="VCMIDLTool"
- PreprocessorDefinitions="NDEBUG"
- MkTypLibCompatible="TRUE"
- SuppressStartupBanner="TRUE"
- TargetEnvironment="1"
- TypeLibraryName=".\./pyexpat.tlb"
- HeaderFileName=""/>
+ Name="VCMIDLTool"/>
<Tool
Name="VCPostBuildEventTool"/>
<Tool
@@ -202,9 +168,7 @@
<Tool
Name="VCPreLinkEventTool"/>
<Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- Culture="1033"/>
+ Name="VCResourceCompilerTool"/>
<Tool
Name="VCWebServiceProxyGeneratorTool"/>
<Tool
@@ -222,111 +186,15 @@
<Files>
<File
RelativePath="..\Modules\pyexpat.c">
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="_DEBUG;HAVE_EXPAT_H;WIN32;_WINDOWS;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;XML_STATIC;HAVE_MEMMOVE;$(NoInherit)"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;XML_STATIC;HAVE_MEMMOVE;$(NoInherit)"/>
- </FileConfiguration>
- <FileConfiguration
- Name="ReleaseItanium|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;XML_STATIC;HAVE_MEMMOVE;$(NoInherit)"/>
- </FileConfiguration>
</File>
<File
RelativePath="..\Modules\expat\xmlparse.c">
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="_DEBUG;HAVE_EXPAT_H;WIN32;_WINDOWS;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;XML_STATIC;HAVE_MEMMOVE;$(NoInherit)"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;XML_STATIC;HAVE_MEMMOVE;$(NoInherit)"/>
- </FileConfiguration>
- <FileConfiguration
- Name="ReleaseItanium|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;XML_STATIC;HAVE_MEMMOVE;$(NoInherit)"/>
- </FileConfiguration>
</File>
<File
RelativePath="..\Modules\expat\xmlrole.c">
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="_DEBUG;HAVE_EXPAT_H;WIN32;_WINDOWS;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;XML_STATIC;HAVE_MEMMOVE;$(NoInherit)"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;XML_STATIC;HAVE_MEMMOVE;$(NoInherit)"/>
- </FileConfiguration>
- <FileConfiguration
- Name="ReleaseItanium|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;XML_STATIC;HAVE_MEMMOVE;$(NoInherit)"/>
- </FileConfiguration>
</File>
<File
RelativePath="..\Modules\expat\xmltok.c">
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="_DEBUG;HAVE_EXPAT_H;WIN32;_WINDOWS;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;XML_STATIC;HAVE_MEMMOVE;$(NoInherit)"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;XML_STATIC;HAVE_MEMMOVE;$(NoInherit)"/>
- </FileConfiguration>
- <FileConfiguration
- Name="ReleaseItanium|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;XML_STATIC;HAVE_MEMMOVE;$(NoInherit)"/>
- </FileConfiguration>
</File>
</Files>
<Globals>
Modified: python/branches/ssize_t/PCbuild/python.vcproj
==============================================================================
--- python/branches/ssize_t/PCbuild/python.vcproj (original)
+++ python/branches/ssize_t/PCbuild/python.vcproj Sat Jan 7 04:49:32 2006
@@ -28,10 +28,6 @@
RuntimeLibrary="2"
EnableFunctionLevelLinking="TRUE"
UsePrecompiledHeader="2"
- PrecompiledHeaderFile=".\x86-temp-release\python/python.pch"
- AssemblerListingLocation=".\x86-temp-release\python/"
- ObjectFile=".\x86-temp-release\python/"
- ProgramDataBaseFileName=".\x86-temp-release\python/"
WarningLevel="3"
SuppressStartupBanner="TRUE"
DebugInformationFormat="3"
@@ -51,9 +47,7 @@
BaseAddress="0x1d000000"
TargetMachine="1"/>
<Tool
- Name="VCMIDLTool"
- TypeLibraryName=".\./python.tlb"
- HeaderFileName=""/>
+ Name="VCMIDLTool"/>
<Tool
Name="VCPostBuildEventTool"/>
<Tool
@@ -90,10 +84,6 @@
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
RuntimeLibrary="3"
UsePrecompiledHeader="2"
- PrecompiledHeaderFile=".\x86-temp-debug\python/python.pch"
- AssemblerListingLocation=".\x86-temp-debug\python/"
- ObjectFile=".\x86-temp-debug\python/"
- ProgramDataBaseFileName=".\x86-temp-debug\python/"
BrowseInformation="1"
WarningLevel="3"
SuppressStartupBanner="TRUE"
@@ -114,9 +104,7 @@
BaseAddress="0x1d000000"
TargetMachine="1"/>
<Tool
- Name="VCMIDLTool"
- TypeLibraryName=".\./python.tlb"
- HeaderFileName=""/>
+ Name="VCMIDLTool"/>
<Tool
Name="VCPostBuildEventTool"/>
<Tool
@@ -160,10 +148,6 @@
BufferSecurityCheck="FALSE"
EnableFunctionLevelLinking="TRUE"
UsePrecompiledHeader="2"
- PrecompiledHeaderFile=".\ia64-temp-release\python/python.pch"
- AssemblerListingLocation=".\ia64-temp-release\python/"
- ObjectFile=".\ia64-temp-release\python/"
- ProgramDataBaseFileName=".\ia64-temp-release\python/"
WarningLevel="3"
SuppressStartupBanner="TRUE"
Detect64BitPortabilityProblems="TRUE"
@@ -185,9 +169,7 @@
BaseAddress="0x1d000000"
TargetMachine="0"/>
<Tool
- Name="VCMIDLTool"
- TypeLibraryName=".\./python.tlb"
- HeaderFileName=""/>
+ Name="VCMIDLTool"/>
<Tool
Name="VCPostBuildEventTool"/>
<Tool
@@ -218,55 +200,9 @@
</File>
<File
RelativePath="..\Modules\python.c">
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"/>
- </FileConfiguration>
- <FileConfiguration
- Name="ReleaseItanium|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
- </FileConfiguration>
</File>
<File
RelativePath="..\PC\python_exe.rc">
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="\Pyinst\python\PC"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="\Pyinst\python\PC"/>
- </FileConfiguration>
- <FileConfiguration
- Name="ReleaseItanium|Win32">
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="\Pyinst\python\PC"/>
- </FileConfiguration>
</File>
</Files>
<Globals>
Modified: python/branches/ssize_t/PCbuild/pythoncore.vcproj
==============================================================================
--- python/branches/ssize_t/PCbuild/pythoncore.vcproj (original)
+++ python/branches/ssize_t/PCbuild/pythoncore.vcproj Sat Jan 7 04:49:32 2006
@@ -29,10 +29,6 @@
RuntimeLibrary="2"
EnableFunctionLevelLinking="TRUE"
UsePrecompiledHeader="2"
- PrecompiledHeaderFile=".\x86-temp-release\pythoncore/pythoncore.pch"
- AssemblerListingLocation=".\x86-temp-release\pythoncore/"
- ObjectFile=".\x86-temp-release\pythoncore/"
- ProgramDataBaseFileName=".\x86-temp-release\pythoncore/"
WarningLevel="3"
SuppressStartupBanner="TRUE"
DebugInformationFormat="3"
@@ -52,13 +48,7 @@
ImportLibrary=".\./python25.lib"
TargetMachine="1"/>
<Tool
- Name="VCMIDLTool"
- PreprocessorDefinitions="NDEBUG"
- MkTypLibCompatible="TRUE"
- SuppressStartupBanner="TRUE"
- TargetEnvironment="1"
- TypeLibraryName=".\./pythoncore.tlb"
- HeaderFileName=""/>
+ Name="VCMIDLTool"/>
<Tool
Name="VCPostBuildEventTool"/>
<Tool
@@ -96,10 +86,6 @@
PreprocessorDefinitions="_DEBUG;USE_DL_EXPORT;WIN32;_WINDOWS"
RuntimeLibrary="3"
UsePrecompiledHeader="2"
- PrecompiledHeaderFile=".\x86-temp-debug\pythoncore/pythoncore.pch"
- AssemblerListingLocation=".\x86-temp-debug\pythoncore/"
- ObjectFile=".\x86-temp-debug\pythoncore/"
- ProgramDataBaseFileName=".\x86-temp-debug\pythoncore/"
WarningLevel="3"
SuppressStartupBanner="TRUE"
DebugInformationFormat="3"
@@ -119,13 +105,7 @@
ImportLibrary=".\./python25_d.lib"
TargetMachine="1"/>
<Tool
- Name="VCMIDLTool"
- PreprocessorDefinitions="_DEBUG"
- MkTypLibCompatible="TRUE"
- SuppressStartupBanner="TRUE"
- TargetEnvironment="1"
- TypeLibraryName=".\./pythoncore.tlb"
- HeaderFileName=""/>
+ Name="VCMIDLTool"/>
<Tool
Name="VCPostBuildEventTool"/>
<Tool
@@ -168,10 +148,6 @@
BufferSecurityCheck="FALSE"
EnableFunctionLevelLinking="TRUE"
UsePrecompiledHeader="2"
- PrecompiledHeaderFile=".\ia64-temp-release\pythoncore/pythoncore.pch"
- AssemblerListingLocation=".\ia64-temp-release\pythoncore/"
- ObjectFile=".\ia64-temp-release\pythoncore/"
- ProgramDataBaseFileName=".\ia64-temp-release\pythoncore/"
WarningLevel="3"
SuppressStartupBanner="TRUE"
Detect64BitPortabilityProblems="TRUE"
@@ -193,13 +169,7 @@
ImportLibrary=".\./python25.lib"
TargetMachine="0"/>
<Tool
- Name="VCMIDLTool"
- PreprocessorDefinitions="NDEBUG"
- MkTypLibCompatible="TRUE"
- SuppressStartupBanner="TRUE"
- TargetEnvironment="1"
- TypeLibraryName=".\./pythoncore.tlb"
- HeaderFileName=""/>
+ Name="VCMIDLTool"/>
<Tool
Name="VCPostBuildEventTool"/>
<Tool
@@ -226,6 +196,67 @@
<References>
</References>
<Files>
+ <Filter
+ Name="zlib"
+ Filter="">
+ <File
+ RelativePath="..\Modules\zlib\adler32.c">
+ </File>
+ <File
+ RelativePath="..\Modules\zlib\compress.c">
+ </File>
+ <File
+ RelativePath="..\Modules\zlib\crc32.c">
+ </File>
+ <File
+ RelativePath="..\Modules\zlib\deflate.c">
+ </File>
+ <File
+ RelativePath="..\Modules\zlib\gzio.c">
+ </File>
+ <File
+ RelativePath="..\Modules\zlib\infback.c">
+ </File>
+ <File
+ RelativePath="..\Modules\zlib\inffast.c">
+ </File>
+ <File
+ RelativePath="..\Modules\zlib\inflate.c">
+ </File>
+ <File
+ RelativePath="..\Modules\zlib\inftrees.c">
+ </File>
+ <File
+ RelativePath="..\Modules\zlib\trees.c">
+ </File>
+ <File
+ RelativePath="..\Modules\zlib\uncompr.c">
+ </File>
+ <File
+ RelativePath="..\Modules\zlibmodule.c">
+ <FileConfiguration
+ Name="Release|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories="..\Modules\zlib"/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories="..\Modules\zlib"/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="ReleaseItanium|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories="..\Modules\zlib"/>
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\Modules\zlib\zutil.c">
+ </File>
+ </Filter>
<File
RelativePath="..\Modules\_bisectmodule.c">
</File>
@@ -249,30 +280,6 @@
</File>
<File
RelativePath="..\Modules\_codecsmodule.c">
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;USE_DL_EXPORT;$(NoInherit)"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="_DEBUG;USE_DL_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
- </FileConfiguration>
- <FileConfiguration
- Name="ReleaseItanium|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;USE_DL_EXPORT;$(NoInherit)"/>
- </FileConfiguration>
</File>
<File
RelativePath="..\Modules\_csv.c">
@@ -282,84 +289,12 @@
</File>
<File
RelativePath="..\Modules\_hotshot.c">
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;USE_DL_EXPORT;$(NoInherit)"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="_DEBUG;USE_DL_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
- </FileConfiguration>
- <FileConfiguration
- Name="ReleaseItanium|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;USE_DL_EXPORT;$(NoInherit)"/>
- </FileConfiguration>
</File>
<File
RelativePath="..\Modules\_localemodule.c">
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;USE_DL_EXPORT;$(NoInherit)"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="_DEBUG;USE_DL_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
- </FileConfiguration>
- <FileConfiguration
- Name="ReleaseItanium|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;USE_DL_EXPORT;$(NoInherit)"/>
- </FileConfiguration>
</File>
<File
RelativePath="..\Modules\_randommodule.c">
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;USE_DL_EXPORT;$(NoInherit)"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="_DEBUG;USE_DL_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
- </FileConfiguration>
- <FileConfiguration
- Name="ReleaseItanium|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;USE_DL_EXPORT;$(NoInherit)"/>
- </FileConfiguration>
</File>
<File
RelativePath="..\Modules\_sre.c">
Modified: python/branches/ssize_t/PCbuild/pythonw.vcproj
==============================================================================
--- python/branches/ssize_t/PCbuild/pythonw.vcproj (original)
+++ python/branches/ssize_t/PCbuild/pythonw.vcproj Sat Jan 7 04:49:32 2006
@@ -24,10 +24,6 @@
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
RuntimeLibrary="3"
UsePrecompiledHeader="2"
- PrecompiledHeaderFile=".\x86-temp-debug\pythonw/pythonw.pch"
- AssemblerListingLocation=".\x86-temp-debug\pythonw/"
- ObjectFile=".\x86-temp-debug\pythonw/"
- ProgramDataBaseFileName=".\x86-temp-debug\pythonw/"
WarningLevel="3"
SuppressStartupBanner="TRUE"
DebugInformationFormat="3"
@@ -46,13 +42,7 @@
BaseAddress="0x1d000000"
TargetMachine="1"/>
<Tool
- Name="VCMIDLTool"
- PreprocessorDefinitions="_DEBUG"
- MkTypLibCompatible="TRUE"
- SuppressStartupBanner="TRUE"
- TargetEnvironment="1"
- TypeLibraryName=".\./pythonw.tlb"
- HeaderFileName=""/>
+ Name="VCMIDLTool"/>
<Tool
Name="VCPostBuildEventTool"/>
<Tool
@@ -91,10 +81,6 @@
RuntimeLibrary="2"
EnableFunctionLevelLinking="TRUE"
UsePrecompiledHeader="2"
- PrecompiledHeaderFile=".\x86-temp-release\pythonw/pythonw.pch"
- AssemblerListingLocation=".\x86-temp-release\pythonw/"
- ObjectFile=".\x86-temp-release\pythonw/"
- ProgramDataBaseFileName=".\x86-temp-release\pythonw/"
WarningLevel="3"
SuppressStartupBanner="TRUE"
DebugInformationFormat="3"
@@ -113,13 +99,7 @@
BaseAddress="0x1d000000"
TargetMachine="1"/>
<Tool
- Name="VCMIDLTool"
- PreprocessorDefinitions="NDEBUG"
- MkTypLibCompatible="TRUE"
- SuppressStartupBanner="TRUE"
- TargetEnvironment="1"
- TypeLibraryName=".\./pythonw.tlb"
- HeaderFileName=""/>
+ Name="VCMIDLTool"/>
<Tool
Name="VCPostBuildEventTool"/>
<Tool
@@ -161,10 +141,6 @@
BufferSecurityCheck="FALSE"
EnableFunctionLevelLinking="TRUE"
UsePrecompiledHeader="2"
- PrecompiledHeaderFile=".\ia64-temp-release\pythonw/pythonw.pch"
- AssemblerListingLocation=".\ia64-temp-release\pythonw/"
- ObjectFile=".\ia64-temp-release\pythonw/"
- ProgramDataBaseFileName=".\ia64-temp-release\pythonw/"
WarningLevel="3"
SuppressStartupBanner="TRUE"
Detect64BitPortabilityProblems="TRUE"
@@ -185,13 +161,7 @@
BaseAddress="0x1d000000"
TargetMachine="0"/>
<Tool
- Name="VCMIDLTool"
- PreprocessorDefinitions="NDEBUG"
- MkTypLibCompatible="TRUE"
- SuppressStartupBanner="TRUE"
- TargetEnvironment="1"
- TypeLibraryName=".\./pythonw.tlb"
- HeaderFileName=""/>
+ Name="VCMIDLTool"/>
<Tool
Name="VCPostBuildEventTool"/>
<Tool
@@ -219,54 +189,9 @@
<Files>
<File
RelativePath="..\PC\python_exe.rc">
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="\Pyinst\python\PC"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="\Pyinst\python\PC"/>
- </FileConfiguration>
- <FileConfiguration
- Name="ReleaseItanium|Win32">
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="\Pyinst\python\PC"/>
- </FileConfiguration>
</File>
<File
RelativePath="..\PC\WinMain.c">
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- <FileConfiguration
- Name="ReleaseItanium|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
- </FileConfiguration>
</File>
</Files>
<Globals>
Modified: python/branches/ssize_t/PCbuild/readme.txt
==============================================================================
--- python/branches/ssize_t/PCbuild/readme.txt (original)
+++ python/branches/ssize_t/PCbuild/readme.txt Sat Jan 7 04:49:32 2006
@@ -124,21 +124,6 @@
nmake -f makefile.vc
nmake -f makefile.vc install
-zlib
- Python wrapper for the zlib compression library. Get the source code
- for version 1.2.3 from a convenient mirror at:
- http://www.gzip.org/zlib/
- Unpack into dist\zlib-1.2.3.
- A custom pre-link step in the zlib project settings should manage to
- build zlib-1.2.3\zlib.lib by magic before zlib.pyd (or zlib_d.pyd) is
- linked in PCbuild\.
- However, the zlib project is not smart enough to remove anything under
- zlib-1.2.3\ when you do a clean, so if you want to rebuild zlib.lib
- you need to clean up zlib-1.2.3\ by hand.
- When building zlib.pyd for Itanium, the pre-link build step won't work,
- so you will need to invoke nmake manually, using an IA64 build
- environment.
-
bz2
Python wrapper for the libbz2 compression library. Homepage
http://sources.redhat.com/bzip2/
Modified: python/branches/ssize_t/PCbuild/select.vcproj
==============================================================================
--- python/branches/ssize_t/PCbuild/select.vcproj (original)
+++ python/branches/ssize_t/PCbuild/select.vcproj Sat Jan 7 04:49:32 2006
@@ -27,10 +27,6 @@
RuntimeLibrary="2"
EnableFunctionLevelLinking="TRUE"
UsePrecompiledHeader="2"
- PrecompiledHeaderFile=".\x86-temp-release\select/select.pch"
- AssemblerListingLocation=".\x86-temp-release\select/"
- ObjectFile=".\x86-temp-release\select/"
- ProgramDataBaseFileName=".\x86-temp-release\select/"
WarningLevel="3"
SuppressStartupBanner="TRUE"
DebugInformationFormat="3"
@@ -51,13 +47,7 @@
ImportLibrary=".\./select.lib"
TargetMachine="1"/>
<Tool
- Name="VCMIDLTool"
- PreprocessorDefinitions="NDEBUG"
- MkTypLibCompatible="TRUE"
- SuppressStartupBanner="TRUE"
- TargetEnvironment="1"
- TypeLibraryName=".\./select.tlb"
- HeaderFileName=""/>
+ Name="VCMIDLTool"/>
<Tool
Name="VCPostBuildEventTool"/>
<Tool
@@ -65,9 +55,7 @@
<Tool
Name="VCPreLinkEventTool"/>
<Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- Culture="1033"/>
+ Name="VCResourceCompilerTool"/>
<Tool
Name="VCWebServiceProxyGeneratorTool"/>
<Tool
@@ -93,10 +81,6 @@
PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS"
RuntimeLibrary="3"
UsePrecompiledHeader="2"
- PrecompiledHeaderFile=".\x86-temp-debug\select/select.pch"
- AssemblerListingLocation=".\x86-temp-debug\select/"
- ObjectFile=".\x86-temp-debug\select/"
- ProgramDataBaseFileName=".\x86-temp-debug\select/"
WarningLevel="3"
SuppressStartupBanner="TRUE"
DebugInformationFormat="3"
@@ -117,13 +101,7 @@
ImportLibrary=".\./select_d.lib"
TargetMachine="1"/>
<Tool
- Name="VCMIDLTool"
- PreprocessorDefinitions="_DEBUG"
- MkTypLibCompatible="TRUE"
- SuppressStartupBanner="TRUE"
- TargetEnvironment="1"
- TypeLibraryName=".\./select.tlb"
- HeaderFileName=""/>
+ Name="VCMIDLTool"/>
<Tool
Name="VCPostBuildEventTool"/>
<Tool
@@ -131,9 +109,7 @@
<Tool
Name="VCPreLinkEventTool"/>
<Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
- Culture="1033"/>
+ Name="VCResourceCompilerTool"/>
<Tool
Name="VCWebServiceProxyGeneratorTool"/>
<Tool
@@ -165,10 +141,6 @@
BufferSecurityCheck="FALSE"
EnableFunctionLevelLinking="TRUE"
UsePrecompiledHeader="2"
- PrecompiledHeaderFile=".\ia64-temp-release\select/select.pch"
- AssemblerListingLocation=".\ia64-temp-release\select/"
- ObjectFile=".\ia64-temp-release\select/"
- ProgramDataBaseFileName=".\ia64-temp-release\select/"
WarningLevel="3"
SuppressStartupBanner="TRUE"
Detect64BitPortabilityProblems="TRUE"
@@ -191,13 +163,7 @@
ImportLibrary=".\./select.lib"
TargetMachine="0"/>
<Tool
- Name="VCMIDLTool"
- PreprocessorDefinitions="NDEBUG"
- MkTypLibCompatible="TRUE"
- SuppressStartupBanner="TRUE"
- TargetEnvironment="1"
- TypeLibraryName=".\./select.tlb"
- HeaderFileName=""/>
+ Name="VCMIDLTool"/>
<Tool
Name="VCPostBuildEventTool"/>
<Tool
@@ -205,9 +171,7 @@
<Tool
Name="VCPreLinkEventTool"/>
<Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- Culture="1033"/>
+ Name="VCResourceCompilerTool"/>
<Tool
Name="VCWebServiceProxyGeneratorTool"/>
<Tool
@@ -225,30 +189,6 @@
<Files>
<File
RelativePath="..\Modules\selectmodule.c">
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;$(NoInherit)"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;$(NoInherit)"/>
- </FileConfiguration>
- <FileConfiguration
- Name="ReleaseItanium|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;$(NoInherit)"/>
- </FileConfiguration>
</File>
</Files>
<Globals>
Modified: python/branches/ssize_t/PCbuild/unicodedata.vcproj
==============================================================================
--- python/branches/ssize_t/PCbuild/unicodedata.vcproj (original)
+++ python/branches/ssize_t/PCbuild/unicodedata.vcproj Sat Jan 7 04:49:32 2006
@@ -28,10 +28,6 @@
RuntimeLibrary="2"
EnableFunctionLevelLinking="TRUE"
UsePrecompiledHeader="2"
- PrecompiledHeaderFile=".\x86-temp-release\unicodedata/unicodedata.pch"
- AssemblerListingLocation=".\x86-temp-release\unicodedata/"
- ObjectFile=".\x86-temp-release\unicodedata/"
- ProgramDataBaseFileName=".\x86-temp-release\unicodedata/"
WarningLevel="3"
SuppressStartupBanner="TRUE"
CompileAs="0"/>
@@ -47,13 +43,7 @@
ImportLibrary=".\./unicodedata.lib"
TargetMachine="1"/>
<Tool
- Name="VCMIDLTool"
- PreprocessorDefinitions="NDEBUG"
- MkTypLibCompatible="TRUE"
- SuppressStartupBanner="TRUE"
- TargetEnvironment="1"
- TypeLibraryName=".\./unicodedata.tlb"
- HeaderFileName=""/>
+ Name="VCMIDLTool"/>
<Tool
Name="VCPostBuildEventTool"/>
<Tool
@@ -61,9 +51,7 @@
<Tool
Name="VCPreLinkEventTool"/>
<Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- Culture="3081"/>
+ Name="VCResourceCompilerTool"/>
<Tool
Name="VCWebServiceProxyGeneratorTool"/>
<Tool
@@ -91,10 +79,6 @@
BasicRuntimeChecks="3"
RuntimeLibrary="3"
UsePrecompiledHeader="2"
- PrecompiledHeaderFile=".\x86-temp-debug\unicodedata/unicodedata.pch"
- AssemblerListingLocation=".\x86-temp-debug\unicodedata/"
- ObjectFile=".\x86-temp-debug\unicodedata/"
- ProgramDataBaseFileName=".\x86-temp-debug\unicodedata/"
WarningLevel="3"
SuppressStartupBanner="TRUE"
DebugInformationFormat="3"
@@ -112,13 +96,7 @@
ImportLibrary=".\./unicodedata_d.lib"
TargetMachine="1"/>
<Tool
- Name="VCMIDLTool"
- PreprocessorDefinitions="_DEBUG"
- MkTypLibCompatible="TRUE"
- SuppressStartupBanner="TRUE"
- TargetEnvironment="1"
- TypeLibraryName=".\./unicodedata.tlb"
- HeaderFileName=""/>
+ Name="VCMIDLTool"/>
<Tool
Name="VCPostBuildEventTool"/>
<Tool
@@ -126,9 +104,7 @@
<Tool
Name="VCPreLinkEventTool"/>
<Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
- Culture="3081"/>
+ Name="VCResourceCompilerTool"/>
<Tool
Name="VCWebServiceProxyGeneratorTool"/>
<Tool
@@ -161,10 +137,6 @@
BufferSecurityCheck="FALSE"
EnableFunctionLevelLinking="TRUE"
UsePrecompiledHeader="2"
- PrecompiledHeaderFile=".\ia64-temp-release\unicodedata/unicodedata.pch"
- AssemblerListingLocation=".\ia64-temp-release\unicodedata/"
- ObjectFile=".\ia64-temp-release\unicodedata/"
- ProgramDataBaseFileName=".\ia64-temp-release\unicodedata/"
WarningLevel="3"
SuppressStartupBanner="TRUE"
Detect64BitPortabilityProblems="TRUE"
@@ -183,13 +155,7 @@
ImportLibrary=".\./unicodedata.lib"
TargetMachine="0"/>
<Tool
- Name="VCMIDLTool"
- PreprocessorDefinitions="NDEBUG"
- MkTypLibCompatible="TRUE"
- SuppressStartupBanner="TRUE"
- TargetEnvironment="1"
- TypeLibraryName=".\./unicodedata.tlb"
- HeaderFileName=""/>
+ Name="VCMIDLTool"/>
<Tool
Name="VCPostBuildEventTool"/>
<Tool
@@ -197,9 +163,7 @@
<Tool
Name="VCPreLinkEventTool"/>
<Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- Culture="3081"/>
+ Name="VCResourceCompilerTool"/>
<Tool
Name="VCWebServiceProxyGeneratorTool"/>
<Tool
@@ -217,31 +181,6 @@
<Files>
<File
RelativePath="..\Modules\unicodedata.c">
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;MMAP_EXPORTS;$(NoInherit)"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;MMAP_EXPORTS;$(NoInherit)"
- BasicRuntimeChecks="3"/>
- </FileConfiguration>
- <FileConfiguration
- Name="ReleaseItanium|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;MMAP_EXPORTS;$(NoInherit)"/>
- </FileConfiguration>
</File>
</Files>
<Globals>
Modified: python/branches/ssize_t/PCbuild/w9xpopen.vcproj
==============================================================================
--- python/branches/ssize_t/PCbuild/w9xpopen.vcproj (original)
+++ python/branches/ssize_t/PCbuild/w9xpopen.vcproj Sat Jan 7 04:49:32 2006
@@ -25,10 +25,6 @@
BasicRuntimeChecks="3"
RuntimeLibrary="3"
UsePrecompiledHeader="2"
- PrecompiledHeaderFile=".\x86-temp-debug\w9xpopen/w9xpopen.pch"
- AssemblerListingLocation=".\x86-temp-debug\w9xpopen/"
- ObjectFile=".\x86-temp-debug\w9xpopen/"
- ProgramDataBaseFileName=".\x86-temp-debug\w9xpopen/"
WarningLevel="3"
SuppressStartupBanner="TRUE"
DebugInformationFormat="3"/>
@@ -43,13 +39,7 @@
ProgramDatabaseFile=".\./w9xpopen_d.pdb"
TargetMachine="1"/>
<Tool
- Name="VCMIDLTool"
- PreprocessorDefinitions="_DEBUG"
- MkTypLibCompatible="TRUE"
- SuppressStartupBanner="TRUE"
- TargetEnvironment="1"
- TypeLibraryName=".\./w9xpopen.tlb"
- HeaderFileName=""/>
+ Name="VCMIDLTool"/>
<Tool
Name="VCPostBuildEventTool"/>
<Tool
@@ -57,9 +47,7 @@
<Tool
Name="VCPreLinkEventTool"/>
<Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
- Culture="3081"/>
+ Name="VCResourceCompilerTool"/>
<Tool
Name="VCWebServiceProxyGeneratorTool"/>
<Tool
@@ -88,10 +76,6 @@
RuntimeLibrary="2"
EnableFunctionLevelLinking="TRUE"
UsePrecompiledHeader="2"
- PrecompiledHeaderFile=".\x86-temp-release\w9xpopen/w9xpopen.pch"
- AssemblerListingLocation=".\x86-temp-release\w9xpopen/"
- ObjectFile=".\x86-temp-release\w9xpopen/"
- ProgramDataBaseFileName=".\x86-temp-release\w9xpopen/"
WarningLevel="3"
SuppressStartupBanner="TRUE"/>
<Tool
@@ -104,13 +88,7 @@
ProgramDatabaseFile=".\./w9xpopen.pdb"
TargetMachine="1"/>
<Tool
- Name="VCMIDLTool"
- PreprocessorDefinitions="NDEBUG"
- MkTypLibCompatible="TRUE"
- SuppressStartupBanner="TRUE"
- TargetEnvironment="1"
- TypeLibraryName=".\./w9xpopen.tlb"
- HeaderFileName=""/>
+ Name="VCMIDLTool"/>
<Tool
Name="VCPostBuildEventTool"/>
<Tool
@@ -118,9 +96,7 @@
<Tool
Name="VCPreLinkEventTool"/>
<Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- Culture="3081"/>
+ Name="VCResourceCompilerTool"/>
<Tool
Name="VCWebServiceProxyGeneratorTool"/>
<Tool
@@ -138,21 +114,6 @@
<Files>
<File
RelativePath="..\PC\w9xpopen.c">
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- PreprocessorDefinitions=""
- BasicRuntimeChecks="3"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- PreprocessorDefinitions=""/>
- </FileConfiguration>
</File>
</Files>
<Globals>
Modified: python/branches/ssize_t/PCbuild/winsound.vcproj
==============================================================================
--- python/branches/ssize_t/PCbuild/winsound.vcproj (original)
+++ python/branches/ssize_t/PCbuild/winsound.vcproj Sat Jan 7 04:49:32 2006
@@ -26,10 +26,6 @@
BasicRuntimeChecks="3"
RuntimeLibrary="3"
UsePrecompiledHeader="2"
- PrecompiledHeaderFile=".\x86-temp-debug\winsound/winsound.pch"
- AssemblerListingLocation=".\x86-temp-debug\winsound/"
- ObjectFile=".\x86-temp-debug\winsound/"
- ProgramDataBaseFileName=".\x86-temp-debug\winsound/"
WarningLevel="3"
SuppressStartupBanner="TRUE"
DebugInformationFormat="3"
@@ -48,13 +44,7 @@
ImportLibrary=".\./winsound_d.lib"
TargetMachine="1"/>
<Tool
- Name="VCMIDLTool"
- PreprocessorDefinitions="_DEBUG"
- MkTypLibCompatible="TRUE"
- SuppressStartupBanner="TRUE"
- TargetEnvironment="1"
- TypeLibraryName=".\./winsound.tlb"
- HeaderFileName=""/>
+ Name="VCMIDLTool"/>
<Tool
Name="VCPostBuildEventTool"/>
<Tool
@@ -62,9 +52,7 @@
<Tool
Name="VCPreLinkEventTool"/>
<Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
- Culture="3081"/>
+ Name="VCResourceCompilerTool"/>
<Tool
Name="VCWebServiceProxyGeneratorTool"/>
<Tool
@@ -94,10 +82,6 @@
RuntimeLibrary="2"
EnableFunctionLevelLinking="TRUE"
UsePrecompiledHeader="2"
- PrecompiledHeaderFile=".\x86-temp-release\winsound/winsound.pch"
- AssemblerListingLocation=".\x86-temp-release\winsound/"
- ObjectFile=".\x86-temp-release\winsound/"
- ProgramDataBaseFileName=".\x86-temp-release\winsound/"
WarningLevel="3"
SuppressStartupBanner="TRUE"
CompileAs="0"/>
@@ -114,13 +98,7 @@
ImportLibrary=".\./winsound.lib"
TargetMachine="1"/>
<Tool
- Name="VCMIDLTool"
- PreprocessorDefinitions="NDEBUG"
- MkTypLibCompatible="TRUE"
- SuppressStartupBanner="TRUE"
- TargetEnvironment="1"
- TypeLibraryName=".\./winsound.tlb"
- HeaderFileName=""/>
+ Name="VCMIDLTool"/>
<Tool
Name="VCPostBuildEventTool"/>
<Tool
@@ -128,9 +106,7 @@
<Tool
Name="VCPreLinkEventTool"/>
<Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- Culture="3081"/>
+ Name="VCResourceCompilerTool"/>
<Tool
Name="VCWebServiceProxyGeneratorTool"/>
<Tool
@@ -163,10 +139,6 @@
BufferSecurityCheck="FALSE"
EnableFunctionLevelLinking="TRUE"
UsePrecompiledHeader="2"
- PrecompiledHeaderFile=".\ia64-temp-release\winsound/winsound.pch"
- AssemblerListingLocation=".\ia64-temp-release\winsound/"
- ObjectFile=".\ia64-temp-release\winsound/"
- ProgramDataBaseFileName=".\ia64-temp-release\winsound/"
WarningLevel="3"
SuppressStartupBanner="TRUE"
Detect64BitPortabilityProblems="TRUE"
@@ -186,13 +158,7 @@
ImportLibrary=".\./winsound.lib"
TargetMachine="0"/>
<Tool
- Name="VCMIDLTool"
- PreprocessorDefinitions="NDEBUG"
- MkTypLibCompatible="TRUE"
- SuppressStartupBanner="TRUE"
- TargetEnvironment="1"
- TypeLibraryName=".\./winsound.tlb"
- HeaderFileName=""/>
+ Name="VCMIDLTool"/>
<Tool
Name="VCPostBuildEventTool"/>
<Tool
@@ -200,9 +166,7 @@
<Tool
Name="VCPreLinkEventTool"/>
<Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- Culture="3081"/>
+ Name="VCResourceCompilerTool"/>
<Tool
Name="VCWebServiceProxyGeneratorTool"/>
<Tool
@@ -220,31 +184,6 @@
<Files>
<File
RelativePath="..\PC\winsound.c">
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;WINSOUND_EXPORTS;$(NoInherit)"
- BasicRuntimeChecks="3"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;WINSOUND_EXPORTS;$(NoInherit)"/>
- </FileConfiguration>
- <FileConfiguration
- Name="ReleaseItanium|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;WINSOUND_EXPORTS;$(NoInherit)"/>
- </FileConfiguration>
</File>
</Files>
<Globals>
Deleted: /python/branches/ssize_t/PCbuild/zlib.vcproj
==============================================================================
--- /python/branches/ssize_t/PCbuild/zlib.vcproj Sat Jan 7 04:49:32 2006
+++ (empty file)
@@ -1,245 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="7.10"
- Name="zlib"
- RootNamespace="zlib"
- SccProjectName="zlib"
- SccLocalPath="..">
- <Platforms>
- <Platform
- Name="Win32"/>
- </Platforms>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory=".\."
- IntermediateDirectory=".\x86-temp-debug\zlib"
- ConfigurationType="2"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="FALSE">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="..\Include,..\PC,..\..\zlib-1.2.3"
- PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS"
- RuntimeLibrary="3"
- UsePrecompiledHeader="2"
- PrecompiledHeaderFile=".\x86-temp-debug\zlib/zlib.pch"
- AssemblerListingLocation=".\x86-temp-debug\zlib/"
- ObjectFile=".\x86-temp-debug\zlib/"
- ProgramDataBaseFileName=".\x86-temp-debug\zlib/"
- WarningLevel="3"
- SuppressStartupBanner="TRUE"
- DebugInformationFormat="3"
- CompileAs="0"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="..\..\zlib-1.2.3\zlib.lib"
- OutputFile="./zlib_d.pyd"
- LinkIncremental="1"
- SuppressStartupBanner="TRUE"
- IgnoreDefaultLibraryNames="libc;msvcrt"
- GenerateDebugInformation="TRUE"
- ProgramDatabaseFile=".\./zlib_d.pdb"
- SubSystem="2"
- BaseAddress="0x1e1B0000"
- ImportLibrary=".\./zlib_d.lib"
- TargetMachine="1"/>
- <Tool
- Name="VCMIDLTool"
- PreprocessorDefinitions="_DEBUG"
- MkTypLibCompatible="TRUE"
- SuppressStartupBanner="TRUE"
- TargetEnvironment="1"
- TypeLibraryName=".\./zlib.tlb"
- HeaderFileName=""/>
- <Tool
- Name="VCPostBuildEventTool"/>
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCPreLinkEventTool"
- Description="Checking static zlib has been built"
- CommandLine="cd ..\..\zlib-1.2.3
-nmake -nologo -f win32\Makefile.msc zlib.lib
-"/>
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
- Culture="1033"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebDeploymentTool"/>
- <Tool
- Name="VCManagedWrapperGeneratorTool"/>
- <Tool
- Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
- </Configuration>
- <Configuration
- Name="Release|Win32"
- OutputDirectory=".\."
- IntermediateDirectory=".\x86-temp-release\zlib"
- ConfigurationType="2"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="FALSE">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- InlineFunctionExpansion="1"
- AdditionalIncludeDirectories="..\Include,..\PC,..\..\zlib-1.2.3"
- PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS"
- StringPooling="TRUE"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="TRUE"
- UsePrecompiledHeader="2"
- PrecompiledHeaderFile=".\x86-temp-release\zlib/zlib.pch"
- AssemblerListingLocation=".\x86-temp-release\zlib/"
- ObjectFile=".\x86-temp-release\zlib/"
- ProgramDataBaseFileName=".\x86-temp-release\zlib/"
- WarningLevel="3"
- SuppressStartupBanner="TRUE"
- DebugInformationFormat="3"
- CompileAs="0"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="..\..\zlib-1.2.3\zlib.lib"
- OutputFile="./zlib.pyd"
- LinkIncremental="1"
- SuppressStartupBanner="TRUE"
- IgnoreDefaultLibraryNames="libc"
- GenerateDebugInformation="TRUE"
- ProgramDatabaseFile=".\./zlib.pdb"
- SubSystem="2"
- BaseAddress="0x1e1B0000"
- ImportLibrary=".\./zlib.lib"
- TargetMachine="1"/>
- <Tool
- Name="VCMIDLTool"
- PreprocessorDefinitions="NDEBUG"
- MkTypLibCompatible="TRUE"
- SuppressStartupBanner="TRUE"
- TargetEnvironment="1"
- TypeLibraryName=".\./zlib.tlb"
- HeaderFileName=""/>
- <Tool
- Name="VCPostBuildEventTool"/>
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCPreLinkEventTool"
- Description="Checking static zlib has been built"
- CommandLine="cd ..\..\zlib-1.2.3
-nmake -nologo -f win32\Makefile.msc zlib.lib
-"/>
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- Culture="1033"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebDeploymentTool"/>
- <Tool
- Name="VCManagedWrapperGeneratorTool"/>
- <Tool
- Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
- </Configuration>
- <Configuration
- Name="ReleaseItanium|Win32"
- OutputDirectory="./."
- IntermediateDirectory=".\ia64-temp-release\zlib"
- ConfigurationType="2"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="FALSE">
- <Tool
- Name="VCCLCompilerTool"
- AdditionalOptions=" /USECL:MS_ITANIUM"
- Optimization="2"
- InlineFunctionExpansion="1"
- AdditionalIncludeDirectories="{MSSDKPATH}\include\Win64\atl;{MSSDKPATH}\include\Win64\crt;{MSSDKPATH}\include\Win64\crt\sys;{MSSDKPATH}\include\Win64\mfc;..\Include,..\PC,..\..\zlib-1.2.3"
- PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS"
- StringPooling="TRUE"
- BasicRuntimeChecks="0"
- RuntimeLibrary="2"
- BufferSecurityCheck="FALSE"
- EnableFunctionLevelLinking="TRUE"
- UsePrecompiledHeader="2"
- PrecompiledHeaderFile=".\ia64-temp-release\zlib/zlib.pch"
- AssemblerListingLocation=".\ia64-temp-release\zlib/"
- ObjectFile=".\ia64-temp-release\zlib/"
- ProgramDataBaseFileName=".\ia64-temp-release\zlib/"
- WarningLevel="3"
- SuppressStartupBanner="TRUE"
- Detect64BitPortabilityProblems="TRUE"
- DebugInformationFormat="3"
- CompileAs="0"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCLinkerTool"
- AdditionalOptions=" /MACHINE:IA64 /USELINK:MS_SDK"
- AdditionalDependencies="..\..\zlib-1.2.3\zlib.lib"
- OutputFile="./zlib.pyd"
- LinkIncremental="1"
- SuppressStartupBanner="TRUE"
- IgnoreDefaultLibraryNames="libc"
- GenerateDebugInformation="TRUE"
- ProgramDatabaseFile=".\./zlib.pdb"
- SubSystem="2"
- BaseAddress="0x1e1B0000"
- ImportLibrary=".\./zlib.lib"
- TargetMachine="0"/>
- <Tool
- Name="VCMIDLTool"
- PreprocessorDefinitions="NDEBUG"
- MkTypLibCompatible="TRUE"
- SuppressStartupBanner="TRUE"
- TargetEnvironment="1"
- TypeLibraryName=".\./zlib.tlb"
- HeaderFileName=""/>
- <Tool
- Name="VCPostBuildEventTool"/>
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCPreLinkEventTool"
- Description="Checking static zlib has been built"
- CommandLine="cd ..\..\zlib-1.2.3
-nmake -nologo -f win32\Makefile.msc zlib.lib
-"/>
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- Culture="1033"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebDeploymentTool"/>
- <Tool
- Name="VCManagedWrapperGeneratorTool"/>
- <Tool
- Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <File
- RelativePath="..\Modules\zlibmodule.c">
- </File>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
Modified: python/branches/ssize_t/Python/dynload_shlib.c
==============================================================================
--- python/branches/ssize_t/Python/dynload_shlib.c (original)
+++ python/branches/ssize_t/Python/dynload_shlib.c Sat Jan 7 04:49:32 2006
@@ -130,7 +130,7 @@
handle = dlopen(pathname, dlopenflags);
if (handle == NULL) {
- char *error = dlerror();
+ const char *error = dlerror();
if (error == NULL)
error = "unknown dlopen() error";
PyErr_SetString(PyExc_ImportError, error);
Modified: python/branches/ssize_t/Python/sysmodule.c
==============================================================================
--- python/branches/ssize_t/Python/sysmodule.c (original)
+++ python/branches/ssize_t/Python/sysmodule.c Sat Jan 7 04:49:32 2006
@@ -457,16 +457,16 @@
tstate->interp->tscdump = 0;
Py_INCREF(Py_None);
return Py_None;
-
+
}
-PyDoc_STRVAR(settscdump_doc,
+PyDoc_STRVAR(settscdump_doc,
"settscdump(bool)\n\
\n\
If true, tell the Python interpreter to dump VM measurements to\n\
stderr. If false, turn off dump. The measurements are based on the\n\
processor's time-stamp counter."
-);
+);
#endif /* TSC */
static PyObject *
@@ -476,8 +476,8 @@
if (!PyArg_ParseTuple(args, "i:setrecursionlimit", &new_limit))
return NULL;
if (new_limit <= 0) {
- PyErr_SetString(PyExc_ValueError,
- "recursion limit must be positive");
+ PyErr_SetString(PyExc_ValueError,
+ "recursion limit must be positive");
return NULL;
}
Py_SetRecursionLimit(new_limit);
@@ -713,7 +713,7 @@
static PyMethodDef sys_methods[] = {
/* Might as well keep this in alphabetic order */
- {"callstats", (PyCFunction)PyEval_GetCallStats, METH_NOARGS,
+ {"callstats", (PyCFunction)PyEval_GetCallStats, METH_NOARGS,
callstats_doc},
{"displayhook", sys_displayhook, METH_O, displayhook_doc},
{"exc_info", sys_exc_info, METH_NOARGS, exc_info_doc},
@@ -721,11 +721,11 @@
{"excepthook", sys_excepthook, METH_VARARGS, excepthook_doc},
{"exit", sys_exit, METH_VARARGS, exit_doc},
#ifdef Py_USING_UNICODE
- {"getdefaultencoding", (PyCFunction)sys_getdefaultencoding,
- METH_NOARGS, getdefaultencoding_doc},
+ {"getdefaultencoding", (PyCFunction)sys_getdefaultencoding,
+ METH_NOARGS, getdefaultencoding_doc},
#endif
#ifdef HAVE_DLOPEN
- {"getdlopenflags", (PyCFunction)sys_getdlopenflags, METH_NOARGS,
+ {"getdlopenflags", (PyCFunction)sys_getdlopenflags, METH_NOARGS,
getdlopenflags_doc},
#endif
#ifdef COUNT_ALLOCS
@@ -736,7 +736,7 @@
#endif
#ifdef Py_USING_UNICODE
{"getfilesystemencoding", (PyCFunction)sys_getfilesystemencoding,
- METH_NOARGS, getfilesystemencoding_doc},
+ METH_NOARGS, getfilesystemencoding_doc},
#endif
#ifdef Py_TRACE_REFS
{"getobjects", _Py_GetObjects, METH_VARARGS},
@@ -757,14 +757,14 @@
#endif
#ifdef Py_USING_UNICODE
{"setdefaultencoding", sys_setdefaultencoding, METH_VARARGS,
- setdefaultencoding_doc},
+ setdefaultencoding_doc},
#endif
{"setcheckinterval", sys_setcheckinterval, METH_VARARGS,
- setcheckinterval_doc},
+ setcheckinterval_doc},
{"getcheckinterval", sys_getcheckinterval, METH_NOARGS,
- getcheckinterval_doc},
+ getcheckinterval_doc},
#ifdef HAVE_DLOPEN
- {"setdlopenflags", sys_setdlopenflags, METH_VARARGS,
+ {"setdlopenflags", sys_setdlopenflags, METH_VARARGS,
setdlopenflags_doc},
#endif
{"setprofile", sys_setprofile, METH_O, setprofile_doc},
@@ -934,6 +934,88 @@
return fflush (stream) || prev_fail ? EOF : 0;
}
+/* Subversion branch and revision management */
+static const char _patchlevel_revision[] = PY_PATCHLEVEL_REVISION;
+static const char headurl[] = "$HeadURL$";
+static int svn_initialized;
+static char patchlevel_revision[50]; /* Just the number */
+static char branch[50];
+static char shortbranch[50];
+static const char *svn_revision;
+
+static void
+svnversion_init(void)
+{
+ const char *python, *br_start, *br_end, *br_end2, *svnversion;
+ int len, istag;
+
+ if (svn_initialized)
+ return;
+
+ python = strstr(headurl, "/python/");
+ if (!python)
+ Py_FatalError("subversion keywords missing");
+
+ br_start = python + 8;
+ br_end = strchr(br_start, '/');
+ /* Works even for trunk,
+ as we are in trunk/Python/sysmodule.c */
+ br_end2 = strchr(br_end+1, '/');
+
+ istag = strncmp(br_start, "tags", 4) == 0;
+ if (strncmp(br_start, "trunk", 5) == 0) {
+ strcpy(branch, "trunk");
+ strcpy(shortbranch, "trunk");
+
+ }
+ else if (istag || strncmp(br_start, "branches", 8) == 0) {
+ len = br_end2 - br_start;
+ strncpy(branch, br_start, len);
+ branch[len] = '\0';
+
+ len = br_end2 - (br_end + 1);
+ strncpy(shortbranch, br_end + 1, len);
+ shortbranch[len] = '\0';
+ }
+ else {
+ Py_FatalError("bad HeadURL");
+ return;
+ }
+
+
+ svnversion = _Py_svnversion();
+ if (strcmp(svnversion, "exported") != 0)
+ svn_revision = svnversion;
+ else if (istag) {
+ len = strlen(_patchlevel_revision);
+ strncpy(patchlevel_revision, _patchlevel_revision + 11,
+ len - 13);
+ patchlevel_revision[len - 13] = '\0';
+ svn_revision = patchlevel_revision;
+ }
+ else
+ svn_revision = "";
+
+ svn_initialized = 1;
+}
+
+/* Return svnversion output if available.
+ Else return Revision of patchlevel.h if on branch.
+ Else return empty string */
+const char*
+Py_SubversionRevision()
+{
+ svnversion_init();
+ return svn_revision;
+}
+
+const char*
+Py_SubversionShortBranch()
+{
+ svnversion_init();
+ return shortbranch;
+}
+
PyObject *
_PySys_Init(void)
{
@@ -1003,8 +1085,9 @@
PyDict_SetItemString(sysdict, "hexversion",
v = PyInt_FromLong(PY_VERSION_HEX));
Py_XDECREF(v);
- PyDict_SetItemString(sysdict, "build_number",
- v = PyString_FromString(Py_GetBuildNumber()));
+ svnversion_init();
+ v = Py_BuildValue("(ssz)", "CPython", branch, svn_revision);
+ PyDict_SetItemString(sysdict, "subversion", v);
Py_XDECREF(v);
/*
* These release level checks are mutually exclusive and cover
@@ -1086,7 +1169,7 @@
if (warnoptions != NULL) {
PyDict_SetItemString(sysdict, "warnoptions", warnoptions);
}
-
+
if (PyErr_Occurred())
return NULL;
return m;
@@ -1098,7 +1181,7 @@
int i, n;
char *p;
PyObject *v, *w;
-
+
n = 1;
p = path;
while ((p = strchr(p, delim)) != NULL) {
Modified: python/branches/ssize_t/Tools/msi/msi.py
==============================================================================
--- python/branches/ssize_t/Tools/msi/msi.py (original)
+++ python/branches/ssize_t/Tools/msi/msi.py Sat Jan 7 04:49:32 2006
@@ -103,7 +103,6 @@
'select.pyd',
'unicodedata.pyd',
'winsound.pyd',
- 'zlib.pyd',
'_elementtree.pyd',
'_bsddb.pyd',
'_socket.pyd',
@@ -112,15 +111,9 @@
'_tkinter.pyd',
]
-if major+minor <= "23":
+if major+minor <= "24":
extensions.extend([
- '_csv.pyd',
- '_sre.pyd',
- '_symtable.pyd',
- '_winreg.pyd',
- 'datetime.pyd'
- 'mmap.pyd',
- 'parser.pyd',
+ 'zlib.pyd',
])
# Well-known component UUIDs
@@ -907,7 +900,7 @@
pydirs = [(root,"Lib")]
while pydirs:
parent, dir = pydirs.pop()
- if dir == "CVS" or dir.startswith("plat-"):
+ if dir == ".svn" or dir.startswith("plat-"):
continue
elif dir in ["lib-tk", "idlelib", "Icons"]:
if not have_tcl:
@@ -957,9 +950,9 @@
lib.add_file("wininst-6.exe")
lib.add_file("wininst-7.1.exe")
if dir=="data" and parent.physical=="test" and parent.basedir.physical=="email":
- # This should contain all non-CVS files listed in CVS
+ # This should contain all non-.svn files listed in subversion
for f in os.listdir(lib.absolute):
- if f.endswith(".txt") or f=="CVS":continue
+ if f.endswith(".txt") or f==".svn":continue
if f.endswith(".au") or f.endswith(".gif"):
lib.add_file(f)
else:
Modified: python/branches/ssize_t/configure
==============================================================================
--- python/branches/ssize_t/configure (original)
+++ python/branches/ssize_t/configure Sat Jan 7 04:49:32 2006
@@ -1,5 +1,5 @@
#! /bin/sh
-# From configure.in Revision: 41731 .
+# From configure.in Revision: 41868 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.59 for python 2.5.
#
@@ -312,7 +312,7 @@
# include <unistd.h>
#endif"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS VERSION SOVERSION CONFIG_ARGS PYTHONFRAMEWORK PYTHONFRAMEWORKDIR PYTHONFRAMEWORKPREFIX PYTHONFRAMEWORKINSTALLDIR MACHDEP SGI_ABI EXTRAPLATDIR EXTRAMACHDEPPATH CONFIGURE_MACOSX_DEPLOYMENT_TARGET CXX MAINOBJ EXEEXT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC OBJEXT CPP EGREP BUILDEXEEXT LIBRARY LDLIBRARY DLLLIBRARY BLDLIBRARY LDLIBRARYDIR INSTSONAME RUNSHARED LINKCC RANLIB ac_ct_RANLIB AR INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN OPT BASECFLAGS OTHER_LIBTOOL_OPT LIBTOOL_CRUFT SO LDSHARED BLDSHARED CCSHARED LINKFORSHARED CFLAGSFORSHARED SHLIBS USE_SIGNAL_MODULE SIGNAL_OBJS USE_THREAD_MODULE LDLAST THREADOBJ DLINCLDIR DYNLOADFILE MACHDEP_OBJS TRUE LIBOBJS HAVE_GETHOSTBYNAME_R_6_ARG HAVE_GETHOSTBYNAME_R_5_ARG HAVE_GETHOSTBYNAME_R_3_ARG HAVE_GETHOSTBYNAME_R HAVE_GETHOSTBYNAME LIBM LIBC UNICODE_OBJS THREADHEADERS SRCDIRS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS VERSION SOVERSION CONFIG_ARGS PYTHONFRAMEWORK PYTHONFRAMEWORKDIR PYTHONFRAMEWORKPREFIX PYTHONFRAMEWORKINSTALLDIR MACHDEP SGI_ABI EXTRAPLATDIR EXTRAMACHDEPPATH CONFIGURE_MACOSX_DEPLOYMENT_TARGET CXX MAINOBJ EXEEXT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC OBJEXT CPP EGREP BUILDEXEEXT LIBRARY LDLIBRARY DLLLIBRARY BLDLIBRARY LDLIBRARYDIR INSTSONAME RUNSHARED LINKCC RANLIB ac_ct_RANLIB AR SVNVERSION INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN OPT BASECFLAGS OTHER_LIBTOOL_OPT LIBTOOL_CRUFT SO LDSHARED BLDSHARED CCSHARED LINKFORSHARED CFLAGSFORSHARED SHLIBS USE_SIGNAL_MODULE SIGNAL_OBJS USE_THREAD_MODULE LDLAST THREADOBJ DLINCLDIR DYNLOADFILE MACHDEP_OBJS TRUE LIBOBJS HAVE_GETHOSTBYNAME_R_6_ARG HAVE_GETHOSTBYNAME_R_5_ARG HAVE_GETHOSTBYNAME_R_3_ARG HAVE_GETHOSTBYNAME_R HAVE_GETHOSTBYNAME LIBM LIBC UNICODE_OBJS THREADHEADERS SRCDIRS LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@@ -3575,6 +3575,49 @@
test -n "$AR" || AR="ar"
+
+# Extract the first word of "svnversion", so it can be a program name with args.
+set dummy svnversion; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_SVNVERSION+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ if test -n "$SVNVERSION"; then
+ ac_cv_prog_SVNVERSION="$SVNVERSION" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_SVNVERSION="found"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+
+fi
+fi
+SVNVERSION=$ac_cv_prog_SVNVERSION
+if test -n "$SVNVERSION"; then
+ echo "$as_me:$LINENO: result: $SVNVERSION" >&5
+echo "${ECHO_T}$SVNVERSION" >&6
+else
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+if test $SVNVERSION = found
+then
+ SVNVERSION="svnversion \$(srcdir)"
+else
+ SVNVERSION="echo exported"
+fi
+
case $MACHDEP in
bsdos*|hp*|HP*)
# install -d does not work on BSDI or HP-UX
@@ -21955,6 +21998,7 @@
s, at RANLIB@,$RANLIB,;t t
s, at ac_ct_RANLIB@,$ac_ct_RANLIB,;t t
s, at AR@,$AR,;t t
+s, at SVNVERSION@,$SVNVERSION,;t t
s, at INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t
s, at INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t
s, at INSTALL_DATA@,$INSTALL_DATA,;t t
Modified: python/branches/ssize_t/configure.in
==============================================================================
--- python/branches/ssize_t/configure.in (original)
+++ python/branches/ssize_t/configure.in Sat Jan 7 04:49:32 2006
@@ -618,6 +618,15 @@
AC_SUBST(AR)
AC_CHECK_PROGS(AR, ar aal, ar)
+AC_SUBST(SVNVERSION)
+AC_CHECK_PROG(SVNVERSION, svnversion, found)
+if test $SVNVERSION = found
+then
+ SVNVERSION="svnversion \$(srcdir)"
+else
+ SVNVERSION="echo exported"
+fi
+
case $MACHDEP in
bsdos*|hp*|HP*)
# install -d does not work on BSDI or HP-UX
More information about the Python-checkins
mailing list