[Python-checkins] CVS: python/dist/src LICENSE,1.15,1.15.4.1 Makefile.pre.in,1.37.2.1,1.37.2.2 PLAN.txt,1.1.2.16,1.1.2.17 README,1.123,1.123.2.1 acconfig.h,1.46,1.46.4.1 config.h.in,2.92,2.92.2.1 configure,1.209,1.209.2.1 configure.in,1.217,1.217.2.1 setup.py,1.38,1.38.4.1
Tim Peters
tim_one@users.sourceforge.net
Sat, 07 Jul 2001 15:56:00 -0700
- Previous message: [Python-checkins] CVS: python/dist/src/Include abstract.h,2.31.2.1,2.31.2.2 cStringIO.h,2.14,2.14.8.1 ceval.h,2.41.4.1,2.41.4.2 compile.h,2.29,2.29.4.1 dictobject.h,2.20.8.2,2.20.8.3 fileobject.h,2.22,2.22.8.1 floatobject.h,2.17,2.17.8.1 frameobject.h,2.31,2.31.4.1 graminit.h,2.16,2.16.8.1 longobject.h,2.19,2.19.8.1 opcode.h,2.35,2.35.2.1 pyport.h,2.26,2.26.6.1 pystate.h,2.14,2.14.6.1 rangeobject.h,2.15,2.15.8.1 stringobject.h,2.25,2.25.6.1 symtable.h,2.7,2.7.4.1 tupleobject.h,2.24,2.24.8.1 unicodeobject.h,2.20,2.20.2.1
- Next message: [Python-checkins] CVS: python/dist/src/Lib/distutils mwerkscompiler.py,1.1,1.1.6.1 sysconfig.py,1.34,1.34.6.1
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/python/python/dist/src
In directory usw-pr-cvs1:/tmp/cvs-serv24450/mergedescr/dist/src
Modified Files:
Tag: descr-branch
LICENSE Makefile.pre.in PLAN.txt README acconfig.h config.h.in
configure configure.in setup.py
Log Message:
Merge of trunk tag date2001-07-06 into descr-branch.
Index: LICENSE
===================================================================
RCS file: /cvsroot/python/python/dist/src/LICENSE,v
retrieving revision 1.15
retrieving revision 1.15.4.1
diff -C2 -r1.15 -r1.15.4.1
*** LICENSE 2001/04/13 19:41:28 1.15
--- LICENSE 2001/07/07 22:55:27 1.15.4.1
***************
*** 26,34 ****
After Python 2.0 was released by BeOpen.com, Guido van Rossum and the
other PythonLabs developers joined Digital Creations. All
! intellectual property added from this point on, starting with Python
! 2.1 and its alpha and beta releases, is owned by the Python Software
! Foundation (PSF), a non-profit modeled after the Apache Software
! Foundation. See http://www.python.org/psf/ for more information about
! the PSF.
Thanks to the many outside volunteers who have worked under Guido's
--- 26,33 ----
After Python 2.0 was released by BeOpen.com, Guido van Rossum and the
other PythonLabs developers joined Digital Creations. All
! intellectual property added from this point on, including Python
! 2.0.1, is owned by the Python Software Foundation (PSF), a non-profit
! modeled after the Apache Software Foundation. See
! http://www.python.org/psf/ for more information about the PSF.
Thanks to the many outside volunteers who have worked under Guido's
***************
*** 77,96 ****
breach of its terms and conditions.
! 7. This License Agreement shall be governed by the federal
! intellectual property law of the United States, including without
! limitation the federal copyright law, and, to the extent such
! U.S. federal law does not apply, by the law of the Commonwealth of
! Virginia, excluding Virginia's conflict of law provisions.
! Notwithstanding the foregoing, with regard to derivative works based
! on Python 2.1 that incorporate non-separable material that was
! previously distributed under the GNU General Public License (GPL), the
! law of the Commonwealth of Virginia shall govern this License
! Agreement only as to issues arising under or with respect to
! Paragraphs 4, 5, and 7 of this License Agreement. Nothing in this
! License Agreement shall be deemed to create any relationship of
! agency, partnership, or joint venture between PSF and Licensee. This
! License Agreement does not grant permission to use PSF trademarks or
! trade name in a trademark sense to endorse or promote products or
! services of Licensee, or any third party.
8. By copying, installing or otherwise using Python 2.1, Licensee
--- 76,84 ----
breach of its terms and conditions.
! 7. Nothing in this License Agreement shall be deemed to create any
! relationship of agency, partnership, or joint venture between PSF and
! Licensee. This License Agreement does not grant permission to use PSF
! trademarks or trade name in a trademark sense to endorse or promote
! products or services of Licensee, or any third party.
8. By copying, installing or otherwise using Python 2.1, Licensee
Index: Makefile.pre.in
===================================================================
RCS file: /cvsroot/python/python/dist/src/Makefile.pre.in,v
retrieving revision 1.37.2.1
retrieving revision 1.37.2.2
diff -C2 -r1.37.2.1 -r1.37.2.2
*** Makefile.pre.in 2001/04/24 00:49:08 1.37.2.1
--- Makefile.pre.in 2001/07/07 22:55:27 1.37.2.2
***************
*** 56,60 ****
OPT= @OPT@
DEFS= @DEFS@
! CFLAGS= $(OPT) -I. -I$(srcdir)/Include $(DEFS)
LDFLAGS= @LDFLAGS@
LDLAST= @LDLAST@
--- 56,61 ----
OPT= @OPT@
DEFS= @DEFS@
! CFLAGS= $(OPT)
! CPPFLAGS= -I. -I$(srcdir)/Include $(DEFS)
LDFLAGS= @LDFLAGS@
LDLAST= @LDLAST@
***************
*** 65,69 ****
CFLAGSFORSHARED=@CFLAGSFORSHARED@
# C flags used for building the interpreter object files
! PY_CFLAGS= $(CFLAGS) $(CFLAGSFORSHARED)
--- 66,70 ----
CFLAGSFORSHARED=@CFLAGSFORSHARED@
# C flags used for building the interpreter object files
! PY_CFLAGS= $(CFLAGS) $(CPPFLAGS) $(CFLAGSFORSHARED)
***************
*** 138,141 ****
--- 139,143 ----
DLINCLDIR= @DLINCLDIR@
DYNLOADFILE= @DYNLOADFILE@
+ MACHDEP_OBJS= @MACHDEP_OBJS@
PYTHON= python$(EXE)
***************
*** 222,225 ****
--- 224,228 ----
Python/getopt.o \
Python/$(DYNLOADFILE) \
+ $(MACHDEP_OBJS) \
$(LIBOBJS)
***************
*** 285,289 ****
# Build the shared modules
sharedmods: $(PYTHON)
! PYTHONPATH= ./$(PYTHON) $(srcdir)/setup.py build
# buildno should really depend on something like LIBRARY_SRC
--- 288,293 ----
# Build the shared modules
sharedmods: $(PYTHON)
! unset PYTHONPATH PYTHONHOME PYTHONSTARTUP; \
! ./$(PYTHON) $(srcdir)/setup.py build
# buildno should really depend on something like LIBRARY_SRC
***************
*** 401,408 ****
Python/getplatform.o: $(srcdir)/Python/getplatform.c
! $(CC) -c $(CFLAGS) -DPLATFORM='"$(MACHDEP)"' -o $@ $(srcdir)/Python/getplatform.c
Python/importdl.o: $(srcdir)/Python/importdl.c
! $(CC) -c $(CFLAGS) -I$(DLINCLDIR) -o $@ $(srcdir)/Python/importdl.c
Objects/object.o: $(srcdir)/Objects/object.c $(srcdir)/Objects/obmalloc.c
--- 405,412 ----
Python/getplatform.o: $(srcdir)/Python/getplatform.c
! $(CC) -c $(CFLAGS) $(CPPFLAGS) -DPLATFORM='"$(MACHDEP)"' -o $@ $(srcdir)/Python/getplatform.c
Python/importdl.o: $(srcdir)/Python/importdl.c
! $(CC) -c $(CFLAGS) $(CPPFLAGS) -I$(DLINCLDIR) -o $@ $(srcdir)/Python/importdl.c
Objects/object.o: $(srcdir)/Objects/object.c $(srcdir)/Objects/obmalloc.c
***************
*** 411,414 ****
--- 415,420 ----
$(srcdir)/Objects/unicodetype_db.h
+ Mac/Python/macglue.o: $(srcdir)/Mac/Python/macglue.c
+ $(CC) -c $(CFLAGS) $(CPPFLAGS) -I$(srcdir)/Mac/Include -I$(srcdir)/Python -o $@ $(srcdir)/Mac/Python/macglue.c
############################################################################
***************
*** 764,768 ****
tags TAGS \
config.cache config.log config.h Modules/config.c
! -rm -rf build
# Make things extra clean, before making a distribution:
--- 770,774 ----
tags TAGS \
config.cache config.log config.h Modules/config.c
! -rm -rf build platform
# Make things extra clean, before making a distribution:
Index: PLAN.txt
===================================================================
RCS file: /cvsroot/python/python/dist/src/Attic/PLAN.txt,v
retrieving revision 1.1.2.16
retrieving revision 1.1.2.17
diff -C2 -r1.1.2.16 -r1.1.2.17
*** PLAN.txt 2001/07/07 22:45:44 1.1.2.16
--- PLAN.txt 2001/07/07 22:55:27 1.1.2.17
***************
*** 252,258 ****
------------------------------------------------------------------
! Merge of trunk tag date2001-07-06 into descr-branch was committed on
! 2001-07-07.
Merge issues:
--- 252,261 ----
------------------------------------------------------------------
! 2001-07-07
+ Merge of trunk tag date2001-07-06 into descr-branch, via
+ cvs -q -z3 up -j date2001-07-06 mergedescr
+ was committed on 2001-07-07.
+
Merge issues:
***************
*** 266,987 ****
that has been removed on the trunk since descr-fork, it will probably
fail. The cure is to remove the expected-output file in descr-branch too.
- ------------------------------------------------------------------
- 2001-07-06
-
- Screen dump from initial merge attempt, less the lines that apply to files
- already merged.
-
- C:\Code>cvs -q -z3 up -j date2001-07-06 mergedescr
- RCS file: /cvsroot/python/python/dist/src/LICENSE,v
- retrieving revision 1.15
- retrieving revision 1.17
- Merging differences between 1.15 and 1.17 into LICENSE
- RCS file: /cvsroot/python/python/dist/src/Makefile.pre.in,v
- retrieving revision 1.37
- retrieving revision 1.40
- Merging differences between 1.37 and 1.40 into Makefile.pre.in
- RCS file: /cvsroot/python/python/dist/src/README,v
- retrieving revision 1.123
- retrieving revision 1.124
- Merging differences between 1.123 and 1.124 into README
- RCS file: /cvsroot/python/python/dist/src/acconfig.h,v
- retrieving revision 1.46
- retrieving revision 1.49
- Merging differences between 1.46 and 1.49 into acconfig.h
- RCS file: /cvsroot/python/python/dist/src/config.h.in,v
- retrieving revision 2.92
- retrieving revision 2.97
- Merging differences between 2.92 and 2.97 into config.h.in
- RCS file: /cvsroot/python/python/dist/src/configure,v
- retrieving revision 1.209
- retrieving revision 1.215
- Merging differences between 1.209 and 1.215 into configure
- RCS file: /cvsroot/python/python/dist/src/configure.in,v
- retrieving revision 1.217
- retrieving revision 1.223
- Merging differences between 1.217 and 1.223 into configure.in
- RCS file: /cvsroot/python/python/dist/src/setup.py,v
- retrieving revision 1.38
- retrieving revision 1.41
- Merging differences between 1.38 and 1.41 into setup.py
- RCS file: /cvsroot/python/python/dist/src/Grammar/Grammar,v
- retrieving revision 1.42
- retrieving revision 1.43
- Merging differences between 1.42 and 1.43 into Grammar
- RCS file: /cvsroot/python/python/dist/src/Include/abstract.h,v
- retrieving revision 2.31
- retrieving revision 2.34
- Merging differences between 2.31 and 2.34 into abstract.h
- RCS file: /cvsroot/python/python/dist/src/Include/cStringIO.h,v
- retrieving revision 2.14
- retrieving revision 2.15
- Merging differences between 2.14 and 2.15 into cStringIO.h
- RCS file: /cvsroot/python/python/dist/src/Include/fileobject.h,v
- retrieving revision 2.22
- retrieving revision 2.23
- Merging differences between 2.22 and 2.23 into fileobject.h
- RCS file: /cvsroot/python/python/dist/src/Include/floatobject.h,v
- retrieving revision 2.17
- retrieving revision 2.18
- Merging differences between 2.17 and 2.18 into floatobject.h
- RCS file: /cvsroot/python/python/dist/src/Include/longobject.h,v
- retrieving revision 2.19
- retrieving revision 2.20
- Merging differences between 2.19 and 2.20 into longobject.h
- RCS file: /cvsroot/python/python/dist/src/Include/pyport.h,v
- retrieving revision 2.26
- retrieving revision 2.27
- Merging differences between 2.26 and 2.27 into pyport.h
- RCS file: /cvsroot/python/python/dist/src/Include/rangeobject.h,v
- retrieving revision 2.15
- retrieving revision 2.17
- Merging differences between 2.15 and 2.17 into rangeobject.h
- RCS file: /cvsroot/python/python/dist/src/Include/tupleobject.h,v
- retrieving revision 2.24
- retrieving revision 2.25
- Merging differences between 2.24 and 2.25 into tupleobject.h
- RCS file: /cvsroot/python/python/dist/src/Include/unicodeobject.h,v
- retrieving revision 2.20
- retrieving revision 2.27
- Merging differences between 2.20 and 2.27 into unicodeobject.h
- RCS file: /cvsroot/python/python/dist/src/Lib/UserDict.py,v
- retrieving revision 1.12
- retrieving revision 1.14
- Merging differences between 1.12 and 1.14 into UserDict.py
- RCS file: /cvsroot/python/python/dist/src/Lib/UserList.py,v
- retrieving revision 1.16
- retrieving revision 1.17
- Merging differences between 1.16 and 1.17 into UserList.py
- RCS file: /cvsroot/python/python/dist/src/Lib/UserString.py,v
- retrieving revision 1.9
- retrieving revision 1.10
- Merging differences between 1.9 and 1.10 into UserString.py
- RCS file: /cvsroot/python/python/dist/src/Lib/anydbm.py,v
- retrieving revision 1.10
- retrieving revision 1.11
- Merging differences between 1.10 and 1.11 into anydbm.py
- RCS file: /cvsroot/python/python/dist/src/Lib/asyncore.py,v
- retrieving revision 1.11
- retrieving revision 1.14
- Merging differences between 1.11 and 1.14 into asyncore.py
- RCS file: /cvsroot/python/python/dist/src/Lib/base64.py,v
- retrieving revision 1.11
- retrieving revision 1.12
- Merging differences between 1.11 and 1.12 into base64.py
- RCS file: /cvsroot/python/python/dist/src/Lib/bdb.py,v
- retrieving revision 1.31
- retrieving revision 1.32
- Merging differences between 1.31 and 1.32 into bdb.py
- RCS file: /cvsroot/python/python/dist/src/Lib/calendar.py,v
- retrieving revision 1.21
- retrieving revision 1.22
- Merging differences between 1.21 and 1.22 into calendar.py
- RCS file: /cvsroot/python/python/dist/src/Lib/cgi.py,v
- retrieving revision 1.63
- retrieving revision 1.64
- Merging differences between 1.63 and 1.64 into cgi.py
- RCS file: /cvsroot/python/python/dist/src/Lib/chunk.py,v
- retrieving revision 1.10
- retrieving revision 1.11
- Merging differences between 1.10 and 1.11 into chunk.py
- RCS file: /cvsroot/python/python/dist/src/Lib/code.py,v
- retrieving revision 1.15
- retrieving revision 1.16
- Merging differences between 1.15 and 1.16 into code.py
- RCS file: /cvsroot/python/python/dist/src/Lib/dbhash.py,v
- retrieving revision 1.5
- retrieving revision 1.6
- Merging differences between 1.5 and 1.6 into dbhash.py
- RCS file: /cvsroot/python/python/dist/src/Lib/dis.py,v
- retrieving revision 1.34
- retrieving revision 1.35
- Merging differences between 1.34 and 1.35 into dis.py
- RCS file: /cvsroot/python/python/dist/src/Lib/doctest.py,v
- retrieving revision 1.10
- retrieving revision 1.14
- Merging differences between 1.10 and 1.14 into doctest.py
- RCS file: /cvsroot/python/python/dist/src/Lib/dumbdbm.py,v
- retrieving revision 1.10
- retrieving revision 1.11
- Merging differences between 1.10 and 1.11 into dumbdbm.py
- RCS file: /cvsroot/python/python/dist/src/Lib/fnmatch.py,v
- retrieving revision 1.11
- retrieving revision 1.12
- Merging differences between 1.11 and 1.12 into fnmatch.py
- RCS file: /cvsroot/python/python/dist/src/Lib/formatter.py,v
- retrieving revision 1.17
- retrieving revision 1.18
- Merging differences between 1.17 and 1.18 into formatter.py
- RCS file: /cvsroot/python/python/dist/src/Lib/glob.py,v
- retrieving revision 1.9
- retrieving revision 1.10
- Merging differences between 1.9 and 1.10 into glob.py
- RCS file: /cvsroot/python/python/dist/src/Lib/htmllib.py,v
- retrieving revision 1.17
- retrieving revision 1.18
- Merging differences between 1.17 and 1.18 into htmllib.py
- RCS file: /cvsroot/python/python/dist/src/Lib/httplib.py,v
- retrieving revision 1.34
- retrieving revision 1.35
- Merging differences between 1.34 and 1.35 into httplib.py
- RCS file: /cvsroot/python/python/dist/src/Lib/imaplib.py,v
- retrieving revision 1.27
- retrieving revision 1.29
- Merging differences between 1.27 and 1.29 into imaplib.py
- RCS file: /cvsroot/python/python/dist/src/Lib/inspect.py,v
- retrieving revision 1.16
- retrieving revision 1.18
- Merging differences between 1.16 and 1.18 into inspect.py
- RCS file: /cvsroot/python/python/dist/src/Lib/keyword.py,v
- retrieving revision 1.10
- retrieving revision 1.11
- Merging differences between 1.10 and 1.11 into keyword.py
- RCS file: /cvsroot/python/python/dist/src/Lib/linecache.py,v
- retrieving revision 1.7
- retrieving revision 1.8
- Merging differences between 1.7 and 1.8 into linecache.py
- RCS file: /cvsroot/python/python/dist/src/Lib/mailbox.py,v
- retrieving revision 1.30
- retrieving revision 1.31
- Merging differences between 1.30 and 1.31 into mailbox.py
- RCS file: /cvsroot/python/python/dist/src/Lib/mailcap.py,v
- retrieving revision 1.9
- retrieving revision 1.10
- Merging differences between 1.9 and 1.10 into mailcap.py
- RCS file: /cvsroot/python/python/dist/src/Lib/mhlib.py,v
- retrieving revision 1.26
- retrieving revision 1.27
- Merging differences between 1.26 and 1.27 into mhlib.py
- RCS file: /cvsroot/python/python/dist/src/Lib/mimetypes.py,v
- retrieving revision 1.13
- retrieving revision 1.14
- Merging differences between 1.13 and 1.14 into mimetypes.py
- RCS file: /cvsroot/python/python/dist/src/Lib/mimify.py,v
- retrieving revision 1.20
- retrieving revision 1.21
- Merging differences between 1.20 and 1.21 into mimify.py
- RCS file: /cvsroot/python/python/dist/src/Lib/ntpath.py,v
- retrieving revision 1.34
- retrieving revision 1.36
- Merging differences between 1.34 and 1.36 into ntpath.py
- RCS file: /cvsroot/python/python/dist/src/Lib/pipes.py,v
- retrieving revision 1.8
- retrieving revision 1.9
- Merging differences between 1.8 and 1.9 into pipes.py
- RCS file: /cvsroot/python/python/dist/src/Lib/posixfile.py,v
- retrieving revision 1.20
- retrieving revision 1.21
- Merging differences between 1.20 and 1.21 into posixfile.py
- RCS file: /cvsroot/python/python/dist/src/Lib/pprint.py,v
- retrieving revision 1.12
- retrieving revision 1.14
- Merging differences between 1.12 and 1.14 into pprint.py
- RCS file: /cvsroot/python/python/dist/src/Lib/pre.py,v
- retrieving revision 1.9
- retrieving revision 1.10
- Merging differences between 1.9 and 1.10 into pre.py
- RCS file: /cvsroot/python/python/dist/src/Lib/profile.py,v
- retrieving revision 1.27
- retrieving revision 1.29
- Merging differences between 1.27 and 1.29 into profile.py
- RCS file: /cvsroot/python/python/dist/src/Lib/pstats.py,v
- retrieving revision 1.15
- retrieving revision 1.18
- Merging differences between 1.15 and 1.18 into pstats.py
- RCS file: /cvsroot/python/python/dist/src/Lib/pty.py,v
- retrieving revision 1.7
- retrieving revision 1.11
- Merging differences between 1.7 and 1.11 into pty.py
- RCS file: /cvsroot/python/python/dist/src/Lib/pydoc.py,v
- retrieving revision 1.38
- retrieving revision 1.39
- Merging differences between 1.38 and 1.39 into pydoc.py
- RCS file: /cvsroot/python/python/dist/src/Lib/quopri.py,v
- retrieving revision 1.11
- retrieving revision 1.14
- Merging differences between 1.11 and 1.14 into quopri.py
- RCS file: /cvsroot/python/python/dist/src/Lib/rexec.py,v
- retrieving revision 1.28
- retrieving revision 1.30
- Merging differences between 1.28 and 1.30 into rexec.py
- RCS file: /cvsroot/python/python/dist/src/Lib/rfc822.py,v
- retrieving revision 1.54
- retrieving revision 1.57
- Merging differences between 1.54 and 1.57 into rfc822.py
- RCS file: /cvsroot/python/python/dist/src/Lib/sgmllib.py,v
- retrieving revision 1.30
- retrieving revision 1.32
- Merging differences between 1.30 and 1.32 into sgmllib.py
- RCS file: /cvsroot/python/python/dist/src/Lib/site.py,v
- retrieving revision 1.26
- retrieving revision 1.28
- Merging differences between 1.26 and 1.28 into site.py
- RCS file: /cvsroot/python/python/dist/src/Lib/sre_compile.py,v
- retrieving revision 1.37
- retrieving revision 1.38
- Merging differences between 1.37 and 1.38 into sre_compile.py
- RCS file: /cvsroot/python/python/dist/src/Lib/sre_constants.py,v
- retrieving revision 1.28
- retrieving revision 1.29
- Merging differences between 1.28 and 1.29 into sre_constants.py
- RCS file: /cvsroot/python/python/dist/src/Lib/tabnanny.py,v
- retrieving revision 1.13
- retrieving revision 1.15
- Merging differences between 1.13 and 1.15 into tabnanny.py
- RCS file: /cvsroot/python/python/dist/src/Lib/tokenize.py,v
- retrieving revision 1.22
- retrieving revision 1.24
- Merging differences between 1.22 and 1.24 into tokenize.py
- RCS file: /cvsroot/python/python/dist/src/Lib/traceback.py,v
- retrieving revision 1.25
- retrieving revision 1.26
- Merging differences between 1.25 and 1.26 into traceback.py
- RCS file: /cvsroot/python/python/dist/src/Lib/types.py,v
- retrieving revision 1.14
- retrieving revision 1.15
- Merging differences between 1.14 and 1.15 into types.py
- RCS file: /cvsroot/python/python/dist/src/Lib/unittest.py,v
- retrieving revision 1.7
- retrieving revision 1.8
- Merging differences between 1.7 and 1.8 into unittest.py
- RCS file: /cvsroot/python/python/dist/src/Lib/urllib.py,v
- retrieving revision 1.126
- retrieving revision 1.127
- Merging differences between 1.126 and 1.127 into urllib.py
- RCS file: /cvsroot/python/python/dist/src/Lib/urllib2.py,v
- retrieving revision 1.13
- retrieving revision 1.15
- Merging differences between 1.13 and 1.15 into urllib2.py
- RCS file: /cvsroot/python/python/dist/src/Lib/weakref.py,v
- retrieving revision 1.9
- retrieving revision 1.10
- Merging differences between 1.9 and 1.10 into weakref.py
- RCS file: /cvsroot/python/python/dist/src/Lib/zipfile.py,v
- retrieving revision 1.13
- retrieving revision 1.14
- Merging differences between 1.13 and 1.14 into zipfile.py
- RCS file: /cvsroot/python/python/dist/src/Lib/distutils/mwerkscompiler.py,v
- retrieving revision 1.1
- retrieving revision 1.4
- Merging differences between 1.1 and 1.4 into mwerkscompiler.py
- RCS file: /cvsroot/python/python/dist/src/Lib/distutils/sysconfig.py,v
- retrieving revision 1.34
- retrieving revision 1.36
- Merging differences between 1.34 and 1.36 into sysconfig.py
- RCS file: /cvsroot/python/python/dist/src/Lib/distutils/command/bdist_rpm.py,v
- retrieving revision 1.23
- retrieving revision 1.24
- Merging differences between 1.23 and 1.24 into bdist_rpm.py
- RCS file: /cvsroot/python/python/dist/src/Lib/distutils/command/bdist_wininst.py,v
- retrieving revision 1.21
- retrieving revision 1.22
- Merging differences between 1.21 and 1.22 into bdist_wininst.py
- RCS file: /cvsroot/python/python/dist/src/Lib/lib-old/lockfile.py,v
- retrieving revision 1.1
- retrieving revision 1.2
- Merging differences between 1.1 and 1.2 into lockfile.py
- U mergedescr/dist/src/Lib/test/double_const.py
- RCS file: /cvsroot/python/python/dist/src/Lib/test/re_tests.py,v
- retrieving revision 1.28
- retrieving revision 1.29
- Merging differences between 1.28 and 1.29 into re_tests.py
- RCS file: /cvsroot/python/python/dist/src/Lib/test/string_tests.py,v
- retrieving revision 1.7
- retrieving revision 1.9
- Merging differences between 1.7 and 1.9 into string_tests.py
- RCS file: /cvsroot/python/python/dist/src/Lib/test/test_b1.py,v
- retrieving revision 1.34
- retrieving revision 1.35
- Merging differences between 1.34 and 1.35 into test_b1.py
- RCS file: /cvsroot/python/python/dist/src/Lib/test/test_b2.py,v
- retrieving revision 1.24
- retrieving revision 1.26
- Merging differences between 1.24 and 1.26 into test_b2.py
- RCS file: /cvsroot/python/python/dist/src/Lib/test/test_binhex.py,v
- retrieving revision 1.10
- retrieving revision 1.11
- Merging differences between 1.10 and 1.11 into test_binhex.py
- U mergedescr/dist/src/Lib/test/test_call.py
- U mergedescr/dist/src/Lib/test/test_codecs.py
- RCS file: /cvsroot/python/python/dist/src/Lib/test/test_complex.py,v
- retrieving revision 1.1
- retrieving revision 1.2
- Merging differences between 1.1 and 1.2 into test_complex.py
- RCS file: /cvsroot/python/python/dist/src/Lib/test/test_contains.py,v
- retrieving revision 1.6
- retrieving revision 1.7
- Merging differences between 1.6 and 1.7 into test_contains.py
- RCS file: /cvsroot/python/python/dist/src/Lib/test/test_copy_reg.py,v
- retrieving revision 1.1
- retrieving revision 1.2
- Merging differences between 1.1 and 1.2 into test_copy_reg.py
- RCS file: /cvsroot/python/python/dist/src/Lib/test/test_difflib.py,v
- retrieving revision 1.1
- retrieving revision 1.3
- Merging differences between 1.1 and 1.3 into test_difflib.py
- RCS file: /cvsroot/python/python/dist/src/Lib/test/test_doctest.py,v
- retrieving revision 1.1
- retrieving revision 1.2
- Merging differences between 1.1 and 1.2 into test_doctest.py
- RCS file: /cvsroot/python/python/dist/src/Lib/test/test_dospath.py,v
- retrieving revision 1.3
- retrieving revision 1.4
- Merging differences between 1.3 and 1.4 into test_dospath.py
- RCS file: /cvsroot/python/python/dist/src/Lib/test/test_fcntl.py,v
- retrieving revision 1.17
- retrieving revision 1.18
- Merging differences between 1.17 and 1.18 into test_fcntl.py
- RCS file: /cvsroot/python/python/dist/src/Lib/test/test_fnmatch.py,v
- retrieving revision 1.1
- retrieving revision 1.2
- Merging differences between 1.1 and 1.2 into test_fnmatch.py
- U mergedescr/dist/src/Lib/test/test_generators.py
- RCS file: /cvsroot/python/python/dist/src/Lib/test/test_grp.py,v
- retrieving revision 1.7
- retrieving revision 1.8
- Merging differences between 1.7 and 1.8 into test_grp.py
- RCS file: /cvsroot/python/python/dist/src/Lib/test/test_hash.py,v
- retrieving revision 1.2
- retrieving revision 1.4
- Merging differences between 1.2 and 1.4 into test_hash.py
- U mergedescr/dist/src/Lib/test/test_htmlparser.py
- RCS file: /cvsroot/python/python/dist/src/Lib/test/test_import.py,v
- retrieving revision 1.3
- retrieving revision 1.4
- Merging differences between 1.3 and 1.4 into test_import.py
- RCS file: /cvsroot/python/python/dist/src/Lib/test/test_iter.py,v
- retrieving revision 1.2
- retrieving revision 1.17
- Merging differences between 1.2 and 1.17 into test_iter.py
- rcsmerge: warning: conflicts during merge
- RCS file: /cvsroot/python/python/dist/src/Lib/test/test_locale.py,v
- retrieving revision 1.2
- retrieving revision 1.3
- Merging differences between 1.2 and 1.3 into test_locale.py
- RCS file: /cvsroot/python/python/dist/src/Lib/test/test_mailbox.py,v
- retrieving revision 1.3
- retrieving revision 1.6
- Merging differences between 1.3 and 1.6 into test_mailbox.py
- RCS file: /cvsroot/python/python/dist/src/Lib/test/test_minidom.py,v
- retrieving revision 1.26
- retrieving revision 1.27
- Merging differences between 1.26 and 1.27 into test_minidom.py
- RCS file: /cvsroot/python/python/dist/src/Lib/test/test_mmap.py,v
- retrieving revision 1.15
- retrieving revision 1.17
- Merging differences between 1.15 and 1.17 into test_mmap.py
- U mergedescr/dist/src/Lib/test/test_mutants.py
- RCS file: /cvsroot/python/python/dist/src/Lib/test/test_operations.py,v
- retrieving revision 1.3
- retrieving revision 1.5
- Merging differences between 1.3 and 1.5 into test_operations.py
- RCS file: /cvsroot/python/python/dist/src/Lib/test/test_parser.py,v
- retrieving revision 1.6
- retrieving revision 1.7
- Merging differences between 1.6 and 1.7 into test_parser.py
- U mergedescr/dist/src/Lib/test/test_pprint.py
- U mergedescr/dist/src/Lib/test/test_quopri.py
- RCS file: /cvsroot/python/python/dist/src/Lib/test/test_rfc822.py,v
- retrieving revision 1.9
- retrieving revision 1.11
- Merging differences between 1.9 and 1.11 into test_rfc822.py
- RCS file: /cvsroot/python/python/dist/src/Lib/test/test_richcmp.py,v
- retrieving revision 1.5
- retrieving revision 1.6
- Merging differences between 1.5 and 1.6 into test_richcmp.py
- RCS file: /cvsroot/python/python/dist/src/Lib/test/test_scope.py,v
- retrieving revision 1.14
- retrieving revision 1.16
- Merging differences between 1.14 and 1.16 into test_scope.py
- RCS file: /cvsroot/python/python/dist/src/Lib/test/test_sha.py,v
- retrieving revision 1.1
- retrieving revision 1.2
- Merging differences between 1.1 and 1.2 into test_sha.py
- RCS file: /cvsroot/python/python/dist/src/Lib/test/test_sre.py,v
- retrieving revision 1.24
- retrieving revision 1.25
- Merging differences between 1.24 and 1.25 into test_sre.py
- RCS file: /cvsroot/python/python/dist/src/Lib/test/test_strop.py,v
- retrieving revision 1.10
- retrieving revision 1.14
- Merging differences between 1.10 and 1.14 into test_strop.py
- RCS file: /cvsroot/python/python/dist/src/Lib/test/test_struct.py,v
- retrieving revision 1.7
- retrieving revision 1.13
- Merging differences between 1.7 and 1.13 into test_struct.py
- RCS file: /cvsroot/python/python/dist/src/Lib/test/test_time.py,v
- retrieving revision 1.6
- retrieving revision 1.7
- Merging differences between 1.6 and 1.7 into test_time.py
- RCS file: /cvsroot/python/python/dist/src/Lib/test/test_types.py,v
- retrieving revision 1.20
- retrieving revision 1.21
- Merging differences between 1.20 and 1.21 into test_types.py
- U mergedescr/dist/src/Lib/test/test_unicode_file.py
- U mergedescr/dist/src/Lib/test/test_urllib2.py
- RCS file: /cvsroot/python/python/dist/src/Lib/test/test_weakref.py,v
- retrieving revision 1.7
- retrieving revision 1.9
- Merging differences between 1.7 and 1.9 into test_weakref.py
- RCS file: /cvsroot/python/python/dist/src/Lib/test/test_xmllib.py,v
- retrieving revision 1.4
- retrieving revision 1.5
- Merging differences between 1.4 and 1.5 into test_xmllib.py
- RCS file: /cvsroot/python/python/dist/src/Lib/test/output/test_coercion,v
- retrieving revision 1.3
- retrieving revision 1.4
- Merging differences between 1.3 and 1.4 into test_coercion
- RCS file: /cvsroot/python/python/dist/src/Lib/test/output/test_minidom,v
- retrieving revision 1.12
- retrieving revision 1.13
- Merging differences between 1.12 and 1.13 into test_minidom
- RCS file: /cvsroot/python/python/dist/src/Lib/test/output/test_scope,v
- retrieving revision 1.6
- retrieving revision 1.8
- Merging differences between 1.6 and 1.8 into test_scope
- U mergedescr/dist/src/Lib/test/output/test_unicode_file
- RCS file: /cvsroot/python/python/dist/src/Lib/xml/dom/minidom.py,v
- retrieving revision 1.32
- retrieving revision 1.34
- Merging differences between 1.32 and 1.34 into minidom.py
- RCS file: /cvsroot/python/python/dist/src/Lib/xml/sax/expatreader.py,v
- retrieving revision 1.22
- retrieving revision 1.23
- Merging differences between 1.22 and 1.23 into expatreader.py
- RCS file: /cvsroot/python/python/dist/src/Lib/xml/sax/xmlreader.py,v
- retrieving revision 1.14
- retrieving revision 1.16
- Merging differences between 1.14 and 1.16 into xmlreader.py
- RCS file: /cvsroot/python/python/dist/src/Modules/_codecsmodule.c,v
- retrieving revision 2.6
- retrieving revision 2.8
- Merging differences between 2.6 and 2.8 into _codecsmodule.c
- RCS file: /cvsroot/python/python/dist/src/Modules/_cursesmodule.c,v
- retrieving revision 2.51
- retrieving revision 2.52
- Merging differences between 2.51 and 2.52 into _cursesmodule.c
- RCS file: /cvsroot/python/python/dist/src/Modules/_sre.c,v
- retrieving revision 2.55
- retrieving revision 2.60
- Merging differences between 2.55 and 2.60 into _sre.c
- RCS file: /cvsroot/python/python/dist/src/Modules/_testcapimodule.c,v
- retrieving revision 1.3
- retrieving revision 1.9
- Merging differences between 1.3 and 1.9 into _testcapimodule.c
- RCS file: /cvsroot/python/python/dist/src/Modules/_tkinter.c,v
- retrieving revision 1.115
- retrieving revision 1.116
- Merging differences between 1.115 and 1.116 into _tkinter.c
- RCS file: /cvsroot/python/python/dist/src/Modules/_weakref.c,v
- retrieving revision 1.10
- retrieving revision 1.11
- Merging differences between 1.10 and 1.11 into _weakref.c
- U mergedescr/dist/src/Modules/addrinfo.h
- RCS file: /cvsroot/python/python/dist/src/Modules/arraymodule.c,v
- retrieving revision 2.62
- retrieving revision 2.63
- Merging differences between 2.62 and 2.63 into arraymodule.c
- RCS file: /cvsroot/python/python/dist/src/Modules/binascii.c,v
- retrieving revision 2.28
- retrieving revision 2.29
- Merging differences between 2.28 and 2.29 into binascii.c
- RCS file: /cvsroot/python/python/dist/src/Modules/fcntlmodule.c,v
- retrieving revision 2.28
- retrieving revision 2.31
- Merging differences between 2.28 and 2.31 into fcntlmodule.c
- U mergedescr/dist/src/Modules/getaddrinfo.c
- U mergedescr/dist/src/Modules/getnameinfo.c
- RCS file: /cvsroot/python/python/dist/src/Modules/main.c,v
- retrieving revision 1.52
- retrieving revision 1.53
- Merging differences between 1.52 and 1.53 into main.c
- RCS file: /cvsroot/python/python/dist/src/Modules/makesetup,v
- retrieving revision 1.35
- retrieving revision 1.36
- Merging differences between 1.35 and 1.36 into makesetup
- RCS file: /cvsroot/python/python/dist/src/Modules/mathmodule.c,v
- retrieving revision 2.58
- retrieving revision 2.59
- Merging differences between 2.58 and 2.59 into mathmodule.c
- RCS file: /cvsroot/python/python/dist/src/Modules/mmapmodule.c,v
- retrieving revision 2.28
- retrieving revision 2.31
- Merging differences between 2.28 and 2.31 into mmapmodule.c
- RCS file: /cvsroot/python/python/dist/src/Modules/parsermodule.c,v
- retrieving revision 2.60
- retrieving revision 2.61
- Merging differences between 2.60 and 2.61 into parsermodule.c
- RCS file: /cvsroot/python/python/dist/src/Modules/pcremodule.c,v
- retrieving revision 2.25
- retrieving revision 2.26
- Merging differences between 2.25 and 2.26 into pcremodule.c
- RCS file: /cvsroot/python/python/dist/src/Modules/posixmodule.c,v
- retrieving revision 2.187
- retrieving revision 2.190
- Merging differences between 2.187 and 2.190 into posixmodule.c
- RCS file: /cvsroot/python/python/dist/src/Modules/regexpr.c,v
- retrieving revision 1.33
- retrieving revision 1.34
- Merging differences between 1.33 and 1.34 into regexpr.c
- RCS file: /cvsroot/python/python/dist/src/Modules/selectmodule.c,v
- retrieving revision 2.50
- retrieving revision 2.51
- Merging differences between 2.50 and 2.51 into selectmodule.c
- RCS file: /cvsroot/python/python/dist/src/Modules/socketmodule.c,v
- retrieving revision 1.141
- retrieving revision 1.149
- Merging differences between 1.141 and 1.149 into socketmodule.c
- RCS file: /cvsroot/python/python/dist/src/Modules/sre.h,v
- retrieving revision 2.18
- retrieving revision 2.21
- Merging differences between 2.18 and 2.21 into sre.h
- RCS file: /cvsroot/python/python/dist/src/Modules/sre_constants.h,v
- retrieving revision 2.12
- retrieving revision 2.13
- Merging differences between 2.12 and 2.13 into sre_constants.h
- RCS file: /cvsroot/python/python/dist/src/Modules/stropmodule.c,v
- retrieving revision 2.75
- retrieving revision 2.82
- Merging differences between 2.75 and 2.82 into stropmodule.c
- RCS file: /cvsroot/python/python/dist/src/Modules/structmodule.c,v
- retrieving revision 2.42
- retrieving revision 2.48
- Merging differences between 2.42 and 2.48 into structmodule.c
- RCS file: /cvsroot/python/python/dist/src/Modules/termios.c,v
- retrieving revision 2.24
- retrieving revision 2.31
- Merging differences between 2.24 and 2.31 into termios.c
- U mergedescr/dist/src/Modules/testcapi_long.h
- RCS file: /cvsroot/python/python/dist/src/Modules/timemodule.c,v
- retrieving revision 2.110
- retrieving revision 2.111
- Merging differences between 2.110 and 2.111 into timemodule.c
- RCS file: /cvsroot/python/python/dist/src/Modules/xreadlinesmodule.c,v
- retrieving revision 1.5
- retrieving revision 1.6
- Merging differences between 1.5 and 1.6 into xreadlinesmodule.c
- RCS file: /cvsroot/python/python/dist/src/Objects/abstract.c,v
- retrieving revision 2.60
- retrieving revision 2.69
- Merging differences between 2.60 and 2.69 into abstract.c
- rcsmerge: warning: conflicts during merge
- RCS file: /cvsroot/python/python/dist/src/Objects/classobject.c,v
- retrieving revision 2.127
- retrieving revision 2.132
- Merging differences between 2.127 and 2.132 into classobject.c
- rcsmerge: warning: conflicts during merge
- RCS file: /cvsroot/python/python/dist/src/Objects/fileobject.c,v
- retrieving revision 2.112
- retrieving revision 2.113
- Merging differences between 2.112 and 2.113 into fileobject.c
- RCS file: /cvsroot/python/python/dist/src/Objects/floatobject.c,v
- retrieving revision 2.81
- retrieving revision 2.82
- Merging differences between 2.81 and 2.82 into floatobject.c
- RCS file: /cvsroot/python/python/dist/src/Objects/funcobject.c,v
- retrieving revision 2.37
- retrieving revision 2.38
- Merging differences between 2.37 and 2.38 into funcobject.c
- rcsmerge: warning: conflicts during merge
- RCS file: /cvsroot/python/python/dist/src/Objects/intobject.c,v
- retrieving revision 2.56
- retrieving revision 2.57
- Merging differences between 2.56 and 2.57 into intobject.c
- RCS file: /cvsroot/python/python/dist/src/Objects/iterobject.c,v
- retrieving revision 1.3
- retrieving revision 1.4
- Merging differences between 1.3 and 1.4 into iterobject.c
- RCS file: /cvsroot/python/python/dist/src/Objects/listobject.c,v
- retrieving revision 2.92
- retrieving revision 2.96
- Merging differences between 2.92 and 2.96 into listobject.c
- RCS file: /cvsroot/python/python/dist/src/Objects/longobject.c,v
- retrieving revision 1.71
- retrieving revision 1.83
- Merging differences between 1.71 and 1.83 into longobject.c
- rcsmerge: warning: conflicts during merge
- RCS file: /cvsroot/python/python/dist/src/Objects/moduleobject.c,v
- retrieving revision 2.31
- retrieving revision 2.33
- Merging differences between 2.31 and 2.33 into moduleobject.c
- rcsmerge: warning: conflicts during merge
- RCS file: /cvsroot/python/python/dist/src/Objects/object.c,v
- retrieving revision 2.124
- retrieving revision 2.132
- Merging differences between 2.124 and 2.132 into object.c
- rcsmerge: warning: conflicts during merge
- RCS file: /cvsroot/python/python/dist/src/Objects/rangeobject.c,v
- retrieving revision 2.24
- retrieving revision 2.25
- Merging differences between 2.24 and 2.25 into rangeobject.c
- rcsmerge: warning: conflicts during merge
- RCS file: /cvsroot/python/python/dist/src/Objects/tupleobject.c,v
- retrieving revision 2.48
- retrieving revision 2.53
- Merging differences between 2.48 and 2.53 into tupleobject.c
- RCS file: /cvsroot/python/python/dist/src/Objects/typeobject.c,v
- retrieving revision 2.16
- retrieving revision 2.18
- Merging differences between 2.16 and 2.18 into typeobject.c
- rcsmerge: warning: conflicts during merge
- RCS file: /cvsroot/python/python/dist/src/Objects/unicodectype.c,v
- retrieving revision 2.7
- retrieving revision 2.11
- Merging differences between 2.7 and 2.11 into unicodectype.c
- RCS file: /cvsroot/python/python/dist/src/Objects/unicodeobject.c,v
- retrieving revision 2.87
- retrieving revision 2.101
- Merging differences between 2.87 and 2.101 into unicodeobject.c
- rcsmerge: warning: conflicts during merge
- RCS file: /cvsroot/python/python/dist/src/PC/WinMain.c,v
- retrieving revision 1.6
- retrieving revision 1.7
- Merging differences between 1.6 and 1.7 into WinMain.c
- RCS file: /cvsroot/python/python/dist/src/PC/config.h,v
- retrieving revision 1.51
- retrieving revision 1.55
- Merging differences between 1.51 and 1.55 into config.h
- RCS file: /cvsroot/python/python/dist/src/PCbuild/BUILDno.txt,v
- retrieving revision 1.12
- retrieving revision 1.15
- Merging differences between 1.12 and 1.15 into BUILDno.txt
- cvs server: nonmergeable file needs merge
- cvs server: revision 1.16 from repository is now in mergedescr/dist/src/PCbuild/pythoncore.dsp
- cvs server: file from working directory is now in .#pythoncore.dsp.1.15.2.3
- C mergedescr/dist/src/PCbuild/pythoncore.dsp
- RCS file: /cvsroot/python/python/dist/src/Python/bltinmodule.c,v
- retrieving revision 2.198
- retrieving revision 2.215
- Merging differences between 2.198 and 2.215 into bltinmodule.c
- rcsmerge: warning: conflicts during merge
- RCS file: /cvsroot/python/python/dist/src/Python/dynload_win.c,v
- retrieving revision 2.7
- retrieving revision 2.8
- Merging differences between 2.7 and 2.8 into dynload_win.c
- RCS file: /cvsroot/python/python/dist/src/Python/errors.c,v
- retrieving revision 2.62
- retrieving revision 2.63
- Merging differences between 2.62 and 2.63 into errors.c
- RCS file: /cvsroot/python/python/dist/src/Python/getargs.c,v
- retrieving revision 2.54
- retrieving revision 2.60
- Merging differences between 2.54 and 2.60 into getargs.c
- rcsmerge: warning: conflicts during merge
- RCS file: /cvsroot/python/python/dist/src/Python/import.c,v
- retrieving revision 2.176
- retrieving revision 2.178
- Merging differences between 2.176 and 2.178 into import.c
- RCS file: /cvsroot/python/python/dist/src/Python/marshal.c,v
- retrieving revision 1.62
- retrieving revision 1.64
- Merging differences between 1.62 and 1.64 into marshal.c
- RCS file: /cvsroot/python/python/dist/src/Python/pythonrun.c,v
- retrieving revision 2.133
- retrieving revision 2.134
- Merging differences between 2.133 and 2.134 into pythonrun.c
- RCS file: /cvsroot/python/python/dist/src/Python/sysmodule.c,v
- retrieving revision 2.85
- retrieving revision 2.88
- Merging differences between 2.85 and 2.88 into sysmodule.c
------------------------------------------------------------------
2001-07-06
--- 269,272 ----
Index: README
===================================================================
RCS file: /cvsroot/python/python/dist/src/README,v
retrieving revision 1.123
retrieving revision 1.123.2.1
diff -C2 -r1.123 -r1.123.2.1
*** README 2001/04/18 04:37:57 1.123
--- README 2001/07/07 22:55:27 1.123.2.1
***************
*** 387,400 ****
future release.
! Mac OS X: You need to add the "-traditional-cpp" option to the
! compiler command line for the Mac OS X Public Beta. This is
! appearantly a bug in the default pre-processor, and is
! expected not to be a problem with future versions. Run
! configure with "OPT='-g -traditional-cpp' ./configure
! --with-suffix=.exe --with-dyld" to add this
! option. One of the regular expression tests fails due to the
! small stack size used by default (how to change this?), and
! the test_largefile test is only expected to work on a Unix UFS
! filesystem (how to check for this on Mac OS X?).
Cygwin: Cygwin Python builds OOTB when configured as follows:
--- 387,400 ----
future release.
! Mac OS X 10.0: Run configure with "OPT='-no-cpp-precomp' ./configure
! --with-suffix=.exe --with-dyld". This generates executable
! file: 'python.exe' (it cannot be named 'python' on an HFS or
! HFS+ disk as the file name clashes with directory 'Python').
! The '-no-cpp-precomp' option prevents a large number of
! compilation warnings. One of the regular expression tests
! fails with a SEGV due to the small stack size used by default
! (how to change this?), and the test_largefile test is only
! expected to work on a Unix UFS filesystem (how to check for
! this on Mac OS X?).
Cygwin: Cygwin Python builds OOTB when configured as follows:
Index: acconfig.h
===================================================================
RCS file: /cvsroot/python/python/dist/src/acconfig.h,v
retrieving revision 1.46
retrieving revision 1.46.4.1
diff -C2 -r1.46 -r1.46.4.1
*** acconfig.h 2001/03/20 13:09:13 1.46
--- acconfig.h 2001/07/07 22:55:27 1.46.4.1
***************
*** 36,39 ****
--- 36,51 ----
#undef HAVE_ALTZONE
+ /* Define if --enable-ipv6 is specified */
+ #undef ENABLE_IPV6
+
+ /* Define if sockaddr has sa_len member */
+ #undef HAVE_SOCKADDR_SA_LEN
+
+ /* struct addrinfo (netdb.h) */
+ #undef HAVE_ADDRINFO
+
+ /* struct sockaddr_storage (sys/socket.h) */
+ #undef HAVE_SOCKADDR_STORAGE
+
/* Defined when any dynamic module loading is enabled */
#undef HAVE_DYNAMIC_LOADING
***************
*** 93,96 ****
--- 105,117 ----
#undef HAVE_WCHAR_H
+ /* Define if you want to have a Unicode type. */
+ #undef Py_USING_UNICODE
+
+ /* Define as the integral type used for Unicode representation. */
+ #undef PY_UNICODE_TYPE
+
+ /* Define as the size of the unicode type. */
+ #undef Py_UNICODE_SIZE
+
/* Define if malloc(0) returns a NULL pointer */
#undef MALLOC_ZERO_RETURNS_NULL
***************
*** 182,185 ****
--- 203,209 ----
(shared library plus accessory files). */
#undef WITH_NEXT_FRAMEWORK
+
+ /* Define if you want to use MacPython modules on MacOSX in unix-Python */
+ #undef USE_TOOLBOX_OBJECT_GLUE
/* Define if you want to use SGI (IRIX 4) dynamic linking.
Index: config.h.in
===================================================================
RCS file: /cvsroot/python/python/dist/src/config.h.in,v
retrieving revision 2.92
retrieving revision 2.92.2.1
diff -C2 -r2.92 -r2.92.2.1
*** config.h.in 2001/04/18 04:37:57 2.92
--- config.h.in 2001/07/07 22:55:27 2.92.2.1
***************
*** 101,104 ****
--- 101,116 ----
#undef HAVE_ALTZONE
+ /* Define if --enable-ipv6 is specified */
+ #undef ENABLE_IPV6
+
+ /* Define if sockaddr has sa_len member */
+ #undef HAVE_SOCKADDR_SA_LEN
+
+ /* struct addrinfo (netdb.h) */
+ #undef HAVE_ADDRINFO
+
+ /* struct sockaddr_storage (sys/socket.h) */
+ #undef HAVE_SOCKADDR_STORAGE
+
/* Defined when any dynamic module loading is enabled */
#undef HAVE_DYNAMIC_LOADING
***************
*** 152,155 ****
--- 164,176 ----
#undef HAVE_WCHAR_H
+ /* Define if you want to have a Unicode type. */
+ #undef Py_USING_UNICODE
+
+ /* Define as the integral type used for Unicode representation. */
+ #undef PY_UNICODE_TYPE
+
+ /* Define as the size of the unicode type. */
+ #undef Py_UNICODE_SIZE
+
/* Define if malloc(0) returns a NULL pointer */
#undef MALLOC_ZERO_RETURNS_NULL
***************
*** 230,233 ****
--- 251,257 ----
#undef WITH_NEXT_FRAMEWORK
+ /* Define if you want to use MacPython modules on MacOSX in unix-Python */
+ #undef USE_TOOLBOX_OBJECT_GLUE
+
/* Define if you want to use SGI (IRIX 4) dynamic linking.
This requires the "dl" library by Jack Jansen,
***************
*** 270,273 ****
--- 294,300 ----
#undef SIZEOF_VOID_P
+ /* The number of bytes in a wchar_t. */
+ #undef SIZEOF_WCHAR_T
+
/* Define if you have the _getpty function. */
#undef HAVE__GETPTY
***************
*** 339,342 ****
--- 366,372 ----
#undef HAVE_FTRUNCATE
+ /* Define if you have the getaddrinfo function. */
+ #undef HAVE_GETADDRINFO
+
/* Define if you have the getcwd function. */
#undef HAVE_GETCWD
***************
*** 351,354 ****
--- 381,387 ----
#undef HAVE_GETLOGIN
+ /* Define if you have the getnameinfo function. */
+ #undef HAVE_GETNAMEINFO
+
/* Define if you have the getpeername function. */
#undef HAVE_GETPEERNAME
***************
*** 372,375 ****
--- 405,411 ----
#undef HAVE_HYPOT
+ /* Define if you have the inet_pton function. */
+ #undef HAVE_INET_PTON
+
/* Define if you have the kill function. */
#undef HAVE_KILL
***************
*** 590,593 ****
--- 626,632 ----
/* Define if you have the <sys/lock.h> header file. */
#undef HAVE_SYS_LOCK_H
+
+ /* Define if you have the <sys/modem.h> header file. */
+ #undef HAVE_SYS_MODEM_H
/* Define if you have the <sys/ndir.h> header file. */
Index: configure
===================================================================
RCS file: /cvsroot/python/python/dist/src/configure,v
retrieving revision 1.209
retrieving revision 1.209.2.1
diff -C2 -r1.209 -r1.209.2.1
*** configure 2001/04/21 17:41:16 1.209
--- configure 2001/07/07 22:55:27 1.209.2.1
***************
*** 1,5 ****
#! /bin/sh
! # From configure.in Revision: 1.216
# Guess values for system-dependent variables and create Makefiles.
--- 1,5 ----
#! /bin/sh
! # From configure.in Revision: 1.222
[...4942 lines suppressed...]
*** 6223,6227 ****
SRCDIRS="Parser Grammar Objects Python Modules"
echo $ac_n "checking for build directories""... $ac_c" 1>&6
! echo "configure:6226: checking for build directories" >&5
for dir in $SRCDIRS; do
if test ! -d $dir; then
--- 6877,6881 ----
SRCDIRS="Parser Grammar Objects Python Modules"
echo $ac_n "checking for build directories""... $ac_c" 1>&6
! echo "configure:6880: checking for build directories" >&5
for dir in $SRCDIRS; do
if test ! -d $dir; then
***************
*** 6399,6402 ****
--- 7053,7057 ----
s%@DLINCLDIR@%$DLINCLDIR%g
s%@DYNLOADFILE@%$DYNLOADFILE%g
+ s%@MACHDEP_OBJS@%$MACHDEP_OBJS%g
s%@LIBOBJS@%$LIBOBJS%g
s%@HAVE_GETHOSTBYNAME_R_6_ARG@%$HAVE_GETHOSTBYNAME_R_6_ARG%g
Index: configure.in
===================================================================
RCS file: /cvsroot/python/python/dist/src/configure.in,v
retrieving revision 1.217
retrieving revision 1.217.2.1
diff -C2 -r1.217 -r1.217.2.1
*** configure.in 2001/04/21 17:41:16 1.217
--- configure.in 2001/07/07 22:55:27 1.217.2.1
***************
*** 369,372 ****
--- 369,517 ----
fi
+ # Check for enable-ipv6
+ OPT="$OPT -Dss_family=__ss_family -Dss_len=__ss_len"
+ AC_MSG_CHECKING([whether to enable ipv6])
+ AC_ARG_ENABLE(ipv6,
+ [ --enable-ipv6 Enable ipv6 (with ipv4) support
+ --disable-ipv6 Disable ipv6 support],
+ [ case "$enableval" in
+ no)
+ AC_MSG_RESULT(no)
+ ipv6=no
+ ;;
+ *) AC_MSG_RESULT(yes)
+ AC_DEFINE(ENABLE_IPV6)
+ ipv6=yes
+ ;;
+ esac ],
+
+ AC_TRY_RUN([ /* AF_INET6 avalable check */
+ #include <sys/types.h>
+ #include <sys/socket.h>
+ main()
+ {
+ if (socket(AF_INET6, SOCK_STREAM, 0) < 0)
+ exit(1);
+ else
+ exit(0);
+ }
+ ],
+ AC_MSG_RESULT(yes)
+ AC_DEFINE(ENABLE_IPV6)
+ ipv6=yes,
+ AC_MSG_RESULT(no)
+ ipv6=no,
+ AC_MSG_RESULT(no)
+ ipv6=no
+ ))
+
+ ipv6type=unknown
+ ipv6lib=none
+ ipv6trylibc=no
+
+ if test "$ipv6" = "yes"; then
+ AC_MSG_CHECKING([ipv6 stack type])
+ for i in inria kame linux-glibc linux-inet6 toshiba v6d zeta; do
+ case $i in
+ inria)
+ dnl http://www.kame.net/
+ AC_EGREP_CPP(yes, [dnl
+ #include <netinet/in.h>
+ #ifdef IPV6_INRIA_VERSION
+ yes
+ #endif],
+ [ipv6type=$i;
+ OPT="-DINET6 $OPT"])
+ ;;
+ kame)
+ dnl http://www.kame.net/
+ AC_EGREP_CPP(yes, [dnl
+ #include <netinet/in.h>
+ #ifdef __KAME__
+ yes
+ #endif],
+ [ipv6type=$i;
+ ipv6lib=inet6
+ ipv6libdir=/usr/local/v6/lib
+ ipv6trylibc=yes
+ OPT="-DINET6 $OPT"])
+ ;;
+ linux-glibc)
+ dnl http://www.v6.linux.or.jp/
+ AC_EGREP_CPP(yes, [dnl
+ #include <features.h>
+ #if defined(__GLIBC__) && ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) || (__GLIBC__ > 2))
+ yes
+ #endif],
+ [ipv6type=$i;
+ ipv6trylibc=yes
+ OPT="-DINET6 $OPT"])
+ ;;
+ linux-inet6)
+ dnl http://www.v6.linux.or.jp/
+ if test -d /usr/inet6; then
+ ipv6type=$i
+ ipv6lib=inet6
+ ipv6libdir=/usr/inet6/lib
+ OPT="-DINET6 -I/usr/inet6/include $OPT"
+ fi
+ ;;
+ toshiba)
+ AC_EGREP_CPP(yes, [dnl
+ #include <sys/param.h>
+ #ifdef _TOSHIBA_INET6
+ yes
+ #endif],
+ [ipv6type=$i;
+ ipv6lib=inet6;
+ ipv6libdir=/usr/local/v6/lib;
+ OPT="-DINET6 $OPT"])
+ ;;
+ v6d)
+ AC_EGREP_CPP(yes, [dnl
+ #include </usr/local/v6/include/sys/v6config.h>
+ #ifdef __V6D__
+ yes
+ #endif],
+ [ipv6type=$i;
+ ipv6lib=v6;
+ ipv6libdir=/usr/local/v6/lib;
+ OPT="-I/usr/local/v6/include $OPT"])
+ ;;
+ zeta)
+ AC_EGREP_CPP(yes, [dnl
+ #include <sys/param.h>
+ #ifdef _ZETA_MINAMI_INET6
+ yes
+ #endif],
+ [ipv6type=$i;
+ ipv6lib=inet6;
+ ipv6libdir=/usr/local/v6/lib;
+ OPT="-DINET6 $OPT"])
+ ;;
+ esac
+ if test "$ipv6type" != "unknown"; then
+ break
+ fi
+ done
+ AC_MSG_RESULT($ipv6type)
+ fi
+
+ if test "$ipv6" = "yes" -a "$ipv6lib" != "none"; then
+ if test -d $ipv6libdir -a -f $ipv6libdir/lib$ipv6lib.a; then
+ LIBS="-L$ipv6libdir -l$ipv6lib $LIBS"
+ echo "using lib$ipv6lib"
+ else
+ if test $ipv6trylibc = "yes"; then
+ echo "using libc"
+ else
+ echo 'Fatal: no $ipv6lib library found. cannot continue.'
+ echo "You need to fetch lib$ipv6lib.a from appropriate"
+ echo 'ipv6 kit and compile beforehand.'
+ exit 1
+ fi
+ fi
+ fi
+
dnl # check for ANSI or K&R ("traditional") preprocessor
dnl AC_MSG_CHECKING(for C preprocessor type)
***************
*** 382,386 ****
AC_CHECK_HEADERS(dlfcn.h fcntl.h limits.h locale.h ncurses.h poll.h pthread.h \
signal.h stdarg.h stddef.h stdlib.h thread.h unistd.h utime.h termios.h \
! sys/audioio.h sys/file.h sys/lock.h db_185.h db.h \
sys/param.h sys/select.h sys/socket.h sys/time.h sys/times.h \
sys/un.h sys/utsname.h sys/wait.h pty.h libutil.h \
--- 527,531 ----
AC_CHECK_HEADERS(dlfcn.h fcntl.h limits.h locale.h ncurses.h poll.h pthread.h \
signal.h stdarg.h stddef.h stdlib.h thread.h unistd.h utime.h termios.h \
! sys/audioio.h sys/file.h sys/lock.h sys/modem.h db_185.h db.h \
sys/param.h sys/select.h sys/socket.h sys/time.h sys/times.h \
sys/un.h sys/utsname.h sys/wait.h pty.h libutil.h \
***************
*** 678,682 ****
# loading of any modules which reference it in System.framework
next/4*|next/5*) LINKFORSHARED="-u __dummy -framework System" ;;
! Darwin/*) LINKFORSHARED="-u __dummy -framework System -framework Foundation" ;;
UnixWare*) LINKFORSHARED="-dy -Bdynamic -Wl,-Bexport";;
SCO_SV*) LINKFORSHARED="-Bdynamic -dy -Wl,-Bexport";;
--- 823,827 ----
# loading of any modules which reference it in System.framework
next/4*|next/5*) LINKFORSHARED="-u __dummy -framework System" ;;
! Darwin/*) LINKFORSHARED="-u __dummy -u _PyMac_Error -framework System -framework Foundation -framework Carbon" ;;
UnixWare*) LINKFORSHARED="-dy -Bdynamic -Wl,-Bexport";;
SCO_SV*) LINKFORSHARED="-Bdynamic -dy -Wl,-Bexport";;
***************
*** 998,1006 ****
fi
# checks for library functions
AC_CHECK_FUNCS(alarm chown clock confstr ctermid ctermid_r execv \
flock fork fsync fdatasync fpathconf ftime ftruncate \
getgroups getlogin getpeername getpid getpwent getwd \
! kill link lstat mkfifo mktime mremap \
nice pathconf pause plock poll pthread_init \
putenv readlink \
--- 1143,1167 ----
fi
+ # MACHDEP_OBJS can be set to platform-specific object files needed by Python
+
+ AC_SUBST(MACHDEP_OBJS)
+ AC_MSG_CHECKING(MACHDEP_OBJS)
+ if test -z "$MACHDEP_OBJS"
+ then
+ case $ac_sys_system/$ac_sys_release in
+ Darwin/*)
+ MACHDEP_OBJS="Mac/Python/macglue.o"
+ AC_DEFINE(USE_TOOLBOX_OBJECT_GLUE)
+ ;;
+ *) MACHDEP_OBJS="";;
+ esac
+ fi
+ AC_MSG_RESULT($DYNLOADFILE)
+
# checks for library functions
AC_CHECK_FUNCS(alarm chown clock confstr ctermid ctermid_r execv \
flock fork fsync fdatasync fpathconf ftime ftruncate \
getgroups getlogin getpeername getpid getpwent getwd \
! inet_pton kill link lstat mkfifo mktime mremap \
nice pathconf pause plock poll pthread_init \
putenv readlink \
***************
*** 1024,1027 ****
--- 1185,1292 ----
AC_CHECK_FUNCS(gettimeofday, AC_TRY_COMPILE([#include <sys/time.h>], [gettimeofday((struct timeval*)0,(struct timezone*)0);], ,AC_DEFINE(GETTIMEOFDAY_NO_TZ)))
+ AC_CHECK_FUNCS(getaddrinfo, [dnl
+ AC_MSG_CHECKING(getaddrinfo bug)
+ AC_TRY_RUN([
+ #include <sys/types.h>
+ #include <netdb.h>
+ #include <string.h>
+ #include <sys/socket.h>
+ #include <netinet/in.h>
+
+ main()
+ {
+ int passive, gaierr, inet4 = 0, inet6 = 0;
+ struct addrinfo hints, *ai, *aitop;
+ char straddr[INET6_ADDRSTRLEN], strport[16];
+
+ for (passive = 0; passive <= 1; passive++) {
+ memset(&hints, 0, sizeof(hints));
+ hints.ai_family = AF_UNSPEC;
+ hints.ai_flags = passive ? AI_PASSIVE : 0;
+ hints.ai_socktype = SOCK_STREAM;
+ if ((gaierr = getaddrinfo(NULL, "54321", &hints, &aitop)) != 0) {
+ (void)gai_strerror(gaierr);
+ goto bad;
+ }
+ for (ai = aitop; ai; ai = ai->ai_next) {
+ if (ai->ai_addr == NULL ||
+ ai->ai_addrlen == 0 ||
+ getnameinfo(ai->ai_addr, ai->ai_addrlen,
+ straddr, sizeof(straddr), strport, sizeof(strport),
+ NI_NUMERICHOST|NI_NUMERICSERV) != 0) {
+ goto bad;
+ }
+ switch (ai->ai_family) {
+ case AF_INET:
+ if (strcmp(strport, "54321") != 0) {
+ goto bad;
+ }
+ if (passive) {
+ if (strcmp(straddr, "0.0.0.0") != 0) {
+ goto bad;
+ }
+ } else {
+ if (strcmp(straddr, "127.0.0.1") != 0) {
+ goto bad;
+ }
+ }
+ inet4++;
+ break;
+ case AF_INET6:
+ if (strcmp(strport, "54321") != 0) {
+ goto bad;
+ }
+ if (passive) {
+ if (strcmp(straddr, "::") != 0) {
+ goto bad;
+ }
+ } else {
+ if (strcmp(straddr, "::1") != 0) {
+ goto bad;
+ }
+ }
+ inet6++;
+ break;
+ case AF_UNSPEC:
+ goto bad;
+ break;
+ default:
+ /* another family support? */
+ break;
+ }
+ }
+ }
+
+ if (!(inet4 == 0 || inet4 == 2))
+ goto bad;
+ if (!(inet6 == 0 || inet6 == 2))
+ goto bad;
+
+ if (aitop)
+ freeaddrinfo(aitop);
+ exit(0);
+
+ bad:
+ if (aitop)
+ freeaddrinfo(aitop);
+ exit(1);
+ }
+ ],
+ AC_MSG_RESULT(good)
+ buggygetaddrinfo=no,
+ AC_MSG_RESULT(buggy)
+ buggygetaddrinfo=yes,
+ AC_MSG_RESULT(buggy)
+ buggygetaddrinfo=yes)], [buggygetaddrinfo=yes])
+
+ if test "$buggygetaddrinfo" = "yes"; then
+ if test "$ipv6" = "yes"; then
+ echo 'Fatal: You must get working getaddrinfo() function.'
+ echo ' or you can specify "--disable-ipv6"'.
+ exit 1
+ fi
+ fi
+ AC_CHECK_FUNCS(getaddrinfo getnameinfo)
+
# checks for structures
AC_HEADER_TIME
***************
*** 1048,1051 ****
--- 1313,1341 ----
AC_MSG_RESULT($was_it_defined)
+ AC_MSG_CHECKING(for addrinfo)
+ AC_CACHE_VAL(ac_cv_struct_addrinfo,
+ AC_TRY_COMPILE([
+ # include <netdb.h>],
+ [struct addrinfo a],
+ ac_cv_struct_addrinfo=yes,
+ ac_cv_struct_addrinfo=no))
+ AC_MSG_RESULT($ac_cv_struct_addrinfo)
+ if test $ac_cv_struct_addrinfo = yes; then
+ AC_DEFINE(HAVE_ADDRINFO)
+ fi
+
+ AC_MSG_CHECKING(for sockaddr_storage)
+ AC_CACHE_VAL(ac_cv_struct_sockaddr_storage,
+ AC_TRY_COMPILE([
+ # include <sys/types.h>
+ # include <sys/socket.h>],
+ [struct sockaddr_storage s],
+ ac_cv_struct_sockaddr_storage=yes,
+ ac_cv_struct_sockaddr_storage=no))
+ AC_MSG_RESULT($ac_cv_struct_sockaddr_storage)
+ if test $ac_cv_struct_sockaddr_storage = yes; then
+ AC_DEFINE(HAVE_SOCKADDR_STORAGE)
+ fi
+
# checks for compiler characteristics
***************
*** 1093,1096 ****
--- 1383,1396 ----
fi
+ # check if sockaddr has sa_len member
+ AC_MSG_CHECKING(if sockaddr has sa_len member)
+ AC_TRY_COMPILE([#include <sys/types.h>
+ #include <sys/socket.h>],
+ [struct sockaddr x;
+ x.sa_len = 0;],
+ AC_MSG_RESULT(yes)
+ AC_DEFINE(HAVE_SOCKADDR_SA_LEN),
+ AC_MSG_RESULT(no))
+
bad_forward=no
AC_MSG_CHECKING(for bad static forward)
***************
*** 1279,1299 ****
)
! # check for usable wchar_t
! usable_wchar_t="unkown"
! AC_MSG_CHECKING(for usable wchar_t)
! AC_TRY_RUN([
! #include "wchar.h"
! #include "wctype.h"
! main() {
! wchar_t s;
! if (sizeof(s) == 2)
! exit(0);
! else
! exit(1);
! }
! ],
! AC_DEFINE(HAVE_USABLE_WCHAR_T) usable_wchar_t="yes",
! usable_wchar_t="no")
! AC_MSG_RESULT($usable_wchar_t)
# check for endianness
--- 1579,1630 ----
)
! # determine wchar_t size
! if test "$wchar_h" = yes
! then
! AC_CHECK_SIZEOF(wchar_t)
! fi
!
! AC_MSG_CHECKING(what type to use for unicode)
! AC_ARG_ENABLE(unicode,
! [ --enable-unicode[=ucs2,ucs4] Enable Unicode strings (default is yes)],,enable_unicode=yes)
!
! if test $enable_unicode = yes
! then
! # Without any arguments, Py_UNICODE defaults to two-byte mode
! enable_unicode="ucs2"
! fi
!
! case "$enable_unicode" in
! ucs2) unicode_size="2"
! AC_DEFINE(Py_UNICODE_SIZE,2)
! ;;
! ucs4) unicode_size="4"
! AC_DEFINE(Py_UNICODE_SIZE,4)
! ;;
! esac
!
! if test "$enable_unicode" = "no"
! then
! AC_MSG_RESULT(not used)
! else
! AC_DEFINE(Py_USING_UNICODE)
! if test "$unicode_size" = "$ac_cv_sizeof_wchar_t"
! then
! PY_UNICODE_TYPE="wchar_t"
! AC_DEFINE(HAVE_USABLE_WCHAR_T)
! AC_DEFINE(PY_UNICODE_TYPE,wchar_t)
! elif test "$ac_cv_sizeof_short" = "$unicode_size"
! then
! PY_UNICODE_TYPE="unsigned short"
! AC_DEFINE(PY_UNICODE_TYPE,unsigned short)
! elif test "$ac_cv_sizeof_long" = "$unicode_size"
! then
! PY_UNICODE_TYPE="unsigned long"
! AC_DEFINE(PY_UNICODE_TYPE,unsigned long)
! else
! PY_UNICODE_TYPE="no type found"
! fi
! AC_MSG_RESULT($PY_UNICODE_TYPE)
! fi
# check for endianness
Index: setup.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/setup.py,v
retrieving revision 1.38
retrieving revision 1.38.4.1
diff -C2 -r1.38 -r1.38.4.1
*** setup.py 2001/04/15 15:16:12 1.38
--- setup.py 2001/07/07 22:55:27 1.38.4.1
***************
*** 1,7 ****
# Autodetecting setup.py script for building the Python extensions
#
- # To be fixed:
- # Implement --disable-modules setting
- #
__version__ = "$Revision$"
--- 1,4 ----
***************
*** 13,16 ****
--- 10,14 ----
from distutils.core import Extension, setup
from distutils.command.build_ext import build_ext
+ from distutils.command.install import install
# This global variable is used to hold the list of modules to be disabled.
***************
*** 133,136 ****
--- 131,145 ----
self.announce('WARNING: building of extension "%s" failed: %s' %
(ext.name, sys.exc_info()[1]))
+ return
+ try:
+ __import__(ext.name)
+ except ImportError:
+ self.announce('WARNING: removing "%s" since importing it failed' %
+ ext.name)
+ assert not self.inplace
+ fullname = self.get_ext_fullname(ext.name)
+ ext_filename = os.path.join(self.build_lib,
+ self.get_ext_filename(fullname))
+ os.remove(ext_filename)
def get_platform (self):
***************
*** 388,394 ****
exts.append( Extension('resource', ['resource.c']) )
- # Generic dynamic loading module
- #exts.append( Extension('dl', ['dlmodule.c']) )
-
# Sun yellow pages. Some systems have the functions in libc.
if platform not in ['cygwin']:
--- 397,400 ----
***************
*** 599,606 ****
# -lGL -lGLU -lXext -lXmu \
def main():
setup(name = 'Python standard library',
version = '%d.%d' % sys.version_info[:2],
! cmdclass = {'build_ext':PyBuildExt},
# The struct module is defined here, because build_ext won't be
# called unless there's at least one extension module defined.
--- 605,623 ----
# -lGL -lGLU -lXext -lXmu \
+ class PyBuildInstall(install):
+ # Suppress the warning about installation into the lib_dynload
+ # directory, which is not in sys.path when running Python during
+ # installation:
+ def initialize_options (self):
+ install.initialize_options(self)
+ self.warn_dir=0
+
def main():
+ # turn off warnings when deprecated modules are imported
+ import warnings
+ warnings.filterwarnings("ignore",category=DeprecationWarning)
setup(name = 'Python standard library',
version = '%d.%d' % sys.version_info[:2],
! cmdclass = {'build_ext':PyBuildExt, 'install':PyBuildInstall},
# The struct module is defined here, because build_ext won't be
# called unless there's at least one extension module defined.
- Previous message: [Python-checkins] CVS: python/dist/src/Include abstract.h,2.31.2.1,2.31.2.2 cStringIO.h,2.14,2.14.8.1 ceval.h,2.41.4.1,2.41.4.2 compile.h,2.29,2.29.4.1 dictobject.h,2.20.8.2,2.20.8.3 fileobject.h,2.22,2.22.8.1 floatobject.h,2.17,2.17.8.1 frameobject.h,2.31,2.31.4.1 graminit.h,2.16,2.16.8.1 longobject.h,2.19,2.19.8.1 opcode.h,2.35,2.35.2.1 pyport.h,2.26,2.26.6.1 pystate.h,2.14,2.14.6.1 rangeobject.h,2.15,2.15.8.1 stringobject.h,2.25,2.25.6.1 symtable.h,2.7,2.7.4.1 tupleobject.h,2.24,2.24.8.1 unicodeobject.h,2.20,2.20.2.1
- Next message: [Python-checkins] CVS: python/dist/src/Lib/distutils mwerkscompiler.py,1.1,1.1.6.1 sysconfig.py,1.34,1.34.6.1
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]