2001-01-24 13:11:43 -04:00
|
|
|
# Top-level Makefile for Python
|
2001-08-17 12:32:31 -03:00
|
|
|
#
|
2001-01-24 13:11:43 -04:00
|
|
|
# As distributed, this file is called Makefile.pre.in; it is processed
|
|
|
|
# into the real Makefile by running the script ./configure, which
|
|
|
|
# replaces things like @spam@ with values appropriate for your system.
|
|
|
|
# This means that if you edit Makefile, your changes get lost the next
|
|
|
|
# time you run the configure script. Ideally, you can do:
|
2001-08-17 12:32:31 -03:00
|
|
|
#
|
2001-01-24 13:11:43 -04:00
|
|
|
# ./configure
|
|
|
|
# make
|
|
|
|
# make test
|
|
|
|
# make install
|
2001-08-17 12:32:31 -03:00
|
|
|
#
|
2001-01-24 13:11:43 -04:00
|
|
|
# If you have a previous version of Python installed that you don't
|
|
|
|
# want to overwrite, you can use "make altinstall" instead of "make
|
2001-02-16 00:16:34 -04:00
|
|
|
# install". Refer to the "Installing" section in the README file for
|
|
|
|
# additional details.
|
2001-08-17 12:32:31 -03:00
|
|
|
#
|
2001-01-24 13:11:43 -04:00
|
|
|
# See also the section "Build instructions" in the README file.
|
|
|
|
|
|
|
|
# === Variables set by makesetup ===
|
|
|
|
|
|
|
|
MODOBJS= _MODOBJS_
|
|
|
|
MODLIBS= _MODLIBS_
|
|
|
|
|
|
|
|
# === Variables set by configure
|
|
|
|
VERSION= @VERSION@
|
|
|
|
srcdir= @srcdir@
|
|
|
|
VPATH= @srcdir@
|
|
|
|
|
|
|
|
CC= @CC@
|
|
|
|
CXX= @CXX@
|
2006-04-14 11:34:26 -03:00
|
|
|
MAINCC= @MAINCC@
|
2001-01-24 13:11:43 -04:00
|
|
|
LINKCC= @LINKCC@
|
|
|
|
AR= @AR@
|
|
|
|
RANLIB= @RANLIB@
|
2006-01-05 06:00:36 -04:00
|
|
|
SVNVERSION= @SVNVERSION@
|
2001-01-24 13:11:43 -04:00
|
|
|
|
|
|
|
# Shell used by make (some versions default to the login shell, which is bad)
|
|
|
|
SHELL= /bin/sh
|
|
|
|
|
|
|
|
# Use this to make a link between python$(VERSION) and python in $(BINDIR)
|
|
|
|
LN= @LN@
|
|
|
|
|
|
|
|
# Portable install script (configure doesn't always guess right)
|
|
|
|
INSTALL= @INSTALL@
|
|
|
|
INSTALL_PROGRAM=@INSTALL_PROGRAM@
|
2001-04-10 20:03:35 -03:00
|
|
|
INSTALL_SCRIPT= @INSTALL_SCRIPT@
|
2001-01-24 13:11:43 -04:00
|
|
|
INSTALL_DATA= @INSTALL_DATA@
|
|
|
|
# Shared libraries must be installed with executable mode on some systems;
|
|
|
|
# rather than figuring out exactly which, we always give them executable mode.
|
|
|
|
# Also, making them read-only seems to be a good idea...
|
|
|
|
INSTALL_SHARED= ${INSTALL} -m 555
|
|
|
|
|
|
|
|
MAKESETUP= $(srcdir)/Modules/makesetup
|
|
|
|
|
|
|
|
# Compiler options
|
|
|
|
OPT= @OPT@
|
2003-01-01 16:07:49 -04:00
|
|
|
BASECFLAGS= @BASECFLAGS@
|
2005-04-24 19:26:38 -03:00
|
|
|
CFLAGS= $(BASECFLAGS) $(OPT) $(EXTRA_CFLAGS)
|
2004-12-06 20:42:59 -04:00
|
|
|
# Both CPPFLAGS and LDFLAGS need to contain the shell's value for setup.py to
|
|
|
|
# be able to build extension modules using the directories specified in the
|
|
|
|
# environment variables
|
2007-09-05 08:47:34 -03:00
|
|
|
CPPFLAGS= -I. -IInclude -I$(srcdir)/Include @CPPFLAGS@
|
2001-01-24 13:11:43 -04:00
|
|
|
LDFLAGS= @LDFLAGS@
|
|
|
|
LDLAST= @LDLAST@
|
|
|
|
SGI_ABI= @SGI_ABI@
|
2001-01-26 12:14:41 -04:00
|
|
|
CCSHARED= @CCSHARED@
|
|
|
|
LINKFORSHARED= @LINKFORSHARED@
|
|
|
|
# Extra C flags added for building the interpreter object files.
|
|
|
|
CFLAGSFORSHARED=@CFLAGSFORSHARED@
|
|
|
|
# C flags used for building the interpreter object files
|
2002-07-19 03:55:41 -03:00
|
|
|
PY_CFLAGS= $(CFLAGS) $(CPPFLAGS) $(CFLAGSFORSHARED) -DPy_BUILD_CORE
|
2001-01-26 12:14:41 -04:00
|
|
|
|
2001-01-24 13:11:43 -04:00
|
|
|
|
|
|
|
# Machine-dependent subdirectories
|
|
|
|
MACHDEP= @MACHDEP@
|
|
|
|
|
|
|
|
# Install prefix for architecture-independent files
|
|
|
|
prefix= @prefix@
|
|
|
|
|
|
|
|
# Install prefix for architecture-dependent files
|
|
|
|
exec_prefix= @exec_prefix@
|
|
|
|
|
2007-09-09 08:13:42 -03:00
|
|
|
# Install prefix for data files
|
|
|
|
datarootdir= @datarootdir@
|
|
|
|
|
2001-01-24 13:11:43 -04:00
|
|
|
# Expanded directories
|
|
|
|
BINDIR= $(exec_prefix)/bin
|
|
|
|
LIBDIR= $(exec_prefix)/lib
|
2001-08-02 03:20:20 -03:00
|
|
|
MANDIR= @mandir@
|
|
|
|
INCLUDEDIR= @includedir@
|
2001-01-24 13:11:43 -04:00
|
|
|
CONFINCLUDEDIR= $(exec_prefix)/include
|
|
|
|
SCRIPTDIR= $(prefix)/lib
|
|
|
|
|
|
|
|
# Detailed destination directories
|
|
|
|
BINLIBDEST= $(LIBDIR)/python$(VERSION)
|
|
|
|
LIBDEST= $(SCRIPTDIR)/python$(VERSION)
|
|
|
|
INCLUDEPY= $(INCLUDEDIR)/python$(VERSION)
|
|
|
|
CONFINCLUDEPY= $(CONFINCLUDEDIR)/python$(VERSION)
|
|
|
|
LIBP= $(LIBDIR)/python$(VERSION)
|
|
|
|
|
|
|
|
# Symbols used for using shared libraries
|
|
|
|
SO= @SO@
|
|
|
|
LDSHARED= @LDSHARED@
|
2001-02-15 23:36:53 -04:00
|
|
|
BLDSHARED= @BLDSHARED@
|
2001-01-24 13:11:43 -04:00
|
|
|
DESTSHARED= $(BINLIBDEST)/lib-dynload
|
|
|
|
|
|
|
|
# Executable suffix (.exe on Windows and Mac OS X)
|
2001-02-27 14:50:56 -04:00
|
|
|
EXE= @EXEEXT@
|
2001-12-06 17:47:20 -04:00
|
|
|
BUILDEXE= @BUILDEXEEXT@
|
2001-01-24 13:11:43 -04:00
|
|
|
|
2001-08-14 22:26:28 -03:00
|
|
|
# Short name and location for Mac OS X Python framework
|
2006-04-29 08:31:35 -03:00
|
|
|
UNIVERSALSDK=@UNIVERSALSDK@
|
2001-08-14 22:26:28 -03:00
|
|
|
PYTHONFRAMEWORK= @PYTHONFRAMEWORK@
|
|
|
|
PYTHONFRAMEWORKDIR= @PYTHONFRAMEWORKDIR@
|
|
|
|
PYTHONFRAMEWORKPREFIX= @PYTHONFRAMEWORKPREFIX@
|
|
|
|
PYTHONFRAMEWORKINSTALLDIR= @PYTHONFRAMEWORKINSTALLDIR@
|
2004-06-03 09:41:45 -03:00
|
|
|
# Deployment target selected during configure, to be checked
|
2006-04-29 08:31:35 -03:00
|
|
|
# by distutils. The export statement is needed to ensure that the
|
|
|
|
# deployment target is active during build.
|
|
|
|
MACOSX_DEPLOYMENT_TARGET=@CONFIGURE_MACOSX_DEPLOYMENT_TARGET@
|
|
|
|
@EXPORT_MACOSX_DEPLOYMENT_TARGET@export MACOSX_DEPLOYMENT_TARGET
|
|
|
|
|
2005-03-28 19:23:47 -04:00
|
|
|
# Options to enable prebinding (for fast startup prior to Mac OS X 10.3)
|
|
|
|
OTHER_LIBTOOL_OPT=@OTHER_LIBTOOL_OPT@
|
2001-08-14 22:26:28 -03:00
|
|
|
|
2002-03-29 12:28:31 -04:00
|
|
|
# Environment to run shared python without installed libraries
|
|
|
|
RUNSHARED= @RUNSHARED@
|
|
|
|
|
2001-01-24 13:11:43 -04:00
|
|
|
# Modes for directories, executables and data files created by the
|
|
|
|
# install process. Default to user-only-writable for all file types.
|
|
|
|
DIRMODE= 755
|
|
|
|
EXEMODE= 755
|
|
|
|
FILEMODE= 644
|
|
|
|
|
2001-03-21 20:32:32 -04:00
|
|
|
# configure script arguments
|
|
|
|
CONFIG_ARGS= @CONFIG_ARGS@
|
2001-01-24 13:11:43 -04:00
|
|
|
|
|
|
|
|
|
|
|
# Subdirectories with code
|
|
|
|
SRCDIRS= @SRCDIRS@
|
|
|
|
|
|
|
|
# Other subdirectories
|
|
|
|
SUBDIRSTOO= Include Lib Misc Demo
|
|
|
|
|
|
|
|
# Files and directories to be distributed
|
2001-07-26 10:41:06 -03:00
|
|
|
CONFIGFILES= configure configure.in acconfig.h pyconfig.h.in Makefile.pre.in
|
2001-01-24 13:11:43 -04:00
|
|
|
DISTFILES= README ChangeLog $(CONFIGFILES)
|
|
|
|
DISTDIRS= $(SUBDIRS) $(SUBDIRSTOO) Ext-dummy
|
|
|
|
DIST= $(DISTFILES) $(DISTDIRS)
|
|
|
|
|
|
|
|
|
2001-01-26 12:14:41 -04:00
|
|
|
LIBRARY= @LIBRARY@
|
2001-01-24 13:11:43 -04:00
|
|
|
LDLIBRARY= @LDLIBRARY@
|
2001-08-14 22:26:28 -03:00
|
|
|
BLDLIBRARY= @BLDLIBRARY@
|
2001-01-24 13:11:43 -04:00
|
|
|
DLLLIBRARY= @DLLLIBRARY@
|
2001-08-14 22:26:28 -03:00
|
|
|
LDLIBRARYDIR= @LDLIBRARYDIR@
|
2002-03-29 12:28:31 -04:00
|
|
|
INSTSONAME= @INSTSONAME@
|
2001-01-24 13:11:43 -04:00
|
|
|
|
|
|
|
|
|
|
|
LIBS= @LIBS@
|
|
|
|
LIBM= @LIBM@
|
|
|
|
LIBC= @LIBC@
|
|
|
|
SYSLIBS= $(LIBM) $(LIBC)
|
2002-06-11 03:22:31 -03:00
|
|
|
SHLIBS= @SHLIBS@
|
2001-01-24 13:11:43 -04:00
|
|
|
|
2002-04-05 12:50:53 -04:00
|
|
|
THREADOBJ= @THREADOBJ@
|
2001-01-24 13:11:43 -04:00
|
|
|
DLINCLDIR= @DLINCLDIR@
|
|
|
|
DYNLOADFILE= @DYNLOADFILE@
|
2001-06-19 12:00:23 -03:00
|
|
|
MACHDEP_OBJS= @MACHDEP_OBJS@
|
2007-11-12 01:14:05 -04:00
|
|
|
LIBOBJDIR= Python/
|
|
|
|
LIBOBJS= @LIBOBJS@
|
2001-08-17 15:39:25 -03:00
|
|
|
UNICODE_OBJS= @UNICODE_OBJS@
|
2001-01-24 13:11:43 -04:00
|
|
|
|
2001-02-27 14:50:56 -04:00
|
|
|
PYTHON= python$(EXE)
|
2001-12-06 17:47:20 -04:00
|
|
|
BUILDPYTHON= python$(BUILDEXE)
|
2001-01-24 13:11:43 -04:00
|
|
|
|
2008-04-12 21:03:25 -03:00
|
|
|
# The task to run while instrument when building the profile-opt target
|
2008-10-10 04:25:11 -03:00
|
|
|
PROFILE_TASK= $(srcdir)/Tools/pybench/pybench.py -n 2 --with-gc --with-syscheck
|
|
|
|
#PROFILE_TASK= $(srcdir)/Lib/test/regrtest.py
|
2008-04-12 21:03:25 -03:00
|
|
|
|
2001-01-24 13:11:43 -04:00
|
|
|
# === Definitions added by makesetup ===
|
|
|
|
|
|
|
|
|
|
|
|
##########################################################################
|
|
|
|
# Modules
|
|
|
|
MODULE_OBJS= \
|
|
|
|
Modules/config.o \
|
|
|
|
Modules/getpath.o \
|
2001-08-29 20:44:38 -03:00
|
|
|
Modules/main.o \
|
|
|
|
Modules/gcmodule.o
|
2001-01-24 13:11:43 -04:00
|
|
|
|
|
|
|
# Used of signalmodule.o is not available
|
|
|
|
SIGNAL_OBJS= @SIGNAL_OBJS@
|
|
|
|
|
|
|
|
|
|
|
|
##########################################################################
|
|
|
|
# Grammar
|
2001-02-26 22:19:16 -04:00
|
|
|
GRAMMAR_H= $(srcdir)/Include/graminit.h
|
|
|
|
GRAMMAR_C= $(srcdir)/Python/graminit.c
|
2001-01-24 13:11:43 -04:00
|
|
|
GRAMMAR_INPUT= $(srcdir)/Grammar/Grammar
|
|
|
|
|
|
|
|
|
|
|
|
##########################################################################
|
|
|
|
# Parser
|
2001-02-27 14:50:56 -04:00
|
|
|
PGEN= Parser/pgen$(EXE)
|
2001-01-24 13:11:43 -04:00
|
|
|
|
|
|
|
POBJS= \
|
|
|
|
Parser/acceler.o \
|
|
|
|
Parser/grammar1.o \
|
|
|
|
Parser/listnode.o \
|
|
|
|
Parser/node.o \
|
|
|
|
Parser/parser.o \
|
|
|
|
Parser/parsetok.o \
|
|
|
|
Parser/bitset.o \
|
2003-04-17 11:55:42 -03:00
|
|
|
Parser/metagrammar.o \
|
|
|
|
Parser/firstsets.o \
|
|
|
|
Parser/grammar.o \
|
|
|
|
Parser/pgen.o
|
2001-01-24 13:11:43 -04:00
|
|
|
|
2002-08-04 14:29:52 -03:00
|
|
|
PARSER_OBJS= $(POBJS) Parser/myreadline.o Parser/tokenizer.o
|
2001-01-24 13:11:43 -04:00
|
|
|
|
|
|
|
PGOBJS= \
|
2002-04-22 00:05:25 -03:00
|
|
|
Objects/obmalloc.o \
|
2001-12-03 23:54:08 -04:00
|
|
|
Python/mysnprintf.o \
|
2002-08-04 14:29:52 -03:00
|
|
|
Parser/tokenizer_pgen.o \
|
2001-01-24 13:11:43 -04:00
|
|
|
Parser/printgrammar.o \
|
|
|
|
Parser/pgenmain.o
|
|
|
|
|
2008-01-21 09:11:15 -04:00
|
|
|
PARSER_HEADERS= \
|
|
|
|
Parser/parser.h \
|
|
|
|
Parser/tokenizer.h
|
|
|
|
|
2001-01-24 13:11:43 -04:00
|
|
|
PGENOBJS= $(PGENMAIN) $(POBJS) $(PGOBJS)
|
|
|
|
|
2005-10-20 16:59:25 -03:00
|
|
|
##########################################################################
|
|
|
|
# AST
|
2006-04-14 12:02:32 -03:00
|
|
|
AST_H_DIR= $(srcdir)/Include
|
|
|
|
AST_H= $(AST_H_DIR)/Python-ast.h
|
|
|
|
AST_C_DIR= $(srcdir)/Python
|
|
|
|
AST_C= $(AST_C_DIR)/Python-ast.c
|
2005-10-20 16:59:25 -03:00
|
|
|
AST_ASDL= $(srcdir)/Parser/Python.asdl
|
|
|
|
|
|
|
|
ASDLGEN_FILES= $(srcdir)/Parser/asdl.py $(srcdir)/Parser/asdl_c.py
|
|
|
|
# XXX Note that a build now requires Python exist before the build starts
|
2006-04-14 12:02:32 -03:00
|
|
|
ASDLGEN= $(srcdir)/Parser/asdl_c.py
|
2001-01-24 13:11:43 -04:00
|
|
|
|
|
|
|
##########################################################################
|
|
|
|
# Python
|
|
|
|
PYTHON_OBJS= \
|
2008-04-12 20:44:07 -03:00
|
|
|
Python/_warnings.o \
|
2005-10-20 16:59:25 -03:00
|
|
|
Python/Python-ast.o \
|
|
|
|
Python/asdl.o \
|
|
|
|
Python/ast.o \
|
2001-01-24 13:11:43 -04:00
|
|
|
Python/bltinmodule.o \
|
|
|
|
Python/ceval.o \
|
|
|
|
Python/compile.o \
|
|
|
|
Python/codecs.o \
|
|
|
|
Python/errors.o \
|
|
|
|
Python/frozen.o \
|
|
|
|
Python/frozenmain.o \
|
2001-02-27 15:07:02 -04:00
|
|
|
Python/future.o \
|
2001-01-24 13:11:43 -04:00
|
|
|
Python/getargs.o \
|
|
|
|
Python/getcompiler.o \
|
|
|
|
Python/getcopyright.o \
|
|
|
|
Python/getmtime.o \
|
|
|
|
Python/getplatform.o \
|
|
|
|
Python/getversion.o \
|
|
|
|
Python/graminit.o \
|
|
|
|
Python/import.o \
|
|
|
|
Python/importdl.o \
|
|
|
|
Python/marshal.o \
|
|
|
|
Python/modsupport.o \
|
|
|
|
Python/mystrtoul.o \
|
2001-07-31 10:24:44 -03:00
|
|
|
Python/mysnprintf.o \
|
2006-08-21 13:19:37 -03:00
|
|
|
Python/peephole.o \
|
2005-12-17 16:54:49 -04:00
|
|
|
Python/pyarena.o \
|
2001-01-24 13:11:43 -04:00
|
|
|
Python/pyfpe.o \
|
2008-04-18 20:13:07 -03:00
|
|
|
Python/pymath.o \
|
2001-01-24 13:11:43 -04:00
|
|
|
Python/pystate.o \
|
|
|
|
Python/pythonrun.o \
|
|
|
|
Python/structmember.o \
|
2001-02-09 18:22:18 -04:00
|
|
|
Python/symtable.o \
|
2001-01-24 13:11:43 -04:00
|
|
|
Python/sysmodule.o \
|
|
|
|
Python/traceback.o \
|
|
|
|
Python/getopt.o \
|
2007-12-18 19:22:54 -04:00
|
|
|
Python/pystrcmp.o \
|
2004-06-08 15:52:54 -03:00
|
|
|
Python/pystrtod.o \
|
Backport of PEP 3101, Advanced String Formatting, from py3k.
Highlights:
- Adding PyObject_Format.
- Adding string.Format class.
- Adding __format__ for str, unicode, int, long, float, datetime.
- Adding builtin format.
- Adding ''.format and u''.format.
- str/unicode fixups for formatters.
The files in Objects/stringlib that implement PEP 3101 (stringdefs.h,
unicodedefs.h, formatter.h, string_format.h) are identical in trunk
and py3k. Any changes from here on should be made to trunk, and
changes will propogate to py3k).
2008-02-17 15:46:49 -04:00
|
|
|
Python/formatter_unicode.o \
|
|
|
|
Python/formatter_string.o \
|
2001-01-24 13:11:43 -04:00
|
|
|
Python/$(DYNLOADFILE) \
|
2007-11-12 01:14:05 -04:00
|
|
|
$(LIBOBJS) \
|
2001-06-19 12:00:23 -03:00
|
|
|
$(MACHDEP_OBJS) \
|
2002-04-05 12:50:53 -04:00
|
|
|
$(THREADOBJ)
|
2001-01-24 13:11:43 -04:00
|
|
|
|
|
|
|
|
|
|
|
##########################################################################
|
|
|
|
# Objects
|
|
|
|
OBJECT_OBJS= \
|
|
|
|
Objects/abstract.o \
|
2002-04-03 18:41:51 -04:00
|
|
|
Objects/boolobject.o \
|
2001-01-24 13:11:43 -04:00
|
|
|
Objects/bufferobject.o \
|
Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/trunk-bytearray
........
r61750 | christian.heimes | 2008-03-22 20:47:44 +0100 (Sat, 22 Mar 2008) | 1 line
Copied files from py3k w/o modifications
........
r61752 | christian.heimes | 2008-03-22 20:53:20 +0100 (Sat, 22 Mar 2008) | 7 lines
Take One
* Added initialization code, warnings, flags etc. to the appropriate places
* Added new buffer interface to string type
* Modified tests
* Modified Makefile.pre.in to compile the new files
* Added bytesobject.c to Python.h
........
r61754 | christian.heimes | 2008-03-22 21:22:19 +0100 (Sat, 22 Mar 2008) | 2 lines
Disabled bytearray.extend for now since it causes an infinite recursion
Fixed serveral unit tests
........
r61756 | christian.heimes | 2008-03-22 21:43:38 +0100 (Sat, 22 Mar 2008) | 5 lines
Added PyBytes support to several places:
str + bytearray
ord(bytearray)
bytearray(str, encoding)
........
r61760 | christian.heimes | 2008-03-22 21:56:32 +0100 (Sat, 22 Mar 2008) | 1 line
Fixed more unit tests related to type('') is not unicode
........
r61763 | christian.heimes | 2008-03-22 22:20:28 +0100 (Sat, 22 Mar 2008) | 2 lines
Fixed more unit tests
Fixed bytearray.extend
........
r61768 | christian.heimes | 2008-03-22 22:40:50 +0100 (Sat, 22 Mar 2008) | 1 line
Implemented old buffer interface for bytearray
........
r61772 | christian.heimes | 2008-03-22 23:24:52 +0100 (Sat, 22 Mar 2008) | 1 line
Added backport of the io module
........
r61775 | christian.heimes | 2008-03-23 03:50:49 +0100 (Sun, 23 Mar 2008) | 1 line
Fix str assignement to bytearray. Assignment of a str of size 1 is interpreted as a single byte
........
r61805 | christian.heimes | 2008-03-23 19:33:48 +0100 (Sun, 23 Mar 2008) | 3 lines
Fixed more tests
Fixed bytearray() comparsion with unicode()
Fixed iterator assignment of bytearray
........
r61809 | christian.heimes | 2008-03-23 21:02:21 +0100 (Sun, 23 Mar 2008) | 2 lines
str(bytesarray()) now returns the bytes and not the representation of the bytearray object
Enabled and fixed more unit tests
........
r61812 | christian.heimes | 2008-03-23 21:53:08 +0100 (Sun, 23 Mar 2008) | 3 lines
Clear error PyNumber_AsSsize_t() fails
Use CHARMASK for ob_svall access
disabled a test with memoryview again
........
r61819 | christian.heimes | 2008-03-23 23:05:57 +0100 (Sun, 23 Mar 2008) | 1 line
Untested updates to the PCBuild directory
........
r61917 | christian.heimes | 2008-03-26 00:57:06 +0100 (Wed, 26 Mar 2008) | 1 line
The type system of Python 2.6 has subtle differences to 3.0's. I've removed the Py_TPFLAGS_BASETYPE flags from bytearray for now. bytearray can't be subclasses until the issues with bytearray subclasses are fixed.
........
r61920 | christian.heimes | 2008-03-26 01:44:08 +0100 (Wed, 26 Mar 2008) | 2 lines
Disabled last failing test
I don't understand what the test is testing and how it suppose to work. Ka-Ping, please check it out.
........
r61930 | christian.heimes | 2008-03-26 12:46:18 +0100 (Wed, 26 Mar 2008) | 1 line
Re-enabled bytes warning code
........
r61933 | christian.heimes | 2008-03-26 13:20:46 +0100 (Wed, 26 Mar 2008) | 1 line
Fixed a bug in the new buffer protocol. The buffer slots weren't copied into a subclass.
........
r61934 | christian.heimes | 2008-03-26 13:25:09 +0100 (Wed, 26 Mar 2008) | 1 line
Re-enabled bytearray subclassing - all tests are passing.
........
2008-03-26 09:49:49 -03:00
|
|
|
Objects/bytes_methods.o \
|
2008-05-26 10:01:01 -03:00
|
|
|
Objects/bytearrayobject.o \
|
2001-01-25 16:04:14 -04:00
|
|
|
Objects/cellobject.o \
|
2001-01-24 13:11:43 -04:00
|
|
|
Objects/classobject.o \
|
|
|
|
Objects/cobject.o \
|
2005-10-20 16:59:25 -03:00
|
|
|
Objects/codeobject.o \
|
2001-01-24 13:11:43 -04:00
|
|
|
Objects/complexobject.o \
|
2001-08-02 01:15:00 -03:00
|
|
|
Objects/descrobject.o \
|
2002-04-26 16:40:56 -03:00
|
|
|
Objects/enumobject.o \
|
2006-05-27 09:29:24 -03:00
|
|
|
Objects/exceptions.o \
|
2004-06-01 12:22:42 -03:00
|
|
|
Objects/genobject.o \
|
2001-01-24 13:11:43 -04:00
|
|
|
Objects/fileobject.o \
|
|
|
|
Objects/floatobject.o \
|
|
|
|
Objects/frameobject.o \
|
|
|
|
Objects/funcobject.o \
|
|
|
|
Objects/intobject.o \
|
2001-04-20 16:13:02 -03:00
|
|
|
Objects/iterobject.o \
|
2001-01-24 13:11:43 -04:00
|
|
|
Objects/listobject.o \
|
|
|
|
Objects/longobject.o \
|
|
|
|
Objects/dictobject.o \
|
|
|
|
Objects/methodobject.o \
|
|
|
|
Objects/moduleobject.o \
|
|
|
|
Objects/object.o \
|
2002-03-22 20:20:15 -04:00
|
|
|
Objects/obmalloc.o \
|
2001-01-24 13:11:43 -04:00
|
|
|
Objects/rangeobject.o \
|
2008-06-10 18:23:22 -03:00
|
|
|
Objects/setobject.o \
|
2001-01-24 13:11:43 -04:00
|
|
|
Objects/sliceobject.o \
|
2008-06-10 18:23:22 -03:00
|
|
|
Objects/stringobject.o \
|
SF patch #462296: Add attributes to os.stat results; by Nick Mathewson.
This is a big one, touching lots of files. Some of the platforms
aren't tested yet. Briefly, this changes the return value of the
os/posix functions stat(), fstat(), statvfs(), fstatvfs(), and the
time functions localtime(), gmtime(), and strptime() from tuples into
pseudo-sequences. When accessed as a sequence, they behave exactly as
before. But they also have attributes like st_mtime or tm_year. The
stat return value, moreover, has a few platform-specific attributes
that are not available through the sequence interface (because
everybody expects the sequence to have a fixed length, these couldn't
be added there). If your platform's struct stat doesn't define
st_blksize, st_blocks or st_rdev, they won't be accessible from Python
either.
(Still missing is a documentation update.)
2001-10-18 17:34:25 -03:00
|
|
|
Objects/structseq.o \
|
2001-01-24 13:11:43 -04:00
|
|
|
Objects/tupleobject.o \
|
|
|
|
Objects/typeobject.o \
|
2001-10-05 18:56:02 -03:00
|
|
|
Objects/weakrefobject.o \
|
2001-08-17 15:39:25 -03:00
|
|
|
$(UNICODE_OBJS)
|
2001-01-24 13:11:43 -04:00
|
|
|
|
|
|
|
|
|
|
|
##########################################################################
|
|
|
|
# objects that get linked into the Python library
|
|
|
|
LIBRARY_OBJS= \
|
2001-01-27 17:42:38 -04:00
|
|
|
Modules/getbuildinfo.o \
|
2001-01-24 13:11:43 -04:00
|
|
|
$(PARSER_OBJS) \
|
|
|
|
$(OBJECT_OBJS) \
|
|
|
|
$(PYTHON_OBJS) \
|
|
|
|
$(MODULE_OBJS) \
|
|
|
|
$(SIGNAL_OBJS) \
|
|
|
|
$(MODOBJS)
|
|
|
|
|
|
|
|
#########################################################################
|
|
|
|
# Rules
|
|
|
|
|
|
|
|
# Default target
|
2007-09-21 03:33:28 -03:00
|
|
|
all: build_all
|
|
|
|
build_all: $(BUILDPYTHON) oldsharedmods sharedmods
|
2001-01-24 13:11:43 -04:00
|
|
|
|
2008-04-12 21:03:25 -03:00
|
|
|
# Compile a binary with gcc profile guided optimization.
|
|
|
|
profile-opt:
|
|
|
|
@echo "Building with support for profile generation:"
|
|
|
|
$(MAKE) clean
|
|
|
|
$(MAKE) build_all_generate_profile
|
|
|
|
@echo "Running benchmark to generate profile data:"
|
|
|
|
$(MAKE) profile-removal
|
|
|
|
$(MAKE) run_profile_task
|
|
|
|
@echo "Rebuilding with profile guided optimizations:"
|
|
|
|
$(MAKE) clean
|
|
|
|
$(MAKE) build_all_use_profile
|
|
|
|
|
|
|
|
build_all_generate_profile:
|
|
|
|
$(MAKE) all CFLAGS="$(CFLAGS) -fprofile-generate" LIBS="$(LIBS) -lgcov"
|
|
|
|
|
|
|
|
run_profile_task:
|
|
|
|
./$(BUILDPYTHON) $(PROFILE_TASK)
|
|
|
|
|
|
|
|
build_all_use_profile:
|
|
|
|
$(MAKE) all CFLAGS="$(CFLAGS) -fprofile-use"
|
|
|
|
|
2008-05-18 08:46:51 -03:00
|
|
|
coverage:
|
|
|
|
@echo "Building with support for coverage checking:"
|
|
|
|
$(MAKE) clean
|
|
|
|
$(MAKE) all CFLAGS="$(CFLAGS) -O0 -pg -fprofile-arcs -ftest-coverage" LIBS="$(LIBS) -lgcov"
|
|
|
|
|
|
|
|
|
2001-01-24 13:11:43 -04:00
|
|
|
# Build the interpreter
|
2006-04-14 11:34:26 -03:00
|
|
|
$(BUILDPYTHON): Modules/python.o $(LIBRARY) $(LDLIBRARY)
|
2001-03-06 01:52:16 -04:00
|
|
|
$(LINKCC) $(LDFLAGS) $(LINKFORSHARED) -o $@ \
|
2006-04-14 11:34:26 -03:00
|
|
|
Modules/python.o \
|
2001-08-14 22:26:28 -03:00
|
|
|
$(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST)
|
2001-01-24 13:11:43 -04:00
|
|
|
|
2001-12-06 17:47:20 -04:00
|
|
|
platform: $(BUILDPYTHON)
|
2002-03-29 12:28:31 -04:00
|
|
|
$(RUNSHARED) ./$(BUILDPYTHON) -E -c 'import sys ; from distutils.util import get_platform ; print get_platform()+"-"+sys.version[0:3]' >platform
|
2001-01-24 13:11:43 -04:00
|
|
|
|
|
|
|
|
|
|
|
# Build the shared modules
|
2001-12-06 17:47:20 -04:00
|
|
|
sharedmods: $(BUILDPYTHON)
|
2006-10-27 15:15:02 -03:00
|
|
|
@case $$MAKEFLAGS in \
|
2008-01-21 19:50:16 -04:00
|
|
|
*s*) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py -q build;; \
|
2002-03-29 12:28:31 -04:00
|
|
|
*) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py build;; \
|
2001-09-12 15:59:25 -03:00
|
|
|
esac
|
2001-01-24 13:11:43 -04:00
|
|
|
|
|
|
|
# Build static library
|
2001-04-09 19:23:22 -03:00
|
|
|
# avoid long command lines, same as LIBRARY_OBJS
|
2001-01-24 13:11:43 -04:00
|
|
|
$(LIBRARY): $(LIBRARY_OBJS)
|
|
|
|
-rm -f $@
|
2001-01-27 17:42:38 -04:00
|
|
|
$(AR) cr $@ Modules/getbuildinfo.o
|
2001-01-24 13:11:43 -04:00
|
|
|
$(AR) cr $@ $(PARSER_OBJS)
|
|
|
|
$(AR) cr $@ $(OBJECT_OBJS)
|
|
|
|
$(AR) cr $@ $(PYTHON_OBJS)
|
|
|
|
$(AR) cr $@ $(MODULE_OBJS) $(SIGNAL_OBJS)
|
|
|
|
$(AR) cr $@ $(MODOBJS)
|
|
|
|
$(RANLIB) $@
|
|
|
|
|
2002-03-29 12:28:31 -04:00
|
|
|
libpython$(VERSION).so: $(LIBRARY_OBJS)
|
2003-06-14 10:11:24 -03:00
|
|
|
if test $(INSTSONAME) != $(LDLIBRARY); then \
|
2008-09-02 02:29:51 -03:00
|
|
|
$(LDSHARED) $(LDFLAGS) -Wl,-h$(INSTSONAME) -o $(INSTSONAME) $(LIBRARY_OBJS) $(SHLIBS) $(LIBC) $(LIBM) $(LDLAST); \
|
2003-03-30 11:37:33 -04:00
|
|
|
$(LN) -f $(INSTSONAME) $@; \
|
2009-01-02 06:46:42 -04:00
|
|
|
else \
|
2008-09-02 02:29:51 -03:00
|
|
|
$(LDSHARED) $(LDFLAGS) -o $@ $(LIBRARY_OBJS) $(SHLIBS) $(LIBC) $(LIBM) $(LDLAST); \
|
2003-03-30 11:37:33 -04:00
|
|
|
fi
|
2002-03-29 12:28:31 -04:00
|
|
|
|
2009-01-02 06:46:42 -04:00
|
|
|
libpython$(VERSION).dylib: $(LIBRARY_OBJS)
|
|
|
|
$(CC) -dynamiclib -Wl,-single_module $(LDFLAGS) -undefined dynamic_lookup -Wl,-install_name,$(prefix)/lib/libpython$(VERSION).dylib -Wl,-compatibility_version,$(VERSION) -Wl,-current_version,$(VERSION) -o $@ $(LIBRARY_OBJS) $(SHLIBS) $(LIBC) $(LIBM) $(LDLAST); \
|
|
|
|
|
|
|
|
|
2002-03-29 12:28:31 -04:00
|
|
|
libpython$(VERSION).sl: $(LIBRARY_OBJS)
|
2008-09-02 02:29:51 -03:00
|
|
|
$(LDSHARED) $(LDFLAGS) -o $@ $(LIBRARY_OBJS) $(SHLIBS) $(LIBC) $(LIBM) $(LDLAST)
|
2001-01-24 13:11:43 -04:00
|
|
|
|
2002-08-01 18:57:49 -03:00
|
|
|
# This rule is here for OPENSTEP/Rhapsody/MacOSX. It builds a temporary
|
|
|
|
# minimal framework (not including the Lib directory and such) in the current
|
|
|
|
# directory.
|
2008-05-02 16:45:11 -03:00
|
|
|
RESSRCDIR=Mac/Resources/framework
|
2002-08-01 18:57:49 -03:00
|
|
|
$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK): \
|
|
|
|
$(LIBRARY) \
|
2008-05-02 16:45:11 -03:00
|
|
|
$(RESSRCDIR)/Info.plist
|
2002-02-12 17:30:53 -04:00
|
|
|
$(INSTALL) -d -m $(DIRMODE) $(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)
|
2006-04-29 08:31:35 -03:00
|
|
|
if test "${UNIVERSALSDK}"; then \
|
2008-06-05 09:58:24 -03:00
|
|
|
$(CC) -o $(LDLIBRARY) @UNIVERSAL_ARCH_FLAGS@ -dynamiclib \
|
2006-04-29 08:31:35 -03:00
|
|
|
-isysroot "${UNIVERSALSDK}" \
|
|
|
|
-all_load $(LIBRARY) -Wl,-single_module \
|
2008-05-02 16:45:11 -03:00
|
|
|
-install_name $(DESTDIR)$(PYTHONFRAMEWORKINSTALLDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK) \
|
2006-04-29 08:31:35 -03:00
|
|
|
-compatibility_version $(VERSION) \
|
|
|
|
-current_version $(VERSION); \
|
|
|
|
else \
|
2007-07-09 05:41:15 -03:00
|
|
|
/usr/bin/libtool -o $(LDLIBRARY) -dynamic $(OTHER_LIBTOOL_OPT) $(LIBRARY) \
|
2006-04-29 08:31:35 -03:00
|
|
|
@LIBTOOL_CRUFT@ ;\
|
|
|
|
fi
|
2002-08-01 18:57:49 -03:00
|
|
|
$(INSTALL) -d -m $(DIRMODE) \
|
|
|
|
$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/Resources/English.lproj
|
|
|
|
$(INSTALL_DATA) $(RESSRCDIR)/Info.plist \
|
|
|
|
$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/Resources/Info.plist
|
2002-08-04 18:17:20 -03:00
|
|
|
$(LN) -fsn $(VERSION) $(PYTHONFRAMEWORKDIR)/Versions/Current
|
2004-07-16 05:43:47 -03:00
|
|
|
$(LN) -fsn Versions/Current/$(PYTHONFRAMEWORK) $(PYTHONFRAMEWORKDIR)/$(PYTHONFRAMEWORK)
|
2002-08-04 18:17:20 -03:00
|
|
|
$(LN) -fsn Versions/Current/Headers $(PYTHONFRAMEWORKDIR)/Headers
|
|
|
|
$(LN) -fsn Versions/Current/Resources $(PYTHONFRAMEWORKDIR)/Resources
|
2001-01-24 13:11:43 -04:00
|
|
|
|
2003-09-04 08:04:06 -03:00
|
|
|
# This rule builds the Cygwin Python DLL and import library if configured
|
|
|
|
# for a shared core library; otherwise, this rule is a noop.
|
|
|
|
$(DLLLIBRARY) libpython$(VERSION).dll.a: $(LIBRARY_OBJS)
|
|
|
|
if test -n "$(DLLLIBRARY)"; then \
|
2008-09-02 02:29:51 -03:00
|
|
|
$(LDSHARED) $(LDFLAGS) -Wl,--out-implib=$@ -o $(DLLLIBRARY) $^ \
|
|
|
|
$(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST); \
|
2003-09-04 08:04:06 -03:00
|
|
|
else true; \
|
|
|
|
fi
|
2001-01-24 13:11:43 -04:00
|
|
|
|
|
|
|
|
|
|
|
oldsharedmods: $(SHAREDMODS)
|
|
|
|
|
|
|
|
|
|
|
|
Makefile Modules/config.c: Makefile.pre \
|
|
|
|
$(srcdir)/Modules/config.c.in \
|
|
|
|
$(MAKESETUP) \
|
|
|
|
Modules/Setup.config \
|
|
|
|
Modules/Setup \
|
|
|
|
Modules/Setup.local
|
|
|
|
$(SHELL) $(MAKESETUP) -c $(srcdir)/Modules/config.c.in \
|
|
|
|
-s Modules \
|
|
|
|
Modules/Setup.config \
|
|
|
|
Modules/Setup.local \
|
|
|
|
Modules/Setup
|
|
|
|
@mv config.c Modules
|
|
|
|
@echo "The Makefile was updated, you may need to re-run make."
|
|
|
|
|
|
|
|
|
|
|
|
Modules/Setup: $(srcdir)/Modules/Setup.dist
|
|
|
|
@if test -f Modules/Setup; then \
|
|
|
|
echo "-----------------------------------------------"; \
|
|
|
|
echo "Modules/Setup.dist is newer than Modules/Setup;"; \
|
|
|
|
echo "check to make sure you have all the updates you"; \
|
|
|
|
echo "need in your Modules/Setup file."; \
|
2008-05-11 21:46:49 -03:00
|
|
|
echo "Usually, copying Modules/Setup.dist to Modules/Setup will work."; \
|
2001-01-24 13:11:43 -04:00
|
|
|
echo "-----------------------------------------------"; \
|
2001-01-26 12:14:41 -04:00
|
|
|
fi
|
2001-01-24 13:11:43 -04:00
|
|
|
|
|
|
|
############################################################################
|
|
|
|
# Special rules for object files
|
|
|
|
|
2006-01-05 06:00:36 -04:00
|
|
|
Modules/getbuildinfo.o: $(PARSER_OBJS) \
|
|
|
|
$(OBJECT_OBJS) \
|
|
|
|
$(PYTHON_OBJS) \
|
|
|
|
$(MODULE_OBJS) \
|
|
|
|
$(SIGNAL_OBJS) \
|
|
|
|
$(MODOBJS) \
|
|
|
|
$(srcdir)/Modules/getbuildinfo.c
|
2006-12-08 16:46:11 -04:00
|
|
|
$(CC) -c $(PY_CFLAGS) -DSVNVERSION=\"`LC_ALL=C $(SVNVERSION)`\" -o $@ $(srcdir)/Modules/getbuildinfo.c
|
2001-01-26 18:52:45 -04:00
|
|
|
|
2001-01-24 13:11:43 -04:00
|
|
|
Modules/getpath.o: $(srcdir)/Modules/getpath.c Makefile
|
2001-01-26 12:14:41 -04:00
|
|
|
$(CC) -c $(PY_CFLAGS) -DPYTHONPATH='"$(PYTHONPATH)"' \
|
|
|
|
-DPREFIX='"$(prefix)"' \
|
|
|
|
-DEXEC_PREFIX='"$(exec_prefix)"' \
|
|
|
|
-DVERSION='"$(VERSION)"' \
|
|
|
|
-DVPATH='"$(VPATH)"' \
|
2001-01-29 05:39:14 -04:00
|
|
|
-o $@ $(srcdir)/Modules/getpath.c
|
2001-01-24 13:11:43 -04:00
|
|
|
|
2006-04-14 11:34:26 -03:00
|
|
|
Modules/python.o: $(srcdir)/Modules/python.c
|
|
|
|
$(MAINCC) -c $(PY_CFLAGS) -o $@ $(srcdir)/Modules/python.c
|
2001-01-24 13:11:43 -04:00
|
|
|
|
|
|
|
|
|
|
|
$(GRAMMAR_H) $(GRAMMAR_C): $(PGEN) $(GRAMMAR_INPUT)
|
2007-10-12 00:01:01 -03:00
|
|
|
-@$(INSTALL) -d Include
|
2001-02-26 22:19:16 -04:00
|
|
|
-$(PGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C)
|
2001-01-24 13:11:43 -04:00
|
|
|
|
|
|
|
$(PGEN): $(PGENOBJS)
|
2003-07-13 07:10:42 -03:00
|
|
|
$(CC) $(OPT) $(LDFLAGS) $(PGENOBJS) $(LIBS) -o $(PGEN)
|
2001-01-24 13:11:43 -04:00
|
|
|
|
|
|
|
Parser/grammar.o: $(srcdir)/Parser/grammar.c \
|
|
|
|
$(srcdir)/Include/token.h \
|
|
|
|
$(srcdir)/Include/grammar.h
|
|
|
|
Parser/metagrammar.o: $(srcdir)/Parser/metagrammar.c
|
|
|
|
|
2002-08-04 14:29:52 -03:00
|
|
|
Parser/tokenizer_pgen.o: $(srcdir)/Parser/tokenizer.c
|
|
|
|
|
2007-01-12 05:35:56 -04:00
|
|
|
Parser/pgenmain.o: $(srcdir)/Include/parsetok.h
|
|
|
|
|
2006-04-14 12:02:32 -03:00
|
|
|
$(AST_H): $(AST_ASDL) $(ASDLGEN_FILES)
|
|
|
|
$(ASDLGEN) -h $(AST_H_DIR) $(AST_ASDL)
|
2001-01-24 13:11:43 -04:00
|
|
|
|
2006-04-14 12:02:32 -03:00
|
|
|
$(AST_C): $(AST_ASDL) $(ASDLGEN_FILES)
|
|
|
|
$(ASDLGEN) -c $(AST_C_DIR) $(AST_ASDL)
|
2006-07-27 20:43:15 -03:00
|
|
|
|
2005-10-20 16:59:25 -03:00
|
|
|
Python/compile.o Python/symtable.o: $(GRAMMAR_H) $(AST_H)
|
2001-02-26 22:45:36 -04:00
|
|
|
|
2001-01-24 13:11:43 -04:00
|
|
|
Python/getplatform.o: $(srcdir)/Python/getplatform.c
|
2002-07-19 03:55:41 -03:00
|
|
|
$(CC) -c $(PY_CFLAGS) -DPLATFORM='"$(MACHDEP)"' -o $@ $(srcdir)/Python/getplatform.c
|
2001-01-24 13:11:43 -04:00
|
|
|
|
|
|
|
Python/importdl.o: $(srcdir)/Python/importdl.c
|
2002-07-19 03:55:41 -03:00
|
|
|
$(CC) -c $(PY_CFLAGS) -I$(DLINCLDIR) -o $@ $(srcdir)/Python/importdl.c
|
2001-01-24 13:11:43 -04:00
|
|
|
|
|
|
|
Objects/unicodectype.o: $(srcdir)/Objects/unicodectype.c \
|
|
|
|
$(srcdir)/Objects/unicodetype_db.h
|
|
|
|
|
2008-02-24 18:48:05 -04:00
|
|
|
STRINGLIB_HEADERS= \
|
Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/trunk-bytearray
........
r61750 | christian.heimes | 2008-03-22 20:47:44 +0100 (Sat, 22 Mar 2008) | 1 line
Copied files from py3k w/o modifications
........
r61752 | christian.heimes | 2008-03-22 20:53:20 +0100 (Sat, 22 Mar 2008) | 7 lines
Take One
* Added initialization code, warnings, flags etc. to the appropriate places
* Added new buffer interface to string type
* Modified tests
* Modified Makefile.pre.in to compile the new files
* Added bytesobject.c to Python.h
........
r61754 | christian.heimes | 2008-03-22 21:22:19 +0100 (Sat, 22 Mar 2008) | 2 lines
Disabled bytearray.extend for now since it causes an infinite recursion
Fixed serveral unit tests
........
r61756 | christian.heimes | 2008-03-22 21:43:38 +0100 (Sat, 22 Mar 2008) | 5 lines
Added PyBytes support to several places:
str + bytearray
ord(bytearray)
bytearray(str, encoding)
........
r61760 | christian.heimes | 2008-03-22 21:56:32 +0100 (Sat, 22 Mar 2008) | 1 line
Fixed more unit tests related to type('') is not unicode
........
r61763 | christian.heimes | 2008-03-22 22:20:28 +0100 (Sat, 22 Mar 2008) | 2 lines
Fixed more unit tests
Fixed bytearray.extend
........
r61768 | christian.heimes | 2008-03-22 22:40:50 +0100 (Sat, 22 Mar 2008) | 1 line
Implemented old buffer interface for bytearray
........
r61772 | christian.heimes | 2008-03-22 23:24:52 +0100 (Sat, 22 Mar 2008) | 1 line
Added backport of the io module
........
r61775 | christian.heimes | 2008-03-23 03:50:49 +0100 (Sun, 23 Mar 2008) | 1 line
Fix str assignement to bytearray. Assignment of a str of size 1 is interpreted as a single byte
........
r61805 | christian.heimes | 2008-03-23 19:33:48 +0100 (Sun, 23 Mar 2008) | 3 lines
Fixed more tests
Fixed bytearray() comparsion with unicode()
Fixed iterator assignment of bytearray
........
r61809 | christian.heimes | 2008-03-23 21:02:21 +0100 (Sun, 23 Mar 2008) | 2 lines
str(bytesarray()) now returns the bytes and not the representation of the bytearray object
Enabled and fixed more unit tests
........
r61812 | christian.heimes | 2008-03-23 21:53:08 +0100 (Sun, 23 Mar 2008) | 3 lines
Clear error PyNumber_AsSsize_t() fails
Use CHARMASK for ob_svall access
disabled a test with memoryview again
........
r61819 | christian.heimes | 2008-03-23 23:05:57 +0100 (Sun, 23 Mar 2008) | 1 line
Untested updates to the PCBuild directory
........
r61917 | christian.heimes | 2008-03-26 00:57:06 +0100 (Wed, 26 Mar 2008) | 1 line
The type system of Python 2.6 has subtle differences to 3.0's. I've removed the Py_TPFLAGS_BASETYPE flags from bytearray for now. bytearray can't be subclasses until the issues with bytearray subclasses are fixed.
........
r61920 | christian.heimes | 2008-03-26 01:44:08 +0100 (Wed, 26 Mar 2008) | 2 lines
Disabled last failing test
I don't understand what the test is testing and how it suppose to work. Ka-Ping, please check it out.
........
r61930 | christian.heimes | 2008-03-26 12:46:18 +0100 (Wed, 26 Mar 2008) | 1 line
Re-enabled bytes warning code
........
r61933 | christian.heimes | 2008-03-26 13:20:46 +0100 (Wed, 26 Mar 2008) | 1 line
Fixed a bug in the new buffer protocol. The buffer slots weren't copied into a subclass.
........
r61934 | christian.heimes | 2008-03-26 13:25:09 +0100 (Wed, 26 Mar 2008) | 1 line
Re-enabled bytearray subclassing - all tests are passing.
........
2008-03-26 09:49:49 -03:00
|
|
|
$(srcdir)/Include/bytes_methods.h \
|
2008-02-24 18:48:05 -04:00
|
|
|
$(srcdir)/Objects/stringlib/count.h \
|
Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/trunk-bytearray
........
r61750 | christian.heimes | 2008-03-22 20:47:44 +0100 (Sat, 22 Mar 2008) | 1 line
Copied files from py3k w/o modifications
........
r61752 | christian.heimes | 2008-03-22 20:53:20 +0100 (Sat, 22 Mar 2008) | 7 lines
Take One
* Added initialization code, warnings, flags etc. to the appropriate places
* Added new buffer interface to string type
* Modified tests
* Modified Makefile.pre.in to compile the new files
* Added bytesobject.c to Python.h
........
r61754 | christian.heimes | 2008-03-22 21:22:19 +0100 (Sat, 22 Mar 2008) | 2 lines
Disabled bytearray.extend for now since it causes an infinite recursion
Fixed serveral unit tests
........
r61756 | christian.heimes | 2008-03-22 21:43:38 +0100 (Sat, 22 Mar 2008) | 5 lines
Added PyBytes support to several places:
str + bytearray
ord(bytearray)
bytearray(str, encoding)
........
r61760 | christian.heimes | 2008-03-22 21:56:32 +0100 (Sat, 22 Mar 2008) | 1 line
Fixed more unit tests related to type('') is not unicode
........
r61763 | christian.heimes | 2008-03-22 22:20:28 +0100 (Sat, 22 Mar 2008) | 2 lines
Fixed more unit tests
Fixed bytearray.extend
........
r61768 | christian.heimes | 2008-03-22 22:40:50 +0100 (Sat, 22 Mar 2008) | 1 line
Implemented old buffer interface for bytearray
........
r61772 | christian.heimes | 2008-03-22 23:24:52 +0100 (Sat, 22 Mar 2008) | 1 line
Added backport of the io module
........
r61775 | christian.heimes | 2008-03-23 03:50:49 +0100 (Sun, 23 Mar 2008) | 1 line
Fix str assignement to bytearray. Assignment of a str of size 1 is interpreted as a single byte
........
r61805 | christian.heimes | 2008-03-23 19:33:48 +0100 (Sun, 23 Mar 2008) | 3 lines
Fixed more tests
Fixed bytearray() comparsion with unicode()
Fixed iterator assignment of bytearray
........
r61809 | christian.heimes | 2008-03-23 21:02:21 +0100 (Sun, 23 Mar 2008) | 2 lines
str(bytesarray()) now returns the bytes and not the representation of the bytearray object
Enabled and fixed more unit tests
........
r61812 | christian.heimes | 2008-03-23 21:53:08 +0100 (Sun, 23 Mar 2008) | 3 lines
Clear error PyNumber_AsSsize_t() fails
Use CHARMASK for ob_svall access
disabled a test with memoryview again
........
r61819 | christian.heimes | 2008-03-23 23:05:57 +0100 (Sun, 23 Mar 2008) | 1 line
Untested updates to the PCBuild directory
........
r61917 | christian.heimes | 2008-03-26 00:57:06 +0100 (Wed, 26 Mar 2008) | 1 line
The type system of Python 2.6 has subtle differences to 3.0's. I've removed the Py_TPFLAGS_BASETYPE flags from bytearray for now. bytearray can't be subclasses until the issues with bytearray subclasses are fixed.
........
r61920 | christian.heimes | 2008-03-26 01:44:08 +0100 (Wed, 26 Mar 2008) | 2 lines
Disabled last failing test
I don't understand what the test is testing and how it suppose to work. Ka-Ping, please check it out.
........
r61930 | christian.heimes | 2008-03-26 12:46:18 +0100 (Wed, 26 Mar 2008) | 1 line
Re-enabled bytes warning code
........
r61933 | christian.heimes | 2008-03-26 13:20:46 +0100 (Wed, 26 Mar 2008) | 1 line
Fixed a bug in the new buffer protocol. The buffer slots weren't copied into a subclass.
........
r61934 | christian.heimes | 2008-03-26 13:25:09 +0100 (Wed, 26 Mar 2008) | 1 line
Re-enabled bytearray subclassing - all tests are passing.
........
2008-03-26 09:49:49 -03:00
|
|
|
$(srcdir)/Objects/stringlib/ctype.h \
|
2008-02-24 18:48:05 -04:00
|
|
|
$(srcdir)/Objects/stringlib/fastsearch.h \
|
|
|
|
$(srcdir)/Objects/stringlib/find.h \
|
|
|
|
$(srcdir)/Objects/stringlib/formatter.h \
|
|
|
|
$(srcdir)/Objects/stringlib/partition.h \
|
|
|
|
$(srcdir)/Objects/stringlib/stringdefs.h \
|
|
|
|
$(srcdir)/Objects/stringlib/string_format.h \
|
Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/trunk-bytearray
........
r61750 | christian.heimes | 2008-03-22 20:47:44 +0100 (Sat, 22 Mar 2008) | 1 line
Copied files from py3k w/o modifications
........
r61752 | christian.heimes | 2008-03-22 20:53:20 +0100 (Sat, 22 Mar 2008) | 7 lines
Take One
* Added initialization code, warnings, flags etc. to the appropriate places
* Added new buffer interface to string type
* Modified tests
* Modified Makefile.pre.in to compile the new files
* Added bytesobject.c to Python.h
........
r61754 | christian.heimes | 2008-03-22 21:22:19 +0100 (Sat, 22 Mar 2008) | 2 lines
Disabled bytearray.extend for now since it causes an infinite recursion
Fixed serveral unit tests
........
r61756 | christian.heimes | 2008-03-22 21:43:38 +0100 (Sat, 22 Mar 2008) | 5 lines
Added PyBytes support to several places:
str + bytearray
ord(bytearray)
bytearray(str, encoding)
........
r61760 | christian.heimes | 2008-03-22 21:56:32 +0100 (Sat, 22 Mar 2008) | 1 line
Fixed more unit tests related to type('') is not unicode
........
r61763 | christian.heimes | 2008-03-22 22:20:28 +0100 (Sat, 22 Mar 2008) | 2 lines
Fixed more unit tests
Fixed bytearray.extend
........
r61768 | christian.heimes | 2008-03-22 22:40:50 +0100 (Sat, 22 Mar 2008) | 1 line
Implemented old buffer interface for bytearray
........
r61772 | christian.heimes | 2008-03-22 23:24:52 +0100 (Sat, 22 Mar 2008) | 1 line
Added backport of the io module
........
r61775 | christian.heimes | 2008-03-23 03:50:49 +0100 (Sun, 23 Mar 2008) | 1 line
Fix str assignement to bytearray. Assignment of a str of size 1 is interpreted as a single byte
........
r61805 | christian.heimes | 2008-03-23 19:33:48 +0100 (Sun, 23 Mar 2008) | 3 lines
Fixed more tests
Fixed bytearray() comparsion with unicode()
Fixed iterator assignment of bytearray
........
r61809 | christian.heimes | 2008-03-23 21:02:21 +0100 (Sun, 23 Mar 2008) | 2 lines
str(bytesarray()) now returns the bytes and not the representation of the bytearray object
Enabled and fixed more unit tests
........
r61812 | christian.heimes | 2008-03-23 21:53:08 +0100 (Sun, 23 Mar 2008) | 3 lines
Clear error PyNumber_AsSsize_t() fails
Use CHARMASK for ob_svall access
disabled a test with memoryview again
........
r61819 | christian.heimes | 2008-03-23 23:05:57 +0100 (Sun, 23 Mar 2008) | 1 line
Untested updates to the PCBuild directory
........
r61917 | christian.heimes | 2008-03-26 00:57:06 +0100 (Wed, 26 Mar 2008) | 1 line
The type system of Python 2.6 has subtle differences to 3.0's. I've removed the Py_TPFLAGS_BASETYPE flags from bytearray for now. bytearray can't be subclasses until the issues with bytearray subclasses are fixed.
........
r61920 | christian.heimes | 2008-03-26 01:44:08 +0100 (Wed, 26 Mar 2008) | 2 lines
Disabled last failing test
I don't understand what the test is testing and how it suppose to work. Ka-Ping, please check it out.
........
r61930 | christian.heimes | 2008-03-26 12:46:18 +0100 (Wed, 26 Mar 2008) | 1 line
Re-enabled bytes warning code
........
r61933 | christian.heimes | 2008-03-26 13:20:46 +0100 (Wed, 26 Mar 2008) | 1 line
Fixed a bug in the new buffer protocol. The buffer slots weren't copied into a subclass.
........
r61934 | christian.heimes | 2008-03-26 13:25:09 +0100 (Wed, 26 Mar 2008) | 1 line
Re-enabled bytearray subclassing - all tests are passing.
........
2008-03-26 09:49:49 -03:00
|
|
|
$(srcdir)/Objects/stringlib/transmogrify.h \
|
2008-05-11 16:52:48 -03:00
|
|
|
$(srcdir)/Objects/stringlib/unicodedefs.h \
|
|
|
|
$(srcdir)/Objects/stringlib/localeutil.h
|
2008-02-24 18:48:05 -04:00
|
|
|
|
Backport of PEP 3101, Advanced String Formatting, from py3k.
Highlights:
- Adding PyObject_Format.
- Adding string.Format class.
- Adding __format__ for str, unicode, int, long, float, datetime.
- Adding builtin format.
- Adding ''.format and u''.format.
- str/unicode fixups for formatters.
The files in Objects/stringlib that implement PEP 3101 (stringdefs.h,
unicodedefs.h, formatter.h, string_format.h) are identical in trunk
and py3k. Any changes from here on should be made to trunk, and
changes will propogate to py3k).
2008-02-17 15:46:49 -04:00
|
|
|
Objects/unicodeobject.o: $(srcdir)/Objects/unicodeobject.c \
|
2008-02-24 18:48:05 -04:00
|
|
|
$(STRINGLIB_HEADERS)
|
2008-02-19 08:27:59 -04:00
|
|
|
|
Merged revisions 68521,68527,68534-68536,68540,68547,68552,68563,68570,68572,68575,68579-68580,68584 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r68521 | hirokazu.yamamoto | 2009-01-11 04:28:13 +0100 (So, 11 Jan 2009) | 1 line
Fixed version number in build_ssl.bat.
........
r68527 | martin.v.loewis | 2009-01-11 10:43:55 +0100 (So, 11 Jan 2009) | 2 lines
Issue #4895: Use _strdup on Windows CE.
........
r68534 | gregory.p.smith | 2009-01-11 18:53:33 +0100 (So, 11 Jan 2009) | 2 lines
correct email address
........
r68535 | gregory.p.smith | 2009-01-11 18:57:54 +0100 (So, 11 Jan 2009) | 9 lines
Update the documentation for binascii and zlib crc32/adler32 functions
to better describe the signed vs unsigned return value behavior on
different platforms and versions of python. Mention the workaround to
make them all return the same thing by using & 0xffffffff.
Fixes issue4903.
Also needs to be merged into release26-maint, release30-maint, & py3k.
........
r68536 | benjamin.peterson | 2009-01-11 20:48:15 +0100 (So, 11 Jan 2009) | 1 line
add email addresses
........
r68540 | martin.v.loewis | 2009-01-12 08:57:11 +0100 (Mo, 12 Jan 2009) | 2 lines
Issue #4915: Port sysmodule to Windows CE.
........
r68547 | kristjan.jonsson | 2009-01-12 19:09:27 +0100 (Mo, 12 Jan 2009) | 1 line
Add tests for invalid format specifiers in strftime, and for handling of invalid file descriptors in the os module.
........
r68552 | vinay.sajip | 2009-01-12 21:36:18 +0100 (Mo, 12 Jan 2009) | 1 line
Minor changes/corrections in markup.
........
r68563 | benjamin.peterson | 2009-01-13 02:49:10 +0100 (Di, 13 Jan 2009) | 1 line
small logic correction
........
r68570 | raymond.hettinger | 2009-01-13 10:08:32 +0100 (Di, 13 Jan 2009) | 5 lines
Issue 4922: Incorrect comments for MutableSet.add() and MutableSet.discard().
Needs to be backported to 2.6 and forward ported to 3.0 and 3.1.
........
r68572 | andrew.kuchling | 2009-01-13 14:40:54 +0100 (Di, 13 Jan 2009) | 1 line
Note that first coord. is left alone
........
r68575 | thomas.heller | 2009-01-13 18:32:28 +0100 (Di, 13 Jan 2009) | 1 line
Fix refcount leak in error cases. Bug found by coverity.
........
r68579 | benjamin.peterson | 2009-01-13 22:42:23 +0100 (Di, 13 Jan 2009) | 1 line
make bytearrayobject.o depend on the stringlib #4936
........
r68580 | benjamin.peterson | 2009-01-13 22:43:11 +0100 (Di, 13 Jan 2009) | 1 line
add bytearrayobject.h to PYTHON_HEADERS
........
r68584 | benjamin.peterson | 2009-01-13 23:22:41 +0100 (Di, 13 Jan 2009) | 1 line
de-spacify
........
2009-01-13 20:08:09 -04:00
|
|
|
Objects/bytearrayobject.o: $(srcdir)/Objects/bytearrayobject.c \
|
|
|
|
$(STRINGLIB_HEADERS)
|
|
|
|
|
2008-02-19 08:27:59 -04:00
|
|
|
Objects/stringobject.o: $(srcdir)/Objects/stringobject.c \
|
2008-02-24 18:48:05 -04:00
|
|
|
$(STRINGLIB_HEADERS)
|
Backport of PEP 3101, Advanced String Formatting, from py3k.
Highlights:
- Adding PyObject_Format.
- Adding string.Format class.
- Adding __format__ for str, unicode, int, long, float, datetime.
- Adding builtin format.
- Adding ''.format and u''.format.
- str/unicode fixups for formatters.
The files in Objects/stringlib that implement PEP 3101 (stringdefs.h,
unicodedefs.h, formatter.h, string_format.h) are identical in trunk
and py3k. Any changes from here on should be made to trunk, and
changes will propogate to py3k).
2008-02-17 15:46:49 -04:00
|
|
|
|
|
|
|
Python/formatter_unicode.o: $(srcdir)/Python/formatter_unicode.c \
|
2008-02-24 18:48:05 -04:00
|
|
|
$(STRINGLIB_HEADERS)
|
Backport of PEP 3101, Advanced String Formatting, from py3k.
Highlights:
- Adding PyObject_Format.
- Adding string.Format class.
- Adding __format__ for str, unicode, int, long, float, datetime.
- Adding builtin format.
- Adding ''.format and u''.format.
- str/unicode fixups for formatters.
The files in Objects/stringlib that implement PEP 3101 (stringdefs.h,
unicodedefs.h, formatter.h, string_format.h) are identical in trunk
and py3k. Any changes from here on should be made to trunk, and
changes will propogate to py3k).
2008-02-17 15:46:49 -04:00
|
|
|
|
|
|
|
Python/formatter_string.o: $(srcdir)/Python/formatter_string.c \
|
2008-02-24 18:48:05 -04:00
|
|
|
$(STRINGLIB_HEADERS)
|
Backport of PEP 3101, Advanced String Formatting, from py3k.
Highlights:
- Adding PyObject_Format.
- Adding string.Format class.
- Adding __format__ for str, unicode, int, long, float, datetime.
- Adding builtin format.
- Adding ''.format and u''.format.
- str/unicode fixups for formatters.
The files in Objects/stringlib that implement PEP 3101 (stringdefs.h,
unicodedefs.h, formatter.h, string_format.h) are identical in trunk
and py3k. Any changes from here on should be made to trunk, and
changes will propogate to py3k).
2008-02-17 15:46:49 -04:00
|
|
|
|
2001-01-24 13:11:43 -04:00
|
|
|
############################################################################
|
|
|
|
# Header files
|
|
|
|
|
2001-01-25 16:07:50 -04:00
|
|
|
PYTHON_HEADERS= \
|
2005-10-20 16:59:25 -03:00
|
|
|
Include/Python-ast.h \
|
2008-01-21 09:11:15 -04:00
|
|
|
Include/Python.h \
|
2001-09-17 23:40:21 -03:00
|
|
|
Include/abstract.h \
|
2008-01-21 09:11:15 -04:00
|
|
|
Include/asdl.h \
|
|
|
|
Include/ast.h \
|
|
|
|
Include/bitset.h \
|
2002-04-03 18:41:51 -04:00
|
|
|
Include/boolobject.h \
|
Merged revisions 68521,68527,68534-68536,68540,68547,68552,68563,68570,68572,68575,68579-68580,68584 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r68521 | hirokazu.yamamoto | 2009-01-11 04:28:13 +0100 (So, 11 Jan 2009) | 1 line
Fixed version number in build_ssl.bat.
........
r68527 | martin.v.loewis | 2009-01-11 10:43:55 +0100 (So, 11 Jan 2009) | 2 lines
Issue #4895: Use _strdup on Windows CE.
........
r68534 | gregory.p.smith | 2009-01-11 18:53:33 +0100 (So, 11 Jan 2009) | 2 lines
correct email address
........
r68535 | gregory.p.smith | 2009-01-11 18:57:54 +0100 (So, 11 Jan 2009) | 9 lines
Update the documentation for binascii and zlib crc32/adler32 functions
to better describe the signed vs unsigned return value behavior on
different platforms and versions of python. Mention the workaround to
make them all return the same thing by using & 0xffffffff.
Fixes issue4903.
Also needs to be merged into release26-maint, release30-maint, & py3k.
........
r68536 | benjamin.peterson | 2009-01-11 20:48:15 +0100 (So, 11 Jan 2009) | 1 line
add email addresses
........
r68540 | martin.v.loewis | 2009-01-12 08:57:11 +0100 (Mo, 12 Jan 2009) | 2 lines
Issue #4915: Port sysmodule to Windows CE.
........
r68547 | kristjan.jonsson | 2009-01-12 19:09:27 +0100 (Mo, 12 Jan 2009) | 1 line
Add tests for invalid format specifiers in strftime, and for handling of invalid file descriptors in the os module.
........
r68552 | vinay.sajip | 2009-01-12 21:36:18 +0100 (Mo, 12 Jan 2009) | 1 line
Minor changes/corrections in markup.
........
r68563 | benjamin.peterson | 2009-01-13 02:49:10 +0100 (Di, 13 Jan 2009) | 1 line
small logic correction
........
r68570 | raymond.hettinger | 2009-01-13 10:08:32 +0100 (Di, 13 Jan 2009) | 5 lines
Issue 4922: Incorrect comments for MutableSet.add() and MutableSet.discard().
Needs to be backported to 2.6 and forward ported to 3.0 and 3.1.
........
r68572 | andrew.kuchling | 2009-01-13 14:40:54 +0100 (Di, 13 Jan 2009) | 1 line
Note that first coord. is left alone
........
r68575 | thomas.heller | 2009-01-13 18:32:28 +0100 (Di, 13 Jan 2009) | 1 line
Fix refcount leak in error cases. Bug found by coverity.
........
r68579 | benjamin.peterson | 2009-01-13 22:42:23 +0100 (Di, 13 Jan 2009) | 1 line
make bytearrayobject.o depend on the stringlib #4936
........
r68580 | benjamin.peterson | 2009-01-13 22:43:11 +0100 (Di, 13 Jan 2009) | 1 line
add bytearrayobject.h to PYTHON_HEADERS
........
r68584 | benjamin.peterson | 2009-01-13 23:22:41 +0100 (Di, 13 Jan 2009) | 1 line
de-spacify
........
2009-01-13 20:08:09 -04:00
|
|
|
Include/bytearrayobject.h \
|
Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/trunk-bytearray
........
r61750 | christian.heimes | 2008-03-22 20:47:44 +0100 (Sat, 22 Mar 2008) | 1 line
Copied files from py3k w/o modifications
........
r61752 | christian.heimes | 2008-03-22 20:53:20 +0100 (Sat, 22 Mar 2008) | 7 lines
Take One
* Added initialization code, warnings, flags etc. to the appropriate places
* Added new buffer interface to string type
* Modified tests
* Modified Makefile.pre.in to compile the new files
* Added bytesobject.c to Python.h
........
r61754 | christian.heimes | 2008-03-22 21:22:19 +0100 (Sat, 22 Mar 2008) | 2 lines
Disabled bytearray.extend for now since it causes an infinite recursion
Fixed serveral unit tests
........
r61756 | christian.heimes | 2008-03-22 21:43:38 +0100 (Sat, 22 Mar 2008) | 5 lines
Added PyBytes support to several places:
str + bytearray
ord(bytearray)
bytearray(str, encoding)
........
r61760 | christian.heimes | 2008-03-22 21:56:32 +0100 (Sat, 22 Mar 2008) | 1 line
Fixed more unit tests related to type('') is not unicode
........
r61763 | christian.heimes | 2008-03-22 22:20:28 +0100 (Sat, 22 Mar 2008) | 2 lines
Fixed more unit tests
Fixed bytearray.extend
........
r61768 | christian.heimes | 2008-03-22 22:40:50 +0100 (Sat, 22 Mar 2008) | 1 line
Implemented old buffer interface for bytearray
........
r61772 | christian.heimes | 2008-03-22 23:24:52 +0100 (Sat, 22 Mar 2008) | 1 line
Added backport of the io module
........
r61775 | christian.heimes | 2008-03-23 03:50:49 +0100 (Sun, 23 Mar 2008) | 1 line
Fix str assignement to bytearray. Assignment of a str of size 1 is interpreted as a single byte
........
r61805 | christian.heimes | 2008-03-23 19:33:48 +0100 (Sun, 23 Mar 2008) | 3 lines
Fixed more tests
Fixed bytearray() comparsion with unicode()
Fixed iterator assignment of bytearray
........
r61809 | christian.heimes | 2008-03-23 21:02:21 +0100 (Sun, 23 Mar 2008) | 2 lines
str(bytesarray()) now returns the bytes and not the representation of the bytearray object
Enabled and fixed more unit tests
........
r61812 | christian.heimes | 2008-03-23 21:53:08 +0100 (Sun, 23 Mar 2008) | 3 lines
Clear error PyNumber_AsSsize_t() fails
Use CHARMASK for ob_svall access
disabled a test with memoryview again
........
r61819 | christian.heimes | 2008-03-23 23:05:57 +0100 (Sun, 23 Mar 2008) | 1 line
Untested updates to the PCBuild directory
........
r61917 | christian.heimes | 2008-03-26 00:57:06 +0100 (Wed, 26 Mar 2008) | 1 line
The type system of Python 2.6 has subtle differences to 3.0's. I've removed the Py_TPFLAGS_BASETYPE flags from bytearray for now. bytearray can't be subclasses until the issues with bytearray subclasses are fixed.
........
r61920 | christian.heimes | 2008-03-26 01:44:08 +0100 (Wed, 26 Mar 2008) | 2 lines
Disabled last failing test
I don't understand what the test is testing and how it suppose to work. Ka-Ping, please check it out.
........
r61930 | christian.heimes | 2008-03-26 12:46:18 +0100 (Wed, 26 Mar 2008) | 1 line
Re-enabled bytes warning code
........
r61933 | christian.heimes | 2008-03-26 13:20:46 +0100 (Wed, 26 Mar 2008) | 1 line
Fixed a bug in the new buffer protocol. The buffer slots weren't copied into a subclass.
........
r61934 | christian.heimes | 2008-03-26 13:25:09 +0100 (Wed, 26 Mar 2008) | 1 line
Re-enabled bytearray subclassing - all tests are passing.
........
2008-03-26 09:49:49 -03:00
|
|
|
Include/bytes_methods.h \
|
|
|
|
Include/bytesobject.h \
|
2001-09-17 23:40:21 -03:00
|
|
|
Include/bufferobject.h \
|
2008-01-21 09:11:15 -04:00
|
|
|
Include/cellobject.h \
|
2001-09-17 23:40:21 -03:00
|
|
|
Include/ceval.h \
|
|
|
|
Include/classobject.h \
|
|
|
|
Include/cobject.h \
|
2005-10-20 16:59:25 -03:00
|
|
|
Include/code.h \
|
2001-09-17 23:40:21 -03:00
|
|
|
Include/codecs.h \
|
2001-02-02 15:54:23 -04:00
|
|
|
Include/compile.h \
|
2001-01-24 13:11:43 -04:00
|
|
|
Include/complexobject.h \
|
2001-08-02 01:15:00 -03:00
|
|
|
Include/descrobject.h \
|
2001-01-24 13:11:43 -04:00
|
|
|
Include/dictobject.h \
|
2002-04-26 16:40:56 -03:00
|
|
|
Include/enumobject.h \
|
2008-01-21 09:11:15 -04:00
|
|
|
Include/errcode.h \
|
|
|
|
Include/eval.h \
|
2001-09-17 23:40:21 -03:00
|
|
|
Include/fileobject.h \
|
|
|
|
Include/floatobject.h \
|
2008-01-21 09:11:15 -04:00
|
|
|
Include/frameobject.h \
|
2001-09-17 23:40:21 -03:00
|
|
|
Include/funcobject.h \
|
2008-01-21 09:11:15 -04:00
|
|
|
Include/genobject.h \
|
2001-09-17 23:40:21 -03:00
|
|
|
Include/import.h \
|
|
|
|
Include/intobject.h \
|
|
|
|
Include/intrcheck.h \
|
|
|
|
Include/iterobject.h \
|
|
|
|
Include/listobject.h \
|
2008-01-21 09:11:15 -04:00
|
|
|
Include/longintrepr.h \
|
2001-09-17 23:40:21 -03:00
|
|
|
Include/longobject.h \
|
2008-01-21 09:11:15 -04:00
|
|
|
Include/marshal.h \
|
|
|
|
Include/metagrammar.h \
|
2001-01-24 13:11:43 -04:00
|
|
|
Include/methodobject.h \
|
2001-09-17 23:40:21 -03:00
|
|
|
Include/modsupport.h \
|
2001-01-24 13:11:43 -04:00
|
|
|
Include/moduleobject.h \
|
2008-01-21 09:11:15 -04:00
|
|
|
Include/node.h \
|
2001-09-17 23:40:21 -03:00
|
|
|
Include/object.h \
|
|
|
|
Include/objimpl.h \
|
2008-01-21 09:11:15 -04:00
|
|
|
Include/opcode.h \
|
|
|
|
Include/osdefs.h \
|
2007-01-12 05:35:56 -04:00
|
|
|
Include/parsetok.h \
|
2001-09-17 23:40:21 -03:00
|
|
|
Include/patchlevel.h \
|
2008-01-21 09:11:15 -04:00
|
|
|
Include/pgen.h \
|
|
|
|
Include/pgenheaders.h \
|
2005-12-17 16:54:49 -04:00
|
|
|
Include/pyarena.h \
|
2001-09-17 23:40:21 -03:00
|
|
|
Include/pydebug.h \
|
2001-01-24 13:11:43 -04:00
|
|
|
Include/pyerrors.h \
|
2001-09-17 23:40:21 -03:00
|
|
|
Include/pyfpe.h \
|
2008-04-18 20:13:07 -03:00
|
|
|
Include/pymath.h \
|
2008-01-21 09:11:15 -04:00
|
|
|
Include/pygetopt.h \
|
2001-09-17 23:40:21 -03:00
|
|
|
Include/pymem.h \
|
|
|
|
Include/pyport.h \
|
2001-01-24 13:11:43 -04:00
|
|
|
Include/pystate.h \
|
2007-12-18 19:22:54 -04:00
|
|
|
Include/pystrcmp.h \
|
2008-01-21 09:11:15 -04:00
|
|
|
Include/pystrtod.h \
|
2001-01-24 13:11:43 -04:00
|
|
|
Include/pythonrun.h \
|
2008-01-21 09:11:15 -04:00
|
|
|
Include/pythread.h \
|
2001-09-17 23:40:21 -03:00
|
|
|
Include/rangeobject.h \
|
2008-01-21 09:11:15 -04:00
|
|
|
Include/setobject.h \
|
2001-09-17 23:40:21 -03:00
|
|
|
Include/sliceobject.h \
|
|
|
|
Include/stringobject.h \
|
|
|
|
Include/structmember.h \
|
2008-01-21 09:11:15 -04:00
|
|
|
Include/structseq.h \
|
2001-09-17 23:40:21 -03:00
|
|
|
Include/symtable.h \
|
2001-01-24 13:11:43 -04:00
|
|
|
Include/sysmodule.h \
|
2001-09-17 23:40:21 -03:00
|
|
|
Include/traceback.h \
|
|
|
|
Include/tupleobject.h \
|
2008-01-21 09:11:15 -04:00
|
|
|
Include/ucnhash.h \
|
2001-09-17 23:40:21 -03:00
|
|
|
Include/unicodeobject.h \
|
2008-04-12 20:44:07 -03:00
|
|
|
Include/warnings.h \
|
2001-10-05 18:56:02 -03:00
|
|
|
Include/weakrefobject.h \
|
2008-01-21 09:11:15 -04:00
|
|
|
pyconfig.h \
|
|
|
|
$(PARSER_HEADERS)
|
2001-01-24 13:11:43 -04:00
|
|
|
|
2006-04-14 11:34:26 -03:00
|
|
|
$(LIBRARY_OBJS) $(MODOBJS) Modules/python.o: $(PYTHON_HEADERS)
|
2001-01-25 16:07:50 -04:00
|
|
|
|
2001-01-24 13:11:43 -04:00
|
|
|
|
|
|
|
######################################################################
|
|
|
|
|
|
|
|
# Test the interpreter (twice, once without .pyc files, once with)
|
2003-05-06 13:17:27 -03:00
|
|
|
# In the past, we've had problems where bugs in the marshalling or
|
|
|
|
# elsewhere caused bytecode read from .pyc files to behave differently
|
|
|
|
# than bytecode generated directly from a .py source file. Sometimes
|
|
|
|
# the bytecode read from a .pyc file had the bug, somtimes the directly
|
|
|
|
# generated bytecode. This is sometimes a very shy bug needing a lot of
|
|
|
|
# sample data.
|
|
|
|
|
2006-02-22 03:24:06 -04:00
|
|
|
TESTOPTS= -l $(EXTRATESTOPTS)
|
2001-01-24 13:11:43 -04:00
|
|
|
TESTPROG= $(srcdir)/Lib/test/regrtest.py
|
2002-03-29 12:28:31 -04:00
|
|
|
TESTPYTHON= $(RUNSHARED) ./$(BUILDPYTHON) -E -tt
|
2001-01-24 13:11:43 -04:00
|
|
|
test: all platform
|
2001-02-28 20:36:53 -04:00
|
|
|
-find $(srcdir)/Lib -name '*.py[co]' -print | xargs rm -f
|
2001-07-23 13:30:27 -03:00
|
|
|
-$(TESTPYTHON) $(TESTPROG) $(TESTOPTS)
|
|
|
|
$(TESTPYTHON) $(TESTPROG) $(TESTOPTS)
|
2001-01-24 13:11:43 -04:00
|
|
|
|
2003-05-06 12:30:20 -03:00
|
|
|
testall: all platform
|
2007-11-20 22:50:06 -04:00
|
|
|
-find $(srcdir)/Lib -name '*.py[co]' -print | xargs rm -f
|
2008-01-25 21:47:05 -04:00
|
|
|
$(TESTPYTHON) $(srcdir)/Lib/compileall.py
|
2003-05-06 12:30:20 -03:00
|
|
|
-find $(srcdir)/Lib -name '*.py[co]' -print | xargs rm -f
|
|
|
|
-$(TESTPYTHON) $(TESTPROG) $(TESTOPTS) -uall
|
|
|
|
$(TESTPYTHON) $(TESTPROG) $(TESTOPTS) -uall
|
|
|
|
|
2006-04-29 08:31:35 -03:00
|
|
|
# Run the unitests for both architectures in a Universal build on OSX
|
|
|
|
# Must be run on an Intel box.
|
|
|
|
testuniversal: all platform
|
|
|
|
if [ `arch` != 'i386' ];then \
|
|
|
|
echo "This can only be used on OSX/i386" ;\
|
|
|
|
exit 1 ;\
|
|
|
|
fi
|
|
|
|
-find $(srcdir)/Lib -name '*.py[co]' -print | xargs rm -f
|
|
|
|
-$(TESTPYTHON) $(TESTPROG) $(TESTOPTS) -uall
|
|
|
|
$(TESTPYTHON) $(TESTPROG) $(TESTOPTS) -uall
|
|
|
|
$(RUNSHARED) /usr/libexec/oah/translate ./$(BUILDPYTHON) -E -tt $(TESTPROG) $(TESTOPTS) -uall
|
|
|
|
|
|
|
|
|
2006-03-13 06:59:32 -04:00
|
|
|
# Like testall, but with a single pass only
|
2007-09-04 15:17:36 -03:00
|
|
|
# run an optional script to include some information about the build environment
|
2006-05-31 05:01:08 -03:00
|
|
|
buildbottest: all platform
|
2007-09-04 16:05:38 -03:00
|
|
|
-@if which pybuildbot.identify >/dev/null 2>&1; then \
|
|
|
|
pybuildbot.identify "CC='$(CC)'" "CXX='$(CXX)'"; \
|
|
|
|
fi
|
2006-03-13 06:59:32 -04:00
|
|
|
$(TESTPYTHON) $(TESTPROG) $(TESTOPTS) -uall -rw
|
|
|
|
|
2001-02-01 15:51:28 -04:00
|
|
|
QUICKTESTOPTS= $(TESTOPTS) -x test_thread test_signal test_strftime \
|
2001-02-01 23:03:33 -04:00
|
|
|
test_unicodedata test_re test_sre test_select test_poll \
|
2002-08-09 16:18:25 -03:00
|
|
|
test_linuxaudiodev test_struct test_sunaudiodev test_zlib
|
2001-02-01 15:51:28 -04:00
|
|
|
quicktest: all platform
|
2001-02-28 20:36:53 -04:00
|
|
|
-find $(srcdir)/Lib -name '*.py[co]' -print | xargs rm -f
|
2001-07-23 13:30:27 -03:00
|
|
|
-$(TESTPYTHON) $(TESTPROG) $(QUICKTESTOPTS)
|
|
|
|
$(TESTPYTHON) $(TESTPROG) $(QUICKTESTOPTS)
|
2001-02-01 15:51:28 -04:00
|
|
|
|
2001-03-03 00:14:21 -04:00
|
|
|
MEMTESTOPTS= $(QUICKTESTOPTS) -x test_dl test___all__ test_fork1 \
|
|
|
|
test_longexp
|
|
|
|
memtest: all platform
|
|
|
|
-rm -f $(srcdir)/Lib/test/*.py[co]
|
2001-07-23 13:30:27 -03:00
|
|
|
-$(TESTPYTHON) $(TESTPROG) $(MEMTESTOPTS)
|
|
|
|
$(TESTPYTHON) $(TESTPROG) $(MEMTESTOPTS)
|
2001-03-03 00:14:21 -04:00
|
|
|
|
2001-01-24 13:11:43 -04:00
|
|
|
# Install everything
|
2006-05-26 08:43:26 -03:00
|
|
|
install: @FRAMEWORKINSTALLFIRST@ altinstall bininstall maninstall @FRAMEWORKINSTALLLAST@
|
2001-01-24 13:11:43 -04:00
|
|
|
|
|
|
|
# Install almost everything without disturbing previous versions
|
2006-06-06 16:50:24 -03:00
|
|
|
altinstall: @FRAMEWORKALTINSTALLFIRST@ altbininstall libinstall inclinstall libainstall \
|
|
|
|
sharedinstall oldsharedinstall @FRAMEWORKALTINSTALLLAST@
|
2001-01-24 13:11:43 -04:00
|
|
|
|
|
|
|
# Install shared libraries enabled by Setup
|
|
|
|
DESTDIRS= $(exec_prefix) $(LIBDIR) $(BINLIBDEST) $(DESTSHARED)
|
|
|
|
|
|
|
|
oldsharedinstall: $(DESTSHARED) $(SHAREDMODS)
|
|
|
|
@for i in X $(SHAREDMODS); do \
|
2001-02-06 10:50:27 -04:00
|
|
|
if test $$i != X; then \
|
|
|
|
echo $(INSTALL_SHARED) $$i $(DESTSHARED)/`basename $$i`; \
|
2003-05-11 17:25:35 -03:00
|
|
|
$(INSTALL_SHARED) $$i $(DESTDIR)$(DESTSHARED)/`basename $$i`; \
|
2001-02-06 10:50:27 -04:00
|
|
|
fi; \
|
2001-01-24 13:11:43 -04:00
|
|
|
done
|
|
|
|
|
2001-08-17 12:32:31 -03:00
|
|
|
$(DESTSHARED):
|
2001-01-24 13:11:43 -04:00
|
|
|
@for i in $(DESTDIRS); \
|
|
|
|
do \
|
2003-05-11 17:25:35 -03:00
|
|
|
if test ! -d $(DESTDIR)$$i; then \
|
2001-01-24 13:11:43 -04:00
|
|
|
echo "Creating directory $$i"; \
|
2003-05-11 17:25:35 -03:00
|
|
|
$(INSTALL) -d -m $(DIRMODE) $(DESTDIR)$$i; \
|
2001-01-24 13:11:43 -04:00
|
|
|
else true; \
|
|
|
|
fi; \
|
|
|
|
done
|
|
|
|
|
|
|
|
|
|
|
|
# Install the interpreter (by creating a hard link to python$(VERSION))
|
|
|
|
bininstall: altbininstall
|
2003-05-11 17:25:35 -03:00
|
|
|
-if test -f $(DESTDIR)$(BINDIR)/$(PYTHON) -o -h $(DESTDIR)$(BINDIR)/$(PYTHON); \
|
|
|
|
then rm -f $(DESTDIR)$(BINDIR)/$(PYTHON); \
|
2001-01-24 13:11:43 -04:00
|
|
|
else true; \
|
|
|
|
fi
|
2003-05-11 17:25:35 -03:00
|
|
|
(cd $(DESTDIR)$(BINDIR); $(LN) python$(VERSION)$(EXE) $(PYTHON))
|
2007-09-07 17:10:49 -03:00
|
|
|
-rm -f $(DESTDIR)$(BINDIR)/python-config
|
|
|
|
(cd $(DESTDIR)$(BINDIR); $(LN) -s python$(VERSION)-config python-config)
|
2001-01-24 13:11:43 -04:00
|
|
|
|
|
|
|
# Install the interpreter with $(VERSION) affixed
|
|
|
|
# This goes into $(exec_prefix)
|
2001-12-06 17:47:20 -04:00
|
|
|
altbininstall: $(BUILDPYTHON)
|
2002-05-08 05:59:59 -03:00
|
|
|
@for i in $(BINDIR) $(LIBDIR); \
|
2001-01-24 13:11:43 -04:00
|
|
|
do \
|
2003-05-11 17:25:35 -03:00
|
|
|
if test ! -d $(DESTDIR)$$i; then \
|
2001-01-24 13:11:43 -04:00
|
|
|
echo "Creating directory $$i"; \
|
2003-05-11 17:25:35 -03:00
|
|
|
$(INSTALL) -d -m $(DIRMODE) $(DESTDIR)$$i; \
|
2001-01-24 13:11:43 -04:00
|
|
|
else true; \
|
|
|
|
fi; \
|
|
|
|
done
|
2003-05-11 17:25:35 -03:00
|
|
|
$(INSTALL_PROGRAM) $(BUILDPYTHON) $(DESTDIR)$(BINDIR)/python$(VERSION)$(EXE)
|
2009-01-02 06:46:42 -04:00
|
|
|
if test -f $(LDLIBRARY); then \
|
Merged revisions 68133-68134,68141-68142,68145-68146,68148-68149,68159-68162,68166,68171-68174,68179,68195-68196,68210,68214-68215,68217-68222 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r68133 | antoine.pitrou | 2009-01-01 16:38:03 +0100 (Thu, 01 Jan 2009) | 1 line
fill in actual issue number in tests
........
r68134 | hirokazu.yamamoto | 2009-01-01 16:45:39 +0100 (Thu, 01 Jan 2009) | 2 lines
Issue #4797: IOError.filename was not set when _fileio.FileIO failed to open
file with `str' filename on Windows.
........
r68141 | benjamin.peterson | 2009-01-01 17:43:12 +0100 (Thu, 01 Jan 2009) | 1 line
fix highlighting
........
r68142 | benjamin.peterson | 2009-01-01 18:29:49 +0100 (Thu, 01 Jan 2009) | 2 lines
welcome to 2009, Python!
........
r68145 | amaury.forgeotdarc | 2009-01-02 01:03:54 +0100 (Fri, 02 Jan 2009) | 5 lines
#4801 _collections module fails to build on cygwin.
_PyObject_GC_TRACK is the macro version of PyObject_GC_Track,
and according to documentation it should not be used for extension modules.
........
r68146 | ronald.oussoren | 2009-01-02 11:44:46 +0100 (Fri, 02 Jan 2009) | 2 lines
Fix for issue4472: "configure --enable-shared doesn't work on OSX"
........
r68148 | ronald.oussoren | 2009-01-02 11:48:31 +0100 (Fri, 02 Jan 2009) | 2 lines
Forgot to add a NEWS item in my previous checkin
........
r68149 | ronald.oussoren | 2009-01-02 11:50:48 +0100 (Fri, 02 Jan 2009) | 2 lines
Fix for issue4780
........
r68159 | ronald.oussoren | 2009-01-02 15:48:17 +0100 (Fri, 02 Jan 2009) | 2 lines
Fix for issue 1627952
........
r68160 | ronald.oussoren | 2009-01-02 15:52:09 +0100 (Fri, 02 Jan 2009) | 2 lines
Fix for issue r1737832
........
r68161 | ronald.oussoren | 2009-01-02 16:00:05 +0100 (Fri, 02 Jan 2009) | 3 lines
Fix for issue 1149804
........
r68162 | ronald.oussoren | 2009-01-02 16:06:00 +0100 (Fri, 02 Jan 2009) | 3 lines
Fix for issue 4472 is incompatible with Cygwin, this patch
should fix that.
........
r68166 | benjamin.peterson | 2009-01-02 19:26:23 +0100 (Fri, 02 Jan 2009) | 1 line
document PyMemberDef
........
r68171 | georg.brandl | 2009-01-02 21:25:14 +0100 (Fri, 02 Jan 2009) | 3 lines
#4811: fix markup glitches (mostly remains of the conversion),
found by Gabriel Genellina.
........
r68172 | martin.v.loewis | 2009-01-02 21:32:55 +0100 (Fri, 02 Jan 2009) | 2 lines
Issue #4075: Use OutputDebugStringW in Py_FatalError.
........
r68173 | martin.v.loewis | 2009-01-02 21:40:14 +0100 (Fri, 02 Jan 2009) | 2 lines
Issue #4051: Prevent conflict of UNICODE macros in cPickle.
........
r68174 | benjamin.peterson | 2009-01-02 21:47:27 +0100 (Fri, 02 Jan 2009) | 1 line
fix compilation on non-Windows platforms
........
r68179 | raymond.hettinger | 2009-01-02 22:26:45 +0100 (Fri, 02 Jan 2009) | 1 line
Issue #4615. Document how to use itertools for de-duping.
........
r68195 | georg.brandl | 2009-01-03 14:45:15 +0100 (Sat, 03 Jan 2009) | 2 lines
Remove useless string literal.
........
r68196 | georg.brandl | 2009-01-03 15:29:53 +0100 (Sat, 03 Jan 2009) | 2 lines
Fix indentation.
........
r68210 | georg.brandl | 2009-01-03 20:10:12 +0100 (Sat, 03 Jan 2009) | 2 lines
Set eol-style correctly for mp_distributing.py.
........
r68214 | georg.brandl | 2009-01-03 20:44:48 +0100 (Sat, 03 Jan 2009) | 2 lines
Make indentation consistent.
........
r68215 | georg.brandl | 2009-01-03 21:15:14 +0100 (Sat, 03 Jan 2009) | 2 lines
Fix role name.
........
r68217 | georg.brandl | 2009-01-03 21:30:15 +0100 (Sat, 03 Jan 2009) | 2 lines
Add rstlint, a little tool to find subtle markup problems and inconsistencies in the Doc sources.
........
r68218 | georg.brandl | 2009-01-03 21:38:59 +0100 (Sat, 03 Jan 2009) | 2 lines
Recognize usage of the default role.
........
r68219 | georg.brandl | 2009-01-03 21:47:01 +0100 (Sat, 03 Jan 2009) | 2 lines
Fix uses of the default role.
........
r68220 | georg.brandl | 2009-01-03 21:55:06 +0100 (Sat, 03 Jan 2009) | 2 lines
Remove trailing whitespace.
........
r68221 | georg.brandl | 2009-01-03 22:04:55 +0100 (Sat, 03 Jan 2009) | 2 lines
Remove tabs from the documentation.
........
r68222 | georg.brandl | 2009-01-03 22:11:58 +0100 (Sat, 03 Jan 2009) | 2 lines
Disable the line length checker by default.
........
2009-01-03 17:55:17 -04:00
|
|
|
if test -n "$(DLLLIBRARY)" ; then \
|
|
|
|
$(INSTALL_SHARED) $(DLLLIBRARY) $(DESTDIR)$(BINDIR); \
|
2002-07-29 13:18:23 -03:00
|
|
|
else \
|
2009-01-02 06:46:42 -04:00
|
|
|
$(INSTALL_SHARED) $(LDLIBRARY) $(DESTDIR)$(LIBDIR)/$(INSTSONAME); \
|
|
|
|
if test $(LDLIBRARY) != $(INSTSONAME); then \
|
|
|
|
(cd $(DESTDIR)$(LIBDIR); $(LN) -sf $(INSTSONAME) $(LDLIBRARY)) \
|
2003-11-18 15:54:20 -04:00
|
|
|
fi \
|
2002-07-29 13:18:23 -03:00
|
|
|
fi; \
|
2001-01-24 13:11:43 -04:00
|
|
|
else true; \
|
|
|
|
fi
|
|
|
|
|
|
|
|
# Install the manual page
|
|
|
|
maninstall:
|
|
|
|
@for i in $(MANDIR) $(MANDIR)/man1; \
|
|
|
|
do \
|
2003-05-11 17:25:35 -03:00
|
|
|
if test ! -d $(DESTDIR)$$i; then \
|
2001-01-24 13:11:43 -04:00
|
|
|
echo "Creating directory $$i"; \
|
2003-05-11 17:25:35 -03:00
|
|
|
$(INSTALL) -d -m $(DIRMODE) $(DESTDIR)$$i; \
|
2001-01-24 13:11:43 -04:00
|
|
|
else true; \
|
|
|
|
fi; \
|
|
|
|
done
|
|
|
|
$(INSTALL_DATA) $(srcdir)/Misc/python.man \
|
2008-10-21 13:48:37 -03:00
|
|
|
$(DESTDIR)$(MANDIR)/man1/python.1
|
2001-01-24 13:11:43 -04:00
|
|
|
|
|
|
|
# Install the library
|
|
|
|
PLATDIR= plat-$(MACHDEP)
|
2002-12-30 18:23:40 -04:00
|
|
|
EXTRAPLATDIR= @EXTRAPLATDIR@
|
2003-03-17 11:44:10 -04:00
|
|
|
EXTRAMACHDEPPATH=@EXTRAMACHDEPPATH@
|
2002-12-30 18:23:40 -04:00
|
|
|
MACHDEPS= $(PLATDIR) $(EXTRAPLATDIR)
|
2006-07-29 13:56:15 -03:00
|
|
|
XMLLIBSUBDIRS= xml xml/dom xml/etree xml/parsers xml/sax
|
2002-12-30 18:23:40 -04:00
|
|
|
PLATMACDIRS= plat-mac plat-mac/Carbon plat-mac/lib-scriptpackages \
|
2003-01-21 11:05:02 -04:00
|
|
|
plat-mac/lib-scriptpackages/_builtinSuites \
|
2002-12-30 18:23:40 -04:00
|
|
|
plat-mac/lib-scriptpackages/CodeWarrior \
|
|
|
|
plat-mac/lib-scriptpackages/Explorer \
|
|
|
|
plat-mac/lib-scriptpackages/Finder \
|
|
|
|
plat-mac/lib-scriptpackages/Netscape \
|
|
|
|
plat-mac/lib-scriptpackages/StdSuites \
|
2003-03-31 05:39:54 -04:00
|
|
|
plat-mac/lib-scriptpackages/SystemEvents \
|
2006-06-27 01:28:56 -03:00
|
|
|
plat-mac/lib-scriptpackages/Terminal
|
2003-03-17 11:44:10 -04:00
|
|
|
PLATMACPATH=:plat-mac:plat-mac/lib-scriptpackages
|
2008-05-20 04:52:27 -03:00
|
|
|
LIBSUBDIRS= lib-tk site-packages test test/output test/data \
|
2004-07-12 06:25:18 -03:00
|
|
|
test/decimaltestdata \
|
2006-03-22 10:57:54 -04:00
|
|
|
encodings compiler hotshot \
|
|
|
|
email email/mime email/test email/test/data \
|
2008-05-20 04:52:27 -03:00
|
|
|
json json/tests \
|
2006-04-03 13:40:10 -03:00
|
|
|
sqlite3 sqlite3/test \
|
2006-06-22 03:30:50 -03:00
|
|
|
logging bsddb bsddb/test csv wsgiref \
|
2008-05-14 04:21:42 -03:00
|
|
|
lib2to3 lib2to3/fixes lib2to3/pgen2 lib2to3/tests \
|
2006-04-03 17:10:50 -03:00
|
|
|
ctypes ctypes/test ctypes/macholib idlelib idlelib/Icons \
|
2005-01-19 02:24:58 -04:00
|
|
|
distutils distutils/command distutils/tests $(XMLLIBSUBDIRS) \
|
2008-06-19 23:47:03 -03:00
|
|
|
multiprocessing multiprocessing/dummy \
|
2008-05-11 20:39:04 -03:00
|
|
|
lib-old \
|
2005-01-19 02:24:58 -04:00
|
|
|
curses $(MACHDEPS)
|
2007-09-21 03:33:28 -03:00
|
|
|
libinstall: build_all $(srcdir)/Lib/$(PLATDIR)
|
2001-01-24 13:11:43 -04:00
|
|
|
@for i in $(SCRIPTDIR) $(LIBDEST); \
|
|
|
|
do \
|
2003-05-11 17:25:35 -03:00
|
|
|
if test ! -d $(DESTDIR)$$i; then \
|
2001-01-24 13:11:43 -04:00
|
|
|
echo "Creating directory $$i"; \
|
2003-05-11 17:25:35 -03:00
|
|
|
$(INSTALL) -d -m $(DIRMODE) $(DESTDIR)$$i; \
|
2001-01-24 13:11:43 -04:00
|
|
|
else true; \
|
|
|
|
fi; \
|
|
|
|
done
|
|
|
|
@for d in $(LIBSUBDIRS); \
|
|
|
|
do \
|
|
|
|
a=$(srcdir)/Lib/$$d; \
|
|
|
|
if test ! -d $$a; then continue; else true; fi; \
|
|
|
|
b=$(LIBDEST)/$$d; \
|
2003-05-11 17:25:35 -03:00
|
|
|
if test ! -d $(DESTDIR)$$b; then \
|
2001-01-24 13:11:43 -04:00
|
|
|
echo "Creating directory $$b"; \
|
2003-05-11 17:25:35 -03:00
|
|
|
$(INSTALL) -d -m $(DIRMODE) $(DESTDIR)$$b; \
|
2001-01-24 13:11:43 -04:00
|
|
|
else true; \
|
|
|
|
fi; \
|
|
|
|
done
|
2006-06-25 18:19:06 -03:00
|
|
|
@for i in $(srcdir)/Lib/*.py $(srcdir)/Lib/*.doc $(srcdir)/Lib/*.egg-info ; \
|
2001-01-24 13:11:43 -04:00
|
|
|
do \
|
|
|
|
if test -x $$i; then \
|
2003-05-11 17:25:35 -03:00
|
|
|
$(INSTALL_SCRIPT) $$i $(DESTDIR)$(LIBDEST); \
|
2001-04-10 20:03:35 -03:00
|
|
|
echo $(INSTALL_SCRIPT) $$i $(LIBDEST); \
|
2001-01-24 13:11:43 -04:00
|
|
|
else \
|
2003-05-11 17:25:35 -03:00
|
|
|
$(INSTALL_DATA) $$i $(DESTDIR)$(LIBDEST); \
|
2001-01-24 13:11:43 -04:00
|
|
|
echo $(INSTALL_DATA) $$i $(LIBDEST); \
|
|
|
|
fi; \
|
|
|
|
done
|
|
|
|
@for d in $(LIBSUBDIRS); \
|
|
|
|
do \
|
|
|
|
a=$(srcdir)/Lib/$$d; \
|
|
|
|
if test ! -d $$a; then continue; else true; fi; \
|
2006-03-23 08:12:44 -04:00
|
|
|
if test `ls $$a | wc -l` -lt 1; then continue; fi; \
|
2001-01-24 13:11:43 -04:00
|
|
|
b=$(LIBDEST)/$$d; \
|
|
|
|
for i in $$a/*; \
|
|
|
|
do \
|
|
|
|
case $$i in \
|
|
|
|
*CVS) ;; \
|
|
|
|
*.py[co]) ;; \
|
|
|
|
*.orig) ;; \
|
|
|
|
*~) ;; \
|
|
|
|
*) \
|
|
|
|
if test -d $$i; then continue; fi; \
|
|
|
|
if test -x $$i; then \
|
2001-04-10 20:03:35 -03:00
|
|
|
echo $(INSTALL_SCRIPT) $$i $$b; \
|
2003-05-11 17:25:35 -03:00
|
|
|
$(INSTALL_SCRIPT) $$i $(DESTDIR)$$b; \
|
2001-01-24 13:11:43 -04:00
|
|
|
else \
|
|
|
|
echo $(INSTALL_DATA) $$i $$b; \
|
2003-05-11 17:25:35 -03:00
|
|
|
$(INSTALL_DATA) $$i $(DESTDIR)$$b; \
|
2001-01-24 13:11:43 -04:00
|
|
|
fi;; \
|
|
|
|
esac; \
|
|
|
|
done; \
|
|
|
|
done
|
2003-05-11 17:25:35 -03:00
|
|
|
$(INSTALL_DATA) $(srcdir)/LICENSE $(DESTDIR)$(LIBDEST)/LICENSE.txt
|
|
|
|
PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
|
|
|
|
./$(BUILDPYTHON) -Wi -tt $(DESTDIR)$(LIBDEST)/compileall.py \
|
2003-06-21 10:26:28 -03:00
|
|
|
-d $(LIBDEST) -f \
|
2005-10-04 01:32:42 -03:00
|
|
|
-x 'bad_coding|badsyntax|site-packages' $(DESTDIR)$(LIBDEST)
|
2003-05-11 17:25:35 -03:00
|
|
|
PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
|
|
|
|
./$(BUILDPYTHON) -Wi -tt -O $(DESTDIR)$(LIBDEST)/compileall.py \
|
2003-06-21 10:26:28 -03:00
|
|
|
-d $(LIBDEST) -f \
|
2005-10-04 01:32:42 -03:00
|
|
|
-x 'bad_coding|badsyntax|site-packages' $(DESTDIR)$(LIBDEST)
|
2004-03-18 03:51:27 -04:00
|
|
|
-PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
|
2003-05-11 17:25:35 -03:00
|
|
|
./$(BUILDPYTHON) -Wi -t $(DESTDIR)$(LIBDEST)/compileall.py \
|
2003-06-21 10:26:28 -03:00
|
|
|
-d $(LIBDEST)/site-packages -f \
|
2003-05-11 17:25:35 -03:00
|
|
|
-x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
|
2004-03-18 03:51:27 -04:00
|
|
|
-PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
|
2003-05-11 17:25:35 -03:00
|
|
|
./$(BUILDPYTHON) -Wi -t -O $(DESTDIR)$(LIBDEST)/compileall.py \
|
2003-06-21 10:26:28 -03:00
|
|
|
-d $(LIBDEST)/site-packages -f \
|
2003-05-11 17:25:35 -03:00
|
|
|
-x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
|
2008-03-21 21:02:41 -03:00
|
|
|
-PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
|
2008-08-01 11:10:26 -03:00
|
|
|
./$(BUILDPYTHON) -Wi -t -c "import lib2to3.pygram, lib2to3.patcomp;lib2to3.patcomp.PatternCompiler()"
|
2001-01-24 13:11:43 -04:00
|
|
|
|
|
|
|
# Create the PLATDIR source directory, if one wasn't distributed..
|
|
|
|
$(srcdir)/Lib/$(PLATDIR):
|
|
|
|
mkdir $(srcdir)/Lib/$(PLATDIR)
|
|
|
|
cp $(srcdir)/Lib/plat-generic/regen $(srcdir)/Lib/$(PLATDIR)/regen
|
|
|
|
export PATH; PATH="`pwd`:$$PATH"; \
|
|
|
|
export PYTHONPATH; PYTHONPATH="`pwd`/Lib"; \
|
2001-08-14 22:26:28 -03:00
|
|
|
export DYLD_FRAMEWORK_PATH; DYLD_FRAMEWORK_PATH="`pwd`"; \
|
2001-12-19 05:24:40 -04:00
|
|
|
export EXE; EXE="$(BUILDEXE)"; \
|
Merged revisions 68133-68134,68141-68142,68145-68146,68148-68149,68159-68162,68166,68171-68174,68179,68195-68196,68210,68214-68215,68217-68222 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r68133 | antoine.pitrou | 2009-01-01 16:38:03 +0100 (Thu, 01 Jan 2009) | 1 line
fill in actual issue number in tests
........
r68134 | hirokazu.yamamoto | 2009-01-01 16:45:39 +0100 (Thu, 01 Jan 2009) | 2 lines
Issue #4797: IOError.filename was not set when _fileio.FileIO failed to open
file with `str' filename on Windows.
........
r68141 | benjamin.peterson | 2009-01-01 17:43:12 +0100 (Thu, 01 Jan 2009) | 1 line
fix highlighting
........
r68142 | benjamin.peterson | 2009-01-01 18:29:49 +0100 (Thu, 01 Jan 2009) | 2 lines
welcome to 2009, Python!
........
r68145 | amaury.forgeotdarc | 2009-01-02 01:03:54 +0100 (Fri, 02 Jan 2009) | 5 lines
#4801 _collections module fails to build on cygwin.
_PyObject_GC_TRACK is the macro version of PyObject_GC_Track,
and according to documentation it should not be used for extension modules.
........
r68146 | ronald.oussoren | 2009-01-02 11:44:46 +0100 (Fri, 02 Jan 2009) | 2 lines
Fix for issue4472: "configure --enable-shared doesn't work on OSX"
........
r68148 | ronald.oussoren | 2009-01-02 11:48:31 +0100 (Fri, 02 Jan 2009) | 2 lines
Forgot to add a NEWS item in my previous checkin
........
r68149 | ronald.oussoren | 2009-01-02 11:50:48 +0100 (Fri, 02 Jan 2009) | 2 lines
Fix for issue4780
........
r68159 | ronald.oussoren | 2009-01-02 15:48:17 +0100 (Fri, 02 Jan 2009) | 2 lines
Fix for issue 1627952
........
r68160 | ronald.oussoren | 2009-01-02 15:52:09 +0100 (Fri, 02 Jan 2009) | 2 lines
Fix for issue r1737832
........
r68161 | ronald.oussoren | 2009-01-02 16:00:05 +0100 (Fri, 02 Jan 2009) | 3 lines
Fix for issue 1149804
........
r68162 | ronald.oussoren | 2009-01-02 16:06:00 +0100 (Fri, 02 Jan 2009) | 3 lines
Fix for issue 4472 is incompatible with Cygwin, this patch
should fix that.
........
r68166 | benjamin.peterson | 2009-01-02 19:26:23 +0100 (Fri, 02 Jan 2009) | 1 line
document PyMemberDef
........
r68171 | georg.brandl | 2009-01-02 21:25:14 +0100 (Fri, 02 Jan 2009) | 3 lines
#4811: fix markup glitches (mostly remains of the conversion),
found by Gabriel Genellina.
........
r68172 | martin.v.loewis | 2009-01-02 21:32:55 +0100 (Fri, 02 Jan 2009) | 2 lines
Issue #4075: Use OutputDebugStringW in Py_FatalError.
........
r68173 | martin.v.loewis | 2009-01-02 21:40:14 +0100 (Fri, 02 Jan 2009) | 2 lines
Issue #4051: Prevent conflict of UNICODE macros in cPickle.
........
r68174 | benjamin.peterson | 2009-01-02 21:47:27 +0100 (Fri, 02 Jan 2009) | 1 line
fix compilation on non-Windows platforms
........
r68179 | raymond.hettinger | 2009-01-02 22:26:45 +0100 (Fri, 02 Jan 2009) | 1 line
Issue #4615. Document how to use itertools for de-duping.
........
r68195 | georg.brandl | 2009-01-03 14:45:15 +0100 (Sat, 03 Jan 2009) | 2 lines
Remove useless string literal.
........
r68196 | georg.brandl | 2009-01-03 15:29:53 +0100 (Sat, 03 Jan 2009) | 2 lines
Fix indentation.
........
r68210 | georg.brandl | 2009-01-03 20:10:12 +0100 (Sat, 03 Jan 2009) | 2 lines
Set eol-style correctly for mp_distributing.py.
........
r68214 | georg.brandl | 2009-01-03 20:44:48 +0100 (Sat, 03 Jan 2009) | 2 lines
Make indentation consistent.
........
r68215 | georg.brandl | 2009-01-03 21:15:14 +0100 (Sat, 03 Jan 2009) | 2 lines
Fix role name.
........
r68217 | georg.brandl | 2009-01-03 21:30:15 +0100 (Sat, 03 Jan 2009) | 2 lines
Add rstlint, a little tool to find subtle markup problems and inconsistencies in the Doc sources.
........
r68218 | georg.brandl | 2009-01-03 21:38:59 +0100 (Sat, 03 Jan 2009) | 2 lines
Recognize usage of the default role.
........
r68219 | georg.brandl | 2009-01-03 21:47:01 +0100 (Sat, 03 Jan 2009) | 2 lines
Fix uses of the default role.
........
r68220 | georg.brandl | 2009-01-03 21:55:06 +0100 (Sat, 03 Jan 2009) | 2 lines
Remove trailing whitespace.
........
r68221 | georg.brandl | 2009-01-03 22:04:55 +0100 (Sat, 03 Jan 2009) | 2 lines
Remove tabs from the documentation.
........
r68222 | georg.brandl | 2009-01-03 22:11:58 +0100 (Sat, 03 Jan 2009) | 2 lines
Disable the line length checker by default.
........
2009-01-03 17:55:17 -04:00
|
|
|
cd $(srcdir)/Lib/$(PLATDIR); $(RUNSHARED) ./regen
|
2001-01-24 13:11:43 -04:00
|
|
|
|
|
|
|
# Install the include files
|
|
|
|
INCLDIRSTOMAKE=$(INCLUDEDIR) $(CONFINCLUDEDIR) $(INCLUDEPY) $(CONFINCLUDEPY)
|
|
|
|
inclinstall:
|
|
|
|
@for i in $(INCLDIRSTOMAKE); \
|
|
|
|
do \
|
2003-05-11 17:25:35 -03:00
|
|
|
if test ! -d $(DESTDIR)$$i; then \
|
2001-01-24 13:11:43 -04:00
|
|
|
echo "Creating directory $$i"; \
|
2003-05-11 17:25:35 -03:00
|
|
|
$(INSTALL) -d -m $(DIRMODE) $(DESTDIR)$$i; \
|
2001-01-24 13:11:43 -04:00
|
|
|
else true; \
|
|
|
|
fi; \
|
|
|
|
done
|
|
|
|
@for i in $(srcdir)/Include/*.h; \
|
|
|
|
do \
|
|
|
|
echo $(INSTALL_DATA) $$i $(INCLUDEPY); \
|
2003-05-11 17:25:35 -03:00
|
|
|
$(INSTALL_DATA) $$i $(DESTDIR)$(INCLUDEPY); \
|
2001-01-24 13:11:43 -04:00
|
|
|
done
|
2003-05-11 17:25:35 -03:00
|
|
|
$(INSTALL_DATA) pyconfig.h $(DESTDIR)$(CONFINCLUDEPY)/pyconfig.h
|
2001-01-24 13:11:43 -04:00
|
|
|
|
|
|
|
# Install the library and miscellaneous stuff needed for extending/embedding
|
|
|
|
# This goes into $(exec_prefix)
|
|
|
|
LIBPL= $(LIBP)/config
|
|
|
|
libainstall: all
|
|
|
|
@for i in $(LIBDIR) $(LIBP) $(LIBPL); \
|
|
|
|
do \
|
2003-05-11 17:25:35 -03:00
|
|
|
if test ! -d $(DESTDIR)$$i; then \
|
2001-01-24 13:11:43 -04:00
|
|
|
echo "Creating directory $$i"; \
|
2003-05-11 17:25:35 -03:00
|
|
|
$(INSTALL) -d -m $(DIRMODE) $(DESTDIR)$$i; \
|
2001-01-24 13:11:43 -04:00
|
|
|
else true; \
|
|
|
|
fi; \
|
|
|
|
done
|
2002-03-29 12:28:31 -04:00
|
|
|
@if test -d $(LIBRARY); then :; else \
|
2001-09-11 11:41:54 -03:00
|
|
|
if test "$(PYTHONFRAMEWORKDIR)" = no-framework; then \
|
2002-07-29 13:18:23 -03:00
|
|
|
if test "$(SO)" = .dll; then \
|
2003-05-11 17:25:35 -03:00
|
|
|
$(INSTALL_DATA) $(LDLIBRARY) $(DESTDIR)$(LIBPL) ; \
|
2002-07-29 13:18:23 -03:00
|
|
|
else \
|
2003-05-11 17:25:35 -03:00
|
|
|
$(INSTALL_DATA) $(LIBRARY) $(DESTDIR)$(LIBPL)/$(LIBRARY) ; \
|
|
|
|
$(RANLIB) $(DESTDIR)$(LIBPL)/$(LIBRARY) ; \
|
2002-07-29 13:18:23 -03:00
|
|
|
fi; \
|
2001-08-14 22:26:28 -03:00
|
|
|
else \
|
2002-03-29 12:28:31 -04:00
|
|
|
echo Skip install of $(LIBRARY) - use make frameworkinstall; \
|
2001-08-14 22:26:28 -03:00
|
|
|
fi; \
|
2001-01-24 13:11:43 -04:00
|
|
|
fi
|
2003-05-11 17:25:35 -03:00
|
|
|
$(INSTALL_DATA) Modules/config.c $(DESTDIR)$(LIBPL)/config.c
|
2006-04-14 11:34:26 -03:00
|
|
|
$(INSTALL_DATA) Modules/python.o $(DESTDIR)$(LIBPL)/python.o
|
2003-05-11 17:25:35 -03:00
|
|
|
$(INSTALL_DATA) $(srcdir)/Modules/config.c.in $(DESTDIR)$(LIBPL)/config.c.in
|
|
|
|
$(INSTALL_DATA) Makefile $(DESTDIR)$(LIBPL)/Makefile
|
|
|
|
$(INSTALL_DATA) Modules/Setup $(DESTDIR)$(LIBPL)/Setup
|
|
|
|
$(INSTALL_DATA) Modules/Setup.local $(DESTDIR)$(LIBPL)/Setup.local
|
|
|
|
$(INSTALL_DATA) Modules/Setup.config $(DESTDIR)$(LIBPL)/Setup.config
|
|
|
|
$(INSTALL_SCRIPT) $(srcdir)/Modules/makesetup $(DESTDIR)$(LIBPL)/makesetup
|
|
|
|
$(INSTALL_SCRIPT) $(srcdir)/install-sh $(DESTDIR)$(LIBPL)/install-sh
|
2006-04-15 05:13:05 -03:00
|
|
|
# Substitution happens here, as the completely-expanded BINDIR
|
|
|
|
# is not available in configure
|
2006-07-24 10:28:57 -03:00
|
|
|
sed -e "s,@EXENAME@,$(BINDIR)/python$(VERSION)$(EXE)," < $(srcdir)/Misc/python-config.in >python-config
|
2006-07-30 13:20:10 -03:00
|
|
|
$(INSTALL_SCRIPT) python-config $(DESTDIR)$(BINDIR)/python$(VERSION)-config
|
2006-04-15 05:13:05 -03:00
|
|
|
rm python-config
|
2001-01-24 13:11:43 -04:00
|
|
|
@if [ -s Modules/python.exp -a \
|
|
|
|
"`echo $(MACHDEP) | sed 's/^\(...\).*/\1/'`" = "aix" ]; then \
|
|
|
|
echo; echo "Installing support files for building shared extension modules on AIX:"; \
|
|
|
|
$(INSTALL_DATA) Modules/python.exp \
|
2003-05-11 17:25:35 -03:00
|
|
|
$(DESTDIR)$(LIBPL)/python.exp; \
|
2001-01-24 13:11:43 -04:00
|
|
|
echo; echo "$(LIBPL)/python.exp"; \
|
2001-04-10 20:03:35 -03:00
|
|
|
$(INSTALL_SCRIPT) $(srcdir)/Modules/makexp_aix \
|
2003-05-11 17:25:35 -03:00
|
|
|
$(DESTDIR)$(LIBPL)/makexp_aix; \
|
2001-01-24 13:11:43 -04:00
|
|
|
echo "$(LIBPL)/makexp_aix"; \
|
2001-04-10 20:03:35 -03:00
|
|
|
$(INSTALL_SCRIPT) $(srcdir)/Modules/ld_so_aix \
|
2003-05-11 17:25:35 -03:00
|
|
|
$(DESTDIR)$(LIBPL)/ld_so_aix; \
|
2001-01-24 13:11:43 -04:00
|
|
|
echo "$(LIBPL)/ld_so_aix"; \
|
|
|
|
echo; echo "See Misc/AIX-NOTES for details."; \
|
|
|
|
else true; \
|
|
|
|
fi
|
|
|
|
@case "$(MACHDEP)" in beos*) \
|
|
|
|
echo; echo "Installing support files for building shared extension modules on BeOS:"; \
|
2003-05-11 17:25:35 -03:00
|
|
|
$(INSTALL_DATA) Misc/BeOS-NOTES $(DESTDIR)$(LIBPL)/README; \
|
2001-01-24 13:11:43 -04:00
|
|
|
echo; echo "$(LIBPL)/README"; \
|
2003-05-11 17:25:35 -03:00
|
|
|
$(INSTALL_SCRIPT) Modules/ar_beos $(DESTDIR)$(LIBPL)/ar_beos; \
|
2001-02-15 23:36:53 -04:00
|
|
|
echo "$(LIBPL)/ar_beos"; \
|
2003-05-11 17:25:35 -03:00
|
|
|
$(INSTALL_SCRIPT) Modules/ld_so_beos $(DESTDIR)$(LIBPL)/ld_so_beos; \
|
2001-02-15 23:36:53 -04:00
|
|
|
echo "$(LIBPL)/ld_so_beos"; \
|
|
|
|
echo; echo "See Misc/BeOS-NOTES for details."; \
|
2001-01-24 13:11:43 -04:00
|
|
|
;; \
|
|
|
|
esac
|
|
|
|
|
|
|
|
# Install the dynamically loadable modules
|
|
|
|
# This goes into $(exec_prefix)
|
|
|
|
sharedinstall:
|
2002-03-29 12:28:31 -04:00
|
|
|
$(RUNSHARED) ./$(BUILDPYTHON) -E $(srcdir)/setup.py install \
|
|
|
|
--prefix=$(prefix) \
|
2001-10-17 03:26:53 -03:00
|
|
|
--install-scripts=$(BINDIR) \
|
2003-05-11 17:25:35 -03:00
|
|
|
--install-platlib=$(DESTSHARED) \
|
|
|
|
--root=/$(DESTDIR)
|
2001-01-24 13:11:43 -04:00
|
|
|
|
2002-08-08 21:18:21 -03:00
|
|
|
# Here are a couple of targets for MacOSX again, to install a full
|
|
|
|
# framework-based Python. frameworkinstall installs everything, the
|
|
|
|
# subtargets install specific parts. Much of the actual work is offloaded to
|
2006-06-07 16:06:01 -03:00
|
|
|
# the Makefile in Mac
|
2002-08-08 21:18:21 -03:00
|
|
|
#
|
2006-05-26 08:43:26 -03:00
|
|
|
#
|
|
|
|
# This target is here for backward compatiblity, previous versions of Python
|
|
|
|
# hadn't integrated framework installation in the normal install process.
|
|
|
|
frameworkinstall: install
|
2002-08-09 16:18:25 -03:00
|
|
|
|
2001-08-14 22:26:28 -03:00
|
|
|
# On install, we re-make the framework
|
|
|
|
# structure in the install location, /Library/Frameworks/ or the argument to
|
|
|
|
# --enable-framework. If --enable-framework has been specified then we have
|
|
|
|
# automatically set prefix to the location deep down in the framework, so we
|
|
|
|
# only have to cater for the structural bits of the framework.
|
|
|
|
|
2002-08-08 21:18:21 -03:00
|
|
|
frameworkinstallframework: frameworkinstallstructure install frameworkinstallmaclib
|
|
|
|
|
|
|
|
frameworkinstallstructure: $(LDLIBRARY)
|
2001-09-11 11:41:54 -03:00
|
|
|
@if test "$(PYTHONFRAMEWORKDIR)" = no-framework; then \
|
2001-08-14 22:26:28 -03:00
|
|
|
echo Not configured with --enable-framework; \
|
2001-09-11 11:41:54 -03:00
|
|
|
exit 1; \
|
2001-08-14 22:26:28 -03:00
|
|
|
else true; \
|
|
|
|
fi
|
2002-08-08 21:18:21 -03:00
|
|
|
@for i in $(prefix)/Resources/English.lproj $(prefix)/lib; do\
|
2003-05-11 17:25:35 -03:00
|
|
|
if test ! -d $(DESTDIR)$$i; then \
|
2003-05-25 19:01:32 -03:00
|
|
|
echo "Creating directory $(DESTDIR)$$i"; \
|
|
|
|
$(INSTALL) -d -m $(DIRMODE) $(DESTDIR)$$i; \
|
2001-08-14 22:26:28 -03:00
|
|
|
else true; \
|
|
|
|
fi; \
|
|
|
|
done
|
2003-05-25 19:01:32 -03:00
|
|
|
$(LN) -fsn include/python$(VERSION) $(DESTDIR)$(prefix)/Headers
|
2008-05-02 16:45:11 -03:00
|
|
|
sed 's/%VERSION%/'"`$(RUNSHARED) ./$(BUILDPYTHON) -c 'import platform; print platform.python_version()'`"'/g' < $(RESSRCDIR)/Info.plist > $(DESTDIR)$(prefix)/Resources/Info.plist
|
2003-05-25 19:01:32 -03:00
|
|
|
$(LN) -fsn $(VERSION) $(DESTDIR)$(PYTHONFRAMEWORKINSTALLDIR)/Versions/Current
|
2008-05-02 16:45:11 -03:00
|
|
|
$(LN) -fsn Versions/Current/$(PYTHONFRAMEWORK) $(DESTDIR)$(PYTHONFRAMEWORKINSTALLDIR)/$(PYTHONFRAMEWORK)
|
2003-05-25 19:01:32 -03:00
|
|
|
$(LN) -fsn Versions/Current/Headers $(DESTDIR)$(PYTHONFRAMEWORKINSTALLDIR)/Headers
|
|
|
|
$(LN) -fsn Versions/Current/Resources $(DESTDIR)$(PYTHONFRAMEWORKINSTALLDIR)/Resources
|
2003-06-20 17:36:53 -03:00
|
|
|
$(INSTALL_SHARED) $(LDLIBRARY) $(DESTDIR)$(PYTHONFRAMEWORKPREFIX)/$(LDLIBRARY)
|
2001-08-17 12:32:31 -03:00
|
|
|
|
2002-08-08 21:18:21 -03:00
|
|
|
# This installs Mac/Lib into the framework
|
2006-06-27 12:45:32 -03:00
|
|
|
# Install a number of symlinks to keep software that expects a normal unix
|
|
|
|
# install (which includes python-config) happy.
|
2002-08-08 21:18:21 -03:00
|
|
|
frameworkinstallmaclib:
|
2008-05-02 16:45:11 -03:00
|
|
|
ln -fs "../../../$(PYTHONFRAMEWORK)" "$(DESTDIR)$(prefix)/lib/python$(VERSION)/config/libpython$(VERSION).a"
|
2006-06-07 16:06:01 -03:00
|
|
|
cd Mac && $(MAKE) installmacsubtree DESTDIR="$(DESTDIR)"
|
2002-08-08 21:18:21 -03:00
|
|
|
|
|
|
|
# This installs the IDE, the Launcher and other apps into /Applications
|
|
|
|
frameworkinstallapps:
|
2006-06-07 16:06:01 -03:00
|
|
|
cd Mac && $(MAKE) installapps DESTDIR="$(DESTDIR)"
|
2002-08-08 21:18:21 -03:00
|
|
|
|
2008-06-05 09:58:24 -03:00
|
|
|
frameworkinstallapps4way:
|
|
|
|
cd Mac && $(MAKE) installapps4way DESTDIR="$(DESTDIR)"
|
|
|
|
|
2002-08-08 21:18:21 -03:00
|
|
|
# This install the unix python and pythonw tools in /usr/local/bin
|
|
|
|
frameworkinstallunixtools:
|
2006-06-07 16:06:01 -03:00
|
|
|
cd Mac && $(MAKE) installunixtools DESTDIR="$(DESTDIR)"
|
2002-06-21 11:48:38 -03:00
|
|
|
|
2008-06-05 09:58:24 -03:00
|
|
|
frameworkinstallunixtools4way:
|
|
|
|
cd Mac && $(MAKE) installunixtools4way DESTDIR="$(DESTDIR)"
|
|
|
|
|
2006-06-06 16:50:24 -03:00
|
|
|
frameworkaltinstallunixtools:
|
2006-06-07 16:06:01 -03:00
|
|
|
cd Mac && $(MAKE) altinstallunixtools DESTDIR="$(DESTDIR)"
|
2006-06-06 16:50:24 -03:00
|
|
|
|
2008-06-05 09:58:24 -03:00
|
|
|
frameworkaltinstallunixtools4way:
|
|
|
|
cd Mac && $(MAKE) altinstallunixtools4way DESTDIR="$(DESTDIR)"
|
|
|
|
|
2003-06-19 19:35:20 -03:00
|
|
|
# This installs the Demos and Tools into the applications directory.
|
|
|
|
# It is not part of a normal frameworkinstall
|
|
|
|
frameworkinstallextras:
|
2008-12-18 15:47:49 -04:00
|
|
|
cd Mac && $(MAKE) installextras DESTDIR="$(DESTDIR)"
|
2003-06-19 19:35:20 -03:00
|
|
|
|
2003-01-01 16:07:49 -04:00
|
|
|
# This installs a few of the useful scripts in Tools/scripts
|
|
|
|
scriptsinstall:
|
2003-01-03 16:39:29 -04:00
|
|
|
SRCDIR=$(srcdir) $(RUNSHARED) \
|
2003-01-01 16:07:49 -04:00
|
|
|
./$(BUILDPYTHON) $(srcdir)/Tools/scripts/setup.py install \
|
|
|
|
--prefix=$(prefix) \
|
2003-05-11 17:25:35 -03:00
|
|
|
--install-scripts=$(BINDIR) \
|
|
|
|
--root=/$(DESTDIR)
|
2003-01-01 16:07:49 -04:00
|
|
|
|
2001-01-24 13:11:43 -04:00
|
|
|
# Build the toplevel Makefile
|
|
|
|
Makefile.pre: Makefile.pre.in config.status
|
|
|
|
CONFIG_FILES=Makefile.pre CONFIG_HEADERS= $(SHELL) config.status
|
|
|
|
$(MAKE) -f Makefile.pre Makefile
|
|
|
|
|
2001-03-21 20:32:32 -04:00
|
|
|
# Run the configure script.
|
2001-01-24 13:11:43 -04:00
|
|
|
config.status: $(srcdir)/configure
|
2001-03-21 20:32:32 -04:00
|
|
|
$(SHELL) $(srcdir)/configure $(CONFIG_ARGS)
|
2001-01-24 13:11:43 -04:00
|
|
|
|
2001-12-06 17:47:20 -04:00
|
|
|
.PRECIOUS: config.status $(BUILDPYTHON) Makefile Makefile.pre
|
2001-01-24 13:11:43 -04:00
|
|
|
|
|
|
|
# Some make's put the object file in the current directory
|
|
|
|
.c.o:
|
2001-01-26 12:14:41 -04:00
|
|
|
$(CC) -c $(PY_CFLAGS) -o $@ $<
|
2001-01-24 13:11:43 -04:00
|
|
|
|
2006-04-17 16:25:49 -03:00
|
|
|
# Run reindent on the library
|
|
|
|
reindent:
|
2008-01-29 00:13:07 -04:00
|
|
|
./$(BUILDPYTHON) $(srcdir)/Tools/scripts/reindent.py -r $(srcdir)/Lib
|
2006-04-17 16:25:49 -03:00
|
|
|
|
2001-01-24 13:11:43 -04:00
|
|
|
# Rerun configure with the same options as it was run last time,
|
|
|
|
# provided the config.status script exists
|
|
|
|
recheck:
|
|
|
|
$(SHELL) config.status --recheck
|
|
|
|
$(SHELL) config.status
|
|
|
|
|
2001-07-26 10:41:06 -03:00
|
|
|
# Rebuild the configure script from configure.in; also rebuild pyconfig.h.in
|
2001-01-24 13:11:43 -04:00
|
|
|
autoconf:
|
|
|
|
(cd $(srcdir); autoconf)
|
|
|
|
(cd $(srcdir); autoheader)
|
|
|
|
|
|
|
|
# Create a tags file for vi
|
|
|
|
tags::
|
|
|
|
cd $(srcdir); \
|
|
|
|
ctags -w -t Include/*.h; \
|
|
|
|
for i in $(SRCDIRS); do ctags -w -t -a $$i/*.[ch]; \
|
|
|
|
done; \
|
2002-02-28 15:26:08 -04:00
|
|
|
sort -o tags tags
|
2001-01-24 13:11:43 -04:00
|
|
|
|
|
|
|
# Create a tags file for GNU Emacs
|
|
|
|
TAGS::
|
|
|
|
cd $(srcdir); \
|
|
|
|
etags Include/*.h; \
|
|
|
|
for i in $(SRCDIRS); do etags -a $$i/*.[ch]; done
|
|
|
|
|
|
|
|
# Sanitation targets -- clean leaves libraries, executables and tags
|
|
|
|
# files, which clobber removes those as well
|
2006-04-18 20:58:52 -03:00
|
|
|
pycremoval:
|
|
|
|
find $(srcdir) -name '*.py[co]' -exec rm -f {} ';'
|
2001-01-24 13:11:43 -04:00
|
|
|
|
2006-04-18 20:58:52 -03:00
|
|
|
clean: pycremoval
|
2001-02-19 00:35:11 -04:00
|
|
|
find . -name '*.o' -exec rm -f {} ';'
|
2001-04-14 14:57:07 -03:00
|
|
|
find . -name '*.s[ol]' -exec rm -f {} ';'
|
2006-03-16 03:33:49 -04:00
|
|
|
find $(srcdir)/build -name 'fficonfig.h' -exec rm -f {} ';' || true
|
|
|
|
find $(srcdir)/build -name 'fficonfig.py' -exec rm -f {} ';' || true
|
2001-01-24 13:11:43 -04:00
|
|
|
|
2008-04-12 21:03:25 -03:00
|
|
|
profile-removal:
|
|
|
|
find . -name '*.gc??' -exec rm -f {} ';'
|
|
|
|
|
|
|
|
clobber: clean profile-removal
|
2001-12-06 17:47:20 -04:00
|
|
|
-rm -f $(BUILDPYTHON) $(PGEN) $(LIBRARY) $(LDLIBRARY) $(DLLLIBRARY) \
|
2001-04-14 14:57:07 -03:00
|
|
|
tags TAGS \
|
2001-08-17 12:32:31 -03:00
|
|
|
config.cache config.log pyconfig.h Modules/config.c
|
2001-06-06 14:51:57 -03:00
|
|
|
-rm -rf build platform
|
2003-02-27 19:19:46 -04:00
|
|
|
-rm -rf $(PYTHONFRAMEWORKDIR)
|
2001-01-24 13:11:43 -04:00
|
|
|
|
|
|
|
# Make things extra clean, before making a distribution:
|
|
|
|
# remove all generated files, even Makefile[.pre]
|
2006-01-02 21:38:53 -04:00
|
|
|
# Keep configure and Python-ast.[ch], it's possible they can't be generated
|
2001-01-24 13:11:43 -04:00
|
|
|
distclean: clobber
|
2006-01-05 06:00:36 -04:00
|
|
|
-rm -f core Makefile Makefile.pre config.status \
|
2001-01-26 12:14:41 -04:00
|
|
|
Modules/Setup Modules/Setup.local Modules/Setup.config
|
2001-02-03 13:16:29 -04:00
|
|
|
find $(srcdir) '(' -name '*.fdc' -o -name '*~' \
|
|
|
|
-o -name '[@,#]*' -o -name '*.old' \
|
|
|
|
-o -name '*.orig' -o -name '*.rej' \
|
|
|
|
-o -name '*.bak' ')' \
|
|
|
|
-exec rm -f {} ';'
|
2001-01-24 13:11:43 -04:00
|
|
|
|
|
|
|
# Check for smelly exported symbols (not starting with Py/_Py)
|
|
|
|
smelly: all
|
|
|
|
nm -p $(LIBRARY) | \
|
|
|
|
sed -n "/ [TDB] /s/.* //p" | grep -v "^_*Py" | sort -u; \
|
|
|
|
|
|
|
|
# Find files with funny names
|
|
|
|
funny:
|
|
|
|
find $(DISTDIRS) -type d \
|
|
|
|
-o -name '*.[chs]' \
|
|
|
|
-o -name '*.py' \
|
|
|
|
-o -name '*.doc' \
|
|
|
|
-o -name '*.sty' \
|
|
|
|
-o -name '*.bib' \
|
|
|
|
-o -name '*.dat' \
|
|
|
|
-o -name '*.el' \
|
|
|
|
-o -name '*.fd' \
|
|
|
|
-o -name '*.in' \
|
|
|
|
-o -name '*.tex' \
|
|
|
|
-o -name '*,[vpt]' \
|
|
|
|
-o -name 'Setup' \
|
|
|
|
-o -name 'Setup.*' \
|
|
|
|
-o -name README \
|
|
|
|
-o -name Makefile \
|
|
|
|
-o -name ChangeLog \
|
|
|
|
-o -name Repository \
|
|
|
|
-o -name Root \
|
|
|
|
-o -name Entries \
|
|
|
|
-o -name Tag \
|
|
|
|
-o -name tags \
|
|
|
|
-o -name TAGS \
|
|
|
|
-o -name .cvsignore \
|
|
|
|
-o -name MANIFEST \
|
|
|
|
-o -print
|
|
|
|
|
2008-03-18 14:25:13 -03:00
|
|
|
# Perform some verification checks on any modified files.
|
2008-09-05 19:59:17 -03:00
|
|
|
patchcheck:
|
2008-06-05 09:58:24 -03:00
|
|
|
$(RUNSHARED) ./$(BUILDPYTHON) $(srcdir)/Tools/scripts/patchcheck.py
|
2008-03-18 14:25:13 -03:00
|
|
|
|
2001-08-18 18:08:22 -03:00
|
|
|
# Dependencies
|
|
|
|
|
2001-12-02 09:02:32 -04:00
|
|
|
Python/thread.o: @THREADHEADERS@
|
2001-08-18 18:08:22 -03:00
|
|
|
|
2002-10-10 12:04:04 -03:00
|
|
|
# Declare targets that aren't real files
|
2007-09-21 03:33:28 -03:00
|
|
|
.PHONY: all build_all sharedmods oldsharedmods test quicktest memtest
|
2002-10-10 12:04:04 -03:00
|
|
|
.PHONY: install altinstall oldsharedinstall bininstall altbininstall
|
|
|
|
.PHONY: maninstall libinstall inclinstall libainstall sharedinstall
|
|
|
|
.PHONY: frameworkinstall frameworkinstallframework frameworkinstallstructure
|
|
|
|
.PHONY: frameworkinstallmaclib frameworkinstallapps frameworkinstallunixtools
|
2006-06-06 16:50:24 -03:00
|
|
|
.PHONY: frameworkaltinstallunixtools recheck autoconf clean clobber distclean
|
2008-10-06 19:47:18 -03:00
|
|
|
.PHONY: smelly funny patchcheck
|
2002-10-10 12:04:04 -03:00
|
|
|
|
2001-01-24 13:11:43 -04:00
|
|
|
# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
|