From guido@cnri.reston.va.us Mon Jan 3 15:44:42 2000 From: guido@cnri.reston.va.us (Guido van Rossum) Date: Mon, 3 Jan 2000 10:44:42 -0500 (EST) Subject: [Python-checkins] CVS: python/dist/src/Lib base64.py,1.7,1.8 Message-ID: <200001031544.KAA23823@eric.cnri.reston.va.us> Update of /projects/cvsroot/python/dist/src/Lib In directory eric:/projects/python/develop/guido/src/Lib Modified Files: base64.py Log Message: The correct RFC to reference is RFC-1521 (MIME part one), not 1421 (PEM). Index: base64.py =================================================================== RCS file: /projects/cvsroot/python/dist/src/Lib/base64.py,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -r1.7 -r1.8 *** base64.py 1998/05/22 18:18:08 1.7 --- base64.py 2000/01/03 15:44:40 1.8 *************** *** 1,8 **** #! /usr/bin/env python ! # Conversions to/from base64 transport encoding as per RFC-MIME (Dec 1991 ! # version). ! ! # Parameters set by RFC-1421. # # Modified 04-Oct-95 by Jack to use binascii module --- 1,5 ---- #! /usr/bin/env python ! # Conversions to/from base64 transport encoding as per RFC-1521. # # Modified 04-Oct-95 by Jack to use binascii module From fdrake@weyr.cnri.reston.va.us Mon Jan 3 16:08:54 2000 From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake) Date: Mon, 3 Jan 2000 11:08:54 -0500 (EST) Subject: [Python-checkins] CVS: python/dist/src/Doc/lib libbase64.tex Message-ID: <200001031608.LAA10255@weyr.cnri.reston.va.us> Update of /projects/cvsroot/python/dist/src/Doc/lib In directory weyr:/home/fdrake/projects/python/Doc-152p1/lib Modified Files: Tag: release152p1-patches libbase64.tex Log Message: Corrected reference to the RFC; should be 1521, not 1421. Based on a report from Tage Stabell-Kulo and comments from Guido. From fdrake@weyr.cnri.reston.va.us Mon Jan 10 17:55:03 2000 From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake) Date: Mon, 10 Jan 2000 12:55:03 -0500 (EST) Subject: [Python-checkins] CVS: python/dist/src/Doc/api api.tex Message-ID: <200001101755.MAA03700@weyr.cnri.reston.va.us> Update of /projects/cvsroot/python/dist/src/Doc/api In directory weyr:/home/fdrake/projects/python/Doc-152p1/api Modified Files: Tag: release152p1-patches api.tex Log Message: In sum_sequence() example: Use PySequence_Length() instead of PyObject_Size(). The later doesn't appear to exist. From fdrake@weyr.cnri.reston.va.us Mon Jan 10 18:00:55 2000 From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake) Date: Mon, 10 Jan 2000 13:00:55 -0500 (EST) Subject: [Python-checkins] CVS: python/dist/src/Doc/lib librandom.tex libwhrandom.tex Message-ID: <200001101800.NAA03762@weyr.cnri.reston.va.us> Update of /projects/cvsroot/python/dist/src/Doc/lib In directory weyr:/home/fdrake/projects/python/Doc-152p1/lib Modified Files: Tag: release152p1-patches librandom.tex libwhrandom.tex Log Message: Updates to random / whrandom to better reflect recommended usage. Please review! From fdrake@weyr.cnri.reston.va.us Mon Jan 10 20:01:01 2000 From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake) Date: Mon, 10 Jan 2000 15:01:01 -0500 (EST) Subject: [Python-checkins] CVS: python/dist/src/Doc/lib liburllib.tex Message-ID: <200001102001.PAA04669@weyr.cnri.reston.va.us> Update of /projects/cvsroot/python/dist/src/Doc/lib In directory weyr:/home/fdrake/projects/python/Doc-152p1/lib Modified Files: Tag: release152p1-patches liburllib.tex Log Message: Changes from Skip Montanaro , with minor changes. Adds information about setting up proxy information for urlopen() and adds some examples. From fdrake@weyr.cnri.reston.va.us Tue Jan 11 14:44:09 2000 From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake) Date: Tue, 11 Jan 2000 09:44:09 -0500 (EST) Subject: [Python-checkins] CVS: python/dist/src/Doc/ref ref3.tex Message-ID: <200001111444.JAA07268@weyr.cnri.reston.va.us> Update of /projects/cvsroot/python/dist/src/Doc/ref In directory weyr:/home/fdrake/projects/python/Doc-152p1/ref Modified Files: Tag: release152p1-patches ref3.tex Log Message: English usage fix, suggested by John Machin on comp.lang.python: "falls outside" --> "would fall outside" From fdrake@weyr.cnri.reston.va.us Tue Jan 11 20:47:54 2000 From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake) Date: Tue, 11 Jan 2000 15:47:54 -0500 (EST) Subject: [Python-checkins] CVS: python/dist/src/Doc/lib libmimewriter.tex Message-ID: <200001112047.PAA08862@weyr.cnri.reston.va.us> Update of /projects/cvsroot/python/dist/src/Doc/lib In directory weyr:/home/fdrake/projects/python/Doc-152p1/lib Modified Files: Tag: release152p1-patches libmimewriter.tex Log Message: Twiddle: "mutlipart" --> "multipart" Reported by Gerrit Holl . From guido@cnri.reston.va.us Wed Jan 12 16:29:01 2000 From: guido@cnri.reston.va.us (Guido van Rossum) Date: Wed, 12 Jan 2000 11:29:01 -0500 (EST) Subject: [Python-checkins] CVS: python/dist/src/Objects object.c,2.60,2.61 Message-ID: <200001121629.LAA03508@eric.cnri.reston.va.us> Update of /projects/cvsroot/python/dist/src/Objects In directory eric:/projects/python/develop/guido/src/Objects Modified Files: object.c Log Message: On Linux, one sometimes sees spurious errors after interrupting previous output. Call clearerr() to prevent past errors affecting our ferror() test later, in PyObject_Print(). Suggested by Marc Lemburg. Index: object.c =================================================================== RCS file: /projects/cvsroot/python/dist/src/Objects/object.c,v retrieving revision 2.60 retrieving revision 2.61 diff -C2 -r2.60 -r2.61 *** object.c 1998/07/21 21:56:41 2.60 --- object.c 2000/01/12 16:28:58 2.61 *************** *** 169,172 **** --- 169,173 ---- } #endif + clearerr(fp); /* Clear any previous error condition */ if (op == NULL) { fprintf(fp, ""); From guido@cnri.reston.va.us Wed Jan 12 16:38:23 2000 From: guido@cnri.reston.va.us (Guido van Rossum) Date: Wed, 12 Jan 2000 11:38:23 -0500 (EST) Subject: [Python-checkins] CVS: python/dist/src/Modules timemodule.c,2.77,2.78 Message-ID: <200001121638.LAA03660@eric.cnri.reston.va.us> Update of /projects/cvsroot/python/dist/src/Modules In directory eric:/projects/python/develop/guido/src/Modules Modified Files: timemodule.c Log Message: The functions asctime() and mktime() are documented to take a 9-tuple only. Through some mysterious interaction, they would take 9 separate arguments as well. This misfeature is now disabled (to end a difference with JPython). Index: timemodule.c =================================================================== RCS file: /projects/cvsroot/python/dist/src/Modules/timemodule.c,v retrieving revision 2.77 retrieving revision 2.78 diff -C2 -r2.77 -r2.78 *** timemodule.c 1999/11/08 15:32:27 2.77 --- timemodule.c 2000/01/12 16:38:20 2.78 *************** *** 453,460 **** PyObject *args; { struct tm buf; char *p; ! if (!gettmarg(args, &buf)) return NULL; p = asctime(&buf); if (p[24] == '\n') --- 453,463 ---- PyObject *args; { + PyObject *tup; struct tm buf; char *p; ! if (!PyArg_ParseTuple(args, "O", &tup)) return NULL; + if (!gettmarg(tup, &buf)) + return NULL; p = asctime(&buf); if (p[24] == '\n') *************** *** 501,509 **** PyObject *args; { struct tm buf; time_t tt; tt = time(&tt); buf = *localtime(&tt); ! if (!gettmarg(args, &buf)) return NULL; tt = mktime(&buf); --- 504,515 ---- PyObject *args; { + PyObject *tup; struct tm buf; time_t tt; + if (!PyArg_ParseTuple(args, "O", &tup)) + return NULL; tt = time(&tt); buf = *localtime(&tt); ! if (!gettmarg(tup, &buf)) return NULL; tt = mktime(&buf); *************** *** 530,537 **** {"gmtime", time_gmtime, 0, gmtime_doc}, {"localtime", time_localtime, 0, localtime_doc}, ! {"asctime", time_asctime, 0, asctime_doc}, {"ctime", time_ctime, 0, ctime_doc}, #ifdef HAVE_MKTIME ! {"mktime", time_mktime, 0, mktime_doc}, #endif #ifdef HAVE_STRFTIME --- 536,543 ---- {"gmtime", time_gmtime, 0, gmtime_doc}, {"localtime", time_localtime, 0, localtime_doc}, ! {"asctime", time_asctime, 1, asctime_doc}, {"ctime", time_ctime, 0, ctime_doc}, #ifdef HAVE_MKTIME ! {"mktime", time_mktime, 1, mktime_doc}, #endif #ifdef HAVE_STRFTIME From guido@cnri.reston.va.us Wed Jan 12 22:45:57 2000 From: guido@cnri.reston.va.us (Guido van Rossum) Date: Wed, 12 Jan 2000 17:45:57 -0500 (EST) Subject: [Python-checkins] CVS: python/dist/src/Python ceval.c,2.165,2.166 Message-ID: <200001122245.RAA05073@eric.cnri.reston.va.us> Update of /projects/cvsroot/python/dist/src/Python In directory eric:/projects/python/develop/guido/src/Python Modified Files: ceval.c Log Message: Fix a bug in exec_statement() noted incidentally by Tim Peters in PR#175 -- when exec is passed a code object, it didn't sync the locals from the dictionary back into their fast representation. Also took the time to remove some repetitive code there and to do the syncing even when an exception is raised (since a partial effect should still be synced). Index: ceval.c =================================================================== RCS file: /projects/cvsroot/python/dist/src/Python/ceval.c,v retrieving revision 2.165 retrieving revision 2.166 diff -C2 -r2.165 -r2.166 *** ceval.c 1999/11/15 19:29:33 2.165 --- ceval.c 2000/01/12 22:45:54 2.166 *************** *** 2741,2745 **** PyObject *locals; { - char *s; int n; PyObject *v; --- 2741,2744 ---- *************** *** 2778,2808 **** PyDict_SetItemString(globals, "__builtins__", f->f_builtins); if (PyCode_Check(prog)) { ! v = PyEval_EvalCode((PyCodeObject *) prog, ! globals, locals); ! if (v == NULL) ! return -1; ! Py_DECREF(v); ! return 0; } ! if (PyFile_Check(prog)) { FILE *fp = PyFile_AsFile(prog); char *name = PyString_AsString(PyFile_Name(prog)); ! if (PyRun_File(fp, name, Py_file_input, ! globals, locals) == NULL) ! return -1; ! return 0; } ! s = PyString_AsString(prog); ! if ((int)strlen(s) != PyString_Size(prog)) { ! PyErr_SetString(PyExc_ValueError, ! "embedded '\\0' in exec string"); ! return -1; } ! v = PyRun_String(s, Py_file_input, globals, locals); if (v == NULL) return -1; Py_DECREF(v); - if (plain) - PyFrame_LocalsToFast(f, 0); return 0; } --- 2777,2801 ---- PyDict_SetItemString(globals, "__builtins__", f->f_builtins); if (PyCode_Check(prog)) { ! v = PyEval_EvalCode((PyCodeObject *) prog, globals, locals); } ! else if (PyFile_Check(prog)) { FILE *fp = PyFile_AsFile(prog); char *name = PyString_AsString(PyFile_Name(prog)); ! v = PyRun_File(fp, name, Py_file_input, globals, locals); } ! else { ! char *s = PyString_AsString(prog); ! if ((int)strlen(s) != PyString_Size(prog)) { ! PyErr_SetString(PyExc_ValueError, ! "embedded '\\0' in exec string"); ! return -1; ! } ! v = PyRun_String(s, Py_file_input, globals, locals); } ! if (plain) ! PyFrame_LocalsToFast(f, 0); if (v == NULL) return -1; Py_DECREF(v); return 0; } From gstein@lyra.org Wed Jan 12 23:00:16 2000 From: gstein@lyra.org (Greg Stein) Date: Wed, 12 Jan 2000 15:00:16 -0800 (PST) Subject: [Python-checkins] CVS: python/dist/src/Python ceval.c,2.165,2.166 In-Reply-To: <200001122245.RAA05073@eric.cnri.reston.va.us> Message-ID: For the PyRun_File case, you've introduced a Py_DECREF() that wasn't there before. Was that intended? Also note that PyString_AS_STRING() and PyString_GETSIZE could be used since the object must be a string. Cheers, -g On Wed, 12 Jan 2000, Guido van Rossum wrote: >... > *** ceval.c 1999/11/15 19:29:33 2.165 > --- ceval.c 2000/01/12 22:45:54 2.166 > *************** > *** 2741,2745 **** > PyObject *locals; > { > - char *s; > int n; > PyObject *v; > --- 2741,2744 ---- > *************** > *** 2778,2808 **** > PyDict_SetItemString(globals, "__builtins__", f->f_builtins); > if (PyCode_Check(prog)) { > ! v = PyEval_EvalCode((PyCodeObject *) prog, > ! globals, locals); > ! if (v == NULL) > ! return -1; > ! Py_DECREF(v); > ! return 0; > } > ! if (PyFile_Check(prog)) { > FILE *fp = PyFile_AsFile(prog); > char *name = PyString_AsString(PyFile_Name(prog)); > ! if (PyRun_File(fp, name, Py_file_input, > ! globals, locals) == NULL) > ! return -1; > ! return 0; > } > ! s = PyString_AsString(prog); > ! if ((int)strlen(s) != PyString_Size(prog)) { > ! PyErr_SetString(PyExc_ValueError, > ! "embedded '\\0' in exec string"); > ! return -1; > } > ! v = PyRun_String(s, Py_file_input, globals, locals); > if (v == NULL) > return -1; > Py_DECREF(v); > - if (plain) > - PyFrame_LocalsToFast(f, 0); > return 0; > } > --- 2777,2801 ---- > PyDict_SetItemString(globals, "__builtins__", f->f_builtins); > if (PyCode_Check(prog)) { > ! v = PyEval_EvalCode((PyCodeObject *) prog, globals, locals); > } > ! else if (PyFile_Check(prog)) { > FILE *fp = PyFile_AsFile(prog); > char *name = PyString_AsString(PyFile_Name(prog)); > ! v = PyRun_File(fp, name, Py_file_input, globals, locals); > } > ! else { > ! char *s = PyString_AsString(prog); > ! if ((int)strlen(s) != PyString_Size(prog)) { > ! PyErr_SetString(PyExc_ValueError, > ! "embedded '\\0' in exec string"); > ! return -1; > ! } > ! v = PyRun_String(s, Py_file_input, globals, locals); > } > ! if (plain) > ! PyFrame_LocalsToFast(f, 0); > if (v == NULL) > return -1; > Py_DECREF(v); > return 0; > } -- Greg Stein, http://www.lyra.org/ From guido@CNRI.Reston.VA.US Wed Jan 12 22:57:55 2000 From: guido@CNRI.Reston.VA.US (Guido van Rossum) Date: Wed, 12 Jan 2000 17:57:55 -0500 Subject: [Python-checkins] CVS: python/dist/src/Python ceval.c,2.165,2.166 In-Reply-To: Your message of "Wed, 12 Jan 2000 15:00:16 PST." References: Message-ID: <200001122257.RAA05268@eric.cnri.reston.va.us> > For the PyRun_File case, you've introduced a Py_DECREF() that wasn't there > before. Was that intended? Yes. It was a leak. It didn't really leak, because it always returned None, but it caused the reference count for None to increase ad infinitum. > Also note that PyString_AS_STRING() and PyString_GETSIZE could be used > since the object must be a string. I don't care about using those macros except in performance critical contexts, which this can hardly be (relatively speaking, the parsing takes forever). --Guido van Rossum (home page: http://www.python.org/~guido/) From guido@cnri.reston.va.us Fri Jan 14 16:33:11 2000 From: guido@cnri.reston.va.us (Guido van Rossum) Date: Fri, 14 Jan 2000 11:33:11 -0500 (EST) Subject: [Python-checkins] CVS: python/dist/src/Modules selectmodule.c,2.29,2.30 Message-ID: <200001141633.LAA07738@eric.cnri.reston.va.us> Update of /projects/cvsroot/python/dist/src/Modules In directory eric:/projects/python/develop/guido/src/Modules Modified Files: selectmodule.c Log Message: According to Ron Bickers, and with apparent approval of Chris Herborth, the code in list2set() that sets max unconditionally to 0 should not be used on BeOS. So be it. Anybody using BeOS, please test! Index: selectmodule.c =================================================================== RCS file: /projects/cvsroot/python/dist/src/Modules/selectmodule.c,v retrieving revision 2.29 retrieving revision 2.30 diff -C2 -r2.29 -r2.30 *** selectmodule.c 1999/08/27 20:39:37 2.29 --- selectmodule.c 2000/01/14 16:33:09 2.30 *************** *** 144,148 **** goto finally; } ! #if defined(_MSC_VER) || defined(__BEOS__) max = 0; /* not used for Win32 */ #else /* !_MSC_VER */ --- 144,148 ---- goto finally; } ! #if defined(_MSC_VER) max = 0; /* not used for Win32 */ #else /* !_MSC_VER */ From guido@cnri.reston.va.us Mon Jan 17 14:11:06 2000 From: guido@cnri.reston.va.us (Guido van Rossum) Date: Mon, 17 Jan 2000 09:11:06 -0500 (EST) Subject: [Python-checkins] CVS: python/dist/src/Lib rfc822.py,1.44,1.45 Message-ID: <200001171411.JAA10756@eric.cnri.reston.va.us> Update of /projects/cvsroot/python/dist/src/Lib In directory eric:/projects/python/develop/guido/src/Lib Modified Files: rfc822.py Log Message: Fix by Nick Russo in processing of timezone in test program; the ParsedDate didn't have the correct day of week. Index: rfc822.py =================================================================== RCS file: /projects/cvsroot/python/dist/src/Lib/rfc822.py,v retrieving revision 1.44 retrieving revision 1.45 diff -C2 -r1.44 -r1.45 *** rfc822.py 1999/10/06 15:19:19 1.44 --- rfc822.py 2000/01/17 14:11:04 1.45 *************** *** 928,934 **** print 'Date:', m.getheader('date') date = m.getdate_tz('date') if date: ! print 'ParsedDate:', time.asctime(date[:-1]), ! hhmmss = date[-1] hhmm, ss = divmod(hhmmss, 60) hh, mm = divmod(hhmm, 60) --- 928,936 ---- print 'Date:', m.getheader('date') date = m.getdate_tz('date') + tz = date[-1] + date = time.localtime(mktime_tz(date)) if date: ! print 'ParsedDate:', time.asctime(date), ! hhmmss = tz hhmm, ss = divmod(hhmmss, 60) hh, mm = divmod(hhmm, 60) From fdrake@weyr.cnri.reston.va.us Mon Jan 17 14:30:08 2000 From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake) Date: Mon, 17 Jan 2000 09:30:08 -0500 (EST) Subject: [Python-checkins] CVS: python/dist/src/Doc/api api.tex Message-ID: <200001171430.JAA15001@weyr.cnri.reston.va.us> Update of /projects/cvsroot/python/dist/src/Doc/api In directory weyr:/home/fdrake/projects/python/Doc-152p1/api Modified Files: Tag: release152p1-patches api.tex Log Message: Typo: "expelained" --> "explained" Noted by Doug Mennella . From fdrake@weyr.cnri.reston.va.us Mon Jan 17 19:10:55 2000 From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake) Date: Mon, 17 Jan 2000 14:10:55 -0500 (EST) Subject: [Python-checkins] CVS: python/dist/src/Doc/lib libcfgparser.tex Message-ID: <200001171910.OAA16646@weyr.cnri.reston.va.us> Update of /projects/cvsroot/python/dist/src/Doc/lib In directory weyr:/home/fdrake/projects/python/Doc-152p1/lib Modified Files: Tag: release152p1-patches libcfgparser.tex Log Message: Documented the add_section() method; omission noted by Tage Stabell-Kulo . Elaborated on a couple of other items. From akuchlin@CNRI.Reston.VA.US Mon Jan 17 20:12:40 2000 From: akuchlin@CNRI.Reston.VA.US (Andrew M. Kuchling) Date: Mon, 17 Jan 2000 15:12:40 -0500 (EST) Subject: [Python-checkins] CVS: python/dist/src/Doc/lib libasyncore.tex Message-ID: <200001172012.PAA01674@amarok.cnri.reston.va.us> Update of /projects/cvsroot/python/dist/src/Doc/lib In directory amarok:/home/akuchlin/src/Python-1.5/Doc/lib Modified Files: Tag: release152p1-patches libasyncore.tex Log Message: Fix consistent typo: 'asyncronous' -> 'asynchronous' From fdrake@weyr.cnri.reston.va.us Mon Jan 17 20:29:00 2000 From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake) Date: Mon, 17 Jan 2000 15:29:00 -0500 (EST) Subject: [Python-checkins] CVS: python/dist/src/Doc/lib librfc822.tex Message-ID: <200001172029.PAA17305@weyr.cnri.reston.va.us> Update of /projects/cvsroot/python/dist/src/Doc/lib In directory weyr:/home/fdrake/projects/python/Doc-152p1/lib Modified Files: Tag: release152p1-patches librfc822.tex Log Message: Explain that fields 6, 7, & 8 of the time tuples returned by getdate[_tz] and parsedate[_tz] are useless. Problem noted by Nick Russo . From fdrake@weyr.cnri.reston.va.us Tue Jan 18 22:36:22 2000 From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake) Date: Tue, 18 Jan 2000 17:36:22 -0500 (EST) Subject: [Python-checkins] CVS: python/dist/src/Doc/ext ext.tex Message-ID: <200001182236.RAA20024@weyr.cnri.reston.va.us> Update of /projects/cvsroot/python/dist/src/Doc/ext In directory weyr:/home/fdrake/projects/python/Doc-152p1/ext Modified Files: Tag: release152p1-patches ext.tex Log Message: At Just's suggestion, note that PyMac_Initialize() should be called instead of Py_Initialize() when embedding on the Mac. In the example function my_set_callback(), make the parameter declarations match their use. Error noted by Doug Mennella . From guido@cnri.reston.va.us Wed Jan 19 21:57:33 2000 From: guido@cnri.reston.va.us (Guido van Rossum) Date: Wed, 19 Jan 2000 16:57:33 -0500 (EST) Subject: [Python-checkins] CVS: python/dist/src/Lib bdb.py,1.25,1.26 Message-ID: <200001192157.QAA20189@eric.cnri.reston.va.us> Update of /projects/cvsroot/python/dist/src/Lib In directory eric:/projects/python/develop/guido/src/Lib Modified Files: bdb.py Log Message: Change two occurrences of type(x) <> types.CodeType into isinstance(x, types.CodeType). Suggested by Finn Bock. Index: bdb.py =================================================================== RCS file: /projects/cvsroot/python/dist/src/Lib/bdb.py,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -r1.25 -r1.26 *** bdb.py 1999/09/09 23:24:33 1.25 --- bdb.py 2000/01/19 21:57:30 1.26 *************** *** 340,344 **** self.reset() sys.settrace(self.trace_dispatch) ! if type(cmd) <> types.CodeType: cmd = cmd+'\n' try: --- 340,344 ---- self.reset() sys.settrace(self.trace_dispatch) ! if not isinstance(cmd, types.CodeType): cmd = cmd+'\n' try: *************** *** 359,363 **** self.reset() sys.settrace(self.trace_dispatch) ! if type(expr) <> types.CodeType: expr = expr+'\n' try: --- 359,363 ---- self.reset() sys.settrace(self.trace_dispatch) ! if not isinstance(expr, types.CodeType): expr = expr+'\n' try: From fdrake@weyr.cnri.reston.va.us Thu Jan 20 15:33:27 2000 From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake) Date: Thu, 20 Jan 2000 10:33:27 -0500 (EST) Subject: [Python-checkins] CVS: python/dist/src/Doc/lib libstdtypes.tex Message-ID: <200001201533.KAA25518@weyr.cnri.reston.va.us> Update of /projects/cvsroot/python/dist/src/Doc/lib In directory weyr:/home/fdrake/projects/python/Doc-152p1/lib Modified Files: Tag: release152p1-patches libstdtypes.tex Log Message: Fix table note regarding {}.get(); used the wrong variable name. Problem reported to Jack Jansen by Glyph Lefkowitz . From jhylton@cnri.reston.va.us Thu Jan 20 18:19:12 2000 From: jhylton@cnri.reston.va.us (Jeremy Hylton) Date: Thu, 20 Jan 2000 13:19:12 -0500 (EST) Subject: [Python-checkins] CVS: python/dist/src/Lib urllib2.py,NONE,1.1 Message-ID: <200001201819.NAA09666@bitdiddle.cnri.reston.va.us> Update of /projects/cvsroot/python/dist/src/Lib In directory bitdiddle:/home/jhylton/python/src/Lib Added Files: urllib2.py Log Message: EXPERIMENTAL An extensible library for opening URLs using a variety protocols. Intended as a replacement for urllib. From guido@cnri.reston.va.us Thu Jan 20 20:49:31 2000 From: guido@cnri.reston.va.us (Guido van Rossum) Date: Thu, 20 Jan 2000 15:49:31 -0500 (EST) Subject: [Python-checkins] CVS: python/dist/src/Tools/bgen/bgen macsupport.py,1.15,1.16 scantools.py,1.15,1.16 Message-ID: <200001202049.PAA22768@eric.cnri.reston.va.us> Update of /projects/cvsroot/python/dist/src/Tools/bgen/bgen In directory eric:/projects/python/develop/guido/src/Tools/bgen/bgen Modified Files: macsupport.py scantools.py Log Message: Two patches from Jack Jansen: Three bgen mods: - support for FSSpecs passed-by-value and points-passed-by-reference added. - strip single-line comments when parsing header files - if a definition is blacklisted _do_ output it, but in comment Index: macsupport.py =================================================================== RCS file: /projects/cvsroot/python/dist/src/Tools/bgen/bgen/macsupport.py,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -r1.15 -r1.16 *** macsupport.py 1999/09/30 14:15:14 1.15 --- macsupport.py 2000/01/20 20:49:28 1.16 *************** *** 16,20 **** Size = Type("Size", "l") Style = Type("Style", "b") ! StyleParameter = Type("StyleParameter", "h") CharParameter = Type("CharParameter", "h") TextEncoding = Type("TextEncoding", "l") --- 16,20 ---- Size = Type("Size", "l") Style = Type("Style", "b") ! StyleParameter = Type("Style", "h") CharParameter = Type("CharParameter", "h") TextEncoding = Type("TextEncoding", "l") *************** *** 32,36 **** # File System Specifications ! FSSpec_ptr = OpaqueType("FSSpec", "PyMac_BuildFSSpec", "PyMac_GetFSSpec") # OSType and ResType: 4-byte character strings --- 32,36 ---- # File System Specifications ! FSSpec = FSSpec_ptr = OpaqueType("FSSpec", "PyMac_BuildFSSpec", "PyMac_GetFSSpec") # OSType and ResType: 4-byte character strings *************** *** 67,70 **** --- 67,71 ---- Rect = Rect_ptr = OpaqueType("Rect", "PyMac_BuildRect", "PyMac_GetRect") Point = OpaqueByValueType("Point", "PyMac_BuildPoint", "PyMac_GetPoint") + Point_ptr = OpaqueType("Point", "PyMac_BuildPoint", "PyMac_GetPoint") # Event records *************** *** 85,89 **** InBuffer = VarInputBufferType('char', 'long', 'l') # (buf, len) - OptionalInBuffer = OptionalVarInputBufferType('char', 'long', 'l') # (buf, len) InOutBuffer = HeapInputOutputBufferType('char', 'long', 'l') # (inbuf, outbuf, len) --- 86,89 ---- *************** *** 152,158 **** # errorCheck method. class OSErrMixIn: ! "Mix-in class to treat OSErr/OSStatus return values special" def makereturnvar(self): ! if self.returntype.__class__ == OSErrType: return Variable(self.returntype, "_err", ErrorMode) else: --- 152,158 ---- # errorCheck method. class OSErrMixIn: ! "Mix-in class to treat OSErr return values special" def makereturnvar(self): ! if self.returntype is OSErr: return Variable(self.returntype, "_err", ErrorMode) else: Index: scantools.py =================================================================== RCS file: /projects/cvsroot/python/dist/src/Tools/bgen/bgen/scantools.py,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -r1.15 -r1.16 *** scantools.py 1998/04/28 16:04:50 1.15 --- scantools.py 2000/01/20 20:49:28 1.16 *************** *** 235,242 **** self.whole_pat = self.type_pat + self.name_pat + self.args_pat # self.sym_pat = "^[ \t]*\([a-zA-Z0-9_]+\)[ \t]*=" + \ ! # "[ \t]*\([-0-9'\"][^\t\n,;}]*\),?" self.sym_pat = "^[ \t]*\([a-zA-Z0-9_]+\)[ \t]*=" + \ ! "[ \t]*\([-0-9_a-zA-Z'\"][^\t\n,;}]*\),?" self.asplit_pat = "^\(.*[^a-zA-Z0-9_]\)\([a-zA-Z0-9_]+\)$" def compilepatterns(self): --- 235,245 ---- self.whole_pat = self.type_pat + self.name_pat + self.args_pat # self.sym_pat = "^[ \t]*\([a-zA-Z0-9_]+\)[ \t]*=" + \ ! # "[ \t]*\([-0-9'\"(][^\t\n,;}]*\),?" self.sym_pat = "^[ \t]*\([a-zA-Z0-9_]+\)[ \t]*=" + \ ! "[ \t]*\([-0-9_a-zA-Z'\"(][^\t\n,;}]*\),?" self.asplit_pat = "^\(.*[^a-zA-Z0-9_]\)\([a-zA-Z0-9_]+\)$" + self.comment1_pat = "\(.*\)//.*" + # note that the next pattern only removes comments that are wholly within one line + self.comment2_pat = "\(.*\)/\*.*\*/" def compilepatterns(self): *************** *** 373,376 **** --- 376,383 ---- try: line = self.getline() except EOFError: break + if self.comment1.match(line) >= 0: + line = self.comment1.group('rest') + if self.comment2.match(line) >= 0: + line = self.comment2.group('rest') if self.defsfile and self.sym.match(line) >= 0: self.dosymdef() *************** *** 387,390 **** --- 394,399 ---- if not name in self.blacklistnames: self.defsfile.write("%s = %s\n" % (name, defn)) + else: + self.defsfile.write("# %s = %s\n" % (name, defn)) def dofuncspec(self): Return-Path: Delivered-To: python-checkins@dinsdale.python.org Received: from python.org (parrot.python.org [132.151.1.90]) by dinsdale.python.org (Postfix) with ESMTP id 60F481CFD2 for ; Thu, 20 Jan 2000 16:30:38 -0500 (EST) Received: from cnri.reston.va.us (ns.CNRI.Reston.VA.US [132.151.1.1] (may be forged)) by python.org (8.9.1a/8.9.1) with ESMTP id QAA12354 for ; Thu, 20 Jan 2000 16:30:38 -0500 (EST) Received: from kaluha.cnri.reston.va.us (kaluha.cnri.reston.va.us [132.151.7.31]) by cnri.reston.va.us (8.9.1a/8.9.1) with ESMTP id QAA06984 for ; Thu, 20 Jan 2000 16:30:36 -0500 (EST) Received: from eric.cnri.reston.va.us (eric.cnri.reston.va.us [10.27.10.23]) by kaluha.cnri.reston.va.us (8.9.1b+Sun/8.9.1) with ESMTP id QAA29153 for ; Thu, 20 Jan 2000 16:31:46 -0500 (EST) Received: (from guido@localhost) by eric.cnri.reston.va.us (8.9.3+Sun/8.9.1) id QAA23064 for python-checkins@python.org; Thu, 20 Jan 2000 16:31:45 -0500 (EST) Date: Thu, 20 Jan 2000 16:31:45 -0500 (EST) From: Guido van Rossum Message-Id: <200001202131.QAA23064@eric.cnri.reston.va.us> To: python-checkins@python.org Subject: [Python-checkins] CVS: python/dist/src/PCbuild _tkinter.dsp,1.7,1.8 bsddb.dsp,1.5,1.6 parser.dsp,1.4,1.5 pcbuild.dsw,1.5,1.6 python.dsp,1.6,1.7 python15.dsp,1.9,1.10 pythonw.dsp,1.5,1.6 zlib.dsp,1.6,1.7 Sender: python-checkins-admin@python.org Errors-To: python-checkins-admin@python.org X-BeenThere: python-checkins@python.org X-Mailman-Version: 1.2 (experimental) Precedence: bulk List-Id: Check-in messages from the Python maintainers Update of /projects/cvsroot/python/dist/src/PCbuild In directory eric:/tmp/python/dist/src/PCbuild Modified Files: _tkinter.dsp bsddb.dsp parser.dsp pcbuild.dsw python.dsp python15.dsp pythonw.dsp zlib.dsp Log Message: Changes by Trent Mick (of ActiveState) and Dale Nagata to support building for NT Alpha as well as NT x86. Index: _tkinter.dsp =================================================================== RCS file: /projects/cvsroot/python/dist/src/PCbuild/_tkinter.dsp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -r1.7 -r1.8 *** _tkinter.dsp 1998/12/22 21:43:35 1.7 --- _tkinter.dsp 2000/01/20 21:31:41 1.8 *************** *** 1,9 **** # Microsoft Developer Studio Project File - Name="_tkinter" - Package Owner=<4> ! # Microsoft Developer Studio Generated Build File, Format Version 5.00 # ** DO NOT EDIT ** # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 ! CFG=_tkinter - Win32 Debug !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run --- 1,10 ---- # Microsoft Developer Studio Project File - Name="_tkinter" - Package Owner=<4> ! # Microsoft Developer Studio Generated Build File, Format Version 6.00 # ** DO NOT EDIT ** # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 + # TARGTYPE "Win32 (ALPHA) Dynamic-Link Library" 0x0602 ! CFG=_tkinter - Win32 Alpha Debug !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run *************** *** 14,34 **** !MESSAGE by defining the macro CFG on the command line. For example: !MESSAGE ! !MESSAGE NMAKE /f "_tkinter.mak" CFG="_tkinter - Win32 Debug" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE ! !MESSAGE "_tkinter - Win32 Release" (based on\ ! "Win32 (x86) Dynamic-Link Library") ! !MESSAGE "_tkinter - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE # Begin Project # PROP Scc_ProjName "_tkinter" # PROP Scc_LocalPath "..\..\.." - CPP=cl.exe - MTL=midl.exe - RSC=rc.exe ! !IF "$(CFG)" == "_tkinter - Win32 Release" # PROP BASE Use_MFC 0 --- 15,34 ---- !MESSAGE by defining the macro CFG on the command line. For example: !MESSAGE ! !MESSAGE NMAKE /f "_tkinter.mak" CFG="_tkinter - Win32 Alpha Debug" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE ! !MESSAGE "_tkinter - Win32 x86 Release" (based on "Win32 (x86) Dynamic-Link Library") ! !MESSAGE "_tkinter - Win32 x86 Debug" (based on "Win32 (x86) Dynamic-Link Library") ! !MESSAGE "_tkinter - Win32 Alpha Debug" (based on "Win32 (ALPHA) Dynamic-Link Library") ! !MESSAGE "_tkinter - Win32 Alpha Release" (based on "Win32 (ALPHA) Dynamic-Link Library") !MESSAGE # Begin Project + # PROP AllowPerConfigDependencies 0 # PROP Scc_ProjName "_tkinter" # PROP Scc_LocalPath "..\..\.." ! !IF "$(CFG)" == "_tkinter - Win32 x86 Release" # PROP BASE Use_MFC 0 *************** *** 40,51 **** # PROP Use_Debug_Libraries 0 # PROP Output_Dir "." ! # PROP Intermediate_Dir "temp-release" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c # ADD CPP /nologo /MD /W3 /GX /Zi /O2 /I "..\Include" /I "..\PC" /I "C:\Program Files\Tcl\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "WITH_APPINIT" /YX /FD /c ! # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32 ! # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32 # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" --- 40,54 ---- # PROP Use_Debug_Libraries 0 # PROP Output_Dir "." ! # PROP Intermediate_Dir "x86-temp-release" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" F90=df.exe + CPP=cl.exe # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c # ADD CPP /nologo /MD /W3 /GX /Zi /O2 /I "..\Include" /I "..\PC" /I "C:\Program Files\Tcl\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "WITH_APPINIT" /YX /FD /c ! MTL=midl.exe ! # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 ! # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 ! RSC=rc.exe # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" *************** *** 58,79 **** # SUBTRACT LINK32 /pdb:none ! !ELSEIF "$(CFG)" == "_tkinter - Win32 Debug" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 ! # PROP BASE Output_Dir "_tkinter" ! # PROP BASE Intermediate_Dir "_tkinter" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 # PROP Output_Dir "." ! # PROP Intermediate_Dir "temp-debug" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c # ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\Include" /I "..\PC" /I "C:\Program Files\Tcl\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "WITH_APPINIT" /YX /FD /c ! # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32 ! # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32 # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" --- 61,85 ---- # SUBTRACT LINK32 /pdb:none ! !ELSEIF "$(CFG)" == "_tkinter - Win32 x86 Debug" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 ! # PROP BASE Output_Dir "Debug" ! # PROP BASE Intermediate_Dir "Debug" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 # PROP Output_Dir "." ! # PROP Intermediate_Dir "x86-temp-debug" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" F90=df.exe + CPP=cl.exe # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c # ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\Include" /I "..\PC" /I "C:\Program Files\Tcl\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "WITH_APPINIT" /YX /FD /c ! MTL=midl.exe ! # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 ! # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 ! RSC=rc.exe # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" *************** *** 86,102 **** # SUBTRACT LINK32 /pdb:none !ENDIF # Begin Target ! # Name "_tkinter - Win32 Release" ! # Name "_tkinter - Win32 Debug" # Begin Source File SOURCE=..\Modules\_tkinter.c # End Source File # Begin Source File SOURCE=..\Modules\tkappinit.c # End Source File # End Target --- 92,196 ---- # SUBTRACT LINK32 /pdb:none + !ELSEIF "$(CFG)" == "_tkinter - Win32 Alpha Debug" + + # PROP BASE Use_MFC 0 + # PROP BASE Use_Debug_Libraries 1 + # PROP BASE Output_Dir "Debug" + # PROP BASE Intermediate_Dir "Debug" + # PROP BASE Ignore_Export_Lib 0 + # PROP BASE Target_Dir "" + # PROP Use_MFC 0 + # PROP Use_Debug_Libraries 1 + # PROP Output_Dir "." + # PROP Intermediate_Dir "alpha-temp-debug" + # PROP Ignore_Export_Lib 0 + # PROP Target_Dir "" + MTL=midl.exe + # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 + # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 + CPP=cl.exe + # ADD BASE CPP /nologo /MTd /Gt0 /W3 /GX /Zi /Od /I "..\Include" /I "..\PC" /I "C:\Program Files\Tcl\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "WITH_APPINIT" /YX /FD /c + # ADD CPP /nologo /MDd /Gt0 /W3 /GX /Zi /Od /I "..\Include" /I "..\PC" /I "C:\Program Files\Tcl\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "WITH_APPINIT" /YX /FD /c + RSC=rc.exe + # ADD BASE RSC /l 0x409 /d "_DEBUG" + # ADD RSC /l 0x409 /d "_DEBUG" + BSC32=bscmake.exe + # ADD BASE BSC32 /nologo + # ADD BSC32 /nologo + LINK32=link.exe + # ADD BASE LINK32 tcl80.lib tk80.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /base:"0x1e190000" /subsystem:windows /dll /debug /machine:ALPHA /out:"./_tkinter_d.pyd" /pdbtype:sept /libpath:"C:\Program Files\Tcl\lib" /export:init_tkinter + # SUBTRACT BASE LINK32 /pdb:none + # ADD LINK32 tcl80.lib tk80.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /base:"0x1e190000" /subsystem:windows /dll /debug /machine:ALPHA /out:"alpha-temp-debug/_tkinter_d.pyd" /pdbtype:sept /libpath:"C:\Program Files\Tcl\lib" /export:init_tkinter + # SUBTRACT LINK32 /pdb:none + + !ELSEIF "$(CFG)" == "_tkinter - Win32 Alpha Release" + + # PROP BASE Use_MFC 0 + # PROP BASE Use_Debug_Libraries 0 + # PROP BASE Output_Dir "Release" + # PROP BASE Intermediate_Dir "Release" + # PROP BASE Ignore_Export_Lib 0 + # PROP BASE Target_Dir "" + # PROP Use_MFC 0 + # PROP Use_Debug_Libraries 0 + # PROP Output_Dir "." + # PROP Intermediate_Dir "alpha-temp-release" + # PROP Ignore_Export_Lib 0 + # PROP Target_Dir "" + MTL=midl.exe + # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 + # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 + CPP=cl.exe + # ADD BASE CPP /nologo /MT /Gt0 /W3 /GX /Zi /O2 /I "..\Include" /I "..\PC" /I "C:\Program Files\Tcl\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "WITH_APPINIT" /YX /FD /c + # ADD CPP /nologo /MD /Gt0 /W3 /GX /O2 /I "..\Include" /I "..\PC" /I "..\..\Tcl\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "WITH_APPINIT" /YX /FD /c + RSC=rc.exe + # ADD BASE RSC /l 0x409 /d "NDEBUG" + # ADD RSC /l 0x409 /d "NDEBUG" + BSC32=bscmake.exe + # ADD BASE BSC32 /nologo + # ADD BSC32 /nologo + LINK32=link.exe + # ADD BASE LINK32 tcl80.lib tk80.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /base:"0x1e190000" /subsystem:windows /dll /debug /machine:ALPHA /out:"./_tkinter.pyd" /libpath:"C:\Program Files\Tcl\lib" /export:init_tkinter + # SUBTRACT BASE LINK32 /pdb:none + # ADD LINK32 ..\..\tcl\lib\tcl82.lib ..\..\tcl\lib\tk82.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /base:"0x1e190000" /subsystem:windows /dll /debug /machine:ALPHA /out:"alpha-temp-release/_tkinter.pyd" /libpath:"C:\Program Files\Tcl\lib" /export:init_tkinter + # SUBTRACT LINK32 /pdb:none + !ENDIF # Begin Target ! # Name "_tkinter - Win32 x86 Release" ! # Name "_tkinter - Win32 x86 Debug" ! # Name "_tkinter - Win32 Alpha Debug" ! # Name "_tkinter - Win32 Alpha Release" # Begin Source File SOURCE=..\Modules\_tkinter.c + + !IF "$(CFG)" == "_tkinter - Win32 x86 Release" + + !ELSEIF "$(CFG)" == "_tkinter - Win32 x86 Debug" + + !ELSEIF "$(CFG)" == "_tkinter - Win32 Alpha Debug" + + !ELSEIF "$(CFG)" == "_tkinter - Win32 Alpha Release" + + !ENDIF + # End Source File # Begin Source File SOURCE=..\Modules\tkappinit.c + + !IF "$(CFG)" == "_tkinter - Win32 x86 Release" + + !ELSEIF "$(CFG)" == "_tkinter - Win32 x86 Debug" + + !ELSEIF "$(CFG)" == "_tkinter - Win32 Alpha Debug" + + !ELSEIF "$(CFG)" == "_tkinter - Win32 Alpha Release" + + !ENDIF + # End Source File # End Target Index: bsddb.dsp =================================================================== RCS file: /projects/cvsroot/python/dist/src/PCbuild/bsddb.dsp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -r1.5 -r1.6 *** bsddb.dsp 1998/08/12 02:31:42 1.5 --- bsddb.dsp 2000/01/20 21:31:41 1.6 *************** *** 1,9 **** # Microsoft Developer Studio Project File - Name="bsddb" - Package Owner=<4> ! # Microsoft Developer Studio Generated Build File, Format Version 5.00 # ** DO NOT EDIT ** # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 ! CFG=bsddb - Win32 Debug !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run --- 1,10 ---- # Microsoft Developer Studio Project File - Name="bsddb" - Package Owner=<4> ! # Microsoft Developer Studio Generated Build File, Format Version 6.00 # ** DO NOT EDIT ** # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 + # TARGTYPE "Win32 (ALPHA) Dynamic-Link Library" 0x0602 ! CFG=bsddb - Win32 Alpha Debug !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run *************** *** 14,33 **** !MESSAGE by defining the macro CFG on the command line. For example: !MESSAGE ! !MESSAGE NMAKE /f "bsddb.mak" CFG="bsddb - Win32 Debug" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE ! !MESSAGE "bsddb - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") ! !MESSAGE "bsddb - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE # Begin Project # PROP Scc_ProjName "bsddb" # PROP Scc_LocalPath ".." - CPP=cl.exe - MTL=midl.exe - RSC=rc.exe ! !IF "$(CFG)" == "bsddb - Win32 Release" # PROP BASE Use_MFC 0 --- 15,34 ---- !MESSAGE by defining the macro CFG on the command line. For example: !MESSAGE ! !MESSAGE NMAKE /f "bsddb.mak" CFG="bsddb - Win32 Alpha Debug" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE ! !MESSAGE "bsddb - Win32 x86 Release" (based on "Win32 (x86) Dynamic-Link Library") ! !MESSAGE "bsddb - Win32 x86 Debug" (based on "Win32 (x86) Dynamic-Link Library") ! !MESSAGE "bsddb - Win32 Alpha Debug" (based on "Win32 (ALPHA) Dynamic-Link Library") ! !MESSAGE "bsddb - Win32 Alpha Release" (based on "Win32 (ALPHA) Dynamic-Link Library") !MESSAGE # Begin Project + # PROP AllowPerConfigDependencies 0 # PROP Scc_ProjName "bsddb" # PROP Scc_LocalPath ".." ! !IF "$(CFG)" == "bsddb - Win32 x86 Release" # PROP BASE Use_MFC 0 *************** *** 39,49 **** # PROP Use_Debug_Libraries 0 # PROP Output_Dir "." ! # PROP Intermediate_Dir "temp-release" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c # ADD CPP /nologo /MD /W3 /GX /Zi /O2 /I "..\Include" /I "..\PC" /I "..\..\bsddb\include" /I "..\..\bsddb\port\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /YX /FD /c ! # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32 ! # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32 # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" --- 40,54 ---- # PROP Use_Debug_Libraries 0 # PROP Output_Dir "." ! # PROP Intermediate_Dir "x86-temp-release" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" + F90=df.exe + CPP=cl.exe # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c # ADD CPP /nologo /MD /W3 /GX /Zi /O2 /I "..\Include" /I "..\PC" /I "..\..\bsddb\include" /I "..\..\bsddb\port\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /YX /FD /c ! MTL=midl.exe ! # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 ! # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 ! RSC=rc.exe # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" *************** *** 56,76 **** # SUBTRACT LINK32 /pdb:none ! !ELSEIF "$(CFG)" == "bsddb - Win32 Debug" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 ! # PROP BASE Output_Dir "bsddb" ! # PROP BASE Intermediate_Dir "bsddb" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 # PROP Output_Dir "." ! # PROP Intermediate_Dir "temp-debug" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c # ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\Include" /I "..\PC" /I "..\..\bsddb\include" /I "..\..\bsddb\port\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /YX /FD /c ! # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32 ! # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32 # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" --- 61,85 ---- # SUBTRACT LINK32 /pdb:none ! !ELSEIF "$(CFG)" == "bsddb - Win32 x86 Debug" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 ! # PROP BASE Output_Dir "Debug" ! # PROP BASE Intermediate_Dir "Debug" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 # PROP Output_Dir "." ! # PROP Intermediate_Dir "x86-temp-debug" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" + F90=df.exe + CPP=cl.exe # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c # ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\Include" /I "..\PC" /I "..\..\bsddb\include" /I "..\..\bsddb\port\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /YX /FD /c ! MTL=midl.exe ! # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 ! # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 ! RSC=rc.exe # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" *************** *** 83,95 **** # SUBTRACT LINK32 /pdb:none !ENDIF # Begin Target ! # Name "bsddb - Win32 Release" ! # Name "bsddb - Win32 Debug" # Begin Source File SOURCE=..\Modules\bsddbmodule.c # End Source File # End Target --- 92,181 ---- # SUBTRACT LINK32 /pdb:none + !ELSEIF "$(CFG)" == "bsddb - Win32 Alpha Debug" + + # PROP BASE Use_MFC 0 + # PROP BASE Use_Debug_Libraries 1 + # PROP BASE Output_Dir "Debug" + # PROP BASE Intermediate_Dir "Debug" + # PROP BASE Ignore_Export_Lib 0 + # PROP BASE Target_Dir "" + # PROP Use_MFC 0 + # PROP Use_Debug_Libraries 1 + # PROP Output_Dir "." + # PROP Intermediate_Dir "alpha-temp-debug" + # PROP Ignore_Export_Lib 0 + # PROP Target_Dir "" + MTL=midl.exe + # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 + # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 + CPP=cl.exe + # ADD BASE CPP /nologo /MTd /Gt0 /W3 /GX /Zi /Od /I "..\Include" /I "..\PC" /I "..\..\bsddb\include" /I "..\..\bsddb\port\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c + # ADD CPP /nologo /MDd /Gt0 /W3 /GX /Zi /Od /I "..\Include" /I "..\PC" /I "..\..\bsddb\include" /I "..\..\bsddb\port\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c + RSC=rc.exe + # ADD BASE RSC /l 0x409 /d "_DEBUG" + # ADD RSC /l 0x409 /d "_DEBUG" + BSC32=bscmake.exe + # ADD BASE BSC32 /nologo + # ADD BSC32 /nologo + LINK32=link.exe + # ADD BASE LINK32 ..\..\bsddb\port\win32\db.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /dll /debug /machine:ALPHA /nodefaultlib:"MSVCRT" /out:"./bsddb_d.pyd" /pdbtype:sept /libpath:"Debug" /export:initbsddb + # SUBTRACT BASE LINK32 /pdb:none + # ADD LINK32 ..\..\bsddb\port\win32\db.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /dll /debug /machine:ALPHA /nodefaultlib:"MSVCRT" /out:"alpha-temp-debug\bsddb_d.pyd" /pdbtype:sept /libpath:"Debug" /export:initbsddb + # SUBTRACT LINK32 /pdb:none + + !ELSEIF "$(CFG)" == "bsddb - Win32 Alpha Release" + + # PROP BASE Use_MFC 0 + # PROP BASE Use_Debug_Libraries 0 + # PROP BASE Output_Dir "Release" + # PROP BASE Intermediate_Dir "Release" + # PROP BASE Ignore_Export_Lib 0 + # PROP BASE Target_Dir "" + # PROP Use_MFC 0 + # PROP Use_Debug_Libraries 0 + # PROP Output_Dir "." + # PROP Intermediate_Dir "alpha-temp-release" + # PROP Ignore_Export_Lib 0 + # PROP Target_Dir "" + MTL=midl.exe + # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 + # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 + CPP=cl.exe + # ADD BASE CPP /nologo /MT /Gt0 /W3 /GX /Zi /O2 /I "..\Include" /I "..\PC" /I "..\..\bsddb\include" /I "..\..\bsddb\port\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c + # ADD CPP /nologo /MD /Gt0 /W3 /GX /O2 /I "..\Include" /I "..\PC" /I "..\..\bsddb\include" /I "..\..\bsddb\port\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c + RSC=rc.exe + # ADD BASE RSC /l 0x409 /d "NDEBUG" + # ADD RSC /l 0x409 /d "NDEBUG" + BSC32=bscmake.exe + # ADD BASE BSC32 /nologo + # ADD BSC32 /nologo + LINK32=link.exe + # ADD BASE LINK32 ..\..\bsddb\port\win32\db.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /dll /debug /machine:ALPHA /out:"./bsddb.pyd" /libpath:"Release" /export:initbsddb + # SUBTRACT BASE LINK32 /pdb:none + # ADD LINK32 ..\..\bsddb\port\win32\db.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /dll /debug /machine:ALPHA /out:"alpha-temp-release\bsddb.pyd" /libpath:"Release" /export:initbsddb + # SUBTRACT LINK32 /pdb:none + !ENDIF # Begin Target ! # Name "bsddb - Win32 x86 Release" ! # Name "bsddb - Win32 x86 Debug" ! # Name "bsddb - Win32 Alpha Debug" ! # Name "bsddb - Win32 Alpha Release" # Begin Source File SOURCE=..\Modules\bsddbmodule.c + + !IF "$(CFG)" == "bsddb - Win32 x86 Release" + + !ELSEIF "$(CFG)" == "bsddb - Win32 x86 Debug" + + !ELSEIF "$(CFG)" == "bsddb - Win32 Alpha Debug" + + !ELSEIF "$(CFG)" == "bsddb - Win32 Alpha Release" + + !ENDIF + # End Source File # End Target Index: parser.dsp =================================================================== RCS file: /projects/cvsroot/python/dist/src/PCbuild/parser.dsp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** parser.dsp 1998/08/08 21:04:17 1.4 --- parser.dsp 2000/01/20 21:31:41 1.5 *************** *** 1,9 **** # Microsoft Developer Studio Project File - Name="parser" - Package Owner=<4> ! # Microsoft Developer Studio Generated Build File, Format Version 5.00 # ** DO NOT EDIT ** # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 ! CFG=parser - Win32 Debug !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run --- 1,10 ---- # Microsoft Developer Studio Project File - Name="parser" - Package Owner=<4> ! # Microsoft Developer Studio Generated Build File, Format Version 6.00 # ** DO NOT EDIT ** # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 + # TARGTYPE "Win32 (ALPHA) Dynamic-Link Library" 0x0602 ! CFG=parser - Win32 Alpha Debug !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run *************** *** 14,33 **** !MESSAGE by defining the macro CFG on the command line. For example: !MESSAGE ! !MESSAGE NMAKE /f "parser.mak" CFG="parser - Win32 Debug" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE ! !MESSAGE "parser - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") ! !MESSAGE "parser - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE # Begin Project # PROP Scc_ProjName "parser" # PROP Scc_LocalPath ".." - CPP=cl.exe - MTL=midl.exe - RSC=rc.exe ! !IF "$(CFG)" == "parser - Win32 Release" # PROP BASE Use_MFC 0 --- 15,34 ---- !MESSAGE by defining the macro CFG on the command line. For example: !MESSAGE ! !MESSAGE NMAKE /f "parser.mak" CFG="parser - Win32 Alpha Debug" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE ! !MESSAGE "parser - Win32 x86 Release" (based on "Win32 (x86) Dynamic-Link Library") ! !MESSAGE "parser - Win32 x86 Debug" (based on "Win32 (x86) Dynamic-Link Library") ! !MESSAGE "parser - Win32 Alpha Debug" (based on "Win32 (ALPHA) Dynamic-Link Library") ! !MESSAGE "parser - Win32 Alpha Release" (based on "Win32 (ALPHA) Dynamic-Link Library") !MESSAGE # Begin Project + # PROP AllowPerConfigDependencies 0 # PROP Scc_ProjName "parser" # PROP Scc_LocalPath ".." ! !IF "$(CFG)" == "parser - Win32 x86 Release" # PROP BASE Use_MFC 0 *************** *** 39,49 **** # PROP Use_Debug_Libraries 0 # PROP Output_Dir "." ! # PROP Intermediate_Dir "temp-release" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c # ADD CPP /nologo /MD /W3 /GX /Zi /O2 /I "..\Include" /I "..\PC" /I "C:\Program Files\Tcl\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c ! # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32 ! # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32 # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" --- 40,54 ---- # PROP Use_Debug_Libraries 0 # PROP Output_Dir "." ! # PROP Intermediate_Dir "x86-temp-release" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" + F90=df.exe + CPP=cl.exe # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c # ADD CPP /nologo /MD /W3 /GX /Zi /O2 /I "..\Include" /I "..\PC" /I "C:\Program Files\Tcl\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c ! MTL=midl.exe ! # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 ! # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 ! RSC=rc.exe # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" *************** *** 56,76 **** # SUBTRACT LINK32 /pdb:none ! !ELSEIF "$(CFG)" == "parser - Win32 Debug" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 ! # PROP BASE Output_Dir "parser" ! # PROP BASE Intermediate_Dir "parser" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 # PROP Output_Dir "." ! # PROP Intermediate_Dir "temp-debug" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c # ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\Include" /I "..\PC" /I "C:\Program Files\Tcl\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c ! # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32 ! # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32 # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" --- 61,85 ---- # SUBTRACT LINK32 /pdb:none ! !ELSEIF "$(CFG)" == "parser - Win32 x86 Debug" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 ! # PROP BASE Output_Dir "Debug" ! # PROP BASE Intermediate_Dir "Debug" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 # PROP Output_Dir "." ! # PROP Intermediate_Dir "x86-temp-debug" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" + F90=df.exe + CPP=cl.exe # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c # ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\Include" /I "..\PC" /I "C:\Program Files\Tcl\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c ! MTL=midl.exe ! # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 ! # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 ! RSC=rc.exe # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" *************** *** 83,95 **** # SUBTRACT LINK32 /pdb:none !ENDIF # Begin Target ! # Name "parser - Win32 Release" ! # Name "parser - Win32 Debug" # Begin Source File SOURCE=..\Modules\parsermodule.c # End Source File # End Target --- 92,181 ---- # SUBTRACT LINK32 /pdb:none + !ELSEIF "$(CFG)" == "parser - Win32 Alpha Debug" + + # PROP BASE Use_MFC 0 + # PROP BASE Use_Debug_Libraries 1 + # PROP BASE Output_Dir "Debug" + # PROP BASE Intermediate_Dir "Debug" + # PROP BASE Ignore_Export_Lib 0 + # PROP BASE Target_Dir "" + # PROP Use_MFC 0 + # PROP Use_Debug_Libraries 1 + # PROP Output_Dir "." + # PROP Intermediate_Dir "alpha-temp-debug" + # PROP Ignore_Export_Lib 0 + # PROP Target_Dir "" + MTL=midl.exe + # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 + # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 + CPP=cl.exe + # ADD BASE CPP /nologo /MTd /Gt0 /W3 /GX /Zi /Od /I "..\Include" /I "..\PC" /I "C:\Program Files\Tcl\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c + # ADD CPP /nologo /MDd /Gt0 /W3 /GX /Zi /Od /I "..\Include" /I "..\PC" /I "C:\Program Files\Tcl\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c + RSC=rc.exe + # ADD BASE RSC /l 0x409 /d "_DEBUG" + # ADD RSC /l 0x409 /d "_DEBUG" + BSC32=bscmake.exe + # ADD BASE BSC32 /nologo + # ADD BSC32 /nologo + LINK32=link.exe + # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /base:"0x1e100000" /subsystem:windows /dll /debug /machine:ALPHA /out:"./parser_d.pyd" /pdbtype:sept /libpath:"Debug" /export:initparser + # SUBTRACT BASE LINK32 /pdb:none + # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /base:"0x1e100000" /subsystem:windows /dll /debug /machine:ALPHA /out:"alpha-temp-debug/parser_d.pyd" /pdbtype:sept /libpath:"Debug" /export:initparser + # SUBTRACT LINK32 /pdb:none + + !ELSEIF "$(CFG)" == "parser - Win32 Alpha Release" + + # PROP BASE Use_MFC 0 + # PROP BASE Use_Debug_Libraries 0 + # PROP BASE Output_Dir "Release" + # PROP BASE Intermediate_Dir "Release" + # PROP BASE Ignore_Export_Lib 0 + # PROP BASE Target_Dir "" + # PROP Use_MFC 0 + # PROP Use_Debug_Libraries 0 + # PROP Output_Dir "." + # PROP Intermediate_Dir "alpha-temp-release" + # PROP Ignore_Export_Lib 0 + # PROP Target_Dir "" + MTL=midl.exe + # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 + # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 + CPP=cl.exe + # ADD BASE CPP /nologo /MT /Gt0 /W3 /GX /Zi /O2 /I "..\Include" /I "..\PC" /I "C:\Program Files\Tcl\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c + # ADD CPP /nologo /MD /Gt0 /W3 /GX /O2 /I "..\Include" /I "..\PC" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c + RSC=rc.exe + # ADD BASE RSC /l 0x409 /d "NDEBUG" + # ADD RSC /l 0x409 /d "NDEBUG" + BSC32=bscmake.exe + # ADD BASE BSC32 /nologo + # ADD BSC32 /nologo + LINK32=link.exe + # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /base:"0x1e100000" /subsystem:windows /dll /debug /machine:ALPHA /out:"./parser.pyd" /libpath:"Release" /export:initparser + # SUBTRACT BASE LINK32 /pdb:none + # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /base:"0x1e100000" /subsystem:windows /dll /debug /machine:ALPHA /out:"alpha-temp-release/parser.pyd" /libpath:"Release" /export:initparser + # SUBTRACT LINK32 /pdb:none + !ENDIF # Begin Target ! # Name "parser - Win32 x86 Release" ! # Name "parser - Win32 x86 Debug" ! # Name "parser - Win32 Alpha Debug" ! # Name "parser - Win32 Alpha Release" # Begin Source File SOURCE=..\Modules\parsermodule.c + + !IF "$(CFG)" == "parser - Win32 x86 Release" + + !ELSEIF "$(CFG)" == "parser - Win32 x86 Debug" + + !ELSEIF "$(CFG)" == "parser - Win32 Alpha Debug" + + !ELSEIF "$(CFG)" == "parser - Win32 Alpha Release" + + !ENDIF + # End Source File # End Target Index: pcbuild.dsw =================================================================== RCS file: /projects/cvsroot/python/dist/src/PCbuild/pcbuild.dsw,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -r1.5 -r1.6 *** pcbuild.dsw 1998/10/08 01:48:13 1.5 --- pcbuild.dsw 2000/01/20 21:31:41 1.6 *************** *** 1,15 **** ! Microsoft Developer Studio Workspace File, Format Version 5.00 # WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! ############################################################################### ! Project: "_tkinter"=".\_tkinter.dsp" - Package Owner=<4> Package=<5> {{{ - begin source code control - _tkinter - . - end source code control }}} --- 1,11 ---- ! Microsoft Developer Studio Workspace File, Format Version 6.00 # WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! ############################################################################### ! Project: "_tkinter"=.\_tkinter.dsp - Package Owner=<4> Package=<5> {{{ }}} *************** *** 23,34 **** ############################################################################### ! Project: "bsddb"=".\bsddb.dsp" - Package Owner=<4> Package=<5> {{{ - begin source code control - bsddb - .. - end source code control }}} --- 19,26 ---- ############################################################################### ! Project: "bsddb"=.\bsddb.dsp - Package Owner=<4> Package=<5> {{{ }}} *************** *** 42,53 **** ############################################################################### ! Project: "parser"=".\parser.dsp" - Package Owner=<4> Package=<5> {{{ - begin source code control - parser - .. - end source code control }}} --- 34,41 ---- ############################################################################### ! Project: "parser"=.\parser.dsp - Package Owner=<4> Package=<5> {{{ }}} *************** *** 61,72 **** ############################################################################### ! Project: "python"=".\python.dsp" - Package Owner=<4> Package=<5> {{{ - begin source code control - python - .. - end source code control }}} --- 49,56 ---- ############################################################################### ! Project: "python"=.\python.dsp - Package Owner=<4> Package=<5> {{{ }}} *************** *** 80,91 **** ############################################################################### ! Project: "python15"=".\python15.dsp" - Package Owner=<4> Package=<5> {{{ - begin source code control - python15 - .. - end source code control }}} --- 64,71 ---- ############################################################################### ! Project: "python15"=.\python15.dsp - Package Owner=<4> Package=<5> {{{ }}} *************** *** 96,107 **** ############################################################################### ! Project: "pythonw"=".\pythonw.dsp" - Package Owner=<4> Package=<5> {{{ - begin source code control - pythonw - ..\pc - end source code control }}} --- 76,83 ---- ############################################################################### ! Project: "pythonw"=.\pythonw.dsp - Package Owner=<4> Package=<5> {{{ }}} *************** *** 115,126 **** ############################################################################### ! Project: "zlib"=".\zlib.dsp" - Package Owner=<4> Package=<5> {{{ - begin source code control - zlib - .. - end source code control }}} --- 91,98 ---- ############################################################################### ! Project: "zlib"=.\zlib.dsp - Package Owner=<4> Package=<5> {{{ }}} Index: python.dsp =================================================================== RCS file: /projects/cvsroot/python/dist/src/PCbuild/python.dsp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -r1.6 -r1.7 *** python.dsp 1999/12/20 23:02:41 1.6 --- python.dsp 2000/01/20 21:31:41 1.7 *************** *** 1,9 **** # Microsoft Developer Studio Project File - Name="python" - Package Owner=<4> ! # Microsoft Developer Studio Generated Build File, Format Version 5.00 # ** DO NOT EDIT ** # TARGTYPE "Win32 (x86) Console Application" 0x0103 ! CFG=python - Win32 Debug !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run --- 1,10 ---- # Microsoft Developer Studio Project File - Name="python" - Package Owner=<4> ! # Microsoft Developer Studio Generated Build File, Format Version 6.00 # ** DO NOT EDIT ** # TARGTYPE "Win32 (x86) Console Application" 0x0103 + # TARGTYPE "Win32 (ALPHA) Console Application" 0x0603 ! CFG=python - Win32 Alpha Debug !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run *************** *** 14,32 **** !MESSAGE by defining the macro CFG on the command line. For example: !MESSAGE ! !MESSAGE NMAKE /f "python.mak" CFG="python - Win32 Debug" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE ! !MESSAGE "python - Win32 Release" (based on "Win32 (x86) Console Application") ! !MESSAGE "python - Win32 Debug" (based on "Win32 (x86) Console Application") !MESSAGE # Begin Project # PROP Scc_ProjName "python" # PROP Scc_LocalPath ".." - CPP=cl.exe - RSC=rc.exe ! !IF "$(CFG)" == "python - Win32 Release" # PROP BASE Use_MFC 0 --- 15,34 ---- !MESSAGE by defining the macro CFG on the command line. For example: !MESSAGE ! !MESSAGE NMAKE /f "python.mak" CFG="python - Win32 Alpha Debug" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE ! !MESSAGE "python - Win32 x86 Release" (based on "Win32 (x86) Console Application") ! !MESSAGE "python - Win32 x86 Debug" (based on "Win32 (x86) Console Application") ! !MESSAGE "python - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application") ! !MESSAGE "python - Win32 Alpha Release" (based on "Win32 (ALPHA) Console Application") !MESSAGE # Begin Project + # PROP AllowPerConfigDependencies 0 # PROP Scc_ProjName "python" # PROP Scc_LocalPath ".." ! !IF "$(CFG)" == "python - Win32 x86 Release" # PROP BASE Use_MFC 0 *************** *** 38,46 **** # PROP Use_Debug_Libraries 0 # PROP Output_Dir "." ! # PROP Intermediate_Dir "temp-release" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c # ADD CPP /nologo /MD /W3 /GX /Zi /O2 /I "..\Include" /I "..\PC" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" --- 40,50 ---- # PROP Use_Debug_Libraries 0 # PROP Output_Dir "." ! # PROP Intermediate_Dir "x86-temp-release" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" + CPP=cl.exe # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c # ADD CPP /nologo /MD /W3 /GX /Zi /O2 /I "..\Include" /I "..\PC" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c + RSC=rc.exe # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" *************** *** 50,56 **** LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 ! # ADD LINK32 setargv.obj kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"Release" ! !ELSEIF "$(CFG)" == "python - Win32 Debug" # PROP BASE Use_MFC 0 --- 54,60 ---- LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 ! # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"Release" ! !ELSEIF "$(CFG)" == "python - Win32 x86 Debug" # PROP BASE Use_MFC 0 *************** *** 62,70 **** # PROP Use_Debug_Libraries 1 # PROP Output_Dir "." ! # PROP Intermediate_Dir "temp-debug" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c # ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\Include" /I "..\PC" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /YX /FD /c # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /i "..\Include" /d "_DEBUG" --- 66,76 ---- # PROP Use_Debug_Libraries 1 # PROP Output_Dir "." ! # PROP Intermediate_Dir "x86-temp-debug" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" + CPP=cl.exe # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c # ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\Include" /I "..\PC" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /YX /FD /c + RSC=rc.exe # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /i "..\Include" /d "_DEBUG" *************** *** 74,85 **** LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept ! # ADD LINK32 setargv.obj kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /out:"./python_d.exe" /pdbtype:sept /libpath:"Debug" !ENDIF # Begin Target ! # Name "python - Win32 Release" ! # Name "python - Win32 Debug" # Begin Source File --- 80,147 ---- LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept ! # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /out:"./python_d.exe" /pdbtype:sept /libpath:"Debug" ! ! !ELSEIF "$(CFG)" == "python - Win32 Alpha Debug" + # PROP BASE Use_MFC 0 + # PROP BASE Use_Debug_Libraries 1 + # PROP BASE Output_Dir "Debug" + # PROP BASE Intermediate_Dir "Debug" + # PROP BASE Ignore_Export_Lib 0 + # PROP BASE Target_Dir "" + # PROP Use_MFC 0 + # PROP Use_Debug_Libraries 1 + # PROP Output_Dir "." + # PROP Intermediate_Dir "alpha-temp-debug" + # PROP Ignore_Export_Lib 0 + # PROP Target_Dir "" + CPP=cl.exe + # ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\Include" /I "..\PC" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /YX /FD /c + # ADD CPP /nologo /MDd /Gt0 /W3 /GX /Zi /Od /I "..\Include" /I "..\PC" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /YX /FD /c + RSC=rc.exe + # ADD BASE RSC /l 0x409 /i "..\Include" /d "_DEBUG" + # ADD RSC /l 0x409 /i "..\Include" /d "_DEBUG" + BSC32=bscmake.exe + # ADD BASE BSC32 /nologo + # ADD BSC32 /nologo + LINK32=link.exe + # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /out:"./python_d.exe" /pdbtype:sept /libpath:"Debug" + # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /out:"./python_d.exe" /pdbtype:sept /libpath:"Debug" + + !ELSEIF "$(CFG)" == "python - Win32 Alpha Release" + + # PROP BASE Use_MFC 0 + # PROP BASE Use_Debug_Libraries 0 + # PROP BASE Output_Dir "Release" + # PROP BASE Intermediate_Dir "Release" + # PROP BASE Ignore_Export_Lib 0 + # PROP BASE Target_Dir "" + # PROP Use_MFC 0 + # PROP Use_Debug_Libraries 0 + # PROP Output_Dir "." + # PROP Intermediate_Dir "alpha-temp-release" + # PROP Ignore_Export_Lib 0 + # PROP Target_Dir "" + CPP=cl.exe + # ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /O2 /I "..\Include" /I "..\PC" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c + # ADD CPP /nologo /MD /Gt0 /W3 /GX /O2 /I "..\Include" /I "..\PC" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c + RSC=rc.exe + # ADD BASE RSC /l 0x409 /d "NDEBUG" + # ADD RSC /l 0x409 /d "NDEBUG" + BSC32=bscmake.exe + # ADD BASE BSC32 /nologo + # ADD BSC32 /nologo + LINK32=link.exe + # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"Release" + # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"Release" + !ENDIF # Begin Target ! # Name "python - Win32 x86 Release" ! # Name "python - Win32 x86 Debug" ! # Name "python - Win32 Alpha Debug" ! # Name "python - Win32 Alpha Release" # Begin Source File *************** *** 89,103 **** SOURCE=..\Modules\python.c - # End Source File - # Begin Source File ! SOURCE=..\PC\python_exe.rc ! !IF "$(CFG)" == "python - Win32 Release" ! !ELSEIF "$(CFG)" == "python - Win32 Debug" !ENDIF # End Source File # End Target --- 151,169 ---- SOURCE=..\Modules\python.c ! !IF "$(CFG)" == "python - Win32 x86 Release" ! ! !ELSEIF "$(CFG)" == "python - Win32 x86 Debug" ! !ELSEIF "$(CFG)" == "python - Win32 Alpha Debug" ! !ELSEIF "$(CFG)" == "python - Win32 Alpha Release" !ENDIF + # End Source File + # Begin Source File + + SOURCE=..\PC\python_exe.rc # End Source File # End Target Index: python15.dsp =================================================================== RCS file: /projects/cvsroot/python/dist/src/PCbuild/python15.dsp,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -r1.9 -r1.10 *** python15.dsp 1999/12/20 23:00:10 1.9 --- python15.dsp 2000/01/20 21:31:41 1.10 *************** *** 1,9 **** # Microsoft Developer Studio Project File - Name="python15" - Package Owner=<4> ! # Microsoft Developer Studio Generated Build File, Format Version 5.00 # ** DO NOT EDIT ** # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 ! CFG=python15 - Win32 Debug !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run --- 1,10 ---- [...1966 lines suppressed...] + + !ENDIF + # End Source File # Begin Source File SOURCE=..\Modules\yuvconvert.c + + !IF "$(CFG)" == "python15 - Win32 x86 Release" + + !ELSEIF "$(CFG)" == "python15 - Win32 x86 Debug" + + !ELSEIF "$(CFG)" == "python15 - Win32 Alpha Debug" + + !ELSEIF "$(CFG)" == "python15 - Win32 Alpha Release" + + !ENDIF + # End Source File # End Target Index: pythonw.dsp =================================================================== RCS file: /projects/cvsroot/python/dist/src/PCbuild/pythonw.dsp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -r1.5 -r1.6 *** pythonw.dsp 1998/08/13 18:54:51 1.5 --- pythonw.dsp 2000/01/20 21:31:41 1.6 *************** *** 1,9 **** # Microsoft Developer Studio Project File - Name="pythonw" - Package Owner=<4> ! # Microsoft Developer Studio Generated Build File, Format Version 5.00 # ** DO NOT EDIT ** # TARGTYPE "Win32 (x86) Application" 0x0101 ! CFG=pythonw - Win32 Debug !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run --- 1,10 ---- # Microsoft Developer Studio Project File - Name="pythonw" - Package Owner=<4> ! # Microsoft Developer Studio Generated Build File, Format Version 6.00 # ** DO NOT EDIT ** # TARGTYPE "Win32 (x86) Application" 0x0101 + # TARGTYPE "Win32 (ALPHA) Application" 0x0601 ! CFG=pythonw - Win32 Alpha Debug !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run *************** *** 14,33 **** !MESSAGE by defining the macro CFG on the command line. For example: !MESSAGE ! !MESSAGE NMAKE /f "pythonw.mak" CFG="pythonw - Win32 Debug" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE ! !MESSAGE "pythonw - Win32 Release" (based on "Win32 (x86) Application") ! !MESSAGE "pythonw - Win32 Debug" (based on "Win32 (x86) Application") !MESSAGE # Begin Project # PROP Scc_ProjName "pythonw" # PROP Scc_LocalPath "..\pc" - CPP=cl.exe - MTL=midl.exe - RSC=rc.exe ! !IF "$(CFG)" == "pythonw - Win32 Release" # PROP BASE Use_MFC 0 --- 15,34 ---- !MESSAGE by defining the macro CFG on the command line. For example: !MESSAGE ! !MESSAGE NMAKE /f "pythonw.mak" CFG="pythonw - Win32 Alpha Debug" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE ! !MESSAGE "pythonw - Win32 x86 Release" (based on "Win32 (x86) Application") ! !MESSAGE "pythonw - Win32 x86 Debug" (based on "Win32 (x86) Application") ! !MESSAGE "pythonw - Win32 Alpha Debug" (based on "Win32 (ALPHA) Application") ! !MESSAGE "pythonw - Win32 Alpha Release" (based on "Win32 (ALPHA) Application") !MESSAGE # Begin Project + # PROP AllowPerConfigDependencies 0 # PROP Scc_ProjName "pythonw" # PROP Scc_LocalPath "..\pc" ! !IF "$(CFG)" == "pythonw - Win32 x86 Release" # PROP BASE Use_MFC 0 *************** *** 39,49 **** # PROP Use_Debug_Libraries 0 # PROP Output_Dir "." ! # PROP Intermediate_Dir "temp-release" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c # ADD CPP /nologo /MD /W3 /GX /Zi /O2 /I "..\Include" /I "..\PC" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c ! # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32 ! # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32 # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" --- 40,53 ---- # PROP Use_Debug_Libraries 0 # PROP Output_Dir "." ! # PROP Intermediate_Dir "x86-temp-release" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" + CPP=cl.exe # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c # ADD CPP /nologo /MD /W3 /GX /Zi /O2 /I "..\Include" /I "..\PC" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c ! MTL=midl.exe ! # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 ! # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 ! RSC=rc.exe # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" *************** *** 56,60 **** # SUBTRACT LINK32 /pdb:none ! !ELSEIF "$(CFG)" == "pythonw - Win32 Debug" # PROP BASE Use_MFC 0 --- 60,64 ---- # SUBTRACT LINK32 /pdb:none ! !ELSEIF "$(CFG)" == "pythonw - Win32 x86 Debug" # PROP BASE Use_MFC 0 *************** *** 66,76 **** # PROP Use_Debug_Libraries 1 # PROP Output_Dir "." ! # PROP Intermediate_Dir "temp-debug" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c # ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\Include" /I "..\PC" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c ! # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32 ! # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32 # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" --- 70,83 ---- # PROP Use_Debug_Libraries 1 # PROP Output_Dir "." ! # PROP Intermediate_Dir "x86-temp-debug" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" + CPP=cl.exe # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c # ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\Include" /I "..\PC" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c ! MTL=midl.exe ! # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 ! # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 ! RSC=rc.exe # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" *************** *** 83,106 **** # SUBTRACT LINK32 /pdb:none !ENDIF # Begin Target ! # Name "pythonw - Win32 Release" ! # Name "pythonw - Win32 Debug" # Begin Source File SOURCE=..\PC\python_exe.rc ! !IF "$(CFG)" == "pythonw - Win32 Release" ! !ELSEIF "$(CFG)" == "pythonw - Win32 Debug" ! !ENDIF ! # End Source File ! # Begin Source File ! SOURCE=..\PC\WinMain.c # End Source File # End Target --- 90,183 ---- # SUBTRACT LINK32 /pdb:none + !ELSEIF "$(CFG)" == "pythonw - Win32 Alpha Debug" + + # PROP BASE Use_MFC 0 + # PROP BASE Use_Debug_Libraries 1 + # PROP BASE Output_Dir "Debug" + # PROP BASE Intermediate_Dir "Debug" + # PROP BASE Ignore_Export_Lib 0 + # PROP BASE Target_Dir "" + # PROP Use_MFC 0 + # PROP Use_Debug_Libraries 1 + # PROP Output_Dir "." + # PROP Intermediate_Dir "alpha-temp-debug" + # PROP Ignore_Export_Lib 0 + # PROP Target_Dir "" + MTL=midl.exe + # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 + # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 + CPP=cl.exe + # ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\Include" /I "..\PC" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c + # ADD CPP /nologo /MDd /Gt0 /W3 /GX /Zi /Od /I "..\Include" /I "..\PC" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c + RSC=rc.exe + # ADD BASE RSC /l 0x409 /d "_DEBUG" + # ADD RSC /l 0x409 /d "_DEBUG" + BSC32=bscmake.exe + # ADD BASE BSC32 /nologo + # ADD BSC32 /nologo + LINK32=link.exe + # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /base:"0x1e190000" /subsystem:windows /debug /machine:ALPHA /out:"./pythonw_d.exe" /pdbtype:sept /libpath:"Debug" + # SUBTRACT BASE LINK32 /pdb:none + # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /base:"0x1e190000" /subsystem:windows /debug /machine:ALPHA /out:"./pythonw_d.exe" /pdbtype:sept /libpath:"Debug" + # SUBTRACT LINK32 /pdb:none + + !ELSEIF "$(CFG)" == "pythonw - Win32 Alpha Release" + + # PROP BASE Use_MFC 0 + # PROP BASE Use_Debug_Libraries 0 + # PROP BASE Output_Dir "Release" + # PROP BASE Intermediate_Dir "Release" + # PROP BASE Ignore_Export_Lib 0 + # PROP BASE Target_Dir "" + # PROP Use_MFC 0 + # PROP Use_Debug_Libraries 0 + # PROP Output_Dir "." + # PROP Intermediate_Dir "alpha-temp-release" + # PROP Ignore_Export_Lib 0 + # PROP Target_Dir "" + MTL=midl.exe + # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 + # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 + CPP=cl.exe + # ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /O2 /I "..\Include" /I "..\PC" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c + # ADD CPP /nologo /MD /Gt0 /W3 /GX /O2 /I "..\Include" /I "..\PC" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c + RSC=rc.exe + # ADD BASE RSC /l 0x409 /d "NDEBUG" + # ADD RSC /l 0x409 /d "NDEBUG" + BSC32=bscmake.exe + # ADD BASE BSC32 /nologo + # ADD BSC32 /nologo + LINK32=link.exe + # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /base:"0x1e190000" /subsystem:windows /debug /machine:ALPHA /libpath:"Release" + # SUBTRACT BASE LINK32 /pdb:none + # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /base:"0x1e190000" /subsystem:windows /debug /machine:ALPHA /libpath:"Release" + # SUBTRACT LINK32 /pdb:none + !ENDIF # Begin Target ! # Name "pythonw - Win32 x86 Release" ! # Name "pythonw - Win32 x86 Debug" ! # Name "pythonw - Win32 Alpha Debug" ! # Name "pythonw - Win32 Alpha Release" # Begin Source File SOURCE=..\PC\python_exe.rc + # End Source File + # Begin Source File ! SOURCE=..\PC\WinMain.c ! !IF "$(CFG)" == "pythonw - Win32 x86 Release" ! !ELSEIF "$(CFG)" == "pythonw - Win32 x86 Debug" ! !ELSEIF "$(CFG)" == "pythonw - Win32 Alpha Debug" ! !ELSEIF "$(CFG)" == "pythonw - Win32 Alpha Release" ! ! !ENDIF ! # End Source File # End Target Index: zlib.dsp =================================================================== RCS file: /projects/cvsroot/python/dist/src/PCbuild/zlib.dsp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -r1.6 -r1.7 *** zlib.dsp 1999/04/08 20:49:11 1.6 --- zlib.dsp 2000/01/20 21:31:41 1.7 *************** *** 1,9 **** # Microsoft Developer Studio Project File - Name="zlib" - Package Owner=<4> ! # Microsoft Developer Studio Generated Build File, Format Version 5.00 # ** DO NOT EDIT ** # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 ! CFG=zlib - Win32 Debug !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run --- 1,9 ---- # Microsoft Developer Studio Project File - Name="zlib" - Package Owner=<4> ! # Microsoft Developer Studio Generated Build File, Format Version 6.00 # ** DO NOT EDIT ** # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 ! CFG=zlib - Win32 x86 Debug !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run *************** *** 14,26 **** !MESSAGE by defining the macro CFG on the command line. For example: !MESSAGE ! !MESSAGE NMAKE /f "zlib.mak" CFG="zlib - Win32 Debug" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE ! !MESSAGE "zlib - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") ! !MESSAGE "zlib - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE # Begin Project # PROP Scc_ProjName "zlib" # PROP Scc_LocalPath ".." --- 14,27 ---- !MESSAGE by defining the macro CFG on the command line. For example: !MESSAGE ! !MESSAGE NMAKE /f "zlib.mak" CFG="zlib - Win32 x86 Debug" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE ! !MESSAGE "zlib - Win32 x86 Release" (based on "Win32 (x86) Dynamic-Link Library") ! !MESSAGE "zlib - Win32 x86 Debug" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE # Begin Project + # PROP AllowPerConfigDependencies 0 # PROP Scc_ProjName "zlib" # PROP Scc_LocalPath ".." *************** *** 29,33 **** RSC=rc.exe ! !IF "$(CFG)" == "zlib - Win32 Release" # PROP BASE Use_MFC 0 --- 30,34 ---- RSC=rc.exe ! !IF "$(CFG)" == "zlib - Win32 x86 Release" # PROP BASE Use_MFC 0 *************** *** 39,43 **** # PROP Use_Debug_Libraries 0 # PROP Output_Dir "." ! # PROP Intermediate_Dir "temp-release" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" --- 40,44 ---- # PROP Use_Debug_Libraries 0 # PROP Output_Dir "." ! # PROP Intermediate_Dir "x86-temp-release" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" *************** *** 45,50 **** # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c # ADD CPP /nologo /MD /W3 /GX /Zi /O2 /I "..\Include" /I "..\PC" /I "..\..\zlib113" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /YX /FD /c ! # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32 ! # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32 # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" --- 46,51 ---- # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c # ADD CPP /nologo /MD /W3 /GX /Zi /O2 /I "..\Include" /I "..\PC" /I "..\..\zlib113" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /YX /FD /c ! # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 ! # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" *************** *** 57,71 **** # SUBTRACT LINK32 /pdb:none ! !ELSEIF "$(CFG)" == "zlib - Win32 Debug" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 ! # PROP BASE Output_Dir "zlib" ! # PROP BASE Intermediate_Dir "zlib" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 # PROP Output_Dir "." ! # PROP Intermediate_Dir "temp-debug" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" --- 58,72 ---- # SUBTRACT LINK32 /pdb:none ! !ELSEIF "$(CFG)" == "zlib - Win32 x86 Debug" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 ! # PROP BASE Output_Dir "Debug" ! # PROP BASE Intermediate_Dir "Debug" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 # PROP Output_Dir "." ! # PROP Intermediate_Dir "x86-temp-debug" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" *************** *** 73,78 **** # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c # ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\Include" /I "..\PC" /I "..\..\zlib113" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /YX /FD /c ! # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32 ! # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32 # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" --- 74,79 ---- # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c # ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\Include" /I "..\PC" /I "..\..\zlib113" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /YX /FD /c ! # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 ! # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" *************** *** 89,94 **** # Begin Target ! # Name "zlib - Win32 Release" ! # Name "zlib - Win32 Debug" # Begin Source File --- 90,95 ---- # Begin Target ! # Name "zlib - Win32 x86 Release" ! # Name "zlib - Win32 x86 Debug" # Begin Source File From guido@cnri.reston.va.us Thu Jan 20 21:37:22 2000 From: guido@cnri.reston.va.us (Guido van Rossum) Date: Thu, 20 Jan 2000 16:37:22 -0500 (EST) Subject: [Python-checkins] CVS: python/dist/src/Demo/metaclasses index.html,1.8,1.9 Message-ID: <200001202137.QAA23144@eric.cnri.reston.va.us> Update of /projects/cvsroot/python/dist/src/Demo/metaclasses In directory eric:/projects/python/python.org/ftp/pub/www.python.org/doc/essays/metaclasses Modified Files: index.html Log Message: Fix some broken links. Index: index.html =================================================================== RCS file: /projects/cvsroot/python/dist/src/Demo/metaclasses/index.html,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -r1.8 -r1.9 *** index.html 1998/08/10 01:54:40 1.8 --- index.html 2000/01/20 21:37:19 1.9 *************** *** 28,32 **** HREF="http://maigret.cog.brown.edu/pyutil/">MESS package; Jim Fulton has used it in his Extension Classes package. (It has also been referred to as the ``Don Beaudry hack,'' but that's a misnomer. There's nothing hackish --- 28,32 ---- HREF="http://maigret.cog.brown.edu/pyutil/">MESS package; Jim Fulton has used it in his Extension Classes package. (It has also been referred to as the ``Don Beaudry hack,'' but that's a misnomer. There's nothing hackish *************** *** 63,67 ****

(Types are not classes, by the way. See questions 4.2, 4.19 and in particular 6.22 in the Python FAQ for more on this topic.) --- 63,67 ----

(Types are not classes, by the way. See questions 4.2, 4.19 and in particular 6.22 in the Python FAQ for more on this topic.) *************** *** 194,198 **** This is exactly the same as before except that instead of type(B), B.__class__ is invoked. If you have read FAQ question 6.22 you will understand that while there is a big technical difference between type(B) and B.__class__, they play the --- 194,198 ---- This is exactly the same as before except that instead of type(B), B.__class__ is invoked. If you have read FAQ question 6.22 you will understand that while there is a big technical difference between type(B) and B.__class__, they play the From guido@cnri.reston.va.us Thu Jan 20 22:33:18 2000 From: guido@cnri.reston.va.us (Guido van Rossum) Date: Thu, 20 Jan 2000 17:33:18 -0500 (EST) Subject: [Python-checkins] CVS: python/dist/src/Include object.h,2.47,2.48 Message-ID: <200001202233.RAA27440@eric.cnri.reston.va.us> Update of /projects/cvsroot/python/dist/src/Include In directory eric:/tmp/python/dist/src/Include Modified Files: object.h Log Message: The rest of the changes by Trent Mick and Dale Nagata for warning-free compilation on NT Alpha. Mostly added casts etc. Index: object.h =================================================================== RCS file: /projects/cvsroot/python/dist/src/Include/object.h,v retrieving revision 2.47 retrieving revision 2.48 diff -C2 -r2.47 -r2.48 *** object.h 1998/12/04 18:48:12 2.47 --- object.h 2000/01/20 22:32:45 2.48 *************** *** 363,366 **** --- 363,367 ---- extern DL_IMPORT(void) _Py_ForgetReference Py_PROTO((PyObject *)); extern DL_IMPORT(void) _Py_PrintReferences Py_PROTO((FILE *)); + extern DL_IMPORT(void) _Py_ResetReferences Py_PROTO((void)); #endif From guido@cnri.reston.va.us Thu Jan 20 22:33:26 2000 From: guido@cnri.reston.va.us (Guido van Rossum) Date: Thu, 20 Jan 2000 17:33:26 -0500 (EST) Subject: [Python-checkins] CVS: python/dist/src/Modules arraymodule.c,2.36,2.37 Message-ID: <200001202233.RAA27444@eric.cnri.reston.va.us> Update of /projects/cvsroot/python/dist/src/Modules In directory eric:/tmp/python/dist/src/Modules Modified Files: arraymodule.c Log Message: The rest of the changes by Trent Mick and Dale Nagata for warning-free compilation on NT Alpha. Mostly added casts etc. Index: arraymodule.c =================================================================== RCS file: /projects/cvsroot/python/dist/src/Modules/arraymodule.c,v retrieving revision 2.36 retrieving revision 2.37 diff -C2 -r2.36 -r2.37 *** arraymodule.c 1999/12/03 17:15:30 2.36 --- arraymodule.c 2000/01/20 22:32:53 2.37 *************** *** 364,368 **** op->ob_size = size; op->ob_descr = descr; ! _Py_NewReference(op); return (PyObject *) op; } --- 364,368 ---- op->ob_size = size; op->ob_descr = descr; ! _Py_NewReference((PyObject *)op); return (PyObject *) op; } From guido@cnri.reston.va.us Thu Jan 20 22:33:28 2000 From: guido@cnri.reston.va.us (Guido van Rossum) Date: Thu, 20 Jan 2000 17:33:28 -0500 (EST) Subject: [Python-checkins] CVS: python/dist/src/PC config.h,1.30,1.31 Message-ID: <200001202233.RAA27463@eric.cnri.reston.va.us> Update of /projects/cvsroot/python/dist/src/PC In directory eric:/tmp/python/dist/src/PC Modified Files: config.h Log Message: The rest of the changes by Trent Mick and Dale Nagata for warning-free compilation on NT Alpha. Mostly added casts etc. Index: config.h =================================================================== RCS file: /projects/cvsroot/python/dist/src/PC/config.h,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -r1.30 -r1.31 *** config.h 1999/12/20 22:57:41 1.30 --- config.h 2000/01/20 22:32:55 1.31 *************** *** 62,65 **** --- 62,67 ---- #ifdef _M_IX86 #define COMPILER "[MSC 32 bit (Intel)]" + #elif defined(_M_ALPHA) + #define COMPILER "[MSC 32 bit (Alpha)]" #else #define COMPILER "[MSC (Unknown)]" *************** *** 214,218 **** /* So nobody needs to specify the .lib in their Makefile any more */ #ifdef _DEBUG - #define Py_DEBUG #pragma comment(lib,"python15_d.lib") #else --- 216,219 ---- *************** *** 220,223 **** --- 221,228 ---- #endif #endif /* USE_DL_EXPORT */ + + #ifdef _DEBUG + #define Py_DEBUG + #endif #define SIZEOF_INT 4 From guido@cnri.reston.va.us Thu Jan 20 22:33:28 2000 From: guido@cnri.reston.va.us (Guido van Rossum) Date: Thu, 20 Jan 2000 17:33:28 -0500 (EST) Subject: [Python-checkins] CVS: python/dist/src/Objects classobject.c,2.81,2.82 complexobject.c,2.21,2.22 floatobject.c,2.53,2.54 frameobject.c,2.36,2.37 intobject.c,2.36,2.37 listobject.c,2.62,2.63 methodobject.c,2.24,2.25 object.c,2.61,2.62 stringobject.c,2.53,2.54 tupleobject.c,2.28,2.29 Message-ID: <200001202233.RAA27466@eric.cnri.reston.va.us> Update of /projects/cvsroot/python/dist/src/Objects In directory eric:/tmp/python/dist/src/Objects Modified Files: classobject.c complexobject.c floatobject.c frameobject.c intobject.c listobject.c methodobject.c object.c stringobject.c tupleobject.c Log Message: The rest of the changes by Trent Mick and Dale Nagata for warning-free compilation on NT Alpha. Mostly added casts etc. Index: classobject.c =================================================================== RCS file: /projects/cvsroot/python/dist/src/Objects/classobject.c,v retrieving revision 2.81 retrieving revision 2.82 diff -C2 -r2.81 -r2.82 *** classobject.c 1999/10/11 14:03:12 2.81 --- classobject.c 2000/01/20 22:32:54 2.82 *************** *** 505,509 **** extern long _Py_RefTotal; inst->ob_type = &PyInstance_Type; ! _Py_NewReference(inst); _Py_RefTotal--; /* compensate for increment in NEWREF */ #ifdef COUNT_ALLOCS --- 505,509 ---- extern long _Py_RefTotal; inst->ob_type = &PyInstance_Type; ! _Py_NewReference((PyObject *)inst); _Py_RefTotal--; /* compensate for increment in NEWREF */ #ifdef COUNT_ALLOCS *************** *** 557,561 **** inst->ob_type->tp_free--; /* compensate for increment in UNREF */ #endif ! _Py_ForgetReference(inst); inst->ob_type = NULL; #endif /* Py_TRACE_REFS */ --- 557,561 ---- inst->ob_type->tp_free--; /* compensate for increment in UNREF */ #endif ! _Py_ForgetReference((PyObject *)inst); inst->ob_type = NULL; #endif /* Py_TRACE_REFS */ *************** *** 1432,1436 **** free_list = (PyMethodObject *)(im->im_self); im->ob_type = &PyMethod_Type; ! _Py_NewReference(im); } else { --- 1432,1436 ---- free_list = (PyMethodObject *)(im->im_self); im->ob_type = &PyMethod_Type; ! _Py_NewReference((PyObject *)im); } else { Index: complexobject.c =================================================================== RCS file: /projects/cvsroot/python/dist/src/Objects/complexobject.c,v retrieving revision 2.21 retrieving revision 2.22 diff -C2 -r2.21 -r2.22 *** complexobject.c 1999/01/25 19:42:19 2.21 --- complexobject.c 2000/01/20 22:32:54 2.22 *************** *** 173,177 **** op->ob_type = &PyComplex_Type; op->cval = cval; ! _Py_NewReference(op); return (PyObject *) op; } --- 173,177 ---- op->ob_type = &PyComplex_Type; op->cval = cval; ! _Py_NewReference((PyObject *)op); return (PyObject *) op; } Index: floatobject.c =================================================================== RCS file: /projects/cvsroot/python/dist/src/Objects/floatobject.c,v retrieving revision 2.53 retrieving revision 2.54 diff -C2 -r2.53 -r2.54 *** floatobject.c 1999/12/23 19:00:28 2.53 --- floatobject.c 2000/01/20 22:32:54 2.54 *************** *** 146,150 **** op->ob_type = &PyFloat_Type; op->ob_fval = fval; ! _Py_NewReference(op); return (PyObject *) op; } --- 146,150 ---- op->ob_type = &PyFloat_Type; op->ob_fval = fval; ! _Py_NewReference((PyObject *)op); return (PyObject *) op; } Index: frameobject.c =================================================================== RCS file: /projects/cvsroot/python/dist/src/Objects/frameobject.c,v retrieving revision 2.36 retrieving revision 2.37 diff -C2 -r2.36 -r2.37 *** frameobject.c 1998/10/19 14:20:20 2.36 --- frameobject.c 2000/01/20 22:32:54 2.37 *************** *** 185,189 **** return (PyFrameObject *)PyErr_NoMemory(); f->ob_type = &PyFrame_Type; ! _Py_NewReference(f); } else { --- 185,189 ---- return (PyFrameObject *)PyErr_NoMemory(); f->ob_type = &PyFrame_Type; ! _Py_NewReference((PyObject *)f); } else { *************** *** 200,204 **** extras = f->f_nlocals + f->f_stacksize; f->ob_type = &PyFrame_Type; ! _Py_NewReference(f); } if (builtins == NULL) { --- 200,204 ---- extras = f->f_nlocals + f->f_stacksize; f->ob_type = &PyFrame_Type; ! _Py_NewReference((PyObject *)f); } if (builtins == NULL) { Index: intobject.c =================================================================== RCS file: /projects/cvsroot/python/dist/src/Objects/intobject.c,v retrieving revision 2.36 retrieving revision 2.37 diff -C2 -r2.36 -r2.37 *** intobject.c 1999/10/12 19:54:48 2.36 --- intobject.c 2000/01/20 22:32:54 2.37 *************** *** 169,173 **** v->ob_type = &PyInt_Type; v->ob_ival = ival; ! _Py_NewReference(v); #if NSMALLNEGINTS + NSMALLPOSINTS > 0 if (-NSMALLNEGINTS <= ival && ival < NSMALLPOSINTS) { --- 169,173 ---- v->ob_type = &PyInt_Type; v->ob_ival = ival; ! _Py_NewReference((PyObject *)v); #if NSMALLNEGINTS + NSMALLPOSINTS > 0 if (-NSMALLNEGINTS <= ival && ival < NSMALLPOSINTS) { Index: listobject.c =================================================================== RCS file: /projects/cvsroot/python/dist/src/Objects/listobject.c,v retrieving revision 2.62 retrieving revision 2.63 diff -C2 -r2.62 -r2.63 *** listobject.c 1999/06/09 15:19:34 2.62 --- listobject.c 2000/01/20 22:32:54 2.63 *************** *** 89,93 **** for (i = 0; i < size; i++) op->ob_item[i] = NULL; ! _Py_NewReference(op); return (PyObject *) op; } --- 89,93 ---- for (i = 0; i < size; i++) op->ob_item[i] = NULL; ! _Py_NewReference((PyObject *)op); return (PyObject *) op; } Index: methodobject.c =================================================================== RCS file: /projects/cvsroot/python/dist/src/Objects/methodobject.c,v retrieving revision 2.24 retrieving revision 2.25 diff -C2 -r2.24 -r2.25 *** methodobject.c 1998/12/04 18:52:55 2.24 --- methodobject.c 2000/01/20 22:32:54 2.25 *************** *** 48,52 **** free_list = (PyCFunctionObject *)(op->m_self); op->ob_type = &PyCFunction_Type; ! _Py_NewReference(op); } else { --- 48,52 ---- free_list = (PyCFunctionObject *)(op->m_self); op->ob_type = &PyCFunction_Type; ! _Py_NewReference((PyObject *)op); } else { Index: object.c =================================================================== RCS file: /projects/cvsroot/python/dist/src/Objects/object.c,v retrieving revision 2.61 retrieving revision 2.62 diff -C2 -r2.61 -r2.62 *** object.c 2000/01/12 16:28:58 2.61 --- object.c 2000/01/20 22:32:54 2.62 *************** *** 35,39 **** #if defined( Py_TRACE_REFS ) || defined( Py_REF_DEBUG ) ! long _Py_RefTotal; #endif --- 35,39 ---- #if defined( Py_TRACE_REFS ) || defined( Py_REF_DEBUG ) ! DL_IMPORT(long) _Py_RefTotal; #endif *************** *** 150,154 **** op->ob_type = tp; op->ob_size = size; ! _Py_NewReference(op); return op; } --- 150,154 ---- op->ob_type = tp; op->ob_size = size; ! _Py_NewReference((PyObject *)op); return op; } *************** *** 652,656 **** --- 652,658 ---- register PyObject *op; { + #ifdef SLOW_UNREF_CHECK register PyObject *p; + #endif if (op->ob_refcnt < 0) Py_FatalError("UNREF negative refcnt"); Index: stringobject.c =================================================================== RCS file: /projects/cvsroot/python/dist/src/Objects/stringobject.c,v retrieving revision 2.53 retrieving revision 2.54 diff -C2 -r2.53 -r2.54 *** stringobject.c 1999/12/15 02:22:52 2.53 --- stringobject.c 2000/01/20 22:32:54 2.54 *************** *** 105,109 **** op->ob_sinterned = NULL; #endif ! _Py_NewReference(op); if (str != NULL) memcpy(op->ob_sval, str, size); --- 105,109 ---- op->ob_sinterned = NULL; #endif ! _Py_NewReference((PyObject *)op); if (str != NULL) memcpy(op->ob_sval, str, size); *************** *** 155,159 **** op->ob_sinterned = NULL; #endif ! _Py_NewReference(op); strcpy(op->ob_sval, str); #ifndef DONT_SHARE_SHORT_STRINGS --- 155,159 ---- op->ob_sinterned = NULL; #endif ! _Py_NewReference((PyObject *)op); strcpy(op->ob_sval, str); #ifndef DONT_SHARE_SHORT_STRINGS *************** *** 318,322 **** op->ob_sinterned = NULL; #endif ! _Py_NewReference(op); memcpy(op->ob_sval, a->ob_sval, (int) a->ob_size); memcpy(op->ob_sval + a->ob_size, b->ob_sval, (int) b->ob_size); --- 318,322 ---- op->ob_sinterned = NULL; #endif ! _Py_NewReference((PyObject *)op); memcpy(op->ob_sval, a->ob_sval, (int) a->ob_size); memcpy(op->ob_sval + a->ob_size, b->ob_sval, (int) b->ob_size); *************** *** 353,357 **** op->ob_sinterned = NULL; #endif ! _Py_NewReference(op); for (i = 0; i < size; i += a->ob_size) memcpy(op->ob_sval+i, a->ob_sval, (int) a->ob_size); --- 353,357 ---- op->ob_sinterned = NULL; #endif ! _Py_NewReference((PyObject *)op); for (i = 0; i < size; i += a->ob_size) memcpy(op->ob_sval+i, a->ob_sval, (int) a->ob_size); Index: tupleobject.c =================================================================== RCS file: /projects/cvsroot/python/dist/src/Objects/tupleobject.c,v retrieving revision 2.28 retrieving revision 2.29 diff -C2 -r2.28 -r2.29 *** tupleobject.c 1999/07/13 05:41:12 2.28 --- tupleobject.c 2000/01/20 22:32:54 2.29 *************** *** 101,105 **** for (i = 0; i < size; i++) op->ob_item[i] = NULL; ! _Py_NewReference(op); #if MAXSAVESIZE > 0 if (size == 0) { --- 101,105 ---- for (i = 0; i < size; i++) op->ob_item[i] = NULL; ! _Py_NewReference((PyObject *)op); #if MAXSAVESIZE > 0 if (size == 0) { *************** *** 453,457 **** --_Py_RefTotal; #endif ! _Py_ForgetReference(v); if (last_is_sticky && sizediff < 0) { /* shrinking: --- 453,457 ---- --_Py_RefTotal; #endif ! _Py_ForgetReference((PyObject *)v); if (last_is_sticky && sizediff < 0) { /* shrinking: *************** *** 476,480 **** return -1; } ! _Py_NewReference(sv); for (i = sv->ob_size; i < newsize; i++) sv->ob_item[i] = NULL; --- 476,480 ---- return -1; } ! _Py_NewReference((PyObject *)sv); for (i = sv->ob_size; i < newsize; i++) sv->ob_item[i] = NULL; From guido@cnri.reston.va.us Thu Jan 20 22:33:29 2000 From: guido@cnri.reston.va.us (Guido van Rossum) Date: Thu, 20 Jan 2000 17:33:29 -0500 (EST) Subject: [Python-checkins] CVS: python/dist/src/Python pythonrun.c,2.89,2.90 thread_nt.h,2.5,2.6 Message-ID: <200001202233.RAA27473@eric.cnri.reston.va.us> Update of /projects/cvsroot/python/dist/src/Python In directory eric:/tmp/python/dist/src/Python Modified Files: pythonrun.c thread_nt.h Log Message: The rest of the changes by Trent Mick and Dale Nagata for warning-free compilation on NT Alpha. Mostly added casts etc. Index: pythonrun.c =================================================================== RCS file: /projects/cvsroot/python/dist/src/Python/pythonrun.c,v retrieving revision 2.89 retrieving revision 2.90 diff -C2 -r2.89 -r2.90 *** pythonrun.c 1999/07/08 17:26:56 2.89 --- pythonrun.c 2000/01/20 22:32:56 2.90 *************** *** 73,76 **** --- 73,80 ---- static void call_ll_exitfuncs Py_PROTO((void)); + #ifdef Py_TRACE_REFS + int _Py_AskYesNo(char *prompt); + #endif + int Py_DebugFlag; /* Needed by parser.c */ int Py_VerboseFlag; /* Needed by import.c */ Index: thread_nt.h =================================================================== RCS file: /projects/cvsroot/python/dist/src/Python/thread_nt.h,v retrieving revision 2.5 retrieving revision 2.6 diff -C2 -r2.5 -r2.6 *** thread_nt.h 1998/12/21 19:32:32 2.5 --- thread_nt.h 2000/01/20 22:32:56 2.6 *************** *** 66,70 **** if (rv != -1) { success = 1; ! dprintf(("%ld: PyThread_start_new_thread succeeded: %ld\n", PyThread_get_thread_ident(), aThreadId)); } --- 66,70 ---- if (rv != -1) { success = 1; ! dprintf(("%ld: PyThread_start_new_thread succeeded: %ld\n", PyThread_get_thread_ident(), rv)); } From fdrake@weyr.cnri.reston.va.us Thu Jan 20 22:51:16 2000 From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake) Date: Thu, 20 Jan 2000 17:51:16 -0500 (EST) Subject: [Python-checkins] CVS: python/dist/src/Doc/tools/sgmlconv conversion.xml Message-ID: <200001202251.RAA01635@weyr.cnri.reston.va.us> Update of /projects/cvsroot/python/dist/src/Doc/tools/sgmlconv In directory weyr:/home/fdrake/projects/python/Doc/tools/sgmlconv Modified Files: conversion.xml Log Message: Don't insert extra indentation before elements. From guido@cnri.reston.va.us Fri Jan 21 00:03:45 2000 From: guido@cnri.reston.va.us (Guido van Rossum) Date: Thu, 20 Jan 2000 19:03:45 -0500 (EST) Subject: [Python-checkins] CVS: python/dist/src/PCbuild _tkinter.dsp,1.8,1.9 Message-ID: <200001210003.TAA28166@eric.cnri.reston.va.us> Update of /projects/cvsroot/python/dist/src/PCbuild In directory eric:/projects/python/develop/guido/src/PCbuild Modified Files: _tkinter.dsp Log Message: Trent Mick: Setup PC configuration so that MSDEV chooses the x86 release project config as the default. Index: _tkinter.dsp =================================================================== RCS file: /projects/cvsroot/python/dist/src/PCbuild/_tkinter.dsp,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -r1.8 -r1.9 *** _tkinter.dsp 2000/01/20 21:31:41 1.8 --- _tkinter.dsp 2000/01/21 00:03:42 1.9 *************** *** 19,26 **** !MESSAGE Possible choices for configuration are: !MESSAGE - !MESSAGE "_tkinter - Win32 x86 Release" (based on "Win32 (x86) Dynamic-Link Library") - !MESSAGE "_tkinter - Win32 x86 Debug" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE "_tkinter - Win32 Alpha Debug" (based on "Win32 (ALPHA) Dynamic-Link Library") !MESSAGE "_tkinter - Win32 Alpha Release" (based on "Win32 (ALPHA) Dynamic-Link Library") !MESSAGE --- 19,26 ---- !MESSAGE Possible choices for configuration are: !MESSAGE !MESSAGE "_tkinter - Win32 Alpha Debug" (based on "Win32 (ALPHA) Dynamic-Link Library") !MESSAGE "_tkinter - Win32 Alpha Release" (based on "Win32 (ALPHA) Dynamic-Link Library") + !MESSAGE "_tkinter - Win32 x86 Debug" (based on "Win32 (x86) Dynamic-Link Library") + !MESSAGE "_tkinter - Win32 x86 Release" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE From fdrake@weyr.cnri.reston.va.us Fri Jan 28 21:17:12 2000 From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake) Date: Fri, 28 Jan 2000 16:17:12 -0500 (EST) Subject: [Python-checkins] CVS: python/dist/src/Doc/doc doc.tex,1.12,1.12.2.1 Message-ID: <200001282117.QAA11203@weyr.cnri.reston.va.us> Update of /projects/cvsroot/python/dist/src/Doc/doc In directory weyr:/home/fdrake/projects/python/Doc-152p1/doc Modified Files: Tag: release152p1-patches doc.tex Log Message: Clarify paragraph describing the synopsistable environment. Index: doc.tex =================================================================== RCS file: /projects/cvsroot/python/dist/src/Doc/doc/doc.tex,v retrieving revision 1.12 retrieving revision 1.12.2.1 diff -C2 -r1.12 -r1.12.2.1 *** doc.tex 1999/06/11 14:25:45 1.12 --- doc.tex 2000/01/28 21:17:09 1.12.2.1 *************** *** 677,682 **** table generated by this environment contains two columns, and each row is defined by an alternate definition of ! \macro{modulesynopsis}. This environment is not normally use by ! the user, but is created by the \macro{localmoduletable} macro. --- 677,682 ---- table generated by this environment contains two columns, and each row is defined by an alternate definition of ! \macro{modulesynopsis}. This environment is not normally used by ! authors, but is created by the \macro{localmoduletable} macro. From fdrake@weyr.cnri.reston.va.us Fri Jan 28 21:19:06 2000 From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake) Date: Fri, 28 Jan 2000 16:19:06 -0500 (EST) Subject: [Python-checkins] CVS: python/dist/src/Doc/texinputs ltxmarkup.sty,1.3,1.3.4.1 Message-ID: <200001282119.QAA11239@weyr.cnri.reston.va.us> Update of /projects/cvsroot/python/dist/src/Doc/texinputs In directory weyr:/home/fdrake/projects/python/Doc-152p1/texinputs Modified Files: Tag: release152p1-patches ltxmarkup.sty Log Message: For environment descriptions, include the \end{envname} in the synopsis lines. Index: ltxmarkup.sty =================================================================== RCS file: /projects/cvsroot/python/dist/src/Doc/texinputs/ltxmarkup.sty,v retrieving revision 1.3 retrieving revision 1.3.4.1 diff -C2 -r1.3 -r1.3.4.1 *** ltxmarkup.sty 1999/04/23 14:44:53 1.3 --- ltxmarkup.sty 2000/01/28 21:19:03 1.3.4.1 *************** *** 19,23 **** \let\p=\py@ltx@param% #2}}] ! %\item[\code{\e end\{{\bfseries #1}\}}] \index{#1 environment@\idxcode{#1} environment} \index{environments!#1@\idxcode{#1}} --- 19,23 ---- \let\p=\py@ltx@param% #2}}] ! \item[\code{\e end\{{\bfseries #1}\}}] \index{#1 environment@\idxcode{#1} environment} \index{environments!#1@\idxcode{#1}} From fdrake@weyr.cnri.reston.va.us Fri Jan 28 21:23:16 2000 From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake) Date: Fri, 28 Jan 2000 16:23:16 -0500 (EST) Subject: [Python-checkins] CVS: python/dist/src/Doc/perl ltxmarkup.perl,1.3.4.1,1.3.4.2 Message-ID: <200001282123.QAA11344@weyr.cnri.reston.va.us> Update of /projects/cvsroot/python/dist/src/Doc/perl In directory weyr:/home/fdrake/projects/python/Doc-152p1/perl Modified Files: Tag: release152p1-patches ltxmarkup.perl Log Message: For environment descriptions, include the \end{envname} in the synopsis lines. Index: ltxmarkup.perl =================================================================== RCS file: /projects/cvsroot/python/dist/src/Doc/perl/ltxmarkup.perl,v retrieving revision 1.3.4.1 retrieving revision 1.3.4.2 diff -C2 -r1.3.4.1 -r1.3.4.2 *** ltxmarkup.perl 1999/10/28 18:23:23 1.3.4.1 --- ltxmarkup.perl 2000/01/28 21:23:14 1.3.4.2 *************** *** 59,62 **** --- 59,63 ---- . "\n<dt><tt>\begin{<b class='environment'>$env</b>}</tt>" . "\n $params" + . "\n<br /><tt>\end{<b class='environment'>$env</b>}</tt>" . "\n<dd>" . $_ From fdrake@weyr.cnri.reston.va.us Fri Jan 28 21:36:12 2000 From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake) Date: Fri, 28 Jan 2000 16:36:12 -0500 (EST) Subject: [Python-checkins] CVS: python/dist/src/Doc/lib libbsddb.tex,1.3,1.3.4.1 Message-ID: <200001282136.QAA11630@weyr.cnri.reston.va.us> Update of /projects/cvsroot/python/dist/src/Doc/lib In directory weyr:/home/fdrake/projects/python/Doc-152p1/lib Modified Files: Tag: release152p1-patches libbsddb.tex Log Message: Clarify names of the headers for different versions for Berkely DB versions; based on comment from Martijn de Vries <martijn@i2x.com>. Updated some markup. Index: libbsddb.tex =================================================================== RCS file: /projects/cvsroot/python/dist/src/Doc/lib/libbsddb.tex,v retrieving revision 1.3 retrieving revision 1.3.4.1 diff -C2 -r1.3 -r1.3.4.1 *** libbsddb.tex 1999/04/23 20:32:59 1.3 --- libbsddb.tex 2000/01/28 21:36:09 1.3.4.1 *************** *** 8,53 **** ! The \module{bsddb} module provides an interface to the Berkeley DB library. ! Users can create hash, btree or record based library files using the ! appropriate open call. Bsddb objects behave generally like dictionaries. ! Keys and values must be strings, however, so to use other objects as keys or ! to store other kinds of objects the user must serialize them somehow, ! typically using marshal.dumps or pickle.dumps. ! ! The \module{bsddb} module is only available on \UNIX{} systems, so it is not ! built by default in the standard Python distribution. Also, there are two ! incompatible versions of the underlying library. Version 1.85 is widely ! available, but has some known bugs. Version 2 is not quite as widely used, ! but does offer some improvements. The \module{bsddb} module uses the 1.85 ! interface. Users wishing to use version 2 of the Berkeley DB library will ! have to modify the source for the module to include db_185.h instead of ! db.h. The \module{bsddb} module defines the following functions that create ! objects that access the appropriate type of Berkeley DB file. The first two ! arguments of each function are the same. For ease of portability, only the ! first two arguments should be used in most instances. \begin{funcdesc}{hashopen}{filename\optional{, flag\optional{, ! mode\optional{, bsize\optional{, ffactor\optional{, nelem\optional{, ! cachesize\optional{, hash\optional{, lorder}}}}}}}}} ! Open the hash format file named \var{filename}. The optional \var{flag} ! identifies the mode used to open the file. It may be ``r'' (read only), ! ``w'' (read-write), ``c'' (read-write - create if necessary) or ``n'' ! (read-write - truncate to zero length). The other arguments are rarely used ! and are just passed to the low-level dbopen function. Consult the ! Berkeley DB documentation for their use and interpretation. \end{funcdesc} - \begin{funcdesc}{btopen}{filename\optional{, flag\optional{, mode\optional{, btflags\optional{, cachesize\optional{, maxkeypage\optional{, minkeypage\optional{, psize\optional{, lorder}}}}}}}}} ! Open the btree format file named \var{filename}. The optional \var{flag} ! identifies the mode used to open the file. It may be ``r'' (read only), ! ``w'' (read-write), ``c'' (read-write - create if necessary) or ``n'' ! (read-write - truncate to zero length). The other arguments are rarely used ! and are just passed to the low-level dbopen function. Consult the ! Berkeley DB documentation for their use and interpretation. \end{funcdesc} --- 8,62 ---- ! The \module{bsddb} module provides an interface to the Berkeley DB ! library. Users can create hash, btree or record based library files ! using the appropriate open call. Bsddb objects behave generally like ! dictionaries. Keys and values must be strings, however, so to use ! other objects as keys or to store other kinds of objects the user must ! serialize them somehow, typically using marshal.dumps or pickle.dumps. ! ! The \module{bsddb} module is only available on \UNIX{} systems, so it ! is not built by default in the standard Python distribution. Also, ! there are two incompatible versions of the underlying library. ! Version 1.85 is widely available, but has some known bugs. Version 2 ! is not quite as widely used, but does offer some improvements. The ! \module{bsddb} module uses the 1.85 interface. Users wishing to use ! version 2 of the Berkeley DB library will have to modify the source ! for the module to include \file{db_185.h} instead of ! \file{db.h} (\file{db_185.h} contains the version 1.85 compatibility ! interface). The \module{bsddb} module defines the following functions that create ! objects that access the appropriate type of Berkeley DB file. The ! first two arguments of each function are the same. For ease of ! portability, only the first two arguments should be used in most ! instances. \begin{funcdesc}{hashopen}{filename\optional{, flag\optional{, ! mode\optional{, bsize\optional{, ! ffactor\optional{, nelem\optional{, ! cachesize\optional{, hash\optional{, ! lorder}}}}}}}}} ! Open the hash format file named \var{filename}. The optional ! \var{flag} identifies the mode used to open the file. It may be ! \character{r} (read only), \character{w} (read-write), ! \character{c} (read-write - create if necessary) or ! \character{n} (read-write - truncate to zero length). The other ! arguments are rarely used and are just passed to the low-level ! \cfunction{dbopen()} function. Consult the Berkeley DB documentation ! for their use and interpretation. \end{funcdesc} \begin{funcdesc}{btopen}{filename\optional{, flag\optional{, mode\optional{, btflags\optional{, cachesize\optional{, maxkeypage\optional{, minkeypage\optional{, psize\optional{, lorder}}}}}}}}} ! ! Open the btree format file named \var{filename}. The optional ! \var{flag} identifies the mode used to open the file. It may be ! \character{r} (read only), \character{w} (read-write), ! \character{c} (read-write - create if necessary) or ! \character{n} (read-write - truncate to zero length). The other ! arguments are rarely used and are just passed to the low-level dbopen ! function. Consult the Berkeley DB documentation for their use and ! interpretation. \end{funcdesc} *************** *** 55,64 **** rnflags\optional{, cachesize\optional{, psize\optional{, lorder\optional{, reclen\optional{, bval\optional{, bfname}}}}}}}}}} ! Open a DB record format file named \var{filename}. The optional \var{flag} ! identifies the mode used to open the file. It may be ``r'' (read only), ! ``w'' (read-write), ``c'' (read-write - create if necessary) or ``n'' ! (read-write - truncate to zero length). The other arguments are rarely used ! and are just passed to the low-level dbopen function. Consult the ! Berkeley DB documentation for their use and interpretation. \end{funcdesc} --- 64,76 ---- rnflags\optional{, cachesize\optional{, psize\optional{, lorder\optional{, reclen\optional{, bval\optional{, bfname}}}}}}}}}} ! ! Open a DB record format file named \var{filename}. The optional ! \var{flag} identifies the mode used to open the file. It may be ! \character{r} (read only), \character{w} (read-write), ! \character{c} (read-write - create if necessary) or ! \character{n} (read-write - truncate to zero length). The other ! arguments are rarely used and are just passed to the low-level dbopen ! function. Consult the Berkeley DB documentation for their use and ! interpretation. \end{funcdesc} *************** *** 87,91 **** \begin{methoddesc}{has_key}{key} ! Return 1 if the DB file contains the argument as a key. \end{methoddesc} --- 99,103 ---- \begin{methoddesc}{has_key}{key} ! Return \code{1} if the DB file contains the argument as a key. \end{methoddesc} From guido@cnri.reston.va.us Mon Jan 31 18:41:29 2000 From: guido@cnri.reston.va.us (Guido van Rossum) Date: Mon, 31 Jan 2000 13:41:29 -0500 (EST) Subject: [Python-checkins] CVS: python/dist/src/Modules posixmodule.c,2.122,2.123 Message-ID: <200001311841.NAA16517@eric.cnri.reston.va.us> Update of /projects/cvsroot/python/dist/src/Modules In directory eric:/projects/python/develop/guido/src/Modules Modified Files: posixmodule.c Log Message: The initialization of posix_putenv_garbage should only be done when it is defined... Index: posixmodule.c =================================================================== RCS file: /projects/cvsroot/python/dist/src/Modules/posixmodule.c,v retrieving revision 2.122 retrieving revision 2.123 diff -C2 -r2.122 -r2.123 *** posixmodule.c 1999/12/30 18:05:43 2.122 --- posixmodule.c 2000/01/31 18:41:26 2.123 *************** *** 4784,4787 **** --- 4784,4789 ---- PyDict_SetItemString(d, "error", PyExc_OSError); + #ifdef HAVE_PUTENV posix_putenv_garbage = PyDict_New(); + #endif } From guido@cnri.reston.va.us Mon Jan 3 15:44:42 2000 From: guido@cnri.reston.va.us (Guido van Rossum) Date: Mon, 3 Jan 2000 10:44:42 -0500 (EST) Subject: [Python-checkins] CVS: python/dist/src/Lib base64.py,1.7,1.8 Message-ID: <200001031544.KAA23823@eric.cnri.reston.va.us> Update of /projects/cvsroot/python/dist/src/Lib In directory eric:/projects/python/develop/guido/src/Lib Modified Files: base64.py Log Message: The correct RFC to reference is RFC-1521 (MIME part one), not 1421 (PEM). Index: base64.py =================================================================== RCS file: /projects/cvsroot/python/dist/src/Lib/base64.py,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -r1.7 -r1.8 *** base64.py 1998/05/22 18:18:08 1.7 --- base64.py 2000/01/03 15:44:40 1.8 *************** *** 1,8 **** #! /usr/bin/env python ! # Conversions to/from base64 transport encoding as per RFC-MIME (Dec 1991 ! # version). ! ! # Parameters set by RFC-1421. # # Modified 04-Oct-95 by Jack to use binascii module --- 1,5 ---- #! /usr/bin/env python ! # Conversions to/from base64 transport encoding as per RFC-1521. # # Modified 04-Oct-95 by Jack to use binascii module From fdrake@weyr.cnri.reston.va.us Mon Jan 3 16:08:54 2000 From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake) Date: Mon, 3 Jan 2000 11:08:54 -0500 (EST) Subject: [Python-checkins] CVS: python/dist/src/Doc/lib libbase64.tex Message-ID: <200001031608.LAA10255@weyr.cnri.reston.va.us> Update of /projects/cvsroot/python/dist/src/Doc/lib In directory weyr:/home/fdrake/projects/python/Doc-152p1/lib Modified Files: Tag: release152p1-patches libbase64.tex Log Message: Corrected reference to the RFC; should be 1521, not 1421. Based on a report from Tage Stabell-Kulo <tage@grakall.pasta.cs.uit.no> and comments from Guido. From fdrake@weyr.cnri.reston.va.us Mon Jan 10 17:55:03 2000 From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake) Date: Mon, 10 Jan 2000 12:55:03 -0500 (EST) Subject: [Python-checkins] CVS: python/dist/src/Doc/api api.tex Message-ID: <200001101755.MAA03700@weyr.cnri.reston.va.us> Update of /projects/cvsroot/python/dist/src/Doc/api In directory weyr:/home/fdrake/projects/python/Doc-152p1/api Modified Files: Tag: release152p1-patches api.tex Log Message: In sum_sequence() example: Use PySequence_Length() instead of PyObject_Size(). The later doesn't appear to exist. From fdrake@weyr.cnri.reston.va.us Mon Jan 10 18:00:55 2000 From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake) Date: Mon, 10 Jan 2000 13:00:55 -0500 (EST) Subject: [Python-checkins] CVS: python/dist/src/Doc/lib librandom.tex libwhrandom.tex Message-ID: <200001101800.NAA03762@weyr.cnri.reston.va.us> Update of /projects/cvsroot/python/dist/src/Doc/lib In directory weyr:/home/fdrake/projects/python/Doc-152p1/lib Modified Files: Tag: release152p1-patches librandom.tex libwhrandom.tex Log Message: Updates to random / whrandom to better reflect recommended usage. Please review! From fdrake@weyr.cnri.reston.va.us Mon Jan 10 20:01:01 2000 From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake) Date: Mon, 10 Jan 2000 15:01:01 -0500 (EST) Subject: [Python-checkins] CVS: python/dist/src/Doc/lib liburllib.tex Message-ID: <200001102001.PAA04669@weyr.cnri.reston.va.us> Update of /projects/cvsroot/python/dist/src/Doc/lib In directory weyr:/home/fdrake/projects/python/Doc-152p1/lib Modified Files: Tag: release152p1-patches liburllib.tex Log Message: Changes from Skip Montanaro <skip@mojam.com>, with minor changes. Adds information about setting up proxy information for urlopen() and adds some examples. From fdrake@weyr.cnri.reston.va.us Tue Jan 11 14:44:09 2000 From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake) Date: Tue, 11 Jan 2000 09:44:09 -0500 (EST) Subject: [Python-checkins] CVS: python/dist/src/Doc/ref ref3.tex Message-ID: <200001111444.JAA07268@weyr.cnri.reston.va.us> Update of /projects/cvsroot/python/dist/src/Doc/ref In directory weyr:/home/fdrake/projects/python/Doc-152p1/ref Modified Files: Tag: release152p1-patches ref3.tex Log Message: English usage fix, suggested by John Machin <sjmachin@lexicon.net> on comp.lang.python: "falls outside" --> "would fall outside" From fdrake@weyr.cnri.reston.va.us Tue Jan 11 20:47:54 2000 From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake) Date: Tue, 11 Jan 2000 15:47:54 -0500 (EST) Subject: [Python-checkins] CVS: python/dist/src/Doc/lib libmimewriter.tex Message-ID: <200001112047.PAA08862@weyr.cnri.reston.va.us> Update of /projects/cvsroot/python/dist/src/Doc/lib In directory weyr:/home/fdrake/projects/python/Doc-152p1/lib Modified Files: Tag: release152p1-patches libmimewriter.tex Log Message: Twiddle: "mutlipart" --> "multipart" Reported by Gerrit Holl <gerrit.holl@pobox.com>. From guido@cnri.reston.va.us Wed Jan 12 16:29:01 2000 From: guido@cnri.reston.va.us (Guido van Rossum) Date: Wed, 12 Jan 2000 11:29:01 -0500 (EST) Subject: [Python-checkins] CVS: python/dist/src/Objects object.c,2.60,2.61 Message-ID: <200001121629.LAA03508@eric.cnri.reston.va.us> Update of /projects/cvsroot/python/dist/src/Objects In directory eric:/projects/python/develop/guido/src/Objects Modified Files: object.c Log Message: On Linux, one sometimes sees spurious errors after interrupting previous output. Call clearerr() to prevent past errors affecting our ferror() test later, in PyObject_Print(). Suggested by Marc Lemburg. Index: object.c =================================================================== RCS file: /projects/cvsroot/python/dist/src/Objects/object.c,v retrieving revision 2.60 retrieving revision 2.61 diff -C2 -r2.60 -r2.61 *** object.c 1998/07/21 21:56:41 2.60 --- object.c 2000/01/12 16:28:58 2.61 *************** *** 169,172 **** --- 169,173 ---- } #endif + clearerr(fp); /* Clear any previous error condition */ if (op == NULL) { fprintf(fp, "<nil>"); From guido@cnri.reston.va.us Wed Jan 12 16:38:23 2000 From: guido@cnri.reston.va.us (Guido van Rossum) Date: Wed, 12 Jan 2000 11:38:23 -0500 (EST) Subject: [Python-checkins] CVS: python/dist/src/Modules timemodule.c,2.77,2.78 Message-ID: <200001121638.LAA03660@eric.cnri.reston.va.us> Update of /projects/cvsroot/python/dist/src/Modules In directory eric:/projects/python/develop/guido/src/Modules Modified Files: timemodule.c Log Message: The functions asctime() and mktime() are documented to take a 9-tuple only. Through some mysterious interaction, they would take 9 separate arguments as well. This misfeature is now disabled (to end a difference with JPython). Index: timemodule.c =================================================================== RCS file: /projects/cvsroot/python/dist/src/Modules/timemodule.c,v retrieving revision 2.77 retrieving revision 2.78 diff -C2 -r2.77 -r2.78 *** timemodule.c 1999/11/08 15:32:27 2.77 --- timemodule.c 2000/01/12 16:38:20 2.78 *************** *** 453,460 **** PyObject *args; { struct tm buf; char *p; ! if (!gettmarg(args, &buf)) return NULL; p = asctime(&buf); if (p[24] == '\n') --- 453,463 ---- PyObject *args; { + PyObject *tup; struct tm buf; char *p; ! if (!PyArg_ParseTuple(args, "O", &tup)) return NULL; + if (!gettmarg(tup, &buf)) + return NULL; p = asctime(&buf); if (p[24] == '\n') *************** *** 501,509 **** PyObject *args; { struct tm buf; time_t tt; tt = time(&tt); buf = *localtime(&tt); ! if (!gettmarg(args, &buf)) return NULL; tt = mktime(&buf); --- 504,515 ---- PyObject *args; { + PyObject *tup; struct tm buf; time_t tt; + if (!PyArg_ParseTuple(args, "O", &tup)) + return NULL; tt = time(&tt); buf = *localtime(&tt); ! if (!gettmarg(tup, &buf)) return NULL; tt = mktime(&buf); *************** *** 530,537 **** {"gmtime", time_gmtime, 0, gmtime_doc}, {"localtime", time_localtime, 0, localtime_doc}, ! {"asctime", time_asctime, 0, asctime_doc}, {"ctime", time_ctime, 0, ctime_doc}, #ifdef HAVE_MKTIME ! {"mktime", time_mktime, 0, mktime_doc}, #endif #ifdef HAVE_STRFTIME --- 536,543 ---- {"gmtime", time_gmtime, 0, gmtime_doc}, {"localtime", time_localtime, 0, localtime_doc}, ! {"asctime", time_asctime, 1, asctime_doc}, {"ctime", time_ctime, 0, ctime_doc}, #ifdef HAVE_MKTIME ! {"mktime", time_mktime, 1, mktime_doc}, #endif #ifdef HAVE_STRFTIME From guido@cnri.reston.va.us Wed Jan 12 22:45:57 2000 From: guido@cnri.reston.va.us (Guido van Rossum) Date: Wed, 12 Jan 2000 17:45:57 -0500 (EST) Subject: [Python-checkins] CVS: python/dist/src/Python ceval.c,2.165,2.166 Message-ID: <200001122245.RAA05073@eric.cnri.reston.va.us> Update of /projects/cvsroot/python/dist/src/Python In directory eric:/projects/python/develop/guido/src/Python Modified Files: ceval.c Log Message: Fix a bug in exec_statement() noted incidentally by Tim Peters in PR#175 -- when exec is passed a code object, it didn't sync the locals from the dictionary back into their fast representation. Also took the time to remove some repetitive code there and to do the syncing even when an exception is raised (since a partial effect should still be synced). Index: ceval.c =================================================================== RCS file: /projects/cvsroot/python/dist/src/Python/ceval.c,v retrieving revision 2.165 retrieving revision 2.166 diff -C2 -r2.165 -r2.166 *** ceval.c 1999/11/15 19:29:33 2.165 --- ceval.c 2000/01/12 22:45:54 2.166 *************** *** 2741,2745 **** PyObject *locals; { - char *s; int n; PyObject *v; --- 2741,2744 ---- *************** *** 2778,2808 **** PyDict_SetItemString(globals, "__builtins__", f->f_builtins); if (PyCode_Check(prog)) { ! v = PyEval_EvalCode((PyCodeObject *) prog, ! globals, locals); ! if (v == NULL) ! return -1; ! Py_DECREF(v); ! return 0; } ! if (PyFile_Check(prog)) { FILE *fp = PyFile_AsFile(prog); char *name = PyString_AsString(PyFile_Name(prog)); ! if (PyRun_File(fp, name, Py_file_input, ! globals, locals) == NULL) ! return -1; ! return 0; } ! s = PyString_AsString(prog); ! if ((int)strlen(s) != PyString_Size(prog)) { ! PyErr_SetString(PyExc_ValueError, ! "embedded '\\0' in exec string"); ! return -1; } ! v = PyRun_String(s, Py_file_input, globals, locals); if (v == NULL) return -1; Py_DECREF(v); - if (plain) - PyFrame_LocalsToFast(f, 0); return 0; } --- 2777,2801 ---- PyDict_SetItemString(globals, "__builtins__", f->f_builtins); if (PyCode_Check(prog)) { ! v = PyEval_EvalCode((PyCodeObject *) prog, globals, locals); } ! else if (PyFile_Check(prog)) { FILE *fp = PyFile_AsFile(prog); char *name = PyString_AsString(PyFile_Name(prog)); ! v = PyRun_File(fp, name, Py_file_input, globals, locals); } ! else { ! char *s = PyString_AsString(prog); ! if ((int)strlen(s) != PyString_Size(prog)) { ! PyErr_SetString(PyExc_ValueError, ! "embedded '\\0' in exec string"); ! return -1; ! } ! v = PyRun_String(s, Py_file_input, globals, locals); } ! if (plain) ! PyFrame_LocalsToFast(f, 0); if (v == NULL) return -1; Py_DECREF(v); return 0; } From gstein@lyra.org Wed Jan 12 23:00:16 2000 From: gstein@lyra.org (Greg Stein) Date: Wed, 12 Jan 2000 15:00:16 -0800 (PST) Subject: [Python-checkins] CVS: python/dist/src/Python ceval.c,2.165,2.166 In-Reply-To: <200001122245.RAA05073@eric.cnri.reston.va.us> Message-ID: <Pine.LNX.4.10.10001121455520.412-100000@nebula.lyra.org> For the PyRun_File case, you've introduced a Py_DECREF() that wasn't there before. Was that intended? Also note that PyString_AS_STRING() and PyString_GETSIZE could be used since the object must be a string. Cheers, -g On Wed, 12 Jan 2000, Guido van Rossum wrote: >... > *** ceval.c 1999/11/15 19:29:33 2.165 > --- ceval.c 2000/01/12 22:45:54 2.166 > *************** > *** 2741,2745 **** > PyObject *locals; > { > - char *s; > int n; > PyObject *v; > --- 2741,2744 ---- > *************** > *** 2778,2808 **** > PyDict_SetItemString(globals, "__builtins__", f->f_builtins); > if (PyCode_Check(prog)) { > ! v = PyEval_EvalCode((PyCodeObject *) prog, > ! globals, locals); > ! if (v == NULL) > ! return -1; > ! Py_DECREF(v); > ! return 0; > } > ! if (PyFile_Check(prog)) { > FILE *fp = PyFile_AsFile(prog); > char *name = PyString_AsString(PyFile_Name(prog)); > ! if (PyRun_File(fp, name, Py_file_input, > ! globals, locals) == NULL) > ! return -1; > ! return 0; > } > ! s = PyString_AsString(prog); > ! if ((int)strlen(s) != PyString_Size(prog)) { > ! PyErr_SetString(PyExc_ValueError, > ! "embedded '\\0' in exec string"); > ! return -1; > } > ! v = PyRun_String(s, Py_file_input, globals, locals); > if (v == NULL) > return -1; > Py_DECREF(v); > - if (plain) > - PyFrame_LocalsToFast(f, 0); > return 0; > } > --- 2777,2801 ---- > PyDict_SetItemString(globals, "__builtins__", f->f_builtins); > if (PyCode_Check(prog)) { > ! v = PyEval_EvalCode((PyCodeObject *) prog, globals, locals); > } > ! else if (PyFile_Check(prog)) { > FILE *fp = PyFile_AsFile(prog); > char *name = PyString_AsString(PyFile_Name(prog)); > ! v = PyRun_File(fp, name, Py_file_input, globals, locals); > } > ! else { > ! char *s = PyString_AsString(prog); > ! if ((int)strlen(s) != PyString_Size(prog)) { > ! PyErr_SetString(PyExc_ValueError, > ! "embedded '\\0' in exec string"); > ! return -1; > ! } > ! v = PyRun_String(s, Py_file_input, globals, locals); > } > ! if (plain) > ! PyFrame_LocalsToFast(f, 0); > if (v == NULL) > return -1; > Py_DECREF(v); > return 0; > } -- Greg Stein, http://www.lyra.org/ From guido@CNRI.Reston.VA.US Wed Jan 12 22:57:55 2000 From: guido@CNRI.Reston.VA.US (Guido van Rossum) Date: Wed, 12 Jan 2000 17:57:55 -0500 Subject: [Python-checkins] CVS: python/dist/src/Python ceval.c,2.165,2.166 In-Reply-To: Your message of "Wed, 12 Jan 2000 15:00:16 PST." <Pine.LNX.4.10.10001121455520.412-100000@nebula.lyra.org> References: <Pine.LNX.4.10.10001121455520.412-100000@nebula.lyra.org> Message-ID: <200001122257.RAA05268@eric.cnri.reston.va.us> > For the PyRun_File case, you've introduced a Py_DECREF() that wasn't there > before. Was that intended? Yes. It was a leak. It didn't really leak, because it always returned None, but it caused the reference count for None to increase ad infinitum. > Also note that PyString_AS_STRING() and PyString_GETSIZE could be used > since the object must be a string. I don't care about using those macros except in performance critical contexts, which this can hardly be (relatively speaking, the parsing takes forever). --Guido van Rossum (home page: http://www.python.org/~guido/) From guido@cnri.reston.va.us Fri Jan 14 16:33:11 2000 From: guido@cnri.reston.va.us (Guido van Rossum) Date: Fri, 14 Jan 2000 11:33:11 -0500 (EST) Subject: [Python-checkins] CVS: python/dist/src/Modules selectmodule.c,2.29,2.30 Message-ID: <200001141633.LAA07738@eric.cnri.reston.va.us> Update of /projects/cvsroot/python/dist/src/Modules In directory eric:/projects/python/develop/guido/src/Modules Modified Files: selectmodule.c Log Message: According to Ron Bickers, and with apparent approval of Chris Herborth, the code in list2set() that sets max unconditionally to 0 should not be used on BeOS. So be it. Anybody using BeOS, please test! Index: selectmodule.c =================================================================== RCS file: /projects/cvsroot/python/dist/src/Modules/selectmodule.c,v retrieving revision 2.29 retrieving revision 2.30 diff -C2 -r2.29 -r2.30 *** selectmodule.c 1999/08/27 20:39:37 2.29 --- selectmodule.c 2000/01/14 16:33:09 2.30 *************** *** 144,148 **** goto finally; } ! #if defined(_MSC_VER) || defined(__BEOS__) max = 0; /* not used for Win32 */ #else /* !_MSC_VER */ --- 144,148 ---- goto finally; } ! #if defined(_MSC_VER) max = 0; /* not used for Win32 */ #else /* !_MSC_VER */ From guido@cnri.reston.va.us Mon Jan 17 14:11:06 2000 From: guido@cnri.reston.va.us (Guido van Rossum) Date: Mon, 17 Jan 2000 09:11:06 -0500 (EST) Subject: [Python-checkins] CVS: python/dist/src/Lib rfc822.py,1.44,1.45 Message-ID: <200001171411.JAA10756@eric.cnri.reston.va.us> Update of /projects/cvsroot/python/dist/src/Lib In directory eric:/projects/python/develop/guido/src/Lib Modified Files: rfc822.py Log Message: Fix by Nick Russo in processing of timezone in test program; the ParsedDate didn't have the correct day of week. Index: rfc822.py =================================================================== RCS file: /projects/cvsroot/python/dist/src/Lib/rfc822.py,v retrieving revision 1.44 retrieving revision 1.45 diff -C2 -r1.44 -r1.45 *** rfc822.py 1999/10/06 15:19:19 1.44 --- rfc822.py 2000/01/17 14:11:04 1.45 *************** *** 928,934 **** print 'Date:', m.getheader('date') date = m.getdate_tz('date') if date: ! print 'ParsedDate:', time.asctime(date[:-1]), ! hhmmss = date[-1] hhmm, ss = divmod(hhmmss, 60) hh, mm = divmod(hhmm, 60) --- 928,936 ---- print 'Date:', m.getheader('date') date = m.getdate_tz('date') + tz = date[-1] + date = time.localtime(mktime_tz(date)) if date: ! print 'ParsedDate:', time.asctime(date), ! hhmmss = tz hhmm, ss = divmod(hhmmss, 60) hh, mm = divmod(hhmm, 60) From fdrake@weyr.cnri.reston.va.us Mon Jan 17 14:30:08 2000 From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake) Date: Mon, 17 Jan 2000 09:30:08 -0500 (EST) Subject: [Python-checkins] CVS: python/dist/src/Doc/api api.tex Message-ID: <200001171430.JAA15001@weyr.cnri.reston.va.us> Update of /projects/cvsroot/python/dist/src/Doc/api In directory weyr:/home/fdrake/projects/python/Doc-152p1/api Modified Files: Tag: release152p1-patches api.tex Log Message: Typo: "expelained" --> "explained" Noted by Doug Mennella <dougm@imagine-sw.com>. From fdrake@weyr.cnri.reston.va.us Mon Jan 17 19:10:55 2000 From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake) Date: Mon, 17 Jan 2000 14:10:55 -0500 (EST) Subject: [Python-checkins] CVS: python/dist/src/Doc/lib libcfgparser.tex Message-ID: <200001171910.OAA16646@weyr.cnri.reston.va.us> Update of /projects/cvsroot/python/dist/src/Doc/lib In directory weyr:/home/fdrake/projects/python/Doc-152p1/lib Modified Files: Tag: release152p1-patches libcfgparser.tex Log Message: Documented the add_section() method; omission noted by Tage Stabell-Kulo <tage@tagesknb.cs.uit.no>. Elaborated on a couple of other items. From akuchlin@CNRI.Reston.VA.US Mon Jan 17 20:12:40 2000 From: akuchlin@CNRI.Reston.VA.US (Andrew M. Kuchling) Date: Mon, 17 Jan 2000 15:12:40 -0500 (EST) Subject: [Python-checkins] CVS: python/dist/src/Doc/lib libasyncore.tex Message-ID: <200001172012.PAA01674@amarok.cnri.reston.va.us> Update of /projects/cvsroot/python/dist/src/Doc/lib In directory amarok:/home/akuchlin/src/Python-1.5/Doc/lib Modified Files: Tag: release152p1-patches libasyncore.tex Log Message: Fix consistent typo: 'asyncronous' -> 'asynchronous' From fdrake@weyr.cnri.reston.va.us Mon Jan 17 20:29:00 2000 From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake) Date: Mon, 17 Jan 2000 15:29:00 -0500 (EST) Subject: [Python-checkins] CVS: python/dist/src/Doc/lib librfc822.tex Message-ID: <200001172029.PAA17305@weyr.cnri.reston.va.us> Update of /projects/cvsroot/python/dist/src/Doc/lib In directory weyr:/home/fdrake/projects/python/Doc-152p1/lib Modified Files: Tag: release152p1-patches librfc822.tex Log Message: Explain that fields 6, 7, & 8 of the time tuples returned by getdate[_tz] and parsedate[_tz] are useless. Problem noted by Nick Russo <nick@cs.uchicago.edu>. From fdrake@weyr.cnri.reston.va.us Tue Jan 18 22:36:22 2000 From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake) Date: Tue, 18 Jan 2000 17:36:22 -0500 (EST) Subject: [Python-checkins] CVS: python/dist/src/Doc/ext ext.tex Message-ID: <200001182236.RAA20024@weyr.cnri.reston.va.us> Update of /projects/cvsroot/python/dist/src/Doc/ext In directory weyr:/home/fdrake/projects/python/Doc-152p1/ext Modified Files: Tag: release152p1-patches ext.tex Log Message: At Just's suggestion, note that PyMac_Initialize() should be called instead of Py_Initialize() when embedding on the Mac. In the example function my_set_callback(), make the parameter declarations match their use. Error noted by Doug Mennella <dougm@imagine-sw.com>. From guido@cnri.reston.va.us Wed Jan 19 21:57:33 2000 From: guido@cnri.reston.va.us (Guido van Rossum) Date: Wed, 19 Jan 2000 16:57:33 -0500 (EST) Subject: [Python-checkins] CVS: python/dist/src/Lib bdb.py,1.25,1.26 Message-ID: <200001192157.QAA20189@eric.cnri.reston.va.us> Update of /projects/cvsroot/python/dist/src/Lib In directory eric:/projects/python/develop/guido/src/Lib Modified Files: bdb.py Log Message: Change two occurrences of type(x) <> types.CodeType into isinstance(x, types.CodeType). Suggested by Finn Bock. Index: bdb.py =================================================================== RCS file: /projects/cvsroot/python/dist/src/Lib/bdb.py,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -r1.25 -r1.26 *** bdb.py 1999/09/09 23:24:33 1.25 --- bdb.py 2000/01/19 21:57:30 1.26 *************** *** 340,344 **** self.reset() sys.settrace(self.trace_dispatch) ! if type(cmd) <> types.CodeType: cmd = cmd+'\n' try: --- 340,344 ---- self.reset() sys.settrace(self.trace_dispatch) ! if not isinstance(cmd, types.CodeType): cmd = cmd+'\n' try: *************** *** 359,363 **** self.reset() sys.settrace(self.trace_dispatch) ! if type(expr) <> types.CodeType: expr = expr+'\n' try: --- 359,363 ---- self.reset() sys.settrace(self.trace_dispatch) ! if not isinstance(expr, types.CodeType): expr = expr+'\n' try: From fdrake@weyr.cnri.reston.va.us Thu Jan 20 15:33:27 2000 From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake) Date: Thu, 20 Jan 2000 10:33:27 -0500 (EST) Subject: [Python-checkins] CVS: python/dist/src/Doc/lib libstdtypes.tex Message-ID: <200001201533.KAA25518@weyr.cnri.reston.va.us> Update of /projects/cvsroot/python/dist/src/Doc/lib In directory weyr:/home/fdrake/projects/python/Doc-152p1/lib Modified Files: Tag: release152p1-patches libstdtypes.tex Log Message: Fix table note regarding {}.get(); used the wrong variable name. Problem reported to Jack Jansen by Glyph Lefkowitz <glyph@twistedmatrix.com>. From jhylton@cnri.reston.va.us Thu Jan 20 18:19:12 2000 From: jhylton@cnri.reston.va.us (Jeremy Hylton) Date: Thu, 20 Jan 2000 13:19:12 -0500 (EST) Subject: [Python-checkins] CVS: python/dist/src/Lib urllib2.py,NONE,1.1 Message-ID: <200001201819.NAA09666@bitdiddle.cnri.reston.va.us> Update of /projects/cvsroot/python/dist/src/Lib In directory bitdiddle:/home/jhylton/python/src/Lib Added Files: urllib2.py Log Message: EXPERIMENTAL An extensible library for opening URLs using a variety protocols. Intended as a replacement for urllib. From guido@cnri.reston.va.us Thu Jan 20 20:49:31 2000 From: guido@cnri.reston.va.us (Guido van Rossum) Date: Thu, 20 Jan 2000 15:49:31 -0500 (EST) Subject: [Python-checkins] CVS: python/dist/src/Tools/bgen/bgen macsupport.py,1.15,1.16 scantools.py,1.15,1.16 Message-ID: <200001202049.PAA22768@eric.cnri.reston.va.us> Update of /projects/cvsroot/python/dist/src/Tools/bgen/bgen In directory eric:/projects/python/develop/guido/src/Tools/bgen/bgen Modified Files: macsupport.py scantools.py Log Message: Two patches from Jack Jansen: Three bgen mods: - support for FSSpecs passed-by-value and points-passed-by-reference added. - strip single-line comments when parsing header files - if a definition is blacklisted _do_ output it, but in comment Index: macsupport.py =================================================================== RCS file: /projects/cvsroot/python/dist/src/Tools/bgen/bgen/macsupport.py,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -r1.15 -r1.16 *** macsupport.py 1999/09/30 14:15:14 1.15 --- macsupport.py 2000/01/20 20:49:28 1.16 *************** *** 16,20 **** Size = Type("Size", "l") Style = Type("Style", "b") ! StyleParameter = Type("StyleParameter", "h") CharParameter = Type("CharParameter", "h") TextEncoding = Type("TextEncoding", "l") --- 16,20 ---- Size = Type("Size", "l") Style = Type("Style", "b") ! StyleParameter = Type("Style", "h") CharParameter = Type("CharParameter", "h") TextEncoding = Type("TextEncoding", "l") *************** *** 32,36 **** # File System Specifications ! FSSpec_ptr = OpaqueType("FSSpec", "PyMac_BuildFSSpec", "PyMac_GetFSSpec") # OSType and ResType: 4-byte character strings --- 32,36 ---- # File System Specifications ! FSSpec = FSSpec_ptr = OpaqueType("FSSpec", "PyMac_BuildFSSpec", "PyMac_GetFSSpec") # OSType and ResType: 4-byte character strings *************** *** 67,70 **** --- 67,71 ---- Rect = Rect_ptr = OpaqueType("Rect", "PyMac_BuildRect", "PyMac_GetRect") Point = OpaqueByValueType("Point", "PyMac_BuildPoint", "PyMac_GetPoint") + Point_ptr = OpaqueType("Point", "PyMac_BuildPoint", "PyMac_GetPoint") # Event records *************** *** 85,89 **** InBuffer = VarInputBufferType('char', 'long', 'l') # (buf, len) - OptionalInBuffer = OptionalVarInputBufferType('char', 'long', 'l') # (buf, len) InOutBuffer = HeapInputOutputBufferType('char', 'long', 'l') # (inbuf, outbuf, len) --- 86,89 ---- *************** *** 152,158 **** # errorCheck method. class OSErrMixIn: ! "Mix-in class to treat OSErr/OSStatus return values special" def makereturnvar(self): ! if self.returntype.__class__ == OSErrType: return Variable(self.returntype, "_err", ErrorMode) else: --- 152,158 ---- # errorCheck method. class OSErrMixIn: ! "Mix-in class to treat OSErr return values special" def makereturnvar(self): ! if self.returntype is OSErr: return Variable(self.returntype, "_err", ErrorMode) else: Index: scantools.py =================================================================== RCS file: /projects/cvsroot/python/dist/src/Tools/bgen/bgen/scantools.py,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -r1.15 -r1.16 *** scantools.py 1998/04/28 16:04:50 1.15 --- scantools.py 2000/01/20 20:49:28 1.16 *************** *** 235,242 **** self.whole_pat = self.type_pat + self.name_pat + self.args_pat # self.sym_pat = "^[ \t]*\(<name>[a-zA-Z0-9_]+\)[ \t]*=" + \ ! # "[ \t]*\(<defn>[-0-9'\"][^\t\n,;}]*\),?" self.sym_pat = "^[ \t]*\(<name>[a-zA-Z0-9_]+\)[ \t]*=" + \ ! "[ \t]*\(<defn>[-0-9_a-zA-Z'\"][^\t\n,;}]*\),?" self.asplit_pat = "^\(<type>.*[^a-zA-Z0-9_]\)\(<name>[a-zA-Z0-9_]+\)$" def compilepatterns(self): --- 235,245 ---- self.whole_pat = self.type_pat + self.name_pat + self.args_pat # self.sym_pat = "^[ \t]*\(<name>[a-zA-Z0-9_]+\)[ \t]*=" + \ ! # "[ \t]*\(<defn>[-0-9'\"(][^\t\n,;}]*\),?" self.sym_pat = "^[ \t]*\(<name>[a-zA-Z0-9_]+\)[ \t]*=" + \ ! "[ \t]*\(<defn>[-0-9_a-zA-Z'\"(][^\t\n,;}]*\),?" self.asplit_pat = "^\(<type>.*[^a-zA-Z0-9_]\)\(<name>[a-zA-Z0-9_]+\)$" + self.comment1_pat = "\(<rest>.*\)//.*" + # note that the next pattern only removes comments that are wholly within one line + self.comment2_pat = "\(<rest>.*\)/\*.*\*/" def compilepatterns(self): *************** *** 373,376 **** --- 376,383 ---- try: line = self.getline() except EOFError: break + if self.comment1.match(line) >= 0: + line = self.comment1.group('rest') + if self.comment2.match(line) >= 0: + line = self.comment2.group('rest') if self.defsfile and self.sym.match(line) >= 0: self.dosymdef() *************** *** 387,390 **** --- 394,399 ---- if not name in self.blacklistnames: self.defsfile.write("%s = %s\n" % (name, defn)) + else: + self.defsfile.write("# %s = %s\n" % (name, defn)) def dofuncspec(self): Return-Path: <guido@kaluha.cnri.reston.va.us> Delivered-To: python-checkins@dinsdale.python.org Received: from python.org (parrot.python.org [132.151.1.90]) by dinsdale.python.org (Postfix) with ESMTP id 60F481CFD2 for <python-checkins@dinsdale.python.org>; Thu, 20 Jan 2000 16:30:38 -0500 (EST) Received: from cnri.reston.va.us (ns.CNRI.Reston.VA.US [132.151.1.1] (may be forged)) by python.org (8.9.1a/8.9.1) with ESMTP id QAA12354 for <python-checkins@python.org>; Thu, 20 Jan 2000 16:30:38 -0500 (EST) Received: from kaluha.cnri.reston.va.us (kaluha.cnri.reston.va.us [132.151.7.31]) by cnri.reston.va.us (8.9.1a/8.9.1) with ESMTP id QAA06984 for <python-checkins@python.org>; Thu, 20 Jan 2000 16:30:36 -0500 (EST) Received: from eric.cnri.reston.va.us (eric.cnri.reston.va.us [10.27.10.23]) by kaluha.cnri.reston.va.us (8.9.1b+Sun/8.9.1) with ESMTP id QAA29153 for <python-checkins@python.org>; Thu, 20 Jan 2000 16:31:46 -0500 (EST) Received: (from guido@localhost) by eric.cnri.reston.va.us (8.9.3+Sun/8.9.1) id QAA23064 for python-checkins@python.org; Thu, 20 Jan 2000 16:31:45 -0500 (EST) Date: Thu, 20 Jan 2000 16:31:45 -0500 (EST) From: Guido van Rossum <guido@cnri.reston.va.us> Message-Id: <200001202131.QAA23064@eric.cnri.reston.va.us> To: python-checkins@python.org Subject: [Python-checkins] CVS: python/dist/src/PCbuild _tkinter.dsp,1.7,1.8 bsddb.dsp,1.5,1.6 parser.dsp,1.4,1.5 pcbuild.dsw,1.5,1.6 python.dsp,1.6,1.7 python15.dsp,1.9,1.10 pythonw.dsp,1.5,1.6 zlib.dsp,1.6,1.7 Sender: python-checkins-admin@python.org Errors-To: python-checkins-admin@python.org X-BeenThere: python-checkins@python.org X-Mailman-Version: 1.2 (experimental) Precedence: bulk List-Id: Check-in messages from the Python maintainers <python-checkins.python.org> Update of /projects/cvsroot/python/dist/src/PCbuild In directory eric:/tmp/python/dist/src/PCbuild Modified Files: _tkinter.dsp bsddb.dsp parser.dsp pcbuild.dsw python.dsp python15.dsp pythonw.dsp zlib.dsp Log Message: Changes by Trent Mick (of ActiveState) and Dale Nagata to support building for NT Alpha as well as NT x86. Index: _tkinter.dsp =================================================================== RCS file: /projects/cvsroot/python/dist/src/PCbuild/_tkinter.dsp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -r1.7 -r1.8 *** _tkinter.dsp 1998/12/22 21:43:35 1.7 --- _tkinter.dsp 2000/01/20 21:31:41 1.8 *************** *** 1,9 **** # Microsoft Developer Studio Project File - Name="_tkinter" - Package Owner=<4> ! # Microsoft Developer Studio Generated Build File, Format Version 5.00 # ** DO NOT EDIT ** # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 ! CFG=_tkinter - Win32 Debug !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run --- 1,10 ---- # Microsoft Developer Studio Project File - Name="_tkinter" - Package Owner=<4> ! # Microsoft Developer Studio Generated Build File, Format Version 6.00 # ** DO NOT EDIT ** # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 + # TARGTYPE "Win32 (ALPHA) Dynamic-Link Library" 0x0602 ! CFG=_tkinter - Win32 Alpha Debug !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run *************** *** 14,34 **** !MESSAGE by defining the macro CFG on the command line. For example: !MESSAGE ! !MESSAGE NMAKE /f "_tkinter.mak" CFG="_tkinter - Win32 Debug" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE ! !MESSAGE "_tkinter - Win32 Release" (based on\ ! "Win32 (x86) Dynamic-Link Library") ! !MESSAGE "_tkinter - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE # Begin Project # PROP Scc_ProjName "_tkinter" # PROP Scc_LocalPath "..\..\.." - CPP=cl.exe - MTL=midl.exe - RSC=rc.exe ! !IF "$(CFG)" == "_tkinter - Win32 Release" # PROP BASE Use_MFC 0 --- 15,34 ---- !MESSAGE by defining the macro CFG on the command line. For example: !MESSAGE ! !MESSAGE NMAKE /f "_tkinter.mak" CFG="_tkinter - Win32 Alpha Debug" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE ! !MESSAGE "_tkinter - Win32 x86 Release" (based on "Win32 (x86) Dynamic-Link Library") ! !MESSAGE "_tkinter - Win32 x86 Debug" (based on "Win32 (x86) Dynamic-Link Library") ! !MESSAGE "_tkinter - Win32 Alpha Debug" (based on "Win32 (ALPHA) Dynamic-Link Library") ! !MESSAGE "_tkinter - Win32 Alpha Release" (based on "Win32 (ALPHA) Dynamic-Link Library") !MESSAGE # Begin Project + # PROP AllowPerConfigDependencies 0 # PROP Scc_ProjName "_tkinter" # PROP Scc_LocalPath "..\..\.." ! !IF "$(CFG)" == "_tkinter - Win32 x86 Release" # PROP BASE Use_MFC 0 *************** *** 40,51 **** # PROP Use_Debug_Libraries 0 # PROP Output_Dir "." ! # PROP Intermediate_Dir "temp-release" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c # ADD CPP /nologo /MD /W3 /GX /Zi /O2 /I "..\Include" /I "..\PC" /I "C:\Program Files\Tcl\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "WITH_APPINIT" /YX /FD /c ! # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32 ! # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32 # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" --- 40,54 ---- # PROP Use_Debug_Libraries 0 # PROP Output_Dir "." ! # PROP Intermediate_Dir "x86-temp-release" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" F90=df.exe + CPP=cl.exe # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c # ADD CPP /nologo /MD /W3 /GX /Zi /O2 /I "..\Include" /I "..\PC" /I "C:\Program Files\Tcl\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "WITH_APPINIT" /YX /FD /c ! MTL=midl.exe ! # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 ! # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 ! RSC=rc.exe # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" *************** *** 58,79 **** # SUBTRACT LINK32 /pdb:none ! !ELSEIF "$(CFG)" == "_tkinter - Win32 Debug" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 ! # PROP BASE Output_Dir "_tkinter" ! # PROP BASE Intermediate_Dir "_tkinter" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 # PROP Output_Dir "." ! # PROP Intermediate_Dir "temp-debug" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c # ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\Include" /I "..\PC" /I "C:\Program Files\Tcl\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "WITH_APPINIT" /YX /FD /c ! # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32 ! # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32 # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" --- 61,85 ---- # SUBTRACT LINK32 /pdb:none ! !ELSEIF "$(CFG)" == "_tkinter - Win32 x86 Debug" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 ! # PROP BASE Output_Dir "Debug" ! # PROP BASE Intermediate_Dir "Debug" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 # PROP Output_Dir "." ! # PROP Intermediate_Dir "x86-temp-debug" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" F90=df.exe + CPP=cl.exe # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c # ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\Include" /I "..\PC" /I "C:\Program Files\Tcl\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "WITH_APPINIT" /YX /FD /c ! MTL=midl.exe ! # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 ! # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 ! RSC=rc.exe # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" *************** *** 86,102 **** # SUBTRACT LINK32 /pdb:none !ENDIF # Begin Target ! # Name "_tkinter - Win32 Release" ! # Name "_tkinter - Win32 Debug" # Begin Source File SOURCE=..\Modules\_tkinter.c # End Source File # Begin Source File SOURCE=..\Modules\tkappinit.c # End Source File # End Target --- 92,196 ---- # SUBTRACT LINK32 /pdb:none + !ELSEIF "$(CFG)" == "_tkinter - Win32 Alpha Debug" + + # PROP BASE Use_MFC 0 + # PROP BASE Use_Debug_Libraries 1 + # PROP BASE Output_Dir "Debug" + # PROP BASE Intermediate_Dir "Debug" + # PROP BASE Ignore_Export_Lib 0 + # PROP BASE Target_Dir "" + # PROP Use_MFC 0 + # PROP Use_Debug_Libraries 1 + # PROP Output_Dir "." + # PROP Intermediate_Dir "alpha-temp-debug" + # PROP Ignore_Export_Lib 0 + # PROP Target_Dir "" + MTL=midl.exe + # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 + # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 + CPP=cl.exe + # ADD BASE CPP /nologo /MTd /Gt0 /W3 /GX /Zi /Od /I "..\Include" /I "..\PC" /I "C:\Program Files\Tcl\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "WITH_APPINIT" /YX /FD /c + # ADD CPP /nologo /MDd /Gt0 /W3 /GX /Zi /Od /I "..\Include" /I "..\PC" /I "C:\Program Files\Tcl\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "WITH_APPINIT" /YX /FD /c + RSC=rc.exe + # ADD BASE RSC /l 0x409 /d "_DEBUG" + # ADD RSC /l 0x409 /d "_DEBUG" + BSC32=bscmake.exe + # ADD BASE BSC32 /nologo + # ADD BSC32 /nologo + LINK32=link.exe + # ADD BASE LINK32 tcl80.lib tk80.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /base:"0x1e190000" /subsystem:windows /dll /debug /machine:ALPHA /out:"./_tkinter_d.pyd" /pdbtype:sept /libpath:"C:\Program Files\Tcl\lib" /export:init_tkinter + # SUBTRACT BASE LINK32 /pdb:none + # ADD LINK32 tcl80.lib tk80.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /base:"0x1e190000" /subsystem:windows /dll /debug /machine:ALPHA /out:"alpha-temp-debug/_tkinter_d.pyd" /pdbtype:sept /libpath:"C:\Program Files\Tcl\lib" /export:init_tkinter + # SUBTRACT LINK32 /pdb:none + + !ELSEIF "$(CFG)" == "_tkinter - Win32 Alpha Release" + + # PROP BASE Use_MFC 0 + # PROP BASE Use_Debug_Libraries 0 + # PROP BASE Output_Dir "Release" + # PROP BASE Intermediate_Dir "Release" + # PROP BASE Ignore_Export_Lib 0 + # PROP BASE Target_Dir "" + # PROP Use_MFC 0 + # PROP Use_Debug_Libraries 0 + # PROP Output_Dir "." + # PROP Intermediate_Dir "alpha-temp-release" + # PROP Ignore_Export_Lib 0 + # PROP Target_Dir "" + MTL=midl.exe + # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 + # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 + CPP=cl.exe + # ADD BASE CPP /nologo /MT /Gt0 /W3 /GX /Zi /O2 /I "..\Include" /I "..\PC" /I "C:\Program Files\Tcl\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "WITH_APPINIT" /YX /FD /c + # ADD CPP /nologo /MD /Gt0 /W3 /GX /O2 /I "..\Include" /I "..\PC" /I "..\..\Tcl\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "WITH_APPINIT" /YX /FD /c + RSC=rc.exe + # ADD BASE RSC /l 0x409 /d "NDEBUG" + # ADD RSC /l 0x409 /d "NDEBUG" + BSC32=bscmake.exe + # ADD BASE BSC32 /nologo + # ADD BSC32 /nologo + LINK32=link.exe + # ADD BASE LINK32 tcl80.lib tk80.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /base:"0x1e190000" /subsystem:windows /dll /debug /machine:ALPHA /out:"./_tkinter.pyd" /libpath:"C:\Program Files\Tcl\lib" /export:init_tkinter + # SUBTRACT BASE LINK32 /pdb:none + # ADD LINK32 ..\..\tcl\lib\tcl82.lib ..\..\tcl\lib\tk82.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /base:"0x1e190000" /subsystem:windows /dll /debug /machine:ALPHA /out:"alpha-temp-release/_tkinter.pyd" /libpath:"C:\Program Files\Tcl\lib" /export:init_tkinter + # SUBTRACT LINK32 /pdb:none + !ENDIF # Begin Target ! # Name "_tkinter - Win32 x86 Release" ! # Name "_tkinter - Win32 x86 Debug" ! # Name "_tkinter - Win32 Alpha Debug" ! # Name "_tkinter - Win32 Alpha Release" # Begin Source File SOURCE=..\Modules\_tkinter.c + + !IF "$(CFG)" == "_tkinter - Win32 x86 Release" + + !ELSEIF "$(CFG)" == "_tkinter - Win32 x86 Debug" + + !ELSEIF "$(CFG)" == "_tkinter - Win32 Alpha Debug" + + !ELSEIF "$(CFG)" == "_tkinter - Win32 Alpha Release" + + !ENDIF + # End Source File # Begin Source File SOURCE=..\Modules\tkappinit.c + + !IF "$(CFG)" == "_tkinter - Win32 x86 Release" + + !ELSEIF "$(CFG)" == "_tkinter - Win32 x86 Debug" + + !ELSEIF "$(CFG)" == "_tkinter - Win32 Alpha Debug" + + !ELSEIF "$(CFG)" == "_tkinter - Win32 Alpha Release" + + !ENDIF + # End Source File # End Target Index: bsddb.dsp =================================================================== RCS file: /projects/cvsroot/python/dist/src/PCbuild/bsddb.dsp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -r1.5 -r1.6 *** bsddb.dsp 1998/08/12 02:31:42 1.5 --- bsddb.dsp 2000/01/20 21:31:41 1.6 *************** *** 1,9 **** # Microsoft Developer Studio Project File - Name="bsddb" - Package Owner=<4> ! # Microsoft Developer Studio Generated Build File, Format Version 5.00 # ** DO NOT EDIT ** # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 ! CFG=bsddb - Win32 Debug !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run --- 1,10 ---- # Microsoft Developer Studio Project File - Name="bsddb" - Package Owner=<4> ! # Microsoft Developer Studio Generated Build File, Format Version 6.00 # ** DO NOT EDIT ** # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 + # TARGTYPE "Win32 (ALPHA) Dynamic-Link Library" 0x0602 ! CFG=bsddb - Win32 Alpha Debug !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run *************** *** 14,33 **** !MESSAGE by defining the macro CFG on the command line. For example: !MESSAGE ! !MESSAGE NMAKE /f "bsddb.mak" CFG="bsddb - Win32 Debug" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE ! !MESSAGE "bsddb - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") ! !MESSAGE "bsddb - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE # Begin Project # PROP Scc_ProjName "bsddb" # PROP Scc_LocalPath ".." - CPP=cl.exe - MTL=midl.exe - RSC=rc.exe ! !IF "$(CFG)" == "bsddb - Win32 Release" # PROP BASE Use_MFC 0 --- 15,34 ---- !MESSAGE by defining the macro CFG on the command line. For example: !MESSAGE ! !MESSAGE NMAKE /f "bsddb.mak" CFG="bsddb - Win32 Alpha Debug" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE ! !MESSAGE "bsddb - Win32 x86 Release" (based on "Win32 (x86) Dynamic-Link Library") ! !MESSAGE "bsddb - Win32 x86 Debug" (based on "Win32 (x86) Dynamic-Link Library") ! !MESSAGE "bsddb - Win32 Alpha Debug" (based on "Win32 (ALPHA) Dynamic-Link Library") ! !MESSAGE "bsddb - Win32 Alpha Release" (based on "Win32 (ALPHA) Dynamic-Link Library") !MESSAGE # Begin Project + # PROP AllowPerConfigDependencies 0 # PROP Scc_ProjName "bsddb" # PROP Scc_LocalPath ".." ! !IF "$(CFG)" == "bsddb - Win32 x86 Release" # PROP BASE Use_MFC 0 *************** *** 39,49 **** # PROP Use_Debug_Libraries 0 # PROP Output_Dir "." ! # PROP Intermediate_Dir "temp-release" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c # ADD CPP /nologo /MD /W3 /GX /Zi /O2 /I "..\Include" /I "..\PC" /I "..\..\bsddb\include" /I "..\..\bsddb\port\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /YX /FD /c ! # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32 ! # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32 # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" --- 40,54 ---- # PROP Use_Debug_Libraries 0 # PROP Output_Dir "." ! # PROP Intermediate_Dir "x86-temp-release" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" + F90=df.exe + CPP=cl.exe # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c # ADD CPP /nologo /MD /W3 /GX /Zi /O2 /I "..\Include" /I "..\PC" /I "..\..\bsddb\include" /I "..\..\bsddb\port\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /YX /FD /c ! MTL=midl.exe ! # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 ! # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 ! RSC=rc.exe # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" *************** *** 56,76 **** # SUBTRACT LINK32 /pdb:none ! !ELSEIF "$(CFG)" == "bsddb - Win32 Debug" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 ! # PROP BASE Output_Dir "bsddb" ! # PROP BASE Intermediate_Dir "bsddb" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 # PROP Output_Dir "." ! # PROP Intermediate_Dir "temp-debug" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c # ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\Include" /I "..\PC" /I "..\..\bsddb\include" /I "..\..\bsddb\port\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /YX /FD /c ! # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32 ! # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32 # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" --- 61,85 ---- # SUBTRACT LINK32 /pdb:none ! !ELSEIF "$(CFG)" == "bsddb - Win32 x86 Debug" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 ! # PROP BASE Output_Dir "Debug" ! # PROP BASE Intermediate_Dir "Debug" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 # PROP Output_Dir "." ! # PROP Intermediate_Dir "x86-temp-debug" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" + F90=df.exe + CPP=cl.exe # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c # ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\Include" /I "..\PC" /I "..\..\bsddb\include" /I "..\..\bsddb\port\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /YX /FD /c ! MTL=midl.exe ! # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 ! # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 ! RSC=rc.exe # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" *************** *** 83,95 **** # SUBTRACT LINK32 /pdb:none !ENDIF # Begin Target ! # Name "bsddb - Win32 Release" ! # Name "bsddb - Win32 Debug" # Begin Source File SOURCE=..\Modules\bsddbmodule.c # End Source File # End Target --- 92,181 ---- # SUBTRACT LINK32 /pdb:none + !ELSEIF "$(CFG)" == "bsddb - Win32 Alpha Debug" + + # PROP BASE Use_MFC 0 + # PROP BASE Use_Debug_Libraries 1 + # PROP BASE Output_Dir "Debug" + # PROP BASE Intermediate_Dir "Debug" + # PROP BASE Ignore_Export_Lib 0 + # PROP BASE Target_Dir "" + # PROP Use_MFC 0 + # PROP Use_Debug_Libraries 1 + # PROP Output_Dir "." + # PROP Intermediate_Dir "alpha-temp-debug" + # PROP Ignore_Export_Lib 0 + # PROP Target_Dir "" + MTL=midl.exe + # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 + # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 + CPP=cl.exe + # ADD BASE CPP /nologo /MTd /Gt0 /W3 /GX /Zi /Od /I "..\Include" /I "..\PC" /I "..\..\bsddb\include" /I "..\..\bsddb\port\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c + # ADD CPP /nologo /MDd /Gt0 /W3 /GX /Zi /Od /I "..\Include" /I "..\PC" /I "..\..\bsddb\include" /I "..\..\bsddb\port\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c + RSC=rc.exe + # ADD BASE RSC /l 0x409 /d "_DEBUG" + # ADD RSC /l 0x409 /d "_DEBUG" + BSC32=bscmake.exe + # ADD BASE BSC32 /nologo + # ADD BSC32 /nologo + LINK32=link.exe + # ADD BASE LINK32 ..\..\bsddb\port\win32\db.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /dll /debug /machine:ALPHA /nodefaultlib:"MSVCRT" /out:"./bsddb_d.pyd" /pdbtype:sept /libpath:"Debug" /export:initbsddb + # SUBTRACT BASE LINK32 /pdb:none + # ADD LINK32 ..\..\bsddb\port\win32\db.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /dll /debug /machine:ALPHA /nodefaultlib:"MSVCRT" /out:"alpha-temp-debug\bsddb_d.pyd" /pdbtype:sept /libpath:"Debug" /export:initbsddb + # SUBTRACT LINK32 /pdb:none + + !ELSEIF "$(CFG)" == "bsddb - Win32 Alpha Release" + + # PROP BASE Use_MFC 0 + # PROP BASE Use_Debug_Libraries 0 + # PROP BASE Output_Dir "Release" + # PROP BASE Intermediate_Dir "Release" + # PROP BASE Ignore_Export_Lib 0 + # PROP BASE Target_Dir "" + # PROP Use_MFC 0 + # PROP Use_Debug_Libraries 0 + # PROP Output_Dir "." + # PROP Intermediate_Dir "alpha-temp-release" + # PROP Ignore_Export_Lib 0 + # PROP Target_Dir "" + MTL=midl.exe + # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 + # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 + CPP=cl.exe + # ADD BASE CPP /nologo /MT /Gt0 /W3 /GX /Zi /O2 /I "..\Include" /I "..\PC" /I "..\..\bsddb\include" /I "..\..\bsddb\port\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c + # ADD CPP /nologo /MD /Gt0 /W3 /GX /O2 /I "..\Include" /I "..\PC" /I "..\..\bsddb\include" /I "..\..\bsddb\port\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c + RSC=rc.exe + # ADD BASE RSC /l 0x409 /d "NDEBUG" + # ADD RSC /l 0x409 /d "NDEBUG" + BSC32=bscmake.exe + # ADD BASE BSC32 /nologo + # ADD BSC32 /nologo + LINK32=link.exe + # ADD BASE LINK32 ..\..\bsddb\port\win32\db.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /dll /debug /machine:ALPHA /out:"./bsddb.pyd" /libpath:"Release" /export:initbsddb + # SUBTRACT BASE LINK32 /pdb:none + # ADD LINK32 ..\..\bsddb\port\win32\db.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /dll /debug /machine:ALPHA /out:"alpha-temp-release\bsddb.pyd" /libpath:"Release" /export:initbsddb + # SUBTRACT LINK32 /pdb:none + !ENDIF # Begin Target ! # Name "bsddb - Win32 x86 Release" ! # Name "bsddb - Win32 x86 Debug" ! # Name "bsddb - Win32 Alpha Debug" ! # Name "bsddb - Win32 Alpha Release" # Begin Source File SOURCE=..\Modules\bsddbmodule.c + + !IF "$(CFG)" == "bsddb - Win32 x86 Release" + + !ELSEIF "$(CFG)" == "bsddb - Win32 x86 Debug" + + !ELSEIF "$(CFG)" == "bsddb - Win32 Alpha Debug" + + !ELSEIF "$(CFG)" == "bsddb - Win32 Alpha Release" + + !ENDIF + # End Source File # End Target Index: parser.dsp =================================================================== RCS file: /projects/cvsroot/python/dist/src/PCbuild/parser.dsp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** parser.dsp 1998/08/08 21:04:17 1.4 --- parser.dsp 2000/01/20 21:31:41 1.5 *************** *** 1,9 **** # Microsoft Developer Studio Project File - Name="parser" - Package Owner=<4> ! # Microsoft Developer Studio Generated Build File, Format Version 5.00 # ** DO NOT EDIT ** # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 ! CFG=parser - Win32 Debug !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run --- 1,10 ---- # Microsoft Developer Studio Project File - Name="parser" - Package Owner=<4> ! # Microsoft Developer Studio Generated Build File, Format Version 6.00 # ** DO NOT EDIT ** # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 + # TARGTYPE "Win32 (ALPHA) Dynamic-Link Library" 0x0602 ! CFG=parser - Win32 Alpha Debug !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run *************** *** 14,33 **** !MESSAGE by defining the macro CFG on the command line. For example: !MESSAGE ! !MESSAGE NMAKE /f "parser.mak" CFG="parser - Win32 Debug" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE ! !MESSAGE "parser - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") ! !MESSAGE "parser - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE # Begin Project # PROP Scc_ProjName "parser" # PROP Scc_LocalPath ".." - CPP=cl.exe - MTL=midl.exe - RSC=rc.exe ! !IF "$(CFG)" == "parser - Win32 Release" # PROP BASE Use_MFC 0 --- 15,34 ---- !MESSAGE by defining the macro CFG on the command line. For example: !MESSAGE ! !MESSAGE NMAKE /f "parser.mak" CFG="parser - Win32 Alpha Debug" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE ! !MESSAGE "parser - Win32 x86 Release" (based on "Win32 (x86) Dynamic-Link Library") ! !MESSAGE "parser - Win32 x86 Debug" (based on "Win32 (x86) Dynamic-Link Library") ! !MESSAGE "parser - Win32 Alpha Debug" (based on "Win32 (ALPHA) Dynamic-Link Library") ! !MESSAGE "parser - Win32 Alpha Release" (based on "Win32 (ALPHA) Dynamic-Link Library") !MESSAGE # Begin Project + # PROP AllowPerConfigDependencies 0 # PROP Scc_ProjName "parser" # PROP Scc_LocalPath ".." ! !IF "$(CFG)" == "parser - Win32 x86 Release" # PROP BASE Use_MFC 0 *************** *** 39,49 **** # PROP Use_Debug_Libraries 0 # PROP Output_Dir "." ! # PROP Intermediate_Dir "temp-release" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c # ADD CPP /nologo /MD /W3 /GX /Zi /O2 /I "..\Include" /I "..\PC" /I "C:\Program Files\Tcl\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c ! # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32 ! # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32 # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" --- 40,54 ---- # PROP Use_Debug_Libraries 0 # PROP Output_Dir "." ! # PROP Intermediate_Dir "x86-temp-release" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" + F90=df.exe + CPP=cl.exe # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c # ADD CPP /nologo /MD /W3 /GX /Zi /O2 /I "..\Include" /I "..\PC" /I "C:\Program Files\Tcl\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c ! MTL=midl.exe ! # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 ! # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 ! RSC=rc.exe # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" *************** *** 56,76 **** # SUBTRACT LINK32 /pdb:none ! !ELSEIF "$(CFG)" == "parser - Win32 Debug" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 ! # PROP BASE Output_Dir "parser" ! # PROP BASE Intermediate_Dir "parser" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 # PROP Output_Dir "." ! # PROP Intermediate_Dir "temp-debug" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c # ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\Include" /I "..\PC" /I "C:\Program Files\Tcl\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c ! # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32 ! # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32 # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" --- 61,85 ---- # SUBTRACT LINK32 /pdb:none ! !ELSEIF "$(CFG)" == "parser - Win32 x86 Debug" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 ! # PROP BASE Output_Dir "Debug" ! # PROP BASE Intermediate_Dir "Debug" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 # PROP Output_Dir "." ! # PROP Intermediate_Dir "x86-temp-debug" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" + F90=df.exe + CPP=cl.exe # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c # ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\Include" /I "..\PC" /I "C:\Program Files\Tcl\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c ! MTL=midl.exe ! # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 ! # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 ! RSC=rc.exe # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" *************** *** 83,95 **** # SUBTRACT LINK32 /pdb:none !ENDIF # Begin Target ! # Name "parser - Win32 Release" ! # Name "parser - Win32 Debug" # Begin Source File SOURCE=..\Modules\parsermodule.c # End Source File # End Target --- 92,181 ---- # SUBTRACT LINK32 /pdb:none + !ELSEIF "$(CFG)" == "parser - Win32 Alpha Debug" + + # PROP BASE Use_MFC 0 + # PROP BASE Use_Debug_Libraries 1 + # PROP BASE Output_Dir "Debug" + # PROP BASE Intermediate_Dir "Debug" + # PROP BASE Ignore_Export_Lib 0 + # PROP BASE Target_Dir "" + # PROP Use_MFC 0 + # PROP Use_Debug_Libraries 1 + # PROP Output_Dir "." + # PROP Intermediate_Dir "alpha-temp-debug" + # PROP Ignore_Export_Lib 0 + # PROP Target_Dir "" + MTL=midl.exe + # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 + # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 + CPP=cl.exe + # ADD BASE CPP /nologo /MTd /Gt0 /W3 /GX /Zi /Od /I "..\Include" /I "..\PC" /I "C:\Program Files\Tcl\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c + # ADD CPP /nologo /MDd /Gt0 /W3 /GX /Zi /Od /I "..\Include" /I "..\PC" /I "C:\Program Files\Tcl\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c + RSC=rc.exe + # ADD BASE RSC /l 0x409 /d "_DEBUG" + # ADD RSC /l 0x409 /d "_DEBUG" + BSC32=bscmake.exe + # ADD BASE BSC32 /nologo + # ADD BSC32 /nologo + LINK32=link.exe + # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /base:"0x1e100000" /subsystem:windows /dll /debug /machine:ALPHA /out:"./parser_d.pyd" /pdbtype:sept /libpath:"Debug" /export:initparser + # SUBTRACT BASE LINK32 /pdb:none + # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /base:"0x1e100000" /subsystem:windows /dll /debug /machine:ALPHA /out:"alpha-temp-debug/parser_d.pyd" /pdbtype:sept /libpath:"Debug" /export:initparser + # SUBTRACT LINK32 /pdb:none + + !ELSEIF "$(CFG)" == "parser - Win32 Alpha Release" + + # PROP BASE Use_MFC 0 + # PROP BASE Use_Debug_Libraries 0 + # PROP BASE Output_Dir "Release" + # PROP BASE Intermediate_Dir "Release" + # PROP BASE Ignore_Export_Lib 0 + # PROP BASE Target_Dir "" + # PROP Use_MFC 0 + # PROP Use_Debug_Libraries 0 + # PROP Output_Dir "." + # PROP Intermediate_Dir "alpha-temp-release" + # PROP Ignore_Export_Lib 0 + # PROP Target_Dir "" + MTL=midl.exe + # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 + # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 + CPP=cl.exe + # ADD BASE CPP /nologo /MT /Gt0 /W3 /GX /Zi /O2 /I "..\Include" /I "..\PC" /I "C:\Program Files\Tcl\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c + # ADD CPP /nologo /MD /Gt0 /W3 /GX /O2 /I "..\Include" /I "..\PC" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c + RSC=rc.exe + # ADD BASE RSC /l 0x409 /d "NDEBUG" + # ADD RSC /l 0x409 /d "NDEBUG" + BSC32=bscmake.exe + # ADD BASE BSC32 /nologo + # ADD BSC32 /nologo + LINK32=link.exe + # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /base:"0x1e100000" /subsystem:windows /dll /debug /machine:ALPHA /out:"./parser.pyd" /libpath:"Release" /export:initparser + # SUBTRACT BASE LINK32 /pdb:none + # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /base:"0x1e100000" /subsystem:windows /dll /debug /machine:ALPHA /out:"alpha-temp-release/parser.pyd" /libpath:"Release" /export:initparser + # SUBTRACT LINK32 /pdb:none + !ENDIF # Begin Target ! # Name "parser - Win32 x86 Release" ! # Name "parser - Win32 x86 Debug" ! # Name "parser - Win32 Alpha Debug" ! # Name "parser - Win32 Alpha Release" # Begin Source File SOURCE=..\Modules\parsermodule.c + + !IF "$(CFG)" == "parser - Win32 x86 Release" + + !ELSEIF "$(CFG)" == "parser - Win32 x86 Debug" + + !ELSEIF "$(CFG)" == "parser - Win32 Alpha Debug" + + !ELSEIF "$(CFG)" == "parser - Win32 Alpha Release" + + !ENDIF + # End Source File # End Target Index: pcbuild.dsw =================================================================== RCS file: /projects/cvsroot/python/dist/src/PCbuild/pcbuild.dsw,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -r1.5 -r1.6 *** pcbuild.dsw 1998/10/08 01:48:13 1.5 --- pcbuild.dsw 2000/01/20 21:31:41 1.6 *************** *** 1,15 **** ! Microsoft Developer Studio Workspace File, Format Version 5.00 # WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! ############################################################################### ! Project: "_tkinter"=".\_tkinter.dsp" - Package Owner=<4> Package=<5> {{{ - begin source code control - _tkinter - . - end source code control }}} --- 1,11 ---- ! Microsoft Developer Studio Workspace File, Format Version 6.00 # WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! ############################################################################### ! Project: "_tkinter"=.\_tkinter.dsp - Package Owner=<4> Package=<5> {{{ }}} *************** *** 23,34 **** ############################################################################### ! Project: "bsddb"=".\bsddb.dsp" - Package Owner=<4> Package=<5> {{{ - begin source code control - bsddb - .. - end source code control }}} --- 19,26 ---- ############################################################################### ! Project: "bsddb"=.\bsddb.dsp - Package Owner=<4> Package=<5> {{{ }}} *************** *** 42,53 **** ############################################################################### ! Project: "parser"=".\parser.dsp" - Package Owner=<4> Package=<5> {{{ - begin source code control - parser - .. - end source code control }}} --- 34,41 ---- ############################################################################### ! Project: "parser"=.\parser.dsp - Package Owner=<4> Package=<5> {{{ }}} *************** *** 61,72 **** ############################################################################### ! Project: "python"=".\python.dsp" - Package Owner=<4> Package=<5> {{{ - begin source code control - python - .. - end source code control }}} --- 49,56 ---- ############################################################################### ! Project: "python"=.\python.dsp - Package Owner=<4> Package=<5> {{{ }}} *************** *** 80,91 **** ############################################################################### ! Project: "python15"=".\python15.dsp" - Package Owner=<4> Package=<5> {{{ - begin source code control - python15 - .. - end source code control }}} --- 64,71 ---- ############################################################################### ! Project: "python15"=.\python15.dsp - Package Owner=<4> Package=<5> {{{ }}} *************** *** 96,107 **** ############################################################################### ! Project: "pythonw"=".\pythonw.dsp" - Package Owner=<4> Package=<5> {{{ - begin source code control - pythonw - ..\pc - end source code control }}} --- 76,83 ---- ############################################################################### ! Project: "pythonw"=.\pythonw.dsp - Package Owner=<4> Package=<5> {{{ }}} *************** *** 115,126 **** ############################################################################### ! Project: "zlib"=".\zlib.dsp" - Package Owner=<4> Package=<5> {{{ - begin source code control - zlib - .. - end source code control }}} --- 91,98 ---- ############################################################################### ! Project: "zlib"=.\zlib.dsp - Package Owner=<4> Package=<5> {{{ }}} Index: python.dsp =================================================================== RCS file: /projects/cvsroot/python/dist/src/PCbuild/python.dsp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -r1.6 -r1.7 *** python.dsp 1999/12/20 23:02:41 1.6 --- python.dsp 2000/01/20 21:31:41 1.7 *************** *** 1,9 **** # Microsoft Developer Studio Project File - Name="python" - Package Owner=<4> ! # Microsoft Developer Studio Generated Build File, Format Version 5.00 # ** DO NOT EDIT ** # TARGTYPE "Win32 (x86) Console Application" 0x0103 ! CFG=python - Win32 Debug !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run --- 1,10 ---- # Microsoft Developer Studio Project File - Name="python" - Package Owner=<4> ! # Microsoft Developer Studio Generated Build File, Format Version 6.00 # ** DO NOT EDIT ** # TARGTYPE "Win32 (x86) Console Application" 0x0103 + # TARGTYPE "Win32 (ALPHA) Console Application" 0x0603 ! CFG=python - Win32 Alpha Debug !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run *************** *** 14,32 **** !MESSAGE by defining the macro CFG on the command line. For example: !MESSAGE ! !MESSAGE NMAKE /f "python.mak" CFG="python - Win32 Debug" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE ! !MESSAGE "python - Win32 Release" (based on "Win32 (x86) Console Application") ! !MESSAGE "python - Win32 Debug" (based on "Win32 (x86) Console Application") !MESSAGE # Begin Project # PROP Scc_ProjName "python" # PROP Scc_LocalPath ".." - CPP=cl.exe - RSC=rc.exe ! !IF "$(CFG)" == "python - Win32 Release" # PROP BASE Use_MFC 0 --- 15,34 ---- !MESSAGE by defining the macro CFG on the command line. For example: !MESSAGE ! !MESSAGE NMAKE /f "python.mak" CFG="python - Win32 Alpha Debug" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE ! !MESSAGE "python - Win32 x86 Release" (based on "Win32 (x86) Console Application") ! !MESSAGE "python - Win32 x86 Debug" (based on "Win32 (x86) Console Application") ! !MESSAGE "python - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application") ! !MESSAGE "python - Win32 Alpha Release" (based on "Win32 (ALPHA) Console Application") !MESSAGE # Begin Project + # PROP AllowPerConfigDependencies 0 # PROP Scc_ProjName "python" # PROP Scc_LocalPath ".." ! !IF "$(CFG)" == "python - Win32 x86 Release" # PROP BASE Use_MFC 0 *************** *** 38,46 **** # PROP Use_Debug_Libraries 0 # PROP Output_Dir "." ! # PROP Intermediate_Dir "temp-release" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c # ADD CPP /nologo /MD /W3 /GX /Zi /O2 /I "..\Include" /I "..\PC" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" --- 40,50 ---- # PROP Use_Debug_Libraries 0 # PROP Output_Dir "." ! # PROP Intermediate_Dir "x86-temp-release" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" + CPP=cl.exe # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c # ADD CPP /nologo /MD /W3 /GX /Zi /O2 /I "..\Include" /I "..\PC" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c + RSC=rc.exe # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" *************** *** 50,56 **** LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 ! # ADD LINK32 setargv.obj kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"Release" ! !ELSEIF "$(CFG)" == "python - Win32 Debug" # PROP BASE Use_MFC 0 --- 54,60 ---- LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 ! # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"Release" ! !ELSEIF "$(CFG)" == "python - Win32 x86 Debug" # PROP BASE Use_MFC 0 *************** *** 62,70 **** # PROP Use_Debug_Libraries 1 # PROP Output_Dir "." ! # PROP Intermediate_Dir "temp-debug" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c # ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\Include" /I "..\PC" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /YX /FD /c # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /i "..\Include" /d "_DEBUG" --- 66,76 ---- # PROP Use_Debug_Libraries 1 # PROP Output_Dir "." ! # PROP Intermediate_Dir "x86-temp-debug" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" + CPP=cl.exe # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c # ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\Include" /I "..\PC" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /YX /FD /c + RSC=rc.exe # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /i "..\Include" /d "_DEBUG" *************** *** 74,85 **** LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept ! # ADD LINK32 setargv.obj kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /out:"./python_d.exe" /pdbtype:sept /libpath:"Debug" !ENDIF # Begin Target ! # Name "python - Win32 Release" ! # Name "python - Win32 Debug" # Begin Source File --- 80,147 ---- LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept ! # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /out:"./python_d.exe" /pdbtype:sept /libpath:"Debug" ! ! !ELSEIF "$(CFG)" == "python - Win32 Alpha Debug" + # PROP BASE Use_MFC 0 + # PROP BASE Use_Debug_Libraries 1 + # PROP BASE Output_Dir "Debug" + # PROP BASE Intermediate_Dir "Debug" + # PROP BASE Ignore_Export_Lib 0 + # PROP BASE Target_Dir "" + # PROP Use_MFC 0 + # PROP Use_Debug_Libraries 1 + # PROP Output_Dir "." + # PROP Intermediate_Dir "alpha-temp-debug" + # PROP Ignore_Export_Lib 0 + # PROP Target_Dir "" + CPP=cl.exe + # ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\Include" /I "..\PC" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /YX /FD /c + # ADD CPP /nologo /MDd /Gt0 /W3 /GX /Zi /Od /I "..\Include" /I "..\PC" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /YX /FD /c + RSC=rc.exe + # ADD BASE RSC /l 0x409 /i "..\Include" /d "_DEBUG" + # ADD RSC /l 0x409 /i "..\Include" /d "_DEBUG" + BSC32=bscmake.exe + # ADD BASE BSC32 /nologo + # ADD BSC32 /nologo + LINK32=link.exe + # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /out:"./python_d.exe" /pdbtype:sept /libpath:"Debug" + # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /out:"./python_d.exe" /pdbtype:sept /libpath:"Debug" + + !ELSEIF "$(CFG)" == "python - Win32 Alpha Release" + + # PROP BASE Use_MFC 0 + # PROP BASE Use_Debug_Libraries 0 + # PROP BASE Output_Dir "Release" + # PROP BASE Intermediate_Dir "Release" + # PROP BASE Ignore_Export_Lib 0 + # PROP BASE Target_Dir "" + # PROP Use_MFC 0 + # PROP Use_Debug_Libraries 0 + # PROP Output_Dir "." + # PROP Intermediate_Dir "alpha-temp-release" + # PROP Ignore_Export_Lib 0 + # PROP Target_Dir "" + CPP=cl.exe + # ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /O2 /I "..\Include" /I "..\PC" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c + # ADD CPP /nologo /MD /Gt0 /W3 /GX /O2 /I "..\Include" /I "..\PC" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c + RSC=rc.exe + # ADD BASE RSC /l 0x409 /d "NDEBUG" + # ADD RSC /l 0x409 /d "NDEBUG" + BSC32=bscmake.exe + # ADD BASE BSC32 /nologo + # ADD BSC32 /nologo + LINK32=link.exe + # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"Release" + # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"Release" + !ENDIF # Begin Target ! # Name "python - Win32 x86 Release" ! # Name "python - Win32 x86 Debug" ! # Name "python - Win32 Alpha Debug" ! # Name "python - Win32 Alpha Release" # Begin Source File *************** *** 89,103 **** SOURCE=..\Modules\python.c - # End Source File - # Begin Source File ! SOURCE=..\PC\python_exe.rc ! !IF "$(CFG)" == "python - Win32 Release" ! !ELSEIF "$(CFG)" == "python - Win32 Debug" !ENDIF # End Source File # End Target --- 151,169 ---- SOURCE=..\Modules\python.c ! !IF "$(CFG)" == "python - Win32 x86 Release" ! ! !ELSEIF "$(CFG)" == "python - Win32 x86 Debug" ! !ELSEIF "$(CFG)" == "python - Win32 Alpha Debug" ! !ELSEIF "$(CFG)" == "python - Win32 Alpha Release" !ENDIF + # End Source File + # Begin Source File + + SOURCE=..\PC\python_exe.rc # End Source File # End Target Index: python15.dsp =================================================================== RCS file: /projects/cvsroot/python/dist/src/PCbuild/python15.dsp,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -r1.9 -r1.10 *** python15.dsp 1999/12/20 23:00:10 1.9 --- python15.dsp 2000/01/20 21:31:41 1.10 *************** *** 1,9 **** # Microsoft Developer Studio Project File - Name="python15" - Package Owner=<4> ! # Microsoft Developer Studio Generated Build File, Format Version 5.00 # ** DO NOT EDIT ** # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 ! CFG=python15 - Win32 Debug !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run --- 1,10 ---- [...1966 lines suppressed...] + + !ENDIF + # End Source File # Begin Source File SOURCE=..\Modules\yuvconvert.c + + !IF "$(CFG)" == "python15 - Win32 x86 Release" + + !ELSEIF "$(CFG)" == "python15 - Win32 x86 Debug" + + !ELSEIF "$(CFG)" == "python15 - Win32 Alpha Debug" + + !ELSEIF "$(CFG)" == "python15 - Win32 Alpha Release" + + !ENDIF + # End Source File # End Target Index: pythonw.dsp =================================================================== RCS file: /projects/cvsroot/python/dist/src/PCbuild/pythonw.dsp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -r1.5 -r1.6 *** pythonw.dsp 1998/08/13 18:54:51 1.5 --- pythonw.dsp 2000/01/20 21:31:41 1.6 *************** *** 1,9 **** # Microsoft Developer Studio Project File - Name="pythonw" - Package Owner=<4> ! # Microsoft Developer Studio Generated Build File, Format Version 5.00 # ** DO NOT EDIT ** # TARGTYPE "Win32 (x86) Application" 0x0101 ! CFG=pythonw - Win32 Debug !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run --- 1,10 ---- # Microsoft Developer Studio Project File - Name="pythonw" - Package Owner=<4> ! # Microsoft Developer Studio Generated Build File, Format Version 6.00 # ** DO NOT EDIT ** # TARGTYPE "Win32 (x86) Application" 0x0101 + # TARGTYPE "Win32 (ALPHA) Application" 0x0601 ! CFG=pythonw - Win32 Alpha Debug !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run *************** *** 14,33 **** !MESSAGE by defining the macro CFG on the command line. For example: !MESSAGE ! !MESSAGE NMAKE /f "pythonw.mak" CFG="pythonw - Win32 Debug" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE ! !MESSAGE "pythonw - Win32 Release" (based on "Win32 (x86) Application") ! !MESSAGE "pythonw - Win32 Debug" (based on "Win32 (x86) Application") !MESSAGE # Begin Project # PROP Scc_ProjName "pythonw" # PROP Scc_LocalPath "..\pc" - CPP=cl.exe - MTL=midl.exe - RSC=rc.exe ! !IF "$(CFG)" == "pythonw - Win32 Release" # PROP BASE Use_MFC 0 --- 15,34 ---- !MESSAGE by defining the macro CFG on the command line. For example: !MESSAGE ! !MESSAGE NMAKE /f "pythonw.mak" CFG="pythonw - Win32 Alpha Debug" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE ! !MESSAGE "pythonw - Win32 x86 Release" (based on "Win32 (x86) Application") ! !MESSAGE "pythonw - Win32 x86 Debug" (based on "Win32 (x86) Application") ! !MESSAGE "pythonw - Win32 Alpha Debug" (based on "Win32 (ALPHA) Application") ! !MESSAGE "pythonw - Win32 Alpha Release" (based on "Win32 (ALPHA) Application") !MESSAGE # Begin Project + # PROP AllowPerConfigDependencies 0 # PROP Scc_ProjName "pythonw" # PROP Scc_LocalPath "..\pc" ! !IF "$(CFG)" == "pythonw - Win32 x86 Release" # PROP BASE Use_MFC 0 *************** *** 39,49 **** # PROP Use_Debug_Libraries 0 # PROP Output_Dir "." ! # PROP Intermediate_Dir "temp-release" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c # ADD CPP /nologo /MD /W3 /GX /Zi /O2 /I "..\Include" /I "..\PC" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c ! # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32 ! # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32 # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" --- 40,53 ---- # PROP Use_Debug_Libraries 0 # PROP Output_Dir "." ! # PROP Intermediate_Dir "x86-temp-release" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" + CPP=cl.exe # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c # ADD CPP /nologo /MD /W3 /GX /Zi /O2 /I "..\Include" /I "..\PC" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c ! MTL=midl.exe ! # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 ! # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 ! RSC=rc.exe # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" *************** *** 56,60 **** # SUBTRACT LINK32 /pdb:none ! !ELSEIF "$(CFG)" == "pythonw - Win32 Debug" # PROP BASE Use_MFC 0 --- 60,64 ---- # SUBTRACT LINK32 /pdb:none ! !ELSEIF "$(CFG)" == "pythonw - Win32 x86 Debug" # PROP BASE Use_MFC 0 *************** *** 66,76 **** # PROP Use_Debug_Libraries 1 # PROP Output_Dir "." ! # PROP Intermediate_Dir "temp-debug" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c # ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\Include" /I "..\PC" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c ! # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32 ! # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32 # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" --- 70,83 ---- # PROP Use_Debug_Libraries 1 # PROP Output_Dir "." ! # PROP Intermediate_Dir "x86-temp-debug" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" + CPP=cl.exe # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c # ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\Include" /I "..\PC" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c ! MTL=midl.exe ! # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 ! # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 ! RSC=rc.exe # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" *************** *** 83,106 **** # SUBTRACT LINK32 /pdb:none !ENDIF # Begin Target ! # Name "pythonw - Win32 Release" ! # Name "pythonw - Win32 Debug" # Begin Source File SOURCE=..\PC\python_exe.rc ! !IF "$(CFG)" == "pythonw - Win32 Release" ! !ELSEIF "$(CFG)" == "pythonw - Win32 Debug" ! !ENDIF ! # End Source File ! # Begin Source File ! SOURCE=..\PC\WinMain.c # End Source File # End Target --- 90,183 ---- # SUBTRACT LINK32 /pdb:none + !ELSEIF "$(CFG)" == "pythonw - Win32 Alpha Debug" + + # PROP BASE Use_MFC 0 + # PROP BASE Use_Debug_Libraries 1 + # PROP BASE Output_Dir "Debug" + # PROP BASE Intermediate_Dir "Debug" + # PROP BASE Ignore_Export_Lib 0 + # PROP BASE Target_Dir "" + # PROP Use_MFC 0 + # PROP Use_Debug_Libraries 1 + # PROP Output_Dir "." + # PROP Intermediate_Dir "alpha-temp-debug" + # PROP Ignore_Export_Lib 0 + # PROP Target_Dir "" + MTL=midl.exe + # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 + # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 + CPP=cl.exe + # ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\Include" /I "..\PC" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c + # ADD CPP /nologo /MDd /Gt0 /W3 /GX /Zi /Od /I "..\Include" /I "..\PC" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c + RSC=rc.exe + # ADD BASE RSC /l 0x409 /d "_DEBUG" + # ADD RSC /l 0x409 /d "_DEBUG" + BSC32=bscmake.exe + # ADD BASE BSC32 /nologo + # ADD BSC32 /nologo + LINK32=link.exe + # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /base:"0x1e190000" /subsystem:windows /debug /machine:ALPHA /out:"./pythonw_d.exe" /pdbtype:sept /libpath:"Debug" + # SUBTRACT BASE LINK32 /pdb:none + # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /base:"0x1e190000" /subsystem:windows /debug /machine:ALPHA /out:"./pythonw_d.exe" /pdbtype:sept /libpath:"Debug" + # SUBTRACT LINK32 /pdb:none + + !ELSEIF "$(CFG)" == "pythonw - Win32 Alpha Release" + + # PROP BASE Use_MFC 0 + # PROP BASE Use_Debug_Libraries 0 + # PROP BASE Output_Dir "Release" + # PROP BASE Intermediate_Dir "Release" + # PROP BASE Ignore_Export_Lib 0 + # PROP BASE Target_Dir "" + # PROP Use_MFC 0 + # PROP Use_Debug_Libraries 0 + # PROP Output_Dir "." + # PROP Intermediate_Dir "alpha-temp-release" + # PROP Ignore_Export_Lib 0 + # PROP Target_Dir "" + MTL=midl.exe + # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 + # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 + CPP=cl.exe + # ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /O2 /I "..\Include" /I "..\PC" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c + # ADD CPP /nologo /MD /Gt0 /W3 /GX /O2 /I "..\Include" /I "..\PC" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c + RSC=rc.exe + # ADD BASE RSC /l 0x409 /d "NDEBUG" + # ADD RSC /l 0x409 /d "NDEBUG" + BSC32=bscmake.exe + # ADD BASE BSC32 /nologo + # ADD BSC32 /nologo + LINK32=link.exe + # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /base:"0x1e190000" /subsystem:windows /debug /machine:ALPHA /libpath:"Release" + # SUBTRACT BASE LINK32 /pdb:none + # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /base:"0x1e190000" /subsystem:windows /debug /machine:ALPHA /libpath:"Release" + # SUBTRACT LINK32 /pdb:none + !ENDIF # Begin Target ! # Name "pythonw - Win32 x86 Release" ! # Name "pythonw - Win32 x86 Debug" ! # Name "pythonw - Win32 Alpha Debug" ! # Name "pythonw - Win32 Alpha Release" # Begin Source File SOURCE=..\PC\python_exe.rc + # End Source File + # Begin Source File ! SOURCE=..\PC\WinMain.c ! !IF "$(CFG)" == "pythonw - Win32 x86 Release" ! !ELSEIF "$(CFG)" == "pythonw - Win32 x86 Debug" ! !ELSEIF "$(CFG)" == "pythonw - Win32 Alpha Debug" ! !ELSEIF "$(CFG)" == "pythonw - Win32 Alpha Release" ! ! !ENDIF ! # End Source File # End Target Index: zlib.dsp =================================================================== RCS file: /projects/cvsroot/python/dist/src/PCbuild/zlib.dsp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -r1.6 -r1.7 *** zlib.dsp 1999/04/08 20:49:11 1.6 --- zlib.dsp 2000/01/20 21:31:41 1.7 *************** *** 1,9 **** # Microsoft Developer Studio Project File - Name="zlib" - Package Owner=<4> ! # Microsoft Developer Studio Generated Build File, Format Version 5.00 # ** DO NOT EDIT ** # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 ! CFG=zlib - Win32 Debug !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run --- 1,9 ---- # Microsoft Developer Studio Project File - Name="zlib" - Package Owner=<4> ! # Microsoft Developer Studio Generated Build File, Format Version 6.00 # ** DO NOT EDIT ** # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 ! CFG=zlib - Win32 x86 Debug !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run *************** *** 14,26 **** !MESSAGE by defining the macro CFG on the command line. For example: !MESSAGE ! !MESSAGE NMAKE /f "zlib.mak" CFG="zlib - Win32 Debug" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE ! !MESSAGE "zlib - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") ! !MESSAGE "zlib - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE # Begin Project # PROP Scc_ProjName "zlib" # PROP Scc_LocalPath ".." --- 14,27 ---- !MESSAGE by defining the macro CFG on the command line. For example: !MESSAGE ! !MESSAGE NMAKE /f "zlib.mak" CFG="zlib - Win32 x86 Debug" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE ! !MESSAGE "zlib - Win32 x86 Release" (based on "Win32 (x86) Dynamic-Link Library") ! !MESSAGE "zlib - Win32 x86 Debug" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE # Begin Project + # PROP AllowPerConfigDependencies 0 # PROP Scc_ProjName "zlib" # PROP Scc_LocalPath ".." *************** *** 29,33 **** RSC=rc.exe ! !IF "$(CFG)" == "zlib - Win32 Release" # PROP BASE Use_MFC 0 --- 30,34 ---- RSC=rc.exe ! !IF "$(CFG)" == "zlib - Win32 x86 Release" # PROP BASE Use_MFC 0 *************** *** 39,43 **** # PROP Use_Debug_Libraries 0 # PROP Output_Dir "." ! # PROP Intermediate_Dir "temp-release" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" --- 40,44 ---- # PROP Use_Debug_Libraries 0 # PROP Output_Dir "." ! # PROP Intermediate_Dir "x86-temp-release" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" *************** *** 45,50 **** # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c # ADD CPP /nologo /MD /W3 /GX /Zi /O2 /I "..\Include" /I "..\PC" /I "..\..\zlib113" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /YX /FD /c ! # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32 ! # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32 # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" --- 46,51 ---- # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c # ADD CPP /nologo /MD /W3 /GX /Zi /O2 /I "..\Include" /I "..\PC" /I "..\..\zlib113" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /YX /FD /c ! # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 ! # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" *************** *** 57,71 **** # SUBTRACT LINK32 /pdb:none ! !ELSEIF "$(CFG)" == "zlib - Win32 Debug" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 ! # PROP BASE Output_Dir "zlib" ! # PROP BASE Intermediate_Dir "zlib" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 # PROP Output_Dir "." ! # PROP Intermediate_Dir "temp-debug" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" --- 58,72 ---- # SUBTRACT LINK32 /pdb:none ! !ELSEIF "$(CFG)" == "zlib - Win32 x86 Debug" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 ! # PROP BASE Output_Dir "Debug" ! # PROP BASE Intermediate_Dir "Debug" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 # PROP Output_Dir "." ! # PROP Intermediate_Dir "x86-temp-debug" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" *************** *** 73,78 **** # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c # ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\Include" /I "..\PC" /I "..\..\zlib113" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /YX /FD /c ! # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32 ! # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32 # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" --- 74,79 ---- # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c # ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\Include" /I "..\PC" /I "..\..\zlib113" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /YX /FD /c ! # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 ! # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" *************** *** 89,94 **** # Begin Target ! # Name "zlib - Win32 Release" ! # Name "zlib - Win32 Debug" # Begin Source File --- 90,95 ---- # Begin Target ! # Name "zlib - Win32 x86 Release" ! # Name "zlib - Win32 x86 Debug" # Begin Source File From guido@cnri.reston.va.us Thu Jan 20 21:37:22 2000 From: guido@cnri.reston.va.us (Guido van Rossum) Date: Thu, 20 Jan 2000 16:37:22 -0500 (EST) Subject: [Python-checkins] CVS: python/dist/src/Demo/metaclasses index.html,1.8,1.9 Message-ID: <200001202137.QAA23144@eric.cnri.reston.va.us> Update of /projects/cvsroot/python/dist/src/Demo/metaclasses In directory eric:/projects/python/python.org/ftp/pub/www.python.org/doc/essays/metaclasses Modified Files: index.html Log Message: Fix some broken links. Index: index.html =================================================================== RCS file: /projects/cvsroot/python/dist/src/Demo/metaclasses/index.html,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -r1.8 -r1.9 *** index.html 1998/08/10 01:54:40 1.8 --- index.html 2000/01/20 21:37:19 1.9 *************** *** 28,32 **** HREF="http://maigret.cog.brown.edu/pyutil/">MESS</A> package; Jim Fulton has used it in his <A ! HREF="http://www.digicool.com/papers/ExtensionClass.html">Extension Classes</A> package. (It has also been referred to as the ``Don Beaudry <i>hack</i>,'' but that's a misnomer. There's nothing hackish --- 28,32 ---- HREF="http://maigret.cog.brown.edu/pyutil/">MESS</A> package; Jim Fulton has used it in his <A ! HREF="http://www.digicool.com/releases/ExtensionClass/">Extension Classes</A> package. (It has also been referred to as the ``Don Beaudry <i>hack</i>,'' but that's a misnomer. There's nothing hackish *************** *** 63,67 **** <P>(Types are not classes, by the way. See questions 4.2, 4.19 and in particular 6.22 in the <A ! HREF="http://grail.cnri.reston.va.us/cgi-bin/faqw.py" >Python FAQ</A> for more on this topic.) --- 63,67 ---- <P>(Types are not classes, by the way. See questions 4.2, 4.19 and in particular 6.22 in the <A ! HREF="http://www.python.org/cgi-bin/faqw.py" >Python FAQ</A> for more on this topic.) *************** *** 194,198 **** This is exactly the same as before except that instead of type(B), B.__class__ is invoked. If you have read <A HREF= ! "http://grail.cnri.reston.va.us/cgi-bin/faqw.py?req=show&file=faq06.022.htp" >FAQ question 6.22</A> you will understand that while there is a big technical difference between type(B) and B.__class__, they play the --- 194,198 ---- This is exactly the same as before except that instead of type(B), B.__class__ is invoked. If you have read <A HREF= ! "http://www.python.org/cgi-bin/faqw.py?req=show&file=faq06.022.htp" >FAQ question 6.22</A> you will understand that while there is a big technical difference between type(B) and B.__class__, they play the From guido@cnri.reston.va.us Thu Jan 20 22:33:18 2000 From: guido@cnri.reston.va.us (Guido van Rossum) Date: Thu, 20 Jan 2000 17:33:18 -0500 (EST) Subject: [Python-checkins] CVS: python/dist/src/Include object.h,2.47,2.48 Message-ID: <200001202233.RAA27440@eric.cnri.reston.va.us> Update of /projects/cvsroot/python/dist/src/Include In directory eric:/tmp/python/dist/src/Include Modified Files: object.h Log Message: The rest of the changes by Trent Mick and Dale Nagata for warning-free compilation on NT Alpha. Mostly added casts etc. Index: object.h =================================================================== RCS file: /projects/cvsroot/python/dist/src/Include/object.h,v retrieving revision 2.47 retrieving revision 2.48 diff -C2 -r2.47 -r2.48 *** object.h 1998/12/04 18:48:12 2.47 --- object.h 2000/01/20 22:32:45 2.48 *************** *** 363,366 **** --- 363,367 ---- extern DL_IMPORT(void) _Py_ForgetReference Py_PROTO((PyObject *)); extern DL_IMPORT(void) _Py_PrintReferences Py_PROTO((FILE *)); + extern DL_IMPORT(void) _Py_ResetReferences Py_PROTO((void)); #endif From guido@cnri.reston.va.us Thu Jan 20 22:33:26 2000 From: guido@cnri.reston.va.us (Guido van Rossum) Date: Thu, 20 Jan 2000 17:33:26 -0500 (EST) Subject: [Python-checkins] CVS: python/dist/src/Modules arraymodule.c,2.36,2.37 Message-ID: <200001202233.RAA27444@eric.cnri.reston.va.us> Update of /projects/cvsroot/python/dist/src/Modules In directory eric:/tmp/python/dist/src/Modules Modified Files: arraymodule.c Log Message: The rest of the changes by Trent Mick and Dale Nagata for warning-free compilation on NT Alpha. Mostly added casts etc. Index: arraymodule.c =================================================================== RCS file: /projects/cvsroot/python/dist/src/Modules/arraymodule.c,v retrieving revision 2.36 retrieving revision 2.37 diff -C2 -r2.36 -r2.37 *** arraymodule.c 1999/12/03 17:15:30 2.36 --- arraymodule.c 2000/01/20 22:32:53 2.37 *************** *** 364,368 **** op->ob_size = size; op->ob_descr = descr; ! _Py_NewReference(op); return (PyObject *) op; } --- 364,368 ---- op->ob_size = size; op->ob_descr = descr; ! _Py_NewReference((PyObject *)op); return (PyObject *) op; } From guido@cnri.reston.va.us Thu Jan 20 22:33:28 2000 From: guido@cnri.reston.va.us (Guido van Rossum) Date: Thu, 20 Jan 2000 17:33:28 -0500 (EST) Subject: [Python-checkins] CVS: python/dist/src/PC config.h,1.30,1.31 Message-ID: <200001202233.RAA27463@eric.cnri.reston.va.us> Update of /projects/cvsroot/python/dist/src/PC In directory eric:/tmp/python/dist/src/PC Modified Files: config.h Log Message: The rest of the changes by Trent Mick and Dale Nagata for warning-free compilation on NT Alpha. Mostly added casts etc. Index: config.h =================================================================== RCS file: /projects/cvsroot/python/dist/src/PC/config.h,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -r1.30 -r1.31 *** config.h 1999/12/20 22:57:41 1.30 --- config.h 2000/01/20 22:32:55 1.31 *************** *** 62,65 **** --- 62,67 ---- #ifdef _M_IX86 #define COMPILER "[MSC 32 bit (Intel)]" + #elif defined(_M_ALPHA) + #define COMPILER "[MSC 32 bit (Alpha)]" #else #define COMPILER "[MSC (Unknown)]" *************** *** 214,218 **** /* So nobody needs to specify the .lib in their Makefile any more */ #ifdef _DEBUG - #define Py_DEBUG #pragma comment(lib,"python15_d.lib") #else --- 216,219 ---- *************** *** 220,223 **** --- 221,228 ---- #endif #endif /* USE_DL_EXPORT */ + + #ifdef _DEBUG + #define Py_DEBUG + #endif #define SIZEOF_INT 4 From guido@cnri.reston.va.us Thu Jan 20 22:33:28 2000 From: guido@cnri.reston.va.us (Guido van Rossum) Date: Thu, 20 Jan 2000 17:33:28 -0500 (EST) Subject: [Python-checkins] CVS: python/dist/src/Objects classobject.c,2.81,2.82 complexobject.c,2.21,2.22 floatobject.c,2.53,2.54 frameobject.c,2.36,2.37 intobject.c,2.36,2.37 listobject.c,2.62,2.63 methodobject.c,2.24,2.25 object.c,2.61,2.62 stringobject.c,2.53,2.54 tupleobject.c,2.28,2.29 Message-ID: <200001202233.RAA27466@eric.cnri.reston.va.us> Update of /projects/cvsroot/python/dist/src/Objects In directory eric:/tmp/python/dist/src/Objects Modified Files: classobject.c complexobject.c floatobject.c frameobject.c intobject.c listobject.c methodobject.c object.c stringobject.c tupleobject.c Log Message: The rest of the changes by Trent Mick and Dale Nagata for warning-free compilation on NT Alpha. Mostly added casts etc. Index: classobject.c =================================================================== RCS file: /projects/cvsroot/python/dist/src/Objects/classobject.c,v retrieving revision 2.81 retrieving revision 2.82 diff -C2 -r2.81 -r2.82 *** classobject.c 1999/10/11 14:03:12 2.81 --- classobject.c 2000/01/20 22:32:54 2.82 *************** *** 505,509 **** extern long _Py_RefTotal; inst->ob_type = &PyInstance_Type; ! _Py_NewReference(inst); _Py_RefTotal--; /* compensate for increment in NEWREF */ #ifdef COUNT_ALLOCS --- 505,509 ---- extern long _Py_RefTotal; inst->ob_type = &PyInstance_Type; ! _Py_NewReference((PyObject *)inst); _Py_RefTotal--; /* compensate for increment in NEWREF */ #ifdef COUNT_ALLOCS *************** *** 557,561 **** inst->ob_type->tp_free--; /* compensate for increment in UNREF */ #endif ! _Py_ForgetReference(inst); inst->ob_type = NULL; #endif /* Py_TRACE_REFS */ --- 557,561 ---- inst->ob_type->tp_free--; /* compensate for increment in UNREF */ #endif ! _Py_ForgetReference((PyObject *)inst); inst->ob_type = NULL; #endif /* Py_TRACE_REFS */ *************** *** 1432,1436 **** free_list = (PyMethodObject *)(im->im_self); im->ob_type = &PyMethod_Type; ! _Py_NewReference(im); } else { --- 1432,1436 ---- free_list = (PyMethodObject *)(im->im_self); im->ob_type = &PyMethod_Type; ! _Py_NewReference((PyObject *)im); } else { Index: complexobject.c =================================================================== RCS file: /projects/cvsroot/python/dist/src/Objects/complexobject.c,v retrieving revision 2.21 retrieving revision 2.22 diff -C2 -r2.21 -r2.22 *** complexobject.c 1999/01/25 19:42:19 2.21 --- complexobject.c 2000/01/20 22:32:54 2.22 *************** *** 173,177 **** op->ob_type = &PyComplex_Type; op->cval = cval; ! _Py_NewReference(op); return (PyObject *) op; } --- 173,177 ---- op->ob_type = &PyComplex_Type; op->cval = cval; ! _Py_NewReference((PyObject *)op); return (PyObject *) op; } Index: floatobject.c =================================================================== RCS file: /projects/cvsroot/python/dist/src/Objects/floatobject.c,v retrieving revision 2.53 retrieving revision 2.54 diff -C2 -r2.53 -r2.54 *** floatobject.c 1999/12/23 19:00:28 2.53 --- floatobject.c 2000/01/20 22:32:54 2.54 *************** *** 146,150 **** op->ob_type = &PyFloat_Type; op->ob_fval = fval; ! _Py_NewReference(op); return (PyObject *) op; } --- 146,150 ---- op->ob_type = &PyFloat_Type; op->ob_fval = fval; ! _Py_NewReference((PyObject *)op); return (PyObject *) op; } Index: frameobject.c =================================================================== RCS file: /projects/cvsroot/python/dist/src/Objects/frameobject.c,v retrieving revision 2.36 retrieving revision 2.37 diff -C2 -r2.36 -r2.37 *** frameobject.c 1998/10/19 14:20:20 2.36 --- frameobject.c 2000/01/20 22:32:54 2.37 *************** *** 185,189 **** return (PyFrameObject *)PyErr_NoMemory(); f->ob_type = &PyFrame_Type; ! _Py_NewReference(f); } else { --- 185,189 ---- return (PyFrameObject *)PyErr_NoMemory(); f->ob_type = &PyFrame_Type; ! _Py_NewReference((PyObject *)f); } else { *************** *** 200,204 **** extras = f->f_nlocals + f->f_stacksize; f->ob_type = &PyFrame_Type; ! _Py_NewReference(f); } if (builtins == NULL) { --- 200,204 ---- extras = f->f_nlocals + f->f_stacksize; f->ob_type = &PyFrame_Type; ! _Py_NewReference((PyObject *)f); } if (builtins == NULL) { Index: intobject.c =================================================================== RCS file: /projects/cvsroot/python/dist/src/Objects/intobject.c,v retrieving revision 2.36 retrieving revision 2.37 diff -C2 -r2.36 -r2.37 *** intobject.c 1999/10/12 19:54:48 2.36 --- intobject.c 2000/01/20 22:32:54 2.37 *************** *** 169,173 **** v->ob_type = &PyInt_Type; v->ob_ival = ival; ! _Py_NewReference(v); #if NSMALLNEGINTS + NSMALLPOSINTS > 0 if (-NSMALLNEGINTS <= ival && ival < NSMALLPOSINTS) { --- 169,173 ---- v->ob_type = &PyInt_Type; v->ob_ival = ival; ! _Py_NewReference((PyObject *)v); #if NSMALLNEGINTS + NSMALLPOSINTS > 0 if (-NSMALLNEGINTS <= ival && ival < NSMALLPOSINTS) { Index: listobject.c =================================================================== RCS file: /projects/cvsroot/python/dist/src/Objects/listobject.c,v retrieving revision 2.62 retrieving revision 2.63 diff -C2 -r2.62 -r2.63 *** listobject.c 1999/06/09 15:19:34 2.62 --- listobject.c 2000/01/20 22:32:54 2.63 *************** *** 89,93 **** for (i = 0; i < size; i++) op->ob_item[i] = NULL; ! _Py_NewReference(op); return (PyObject *) op; } --- 89,93 ---- for (i = 0; i < size; i++) op->ob_item[i] = NULL; ! _Py_NewReference((PyObject *)op); return (PyObject *) op; } Index: methodobject.c =================================================================== RCS file: /projects/cvsroot/python/dist/src/Objects/methodobject.c,v retrieving revision 2.24 retrieving revision 2.25 diff -C2 -r2.24 -r2.25 *** methodobject.c 1998/12/04 18:52:55 2.24 --- methodobject.c 2000/01/20 22:32:54 2.25 *************** *** 48,52 **** free_list = (PyCFunctionObject *)(op->m_self); op->ob_type = &PyCFunction_Type; ! _Py_NewReference(op); } else { --- 48,52 ---- free_list = (PyCFunctionObject *)(op->m_self); op->ob_type = &PyCFunction_Type; ! _Py_NewReference((PyObject *)op); } else { Index: object.c =================================================================== RCS file: /projects/cvsroot/python/dist/src/Objects/object.c,v retrieving revision 2.61 retrieving revision 2.62 diff -C2 -r2.61 -r2.62 *** object.c 2000/01/12 16:28:58 2.61 --- object.c 2000/01/20 22:32:54 2.62 *************** *** 35,39 **** #if defined( Py_TRACE_REFS ) || defined( Py_REF_DEBUG ) ! long _Py_RefTotal; #endif --- 35,39 ---- #if defined( Py_TRACE_REFS ) || defined( Py_REF_DEBUG ) ! DL_IMPORT(long) _Py_RefTotal; #endif *************** *** 150,154 **** op->ob_type = tp; op->ob_size = size; ! _Py_NewReference(op); return op; } --- 150,154 ---- op->ob_type = tp; op->ob_size = size; ! _Py_NewReference((PyObject *)op); return op; } *************** *** 652,656 **** --- 652,658 ---- register PyObject *op; { + #ifdef SLOW_UNREF_CHECK register PyObject *p; + #endif if (op->ob_refcnt < 0) Py_FatalError("UNREF negative refcnt"); Index: stringobject.c =================================================================== RCS file: /projects/cvsroot/python/dist/src/Objects/stringobject.c,v retrieving revision 2.53 retrieving revision 2.54 diff -C2 -r2.53 -r2.54 *** stringobject.c 1999/12/15 02:22:52 2.53 --- stringobject.c 2000/01/20 22:32:54 2.54 *************** *** 105,109 **** op->ob_sinterned = NULL; #endif ! _Py_NewReference(op); if (str != NULL) memcpy(op->ob_sval, str, size); --- 105,109 ---- op->ob_sinterned = NULL; #endif ! _Py_NewReference((PyObject *)op); if (str != NULL) memcpy(op->ob_sval, str, size); *************** *** 155,159 **** op->ob_sinterned = NULL; #endif ! _Py_NewReference(op); strcpy(op->ob_sval, str); #ifndef DONT_SHARE_SHORT_STRINGS --- 155,159 ---- op->ob_sinterned = NULL; #endif ! _Py_NewReference((PyObject *)op); strcpy(op->ob_sval, str); #ifndef DONT_SHARE_SHORT_STRINGS *************** *** 318,322 **** op->ob_sinterned = NULL; #endif ! _Py_NewReference(op); memcpy(op->ob_sval, a->ob_sval, (int) a->ob_size); memcpy(op->ob_sval + a->ob_size, b->ob_sval, (int) b->ob_size); --- 318,322 ---- op->ob_sinterned = NULL; #endif ! _Py_NewReference((PyObject *)op); memcpy(op->ob_sval, a->ob_sval, (int) a->ob_size); memcpy(op->ob_sval + a->ob_size, b->ob_sval, (int) b->ob_size); *************** *** 353,357 **** op->ob_sinterned = NULL; #endif ! _Py_NewReference(op); for (i = 0; i < size; i += a->ob_size) memcpy(op->ob_sval+i, a->ob_sval, (int) a->ob_size); --- 353,357 ---- op->ob_sinterned = NULL; #endif ! _Py_NewReference((PyObject *)op); for (i = 0; i < size; i += a->ob_size) memcpy(op->ob_sval+i, a->ob_sval, (int) a->ob_size); Index: tupleobject.c =================================================================== RCS file: /projects/cvsroot/python/dist/src/Objects/tupleobject.c,v retrieving revision 2.28 retrieving revision 2.29 diff -C2 -r2.28 -r2.29 *** tupleobject.c 1999/07/13 05:41:12 2.28 --- tupleobject.c 2000/01/20 22:32:54 2.29 *************** *** 101,105 **** for (i = 0; i < size; i++) op->ob_item[i] = NULL; ! _Py_NewReference(op); #if MAXSAVESIZE > 0 if (size == 0) { --- 101,105 ---- for (i = 0; i < size; i++) op->ob_item[i] = NULL; ! _Py_NewReference((PyObject *)op); #if MAXSAVESIZE > 0 if (size == 0) { *************** *** 453,457 **** --_Py_RefTotal; #endif ! _Py_ForgetReference(v); if (last_is_sticky && sizediff < 0) { /* shrinking: --- 453,457 ---- --_Py_RefTotal; #endif ! _Py_ForgetReference((PyObject *)v); if (last_is_sticky && sizediff < 0) { /* shrinking: *************** *** 476,480 **** return -1; } ! _Py_NewReference(sv); for (i = sv->ob_size; i < newsize; i++) sv->ob_item[i] = NULL; --- 476,480 ---- return -1; } ! _Py_NewReference((PyObject *)sv); for (i = sv->ob_size; i < newsize; i++) sv->ob_item[i] = NULL; From guido@cnri.reston.va.us Thu Jan 20 22:33:29 2000 From: guido@cnri.reston.va.us (Guido van Rossum) Date: Thu, 20 Jan 2000 17:33:29 -0500 (EST) Subject: [Python-checkins] CVS: python/dist/src/Python pythonrun.c,2.89,2.90 thread_nt.h,2.5,2.6 Message-ID: <200001202233.RAA27473@eric.cnri.reston.va.us> Update of /projects/cvsroot/python/dist/src/Python In directory eric:/tmp/python/dist/src/Python Modified Files: pythonrun.c thread_nt.h Log Message: The rest of the changes by Trent Mick and Dale Nagata for warning-free compilation on NT Alpha. Mostly added casts etc. Index: pythonrun.c =================================================================== RCS file: /projects/cvsroot/python/dist/src/Python/pythonrun.c,v retrieving revision 2.89 retrieving revision 2.90 diff -C2 -r2.89 -r2.90 *** pythonrun.c 1999/07/08 17:26:56 2.89 --- pythonrun.c 2000/01/20 22:32:56 2.90 *************** *** 73,76 **** --- 73,80 ---- static void call_ll_exitfuncs Py_PROTO((void)); + #ifdef Py_TRACE_REFS + int _Py_AskYesNo(char *prompt); + #endif + int Py_DebugFlag; /* Needed by parser.c */ int Py_VerboseFlag; /* Needed by import.c */ Index: thread_nt.h =================================================================== RCS file: /projects/cvsroot/python/dist/src/Python/thread_nt.h,v retrieving revision 2.5 retrieving revision 2.6 diff -C2 -r2.5 -r2.6 *** thread_nt.h 1998/12/21 19:32:32 2.5 --- thread_nt.h 2000/01/20 22:32:56 2.6 *************** *** 66,70 **** if (rv != -1) { success = 1; ! dprintf(("%ld: PyThread_start_new_thread succeeded: %ld\n", PyThread_get_thread_ident(), aThreadId)); } --- 66,70 ---- if (rv != -1) { success = 1; ! dprintf(("%ld: PyThread_start_new_thread succeeded: %ld\n", PyThread_get_thread_ident(), rv)); } From fdrake@weyr.cnri.reston.va.us Thu Jan 20 22:51:16 2000 From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake) Date: Thu, 20 Jan 2000 17:51:16 -0500 (EST) Subject: [Python-checkins] CVS: python/dist/src/Doc/tools/sgmlconv conversion.xml Message-ID: <200001202251.RAA01635@weyr.cnri.reston.va.us> Update of /projects/cvsroot/python/dist/src/Doc/tools/sgmlconv In directory weyr:/home/fdrake/projects/python/Doc/tools/sgmlconv Modified Files: conversion.xml Log Message: Don't insert extra indentation before <title> elements. From guido@cnri.reston.va.us Fri Jan 21 00:03:45 2000 From: guido@cnri.reston.va.us (Guido van Rossum) Date: Thu, 20 Jan 2000 19:03:45 -0500 (EST) Subject: [Python-checkins] CVS: python/dist/src/PCbuild _tkinter.dsp,1.8,1.9 Message-ID: <200001210003.TAA28166@eric.cnri.reston.va.us> Update of /projects/cvsroot/python/dist/src/PCbuild In directory eric:/projects/python/develop/guido/src/PCbuild Modified Files: _tkinter.dsp Log Message: Trent Mick: Setup PC configuration so that MSDEV chooses the x86 release project config as the default. Index: _tkinter.dsp =================================================================== RCS file: /projects/cvsroot/python/dist/src/PCbuild/_tkinter.dsp,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -r1.8 -r1.9 *** _tkinter.dsp 2000/01/20 21:31:41 1.8 --- _tkinter.dsp 2000/01/21 00:03:42 1.9 *************** *** 19,26 **** !MESSAGE Possible choices for configuration are: !MESSAGE - !MESSAGE "_tkinter - Win32 x86 Release" (based on "Win32 (x86) Dynamic-Link Library") - !MESSAGE "_tkinter - Win32 x86 Debug" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE "_tkinter - Win32 Alpha Debug" (based on "Win32 (ALPHA) Dynamic-Link Library") !MESSAGE "_tkinter - Win32 Alpha Release" (based on "Win32 (ALPHA) Dynamic-Link Library") !MESSAGE --- 19,26 ---- !MESSAGE Possible choices for configuration are: !MESSAGE !MESSAGE "_tkinter - Win32 Alpha Debug" (based on "Win32 (ALPHA) Dynamic-Link Library") !MESSAGE "_tkinter - Win32 Alpha Release" (based on "Win32 (ALPHA) Dynamic-Link Library") + !MESSAGE "_tkinter - Win32 x86 Debug" (based on "Win32 (x86) Dynamic-Link Library") + !MESSAGE "_tkinter - Win32 x86 Release" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE From fdrake@weyr.cnri.reston.va.us Fri Jan 28 21:17:12 2000 From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake) Date: Fri, 28 Jan 2000 16:17:12 -0500 (EST) Subject: [Python-checkins] CVS: python/dist/src/Doc/doc doc.tex,1.12,1.12.2.1 Message-ID: <200001282117.QAA11203@weyr.cnri.reston.va.us> Update of /projects/cvsroot/python/dist/src/Doc/doc In directory weyr:/home/fdrake/projects/python/Doc-152p1/doc Modified Files: Tag: release152p1-patches doc.tex Log Message: Clarify paragraph describing the synopsistable environment. Index: doc.tex =================================================================== RCS file: /projects/cvsroot/python/dist/src/Doc/doc/doc.tex,v retrieving revision 1.12 retrieving revision 1.12.2.1 diff -C2 -r1.12 -r1.12.2.1 *** doc.tex 1999/06/11 14:25:45 1.12 --- doc.tex 2000/01/28 21:17:09 1.12.2.1 *************** *** 677,682 **** table generated by this environment contains two columns, and each row is defined by an alternate definition of ! \macro{modulesynopsis}. This environment is not normally use by ! the user, but is created by the \macro{localmoduletable} macro. --- 677,682 ---- table generated by this environment contains two columns, and each row is defined by an alternate definition of ! \macro{modulesynopsis}. This environment is not normally used by ! authors, but is created by the \macro{localmoduletable} macro. From fdrake@weyr.cnri.reston.va.us Fri Jan 28 21:19:06 2000 From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake) Date: Fri, 28 Jan 2000 16:19:06 -0500 (EST) Subject: [Python-checkins] CVS: python/dist/src/Doc/texinputs ltxmarkup.sty,1.3,1.3.4.1 Message-ID: <200001282119.QAA11239@weyr.cnri.reston.va.us> Update of /projects/cvsroot/python/dist/src/Doc/texinputs In directory weyr:/home/fdrake/projects/python/Doc-152p1/texinputs Modified Files: Tag: release152p1-patches ltxmarkup.sty Log Message: For environment descriptions, include the \end{envname} in the synopsis lines. Index: ltxmarkup.sty =================================================================== RCS file: /projects/cvsroot/python/dist/src/Doc/texinputs/ltxmarkup.sty,v retrieving revision 1.3 retrieving revision 1.3.4.1 diff -C2 -r1.3 -r1.3.4.1 *** ltxmarkup.sty 1999/04/23 14:44:53 1.3 --- ltxmarkup.sty 2000/01/28 21:19:03 1.3.4.1 *************** *** 19,23 **** \let\p=\py@ltx@param% #2}}] ! %\item[\code{\e end\{{\bfseries #1}\}}] \index{#1 environment@\idxcode{#1} environment} \index{environments!#1@\idxcode{#1}} --- 19,23 ---- \let\p=\py@ltx@param% #2}}] ! \item[\code{\e end\{{\bfseries #1}\}}] \index{#1 environment@\idxcode{#1} environment} \index{environments!#1@\idxcode{#1}} From fdrake@weyr.cnri.reston.va.us Fri Jan 28 21:23:16 2000 From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake) Date: Fri, 28 Jan 2000 16:23:16 -0500 (EST) Subject: [Python-checkins] CVS: python/dist/src/Doc/perl ltxmarkup.perl,1.3.4.1,1.3.4.2 Message-ID: <200001282123.QAA11344@weyr.cnri.reston.va.us> Update of /projects/cvsroot/python/dist/src/Doc/perl In directory weyr:/home/fdrake/projects/python/Doc-152p1/perl Modified Files: Tag: release152p1-patches ltxmarkup.perl Log Message: For environment descriptions, include the \end{envname} in the synopsis lines. Index: ltxmarkup.perl =================================================================== RCS file: /projects/cvsroot/python/dist/src/Doc/perl/ltxmarkup.perl,v retrieving revision 1.3.4.1 retrieving revision 1.3.4.2 diff -C2 -r1.3.4.1 -r1.3.4.2 *** ltxmarkup.perl 1999/10/28 18:23:23 1.3.4.1 --- ltxmarkup.perl 2000/01/28 21:23:14 1.3.4.2 *************** *** 59,62 **** --- 59,63 ---- . "\n<dt><tt>\begin{<b class='environment'>$env</b>}</tt>" . "\n $params" + . "\n<br /><tt>\end{<b class='environment'>$env</b>}</tt>" . "\n<dd>" . $_ From fdrake@weyr.cnri.reston.va.us Fri Jan 28 21:36:12 2000 From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake) Date: Fri, 28 Jan 2000 16:36:12 -0500 (EST) Subject: [Python-checkins] CVS: python/dist/src/Doc/lib libbsddb.tex,1.3,1.3.4.1 Message-ID: <200001282136.QAA11630@weyr.cnri.reston.va.us> Update of /projects/cvsroot/python/dist/src/Doc/lib In directory weyr:/home/fdrake/projects/python/Doc-152p1/lib Modified Files: Tag: release152p1-patches libbsddb.tex Log Message: Clarify names of the headers for different versions for Berkely DB versions; based on comment from Martijn de Vries <martijn@i2x.com>. Updated some markup. Index: libbsddb.tex =================================================================== RCS file: /projects/cvsroot/python/dist/src/Doc/lib/libbsddb.tex,v retrieving revision 1.3 retrieving revision 1.3.4.1 diff -C2 -r1.3 -r1.3.4.1 *** libbsddb.tex 1999/04/23 20:32:59 1.3 --- libbsddb.tex 2000/01/28 21:36:09 1.3.4.1 *************** *** 8,53 **** ! The \module{bsddb} module provides an interface to the Berkeley DB library. ! Users can create hash, btree or record based library files using the ! appropriate open call. Bsddb objects behave generally like dictionaries. ! Keys and values must be strings, however, so to use other objects as keys or ! to store other kinds of objects the user must serialize them somehow, ! typically using marshal.dumps or pickle.dumps. ! ! The \module{bsddb} module is only available on \UNIX{} systems, so it is not ! built by default in the standard Python distribution. Also, there are two ! incompatible versions of the underlying library. Version 1.85 is widely ! available, but has some known bugs. Version 2 is not quite as widely used, ! but does offer some improvements. The \module{bsddb} module uses the 1.85 ! interface. Users wishing to use version 2 of the Berkeley DB library will ! have to modify the source for the module to include db_185.h instead of ! db.h. The \module{bsddb} module defines the following functions that create ! objects that access the appropriate type of Berkeley DB file. The first two ! arguments of each function are the same. For ease of portability, only the ! first two arguments should be used in most instances. \begin{funcdesc}{hashopen}{filename\optional{, flag\optional{, ! mode\optional{, bsize\optional{, ffactor\optional{, nelem\optional{, ! cachesize\optional{, hash\optional{, lorder}}}}}}}}} ! Open the hash format file named \var{filename}. The optional \var{flag} ! identifies the mode used to open the file. It may be ``r'' (read only), ! ``w'' (read-write), ``c'' (read-write - create if necessary) or ``n'' ! (read-write - truncate to zero length). The other arguments are rarely used ! and are just passed to the low-level dbopen function. Consult the ! Berkeley DB documentation for their use and interpretation. \end{funcdesc} - \begin{funcdesc}{btopen}{filename\optional{, flag\optional{, mode\optional{, btflags\optional{, cachesize\optional{, maxkeypage\optional{, minkeypage\optional{, psize\optional{, lorder}}}}}}}}} ! Open the btree format file named \var{filename}. The optional \var{flag} ! identifies the mode used to open the file. It may be ``r'' (read only), ! ``w'' (read-write), ``c'' (read-write - create if necessary) or ``n'' ! (read-write - truncate to zero length). The other arguments are rarely used ! and are just passed to the low-level dbopen function. Consult the ! Berkeley DB documentation for their use and interpretation. \end{funcdesc} --- 8,62 ---- ! The \module{bsddb} module provides an interface to the Berkeley DB ! library. Users can create hash, btree or record based library files ! using the appropriate open call. Bsddb objects behave generally like ! dictionaries. Keys and values must be strings, however, so to use ! other objects as keys or to store other kinds of objects the user must ! serialize them somehow, typically using marshal.dumps or pickle.dumps. ! ! The \module{bsddb} module is only available on \UNIX{} systems, so it ! is not built by default in the standard Python distribution. Also, ! there are two incompatible versions of the underlying library. ! Version 1.85 is widely available, but has some known bugs. Version 2 ! is not quite as widely used, but does offer some improvements. The ! \module{bsddb} module uses the 1.85 interface. Users wishing to use ! version 2 of the Berkeley DB library will have to modify the source ! for the module to include \file{db_185.h} instead of ! \file{db.h} (\file{db_185.h} contains the version 1.85 compatibility ! interface). The \module{bsddb} module defines the following functions that create ! objects that access the appropriate type of Berkeley DB file. The ! first two arguments of each function are the same. For ease of ! portability, only the first two arguments should be used in most ! instances. \begin{funcdesc}{hashopen}{filename\optional{, flag\optional{, ! mode\optional{, bsize\optional{, ! ffactor\optional{, nelem\optional{, ! cachesize\optional{, hash\optional{, ! lorder}}}}}}}}} ! Open the hash format file named \var{filename}. The optional ! \var{flag} identifies the mode used to open the file. It may be ! \character{r} (read only), \character{w} (read-write), ! \character{c} (read-write - create if necessary) or ! \character{n} (read-write - truncate to zero length). The other ! arguments are rarely used and are just passed to the low-level ! \cfunction{dbopen()} function. Consult the Berkeley DB documentation ! for their use and interpretation. \end{funcdesc} \begin{funcdesc}{btopen}{filename\optional{, flag\optional{, mode\optional{, btflags\optional{, cachesize\optional{, maxkeypage\optional{, minkeypage\optional{, psize\optional{, lorder}}}}}}}}} ! ! Open the btree format file named \var{filename}. The optional ! \var{flag} identifies the mode used to open the file. It may be ! \character{r} (read only), \character{w} (read-write), ! \character{c} (read-write - create if necessary) or ! \character{n} (read-write - truncate to zero length). The other ! arguments are rarely used and are just passed to the low-level dbopen ! function. Consult the Berkeley DB documentation for their use and ! interpretation. \end{funcdesc} *************** *** 55,64 **** rnflags\optional{, cachesize\optional{, psize\optional{, lorder\optional{, reclen\optional{, bval\optional{, bfname}}}}}}}}}} ! Open a DB record format file named \var{filename}. The optional \var{flag} ! identifies the mode used to open the file. It may be ``r'' (read only), ! ``w'' (read-write), ``c'' (read-write - create if necessary) or ``n'' ! (read-write - truncate to zero length). The other arguments are rarely used ! and are just passed to the low-level dbopen function. Consult the ! Berkeley DB documentation for their use and interpretation. \end{funcdesc} --- 64,76 ---- rnflags\optional{, cachesize\optional{, psize\optional{, lorder\optional{, reclen\optional{, bval\optional{, bfname}}}}}}}}}} ! ! Open a DB record format file named \var{filename}. The optional ! \var{flag} identifies the mode used to open the file. It may be ! \character{r} (read only), \character{w} (read-write), ! \character{c} (read-write - create if necessary) or ! \character{n} (read-write - truncate to zero length). The other ! arguments are rarely used and are just passed to the low-level dbopen ! function. Consult the Berkeley DB documentation for their use and ! interpretation. \end{funcdesc} *************** *** 87,91 **** \begin{methoddesc}{has_key}{key} ! Return 1 if the DB file contains the argument as a key. \end{methoddesc} --- 99,103 ---- \begin{methoddesc}{has_key}{key} ! Return \code{1} if the DB file contains the argument as a key. \end{methoddesc} From guido@cnri.reston.va.us Mon Jan 31 18:41:29 2000 From: guido@cnri.reston.va.us (Guido van Rossum) Date: Mon, 31 Jan 2000 13:41:29 -0500 (EST) Subject: [Python-checkins] CVS: python/dist/src/Modules posixmodule.c,2.122,2.123 Message-ID: <200001311841.NAA16517@eric.cnri.reston.va.us> Update of /projects/cvsroot/python/dist/src/Modules In directory eric:/projects/python/develop/guido/src/Modules Modified Files: posixmodule.c Log Message: The initialization of posix_putenv_garbage should only be done when it is defined... Index: posixmodule.c =================================================================== RCS file: /projects/cvsroot/python/dist/src/Modules/posixmodule.c,v retrieving revision 2.122 retrieving revision 2.123 diff -C2 -r2.122 -r2.123 *** posixmodule.c 1999/12/30 18:05:43 2.122 --- posixmodule.c 2000/01/31 18:41:26 2.123 *************** *** 4784,4787 **** --- 4784,4789 ---- PyDict_SetItemString(d, "error", PyExc_OSError); + #ifdef HAVE_PUTENV posix_putenv_garbage = PyDict_New(); + #endif }