Mercurial > cpython-lru_cache-weakref

annotate Mac/README @ 78069:a8aa77458e12 3.2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add c_size_t and c_ssize_t to the ctypes summary table.
author Antoine Pitrou <solipsis@pitrou.net>
date Thu, 12 Jul 2012 20:31:50 +0200
parents 7464c8cf7466
children e37647470fcf 796d9fc28e95
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
38673
a19c20c5e5c7 Merge the rest of the trunk.
Thomas Wouters <thomas@python.org>
parents:
diff changeset
1 ============
a19c20c5e5c7 Merge the rest of the trunk.
Thomas Wouters <thomas@python.org>
parents:
diff changeset
2 MacOSX Notes
a19c20c5e5c7 Merge the rest of the trunk.
Thomas Wouters <thomas@python.org>
parents:
diff changeset
3 ============
a19c20c5e5c7 Merge the rest of the trunk.
Thomas Wouters <thomas@python.org>
parents:
diff changeset
4
a19c20c5e5c7 Merge the rest of the trunk.
Thomas Wouters <thomas@python.org>
parents:
diff changeset
5 This document provides a quick overview of some Mac OS X specific features in
a19c20c5e5c7 Merge the rest of the trunk.
Thomas Wouters <thomas@python.org>
parents:
diff changeset
6 the Python distribution.
a19c20c5e5c7 Merge the rest of the trunk.
Thomas Wouters <thomas@python.org>
parents:
diff changeset
7
61114
bfd2541d8ec5 Merged revisions 80647 via svnmerge from
Ronald Oussoren <ronaldoussoren@mac.com>
parents: 58787
diff changeset
8 * ``--enable-framework[=DIR]``
59740
02e21576da03 port r78813 from trunk fixing #8089
Benjamin Peterson <benjamin@python.org>
parents: 58788
diff changeset
9
02e21576da03 port r78813 from trunk fixing #8089
Benjamin Peterson <benjamin@python.org>
parents: 58788
diff changeset
10 If this argument is specified the build will create a Python.framework rather
02e21576da03 port r78813 from trunk fixing #8089
Benjamin Peterson <benjamin@python.org>
parents: 58788
diff changeset
11 than a traditional Unix install. See the section
02e21576da03 port r78813 from trunk fixing #8089
Benjamin Peterson <benjamin@python.org>
parents: 58788
diff changeset
12 _`Building and using a framework-based Python on Mac OS X` for more
02e21576da03 port r78813 from trunk fixing #8089
Benjamin Peterson <benjamin@python.org>
parents: 58788
diff changeset
13 information on frameworks.
02e21576da03 port r78813 from trunk fixing #8089
Benjamin Peterson <benjamin@python.org>
parents: 58788
diff changeset
14
61114
bfd2541d8ec5 Merged revisions 80647 via svnmerge from
Ronald Oussoren <ronaldoussoren@mac.com>
parents: 58787
diff changeset
15 If the optional directory argument is specified the framework it installed
bfd2541d8ec5 Merged revisions 80647 via svnmerge from
Ronald Oussoren <ronaldoussoren@mac.com>
parents: 58787
diff changeset
16 into that directory. This can be used to install a python framework into
bfd2541d8ec5 Merged revisions 80647 via svnmerge from
Ronald Oussoren <ronaldoussoren@mac.com>
parents: 58787
diff changeset
17 your home directory::
bfd2541d8ec5 Merged revisions 80647 via svnmerge from
Ronald Oussoren <ronaldoussoren@mac.com>
parents: 58787
diff changeset
18
bfd2541d8ec5 Merged revisions 80647 via svnmerge from
Ronald Oussoren <ronaldoussoren@mac.com>
parents: 58787
diff changeset
19 $ configure --enable-framework=/Users/ronald/Library/Frameworks
bfd2541d8ec5 Merged revisions 80647 via svnmerge from
Ronald Oussoren <ronaldoussoren@mac.com>
parents: 58787
diff changeset
20 $ make && make install
bfd2541d8ec5 Merged revisions 80647 via svnmerge from
Ronald Oussoren <ronaldoussoren@mac.com>
parents: 58787
diff changeset
21
bfd2541d8ec5 Merged revisions 80647 via svnmerge from
Ronald Oussoren <ronaldoussoren@mac.com>
parents: 58787
diff changeset
22 This will install the framework itself in ``/Users/ronald/Library/Frameworks``,
bfd2541d8ec5 Merged revisions 80647 via svnmerge from
Ronald Oussoren <ronaldoussoren@mac.com>
parents: 58787
diff changeset
23 the applications in a subdirectory of ``/Users/ronald/Applications`` and the
bfd2541d8ec5 Merged revisions 80647 via svnmerge from
Ronald Oussoren <ronaldoussoren@mac.com>
parents: 58787
diff changeset
24 command-line tools in ``/Users/ronald/bin``.
bfd2541d8ec5 Merged revisions 80647 via svnmerge from
Ronald Oussoren <ronaldoussoren@mac.com>
parents: 58787
diff changeset
25
59740
02e21576da03 port r78813 from trunk fixing #8089
Benjamin Peterson <benjamin@python.org>
parents: 58788
diff changeset
26 * ``--with-framework-name=NAME``
02e21576da03 port r78813 from trunk fixing #8089
Benjamin Peterson <benjamin@python.org>
parents: 58788
diff changeset
27
02e21576da03 port r78813 from trunk fixing #8089
Benjamin Peterson <benjamin@python.org>
parents: 58788
diff changeset
28 Specify the name for the python framework, defaults to ``Python``. This option
02e21576da03 port r78813 from trunk fixing #8089
Benjamin Peterson <benjamin@python.org>
parents: 58788
diff changeset
29 is only valid when ``--enable-framework`` is specified.
02e21576da03 port r78813 from trunk fixing #8089
Benjamin Peterson <benjamin@python.org>
parents: 58788
diff changeset
30
02e21576da03 port r78813 from trunk fixing #8089
Benjamin Peterson <benjamin@python.org>
parents: 58788
diff changeset
31 * ``--enable-universalsdk[=PATH]``
02e21576da03 port r78813 from trunk fixing #8089
Benjamin Peterson <benjamin@python.org>
parents: 58788
diff changeset
32
02e21576da03 port r78813 from trunk fixing #8089
Benjamin Peterson <benjamin@python.org>
parents: 58788
diff changeset
33 Create a universal binary build of of Python. This can be used with both
02e21576da03 port r78813 from trunk fixing #8089
Benjamin Peterson <benjamin@python.org>
parents: 58788
diff changeset
34 regular and framework builds.
02e21576da03 port r78813 from trunk fixing #8089
Benjamin Peterson <benjamin@python.org>
parents: 58788
diff changeset
35
57914
94e957cfda38 Merged revisions 77031 via svnmerge from
Ronald Oussoren <ronaldoussoren@mac.com>
parents: 57718
diff changeset
36 The optional argument specifies which OSX SDK should be used to perform the
59740
02e21576da03 port r78813 from trunk fixing #8089
Benjamin Peterson <benjamin@python.org>
parents: 58788
diff changeset
37 build. This defaults to ``/Developer/SDKs/MacOSX.10.4u.sdk``, specify
02e21576da03 port r78813 from trunk fixing #8089
Benjamin Peterson <benjamin@python.org>
parents: 58788
diff changeset
38 ``/`` when building on a 10.5 system, especially when building 64-bit code.
02e21576da03 port r78813 from trunk fixing #8089
Benjamin Peterson <benjamin@python.org>
parents: 58788
diff changeset
39
02e21576da03 port r78813 from trunk fixing #8089
Benjamin Peterson <benjamin@python.org>
parents: 58788
diff changeset
40 See the section _`Building and using a universal binary of Python on Mac OS X`
02e21576da03 port r78813 from trunk fixing #8089
Benjamin Peterson <benjamin@python.org>
parents: 58788
diff changeset
41 for more information.
02e21576da03 port r78813 from trunk fixing #8089
Benjamin Peterson <benjamin@python.org>
parents: 58788
diff changeset
42
57914
94e957cfda38 Merged revisions 77031 via svnmerge from
Ronald Oussoren <ronaldoussoren@mac.com>
parents: 57718
diff changeset
43 * ``--with-univeral-archs=VALUE``
59740
02e21576da03 port r78813 from trunk fixing #8089
Benjamin Peterson <benjamin@python.org>
parents: 58788
diff changeset
44
02e21576da03 port r78813 from trunk fixing #8089
Benjamin Peterson <benjamin@python.org>
parents: 58788
diff changeset
45 Specify the kind of universal binary that should be created. This option is
02e21576da03 port r78813 from trunk fixing #8089
Benjamin Peterson <benjamin@python.org>
parents: 58788
diff changeset
46 only valid when ``--enable-universalsdk`` is specified.
02e21576da03 port r78813 from trunk fixing #8089
Benjamin Peterson <benjamin@python.org>
parents: 58788
diff changeset
47
38673
a19c20c5e5c7 Merge the rest of the trunk.
Thomas Wouters <thomas@python.org>
parents:
diff changeset
48
a19c20c5e5c7 Merge the rest of the trunk.
Thomas Wouters <thomas@python.org>
parents:
diff changeset
49 Building and using a universal binary of Python on Mac OS X
a19c20c5e5c7 Merge the rest of the trunk.
Thomas Wouters <thomas@python.org>
parents:
diff changeset
50 ===========================================================
a19c20c5e5c7 Merge the rest of the trunk.
Thomas Wouters <thomas@python.org>
parents:
diff changeset
51
a19c20c5e5c7 Merge the rest of the trunk.
Thomas Wouters <thomas@python.org>
parents:
diff changeset
52 1. What is a universal binary
a19c20c5e5c7 Merge the rest of the trunk.
Thomas Wouters <thomas@python.org>
parents:
diff changeset
53 -----------------------------
a19c20c5e5c7 Merge the rest of the trunk.
Thomas Wouters <thomas@python.org>
parents:
diff changeset
54
a19c20c5e5c7 Merge the rest of the trunk.
Thomas Wouters <thomas@python.org>
parents:
diff changeset
55 A universal binary build of Python contains object code for both PPC and i386
a19c20c5e5c7 Merge the rest of the trunk.
Thomas Wouters <thomas@python.org>
parents:
diff changeset
56 and can therefore run at native speed on both classic powerpc based macs and
a19c20c5e5c7 Merge the rest of the trunk.
Thomas Wouters <thomas@python.org>
parents:
diff changeset
57 the newer intel based macs.
a19c20c5e5c7 Merge the rest of the trunk.
Thomas Wouters <thomas@python.org>
parents:
diff changeset
58
a19c20c5e5c7 Merge the rest of the trunk.
Thomas Wouters <thomas@python.org>
parents:
diff changeset
59 2. How do I build a universal binary
a19c20c5e5c7 Merge the rest of the trunk.
Thomas Wouters <thomas@python.org>
parents:
diff changeset
60 ------------------------------------
a19c20c5e5c7 Merge the rest of the trunk.
Thomas Wouters <thomas@python.org>
parents:
diff changeset
61
a19c20c5e5c7 Merge the rest of the trunk.
Thomas Wouters <thomas@python.org>
parents:
diff changeset
62 You can enable universal binaries by specifying the "--enable-universalsdk"
a19c20c5e5c7 Merge the rest of the trunk.
Thomas Wouters <thomas@python.org>
parents:
diff changeset
63 flag to configure::
a19c20c5e5c7 Merge the rest of the trunk.
Thomas Wouters <thomas@python.org>
parents:
diff changeset
64
a19c20c5e5c7 Merge the rest of the trunk.
Thomas Wouters <thomas@python.org>
parents:
diff changeset
65 $ ./configure --enable-universalsdk
a19c20c5e5c7 Merge the rest of the trunk.
Thomas Wouters <thomas@python.org>
parents:
diff changeset
66 $ make
a19c20c5e5c7 Merge the rest of the trunk.
Thomas Wouters <thomas@python.org>
parents:
diff changeset
67 $ make install
a19c20c5e5c7 Merge the rest of the trunk.
Thomas Wouters <thomas@python.org>
parents:
diff changeset
68
75793
7464c8cf7466 Issue #14346: Fix some typos in the Mac/README file.
Ned Deily <nad@acm.org>
parents: 68257
diff changeset
69 This flag can be used with a framework build of python, but also with a classic
38673
a19c20c5e5c7 Merge the rest of the trunk.
Thomas Wouters <thomas@python.org>
parents:
diff changeset
70 unix build. Either way you will have to build python on Mac OS X 10.4 (or later)
a19c20c5e5c7 Merge the rest of the trunk.
Thomas Wouters <thomas@python.org>
parents:
diff changeset
71 with Xcode 2.1 (or later). You also have to install the 10.4u SDK when
a19c20c5e5c7 Merge the rest of the trunk.
Thomas Wouters <thomas@python.org>
parents:
diff changeset
72 installing Xcode.
a19c20c5e5c7 Merge the rest of the trunk.
Thomas Wouters <thomas@python.org>
parents:
diff changeset
73
59740
02e21576da03 port r78813 from trunk fixing #8089
Benjamin Peterson <benjamin@python.org>
parents: 58788
diff changeset
74 2.1 Flavours of universal binaries
02e21576da03 port r78813 from trunk fixing #8089
Benjamin Peterson <benjamin@python.org>
parents: 58788
diff changeset
75 ..................................
02e21576da03 port r78813 from trunk fixing #8089
Benjamin Peterson <benjamin@python.org>
parents: 58788
diff changeset
76
02e21576da03 port r78813 from trunk fixing #8089
Benjamin Peterson <benjamin@python.org>
parents: 58788
diff changeset
77 It is possible to build a number of flavours of the universal binary build,
02e21576da03 port r78813 from trunk fixing #8089
Benjamin Peterson <benjamin@python.org>
parents: 58788
diff changeset
78 the default is a 32-bit only binary (i386 and ppc). The flavour can be
02e21576da03 port r78813 from trunk fixing #8089
Benjamin Peterson <benjamin@python.org>
parents: 58788
diff changeset
79 specified using the option ``--with-universal-archs=VALUE``. The following
02e21576da03 port r78813 from trunk fixing #8089
Benjamin Peterson <benjamin@python.org>
parents: 58788
diff changeset
80 values are available:
02e21576da03 port r78813 from trunk fixing #8089
Benjamin Peterson <benjamin@python.org>
parents: 58788
diff changeset
81
02e21576da03 port r78813 from trunk fixing #8089
Benjamin Peterson <benjamin@python.org>
parents: 58788
diff changeset
82 * ``32-bit``: ``ppc``, ``i386``
02e21576da03 port r78813 from trunk fixing #8089
Benjamin Peterson <benjamin@python.org>
parents: 58788
diff changeset
83
02e21576da03 port r78813 from trunk fixing #8089
Benjamin Peterson <benjamin@python.org>
parents: 58788
diff changeset
84 * ``64-bit``: ``ppc64``, ``x86_64``
02e21576da03 port r78813 from trunk fixing #8089
Benjamin Peterson <benjamin@python.org>
parents: 58788
diff changeset
85
02e21576da03 port r78813 from trunk fixing #8089
Benjamin Peterson <benjamin@python.org>
parents: 58788
diff changeset
86 * ``all``: ``ppc``, ``ppc64``, ``i386``, ``x86_64``
02e21576da03 port r78813 from trunk fixing #8089
Benjamin Peterson <benjamin@python.org>
parents: 58788
diff changeset
87
02e21576da03 port r78813 from trunk fixing #8089
Benjamin Peterson <benjamin@python.org>
parents: 58788
diff changeset
88 * ``3-way``: ``ppc``, ``i386`` and ``x86_64``
02e21576da03 port r78813 from trunk fixing #8089
Benjamin Peterson <benjamin@python.org>
parents: 58788
diff changeset
89
02e21576da03 port r78813 from trunk fixing #8089
Benjamin Peterson <benjamin@python.org>
parents: 58788
diff changeset
90 * ``intel``: ``i386``, ``x86_64``
02e21576da03 port r78813 from trunk fixing #8089
Benjamin Peterson <benjamin@python.org>
parents: 58788
diff changeset
91
57914
94e957cfda38 Merged revisions 77031 via svnmerge from
Ronald Oussoren <ronaldoussoren@mac.com>
parents: 57718
diff changeset
92 To build a universal binary that includes a 64-bit architecture, you must build
94e957cfda38 Merged revisions 77031 via svnmerge from
Ronald Oussoren <ronaldoussoren@mac.com>
parents: 57718
diff changeset
93 on a system running OSX 10.5 or later. The ``all`` flavour can only be built on
59740
02e21576da03 port r78813 from trunk fixing #8089
Benjamin Peterson <benjamin@python.org>
parents: 58788
diff changeset
94 OSX 10.5.
02e21576da03 port r78813 from trunk fixing #8089
Benjamin Peterson <benjamin@python.org>
parents: 58788
diff changeset
95
57914
94e957cfda38 Merged revisions 77031 via svnmerge from
Ronald Oussoren <ronaldoussoren@mac.com>
parents: 57718
diff changeset
96 The makefile for a framework build will install ``python32`` and ``pythonw32``
94e957cfda38 Merged revisions 77031 via svnmerge from
Ronald Oussoren <ronaldoussoren@mac.com>
parents: 57718
diff changeset
97 binaries when the universal architecures includes at least one 32-bit architecture
94e957cfda38 Merged revisions 77031 via svnmerge from
Ronald Oussoren <ronaldoussoren@mac.com>
parents: 57718
diff changeset
98 (that is, for all flavours but ``64-bit``).
94e957cfda38 Merged revisions 77031 via svnmerge from
Ronald Oussoren <ronaldoussoren@mac.com>
parents: 57718
diff changeset
99
94e957cfda38 Merged revisions 77031 via svnmerge from
Ronald Oussoren <ronaldoussoren@mac.com>
parents: 57718
diff changeset
100 Running a specific archicture
94e957cfda38 Merged revisions 77031 via svnmerge from
Ronald Oussoren <ronaldoussoren@mac.com>
parents: 57718
diff changeset
101 .............................
94e957cfda38 Merged revisions 77031 via svnmerge from
Ronald Oussoren <ronaldoussoren@mac.com>
parents: 57718
diff changeset
102
94e957cfda38 Merged revisions 77031 via svnmerge from
Ronald Oussoren <ronaldoussoren@mac.com>
parents: 57718
diff changeset
103 You can run code using a specific architecture using the ``arch`` command::
94e957cfda38 Merged revisions 77031 via svnmerge from
Ronald Oussoren <ronaldoussoren@mac.com>
parents: 57718
diff changeset
104
94e957cfda38 Merged revisions 77031 via svnmerge from
Ronald Oussoren <ronaldoussoren@mac.com>
parents: 57718
diff changeset
105 $ arch -i386 python
94e957cfda38 Merged revisions 77031 via svnmerge from
Ronald Oussoren <ronaldoussoren@mac.com>
parents: 57718
diff changeset
106
94e957cfda38 Merged revisions 77031 via svnmerge from
Ronald Oussoren <ronaldoussoren@mac.com>
parents: 57718
diff changeset
107 Or to explicitly run in 32-bit mode, regardless of the machine hardware::
94e957cfda38 Merged revisions 77031 via svnmerge from
Ronald Oussoren <ronaldoussoren@mac.com>
parents: 57718
diff changeset
108
94e957cfda38 Merged revisions 77031 via svnmerge from
Ronald Oussoren <ronaldoussoren@mac.com>
parents: 57718
diff changeset
109 $ arch -i386 -ppc python
94e957cfda38 Merged revisions 77031 via svnmerge from
Ronald Oussoren <ronaldoussoren@mac.com>
parents: 57718
diff changeset
110
94e957cfda38 Merged revisions 77031 via svnmerge from
Ronald Oussoren <ronaldoussoren@mac.com>
parents: 57718
diff changeset
111 NOTE: When you're using a framework install of Python this requires at least
94e957cfda38 Merged revisions 77031 via svnmerge from
Ronald Oussoren <ronaldoussoren@mac.com>
parents: 57718
diff changeset
112 Python 2.7 or 3.2, in earlier versions the python (and pythonw) commands are
94e957cfda38 Merged revisions 77031 via svnmerge from
Ronald Oussoren <ronaldoussoren@mac.com>
parents: 57718
diff changeset
113 wrapper tools that execute the real interpreter without ensuring that the
94e957cfda38 Merged revisions 77031 via svnmerge from
Ronald Oussoren <ronaldoussoren@mac.com>
parents: 57718
diff changeset
114 real interpreter runs with the same architecture.
38673
a19c20c5e5c7 Merge the rest of the trunk.
Thomas Wouters <thomas@python.org>
parents:
diff changeset
115
a19c20c5e5c7 Merge the rest of the trunk.
Thomas Wouters <thomas@python.org>
parents:
diff changeset
116 Building and using a framework-based Python on Mac OS X.
a19c20c5e5c7 Merge the rest of the trunk.
Thomas Wouters <thomas@python.org>
parents:
diff changeset
117 ========================================================
a19c20c5e5c7 Merge the rest of the trunk.
Thomas Wouters <thomas@python.org>
parents:
diff changeset
118
a19c20c5e5c7 Merge the rest of the trunk.
Thomas Wouters <thomas@python.org>
parents:
diff changeset
119
a19c20c5e5c7 Merge the rest of the trunk.
Thomas Wouters <thomas@python.org>
parents:
diff changeset
120 1. Why would I want a framework Python instead of a normal static Python?
a19c20c5e5c7 Merge the rest of the trunk.
Thomas Wouters <thomas@python.org>
parents:
diff changeset
121 --------------------------------------------------------------------------
a19c20c5e5c7 Merge the rest of the trunk.
Thomas Wouters <thomas@python.org>
parents:
diff changeset
122
a19c20c5e5c7 Merge the rest of the trunk.
Thomas Wouters <thomas@python.org>
parents:
diff changeset
123 The main reason is because you want to create GUI programs in Python. With the
a19c20c5e5c7 Merge the rest of the trunk.
Thomas Wouters <thomas@python.org>
parents:
diff changeset
124 exception of X11/XDarwin-based GUI toolkits all GUI programs need to be run
a19c20c5e5c7 Merge the rest of the trunk.
Thomas Wouters <thomas@python.org>
parents:
diff changeset
125 from a fullblown MacOSX application (a ".app" bundle).
a19c20c5e5c7 Merge the rest of the trunk.
Thomas Wouters <thomas@python.org>
parents:
diff changeset
126
a19c20c5e5c7 Merge the rest of the trunk.
Thomas Wouters <thomas@python.org>
parents:
diff changeset
127 While it is technically possible to create a .app without using frameworks you
a19c20c5e5c7 Merge the rest of the trunk.
Thomas Wouters <thomas@python.org>
parents:
diff changeset
128 will have to do the work yourself if you really want this.
a19c20c5e5c7 Merge the rest of the trunk.
Thomas Wouters <thomas@python.org>
parents:
diff changeset
129
a19c20c5e5c7 Merge the rest of the trunk.
Thomas Wouters <thomas@python.org>
parents:
diff changeset
130 A second reason for using frameworks is that they put Python-related items in
a19c20c5e5c7 Merge the rest of the trunk.
Thomas Wouters <thomas@python.org>
parents:
diff changeset
131 only two places: "/Library/Framework/Python.framework" and
57718
72ef3db5c6b3 Make the example paths in Mac/README no longer directly refer to 2.6.
Brett Cannon <bcannon@gmail.com>
parents: 48392
diff changeset
132 "/Applications/MacPython <VERSION>" where ``<VERSION>`` can be e.g. "2.6",
72ef3db5c6b3 Make the example paths in Mac/README no longer directly refer to 2.6.
Brett Cannon <bcannon@gmail.com>
parents: 48392
diff changeset
133 "3.1", etc.. This simplifies matters for users installing
38673
a19c20c5e5c7 Merge the rest of the trunk.
Thomas Wouters <thomas@python.org>
parents:
diff changeset
134 Python from a binary distribution if they want to get rid of it again. Moreover,
a19c20c5e5c7 Merge the rest of the trunk.
Thomas Wouters <thomas@python.org>
parents:
diff changeset
135 due to the way frameworks work a user without admin privileges can install a
a19c20c5e5c7 Merge the rest of the trunk.
Thomas Wouters <thomas@python.org>
parents:
diff changeset
136 binary distribution in his or her home directory without recompilation.
a19c20c5e5c7 Merge the rest of the trunk.
Thomas Wouters <thomas@python.org>
parents:
diff changeset
137
a19c20c5e5c7 Merge the rest of the trunk.
Thomas Wouters <thomas@python.org>
parents:
diff changeset
138 2. How does a framework Python differ from a normal static Python?
a19c20c5e5c7 Merge the rest of the trunk.
Thomas Wouters <thomas@python.org>
parents:
diff changeset
139 ------------------------------------------------------------------
a19c20c5e5c7 Merge the rest of the trunk.
Thomas Wouters <thomas@python.org>
parents:
diff changeset
140
a19c20c5e5c7 Merge the rest of the trunk.
Thomas Wouters <thomas@python.org>
parents:
diff changeset
141 In everyday use there is no difference, except that things are stored in
a19c20c5e5c7 Merge the rest of the trunk.
Thomas Wouters <thomas@python.org>
parents:
diff changeset
142 a different place. If you look in /Library/Frameworks/Python.framework
a19c20c5e5c7 Merge the rest of the trunk.
Thomas Wouters <thomas@python.org>
parents:
diff changeset
143 you will see lots of relative symlinks, see the Apple documentation for
a19c20c5e5c7 Merge the rest of the trunk.
Thomas Wouters <thomas@python.org>
parents:
diff changeset
144 details. If you are used to a normal unix Python file layout go down to
a19c20c5e5c7 Merge the rest of the trunk.
Thomas Wouters <thomas@python.org>
parents:
diff changeset
145 Versions/Current and you will see the familiar bin and lib directories.
a19c20c5e5c7 Merge the rest of the trunk.
Thomas Wouters <thomas@python.org>
parents:
diff changeset
146
a19c20c5e5c7 Merge the rest of the trunk.
Thomas Wouters <thomas@python.org>
parents:
diff changeset
147 3. Do I need extra packages?
a19c20c5e5c7 Merge the rest of the trunk.
Thomas Wouters <thomas@python.org>
parents:
diff changeset
148 ----------------------------
a19c20c5e5c7 Merge the rest of the trunk.
Thomas Wouters <thomas@python.org>
parents:
diff changeset
149
a19c20c5e5c7 Merge the rest of the trunk.
Thomas Wouters <thomas@python.org>
parents:
diff changeset
150 Yes, probably. If you want Tkinter support you need to get the OSX AquaTk
a19c20c5e5c7 Merge the rest of the trunk.
Thomas Wouters <thomas@python.org>
parents:
diff changeset
151 distribution, this is installed by default on Mac OS X 10.4 or later. If
a19c20c5e5c7 Merge the rest of the trunk.
Thomas Wouters <thomas@python.org>
parents:
diff changeset
152 you want wxPython you need to get that. If you want Cocoa you need to get
a19c20c5e5c7 Merge the rest of the trunk.
Thomas Wouters <thomas@python.org>
parents:
diff changeset
153 PyObjC.
a19c20c5e5c7 Merge the rest of the trunk.
Thomas Wouters <thomas@python.org>
parents:
diff changeset
154
a19c20c5e5c7 Merge the rest of the trunk.
Thomas Wouters <thomas@python.org>
parents:
diff changeset
155 4. How do I build a framework Python?
a19c20c5e5c7 Merge the rest of the trunk.
Thomas Wouters <thomas@python.org>
parents:
diff changeset
156 -------------------------------------
a19c20c5e5c7 Merge the rest of the trunk.
Thomas Wouters <thomas@python.org>
parents:
diff changeset
157
a19c20c5e5c7 Merge the rest of the trunk.
Thomas Wouters <thomas@python.org>
parents:
diff changeset
158 This directory contains a Makefile that will create a couple of python-related
a19c20c5e5c7 Merge the rest of the trunk.
Thomas Wouters <thomas@python.org>
parents:
diff changeset
159 applications (fullblown OSX .app applications, that is) in
57718
72ef3db5c6b3 Make the example paths in Mac/README no longer directly refer to 2.6.
Brett Cannon <bcannon@gmail.com>
parents: 48392
diff changeset
160 "/Applications/MacPython <VERSION>", and a hidden helper application Python.app
38673
a19c20c5e5c7 Merge the rest of the trunk.
Thomas Wouters <thomas@python.org>
parents:
diff changeset
161 inside the Python.framework, and unix tools "python" and "pythonw" into
a19c20c5e5c7 Merge the rest of the trunk.
Thomas Wouters <thomas@python.org>
parents:
diff changeset
162 /usr/local/bin. In addition it has a target "installmacsubtree" that installs
a19c20c5e5c7 Merge the rest of the trunk.
Thomas Wouters <thomas@python.org>
parents:
diff changeset
163 the relevant portions of the Mac subtree into the Python.framework.
a19c20c5e5c7 Merge the rest of the trunk.
Thomas Wouters <thomas@python.org>
parents:
diff changeset
164
a19c20c5e5c7 Merge the rest of the trunk.
Thomas Wouters <thomas@python.org>
parents:
diff changeset
165 It is normally invoked indirectly through the main Makefile, as the last step
a19c20c5e5c7 Merge the rest of the trunk.
Thomas Wouters <thomas@python.org>
parents:
diff changeset
166 in the sequence
a19c20c5e5c7 Merge the rest of the trunk.
Thomas Wouters <thomas@python.org>
parents:
diff changeset
167
a19c20c5e5c7 Merge the rest of the trunk.
Thomas Wouters <thomas@python.org>
parents:
diff changeset
168 1. ./configure --enable-framework
a19c20c5e5c7 Merge the rest of the trunk.
Thomas Wouters <thomas@python.org>
parents:
diff changeset
169
a19c20c5e5c7 Merge the rest of the trunk.
Thomas Wouters <thomas@python.org>
parents:
diff changeset
170 2. make
a19c20c5e5c7 Merge the rest of the trunk.
Thomas Wouters <thomas@python.org>
parents:
diff changeset
171
a19c20c5e5c7 Merge the rest of the trunk.
Thomas Wouters <thomas@python.org>
parents:
diff changeset
172 3. make install
a19c20c5e5c7 Merge the rest of the trunk.
Thomas Wouters <thomas@python.org>
parents:
diff changeset
173
a19c20c5e5c7 Merge the rest of the trunk.
Thomas Wouters <thomas@python.org>
parents:
diff changeset
174 This sequence will put the framework in /Library/Framework/Python.framework,
57718
72ef3db5c6b3 Make the example paths in Mac/README no longer directly refer to 2.6.
Brett Cannon <bcannon@gmail.com>
parents: 48392
diff changeset
175 the applications in "/Applications/MacPython <VERSION>" and the unix tools in
38673
a19c20c5e5c7 Merge the rest of the trunk.
Thomas Wouters <thomas@python.org>
parents:
diff changeset
176 /usr/local/bin.
a19c20c5e5c7 Merge the rest of the trunk.
Thomas Wouters <thomas@python.org>
parents:
diff changeset
177
a19c20c5e5c7 Merge the rest of the trunk.
Thomas Wouters <thomas@python.org>
parents:
diff changeset
178 Installing in another place, for instance $HOME/Library/Frameworks if you have
a19c20c5e5c7 Merge the rest of the trunk.
Thomas Wouters <thomas@python.org>
parents:
diff changeset
179 no admin privileges on your machine, has only been tested very lightly. This
a19c20c5e5c7 Merge the rest of the trunk.
Thomas Wouters <thomas@python.org>
parents:
diff changeset
180 can be done by configuring with --enable-framework=$HOME/Library/Frameworks.
57718
72ef3db5c6b3 Make the example paths in Mac/README no longer directly refer to 2.6.
Brett Cannon <bcannon@gmail.com>
parents: 48392
diff changeset
181 The other two directories, "/Applications/MacPython-<VERSION>" and
72ef3db5c6b3 Make the example paths in Mac/README no longer directly refer to 2.6.
Brett Cannon <bcannon@gmail.com>
parents: 48392
diff changeset
182 /usr/local/bin, will then also be deposited in $HOME. This is sub-optimal for
72ef3db5c6b3 Make the example paths in Mac/README no longer directly refer to 2.6.
Brett Cannon <bcannon@gmail.com>
parents: 48392
diff changeset
183 the unix tools, which you would want in $HOME/bin, but there is no easy way to
72ef3db5c6b3 Make the example paths in Mac/README no longer directly refer to 2.6.
Brett Cannon <bcannon@gmail.com>
parents: 48392
diff changeset
184 fix this right now.
38673
a19c20c5e5c7 Merge the rest of the trunk.
Thomas Wouters <thomas@python.org>
parents:
diff changeset
185
a19c20c5e5c7 Merge the rest of the trunk.
Thomas Wouters <thomas@python.org>
parents:
diff changeset
186 If you want to install some part, but not all, read the main Makefile. The
a19c20c5e5c7 Merge the rest of the trunk.
Thomas Wouters <thomas@python.org>
parents:
diff changeset
187 frameworkinstall is composed of a couple of sub-targets that install the
a19c20c5e5c7 Merge the rest of the trunk.
Thomas Wouters <thomas@python.org>
parents:
diff changeset
188 framework itself, the Mac subtree, the applications and the unix tools.
a19c20c5e5c7 Merge the rest of the trunk.
Thomas Wouters <thomas@python.org>
parents:
diff changeset
189
a19c20c5e5c7 Merge the rest of the trunk.
Thomas Wouters <thomas@python.org>
parents:
diff changeset
190 There is an extra target frameworkinstallextras that is not part of the
67228
fdb6bd1d5354 Remove mentions of the Demo directory.
Georg Brandl <georg@python.org>
parents: 61125
diff changeset
191 normal frameworkinstall which installs the Tools directory into
fdb6bd1d5354 Remove mentions of the Demo directory.
Georg Brandl <georg@python.org>
parents: 61125
diff changeset
192 "/Applications/MacPython <VERSION>", this is useful for binary
57718
72ef3db5c6b3 Make the example paths in Mac/README no longer directly refer to 2.6.
Brett Cannon <bcannon@gmail.com>
parents: 48392
diff changeset
193 distributions.
38673
a19c20c5e5c7 Merge the rest of the trunk.
Thomas Wouters <thomas@python.org>
parents:
diff changeset
194
a19c20c5e5c7 Merge the rest of the trunk.
Thomas Wouters <thomas@python.org>
parents:
diff changeset
195 What do all these programs do?
a19c20c5e5c7 Merge the rest of the trunk.
Thomas Wouters <thomas@python.org>
parents:
diff changeset
196 ===============================
a19c20c5e5c7 Merge the rest of the trunk.
Thomas Wouters <thomas@python.org>
parents:
diff changeset
197
a19c20c5e5c7 Merge the rest of the trunk.
Thomas Wouters <thomas@python.org>
parents:
diff changeset
198 "IDLE.app" is an integrated development environment for Python: editor,
a19c20c5e5c7 Merge the rest of the trunk.
Thomas Wouters <thomas@python.org>
parents:
diff changeset
199 debugger, etc.
a19c20c5e5c7 Merge the rest of the trunk.
Thomas Wouters <thomas@python.org>
parents:
diff changeset
200
a19c20c5e5c7 Merge the rest of the trunk.
Thomas Wouters <thomas@python.org>
parents:
diff changeset
201 "PythonLauncher.app" is a helper application that will handle things when you
a19c20c5e5c7 Merge the rest of the trunk.
Thomas Wouters <thomas@python.org>
parents:
diff changeset
202 double-click a .py, .pyc or .pyw file. For the first two it creates a Terminal
a19c20c5e5c7 Merge the rest of the trunk.
Thomas Wouters <thomas@python.org>
parents:
diff changeset
203 window and runs the scripts with the normal command-line Python. For the
a19c20c5e5c7 Merge the rest of the trunk.
Thomas Wouters <thomas@python.org>
parents:
diff changeset
204 latter it runs the script in the Python.app interpreter so the script can do
a19c20c5e5c7 Merge the rest of the trunk.
Thomas Wouters <thomas@python.org>
parents:
diff changeset
205 GUI-things. Keep the "alt" key depressed while dragging or double-clicking a
a19c20c5e5c7 Merge the rest of the trunk.
Thomas Wouters <thomas@python.org>
parents:
diff changeset
206 script to set runtime options. These options can be set once and for all
a19c20c5e5c7 Merge the rest of the trunk.
Thomas Wouters <thomas@python.org>
parents:
diff changeset
207 through PythonLauncher's preferences dialog.
a19c20c5e5c7 Merge the rest of the trunk.
Thomas Wouters <thomas@python.org>
parents:
diff changeset
208
a19c20c5e5c7 Merge the rest of the trunk.
Thomas Wouters <thomas@python.org>
parents:
diff changeset
209 The commandline scripts /usr/local/bin/python and pythonw can be used to run
a19c20c5e5c7 Merge the rest of the trunk.
Thomas Wouters <thomas@python.org>
parents:
diff changeset
210 non-GUI and GUI python scripts from the command line, respectively.
a19c20c5e5c7 Merge the rest of the trunk.
Thomas Wouters <thomas@python.org>
parents:
diff changeset
211
a19c20c5e5c7 Merge the rest of the trunk.
Thomas Wouters <thomas@python.org>
parents:
diff changeset
212 How do I create a binary distribution?
a19c20c5e5c7 Merge the rest of the trunk.
Thomas Wouters <thomas@python.org>
parents:
diff changeset
213 ======================================
a19c20c5e5c7 Merge the rest of the trunk.
Thomas Wouters <thomas@python.org>
parents:
diff changeset
214
a19c20c5e5c7 Merge the rest of the trunk.
Thomas Wouters <thomas@python.org>
parents:
diff changeset
215 Go to the directory "Mac/OSX/BuildScript". There you'll find a script
a19c20c5e5c7 Merge the rest of the trunk.
Thomas Wouters <thomas@python.org>
parents:
diff changeset
216 "build-installer.py" that does all the work. This will download and build
75793
7464c8cf7466 Issue #14346: Fix some typos in the Mac/README file.
Ned Deily <nad@acm.org>
parents: 68257
diff changeset
217 a number of 3rd-party libaries, configures and builds a framework Python,
7464c8cf7466 Issue #14346: Fix some typos in the Mac/README file.
Ned Deily <nad@acm.org>
parents: 68257
diff changeset
218 installs it, creates the installer package files and then packs this in a
38673
a19c20c5e5c7 Merge the rest of the trunk.
Thomas Wouters <thomas@python.org>
parents:
diff changeset
219 DMG image.
a19c20c5e5c7 Merge the rest of the trunk.
Thomas Wouters <thomas@python.org>
parents:
diff changeset
220
a19c20c5e5c7 Merge the rest of the trunk.
Thomas Wouters <thomas@python.org>
parents:
diff changeset
221 The script will build a universal binary, you'll therefore have to run this
a19c20c5e5c7 Merge the rest of the trunk.
Thomas Wouters <thomas@python.org>
parents:
diff changeset
222 script on Mac OS X 10.4 or later and with Xcode 2.1 or later installed.
a19c20c5e5c7 Merge the rest of the trunk.
Thomas Wouters <thomas@python.org>
parents:
diff changeset
223
a19c20c5e5c7 Merge the rest of the trunk.
Thomas Wouters <thomas@python.org>
parents:
diff changeset
224 All of this is normally done completely isolated in /tmp/_py, so it does not
a19c20c5e5c7 Merge the rest of the trunk.
Thomas Wouters <thomas@python.org>
parents:
diff changeset
225 use your normal build directory nor does it install into /.
a19c20c5e5c7 Merge the rest of the trunk.
Thomas Wouters <thomas@python.org>
parents:
diff changeset
226
a19c20c5e5c7 Merge the rest of the trunk.
Thomas Wouters <thomas@python.org>
parents:
diff changeset
227 Because of the way the script locates the files it needs you have to run it
a19c20c5e5c7 Merge the rest of the trunk.
Thomas Wouters <thomas@python.org>
parents:
diff changeset
228 from within the BuildScript directory. The script accepts a number of
a19c20c5e5c7 Merge the rest of the trunk.
Thomas Wouters <thomas@python.org>
parents:
diff changeset
229 command-line arguments, run it with --help for more information.
a19c20c5e5c7 Merge the rest of the trunk.
Thomas Wouters <thomas@python.org>
parents:
diff changeset
230
58788
b47bcca0015a Merged revisions 78063 via svnmerge from
Ronald Oussoren <ronaldoussoren@mac.com>
parents: 48392
diff changeset
231 Configure warnings
b47bcca0015a Merged revisions 78063 via svnmerge from
Ronald Oussoren <ronaldoussoren@mac.com>
parents: 48392
diff changeset
232 ==================
b47bcca0015a Merged revisions 78063 via svnmerge from
Ronald Oussoren <ronaldoussoren@mac.com>
parents: 48392
diff changeset
233
b47bcca0015a Merged revisions 78063 via svnmerge from
Ronald Oussoren <ronaldoussoren@mac.com>
parents: 48392
diff changeset
234 The configure script sometimes emits warnings like the one below::
b47bcca0015a Merged revisions 78063 via svnmerge from
Ronald Oussoren <ronaldoussoren@mac.com>
parents: 48392
diff changeset
235
b47bcca0015a Merged revisions 78063 via svnmerge from
Ronald Oussoren <ronaldoussoren@mac.com>
parents: 48392
diff changeset
236 configure: WARNING: libintl.h: present but cannot be compiled
b47bcca0015a Merged revisions 78063 via svnmerge from
Ronald Oussoren <ronaldoussoren@mac.com>
parents: 48392
diff changeset
237 configure: WARNING: libintl.h: check for missing prerequisite headers?
b47bcca0015a Merged revisions 78063 via svnmerge from
Ronald Oussoren <ronaldoussoren@mac.com>
parents: 48392
diff changeset
238 configure: WARNING: libintl.h: see the Autoconf documentation
b47bcca0015a Merged revisions 78063 via svnmerge from
Ronald Oussoren <ronaldoussoren@mac.com>
parents: 48392
diff changeset
239 configure: WARNING: libintl.h: section "Present But Cannot Be Compiled"
b47bcca0015a Merged revisions 78063 via svnmerge from
Ronald Oussoren <ronaldoussoren@mac.com>
parents: 48392
diff changeset
240 configure: WARNING: libintl.h: proceeding with the preprocessor's result
b47bcca0015a Merged revisions 78063 via svnmerge from
Ronald Oussoren <ronaldoussoren@mac.com>
parents: 48392
diff changeset
241 configure: WARNING: libintl.h: in the future, the compiler will take precedence
b47bcca0015a Merged revisions 78063 via svnmerge from
Ronald Oussoren <ronaldoussoren@mac.com>
parents: 48392
diff changeset
242 configure: WARNING: ## -------------------------------------- ##
b47bcca0015a Merged revisions 78063 via svnmerge from
Ronald Oussoren <ronaldoussoren@mac.com>
parents: 48392
diff changeset
243 configure: WARNING: ## Report this to http://bugs.python.org/ ##
b47bcca0015a Merged revisions 78063 via svnmerge from
Ronald Oussoren <ronaldoussoren@mac.com>
parents: 48392
diff changeset
244 configure: WARNING: ## -------------------------------------- ##
b47bcca0015a Merged revisions 78063 via svnmerge from
Ronald Oussoren <ronaldoussoren@mac.com>
parents: 48392
diff changeset
245
b47bcca0015a Merged revisions 78063 via svnmerge from
Ronald Oussoren <ronaldoussoren@mac.com>
parents: 48392
diff changeset
246 This almost always means you are trying to build a universal binary for
b47bcca0015a Merged revisions 78063 via svnmerge from
Ronald Oussoren <ronaldoussoren@mac.com>
parents: 48392
diff changeset
247 Python and have libaries in ``/usr/local`` that don't contain the required
b47bcca0015a Merged revisions 78063 via svnmerge from
Ronald Oussoren <ronaldoussoren@mac.com>
parents: 48392
diff changeset
248 architectures. Temporarily move ``/usr/local`` aside to finish the build.
b47bcca0015a Merged revisions 78063 via svnmerge from
Ronald Oussoren <ronaldoussoren@mac.com>
parents: 48392
diff changeset
249
61126
af810431bdac Merged revisions 80659 via svnmerge from
Ronald Oussoren <ronaldoussoren@mac.com>
parents: 59740
diff changeset
250
af810431bdac Merged revisions 80659 via svnmerge from
Ronald Oussoren <ronaldoussoren@mac.com>
parents: 59740
diff changeset
251 Uninstalling a framework install, including the binary installer
af810431bdac Merged revisions 80659 via svnmerge from
Ronald Oussoren <ronaldoussoren@mac.com>
parents: 59740
diff changeset
252 ================================================================
af810431bdac Merged revisions 80659 via svnmerge from
Ronald Oussoren <ronaldoussoren@mac.com>
parents: 59740
diff changeset
253
75793
7464c8cf7466 Issue #14346: Fix some typos in the Mac/README file.
Ned Deily <nad@acm.org>
parents: 68257
diff changeset
254 Uninstalling a framework can be done by manually removing all bits that got installed.
7464c8cf7466 Issue #14346: Fix some typos in the Mac/README file.
Ned Deily <nad@acm.org>
parents: 68257
diff changeset
255 That's true for both installations from source and installations using the binary installer.
61126
af810431bdac Merged revisions 80659 via svnmerge from
Ronald Oussoren <ronaldoussoren@mac.com>
parents: 59740
diff changeset
256 Sadly enough OSX does not have a central uninstaller.
af810431bdac Merged revisions 80659 via svnmerge from
Ronald Oussoren <ronaldoussoren@mac.com>
parents: 59740
diff changeset
257
af810431bdac Merged revisions 80659 via svnmerge from
Ronald Oussoren <ronaldoussoren@mac.com>
parents: 59740
diff changeset
258 The main bit of a framework install is the framework itself, installed in
af810431bdac Merged revisions 80659 via svnmerge from
Ronald Oussoren <ronaldoussoren@mac.com>
parents: 59740
diff changeset
259 ``/Library/Frameworks/Python.framework``. This can contain multiple versions
af810431bdac Merged revisions 80659 via svnmerge from
Ronald Oussoren <ronaldoussoren@mac.com>
parents: 59740
diff changeset
260 of Python, if you want to remove just one version you have to remove the
af810431bdac Merged revisions 80659 via svnmerge from
Ronald Oussoren <ronaldoussoren@mac.com>
parents: 59740
diff changeset
261 version-specific subdirectory: ``/Library/Frameworks/Python.framework/Versions/X.Y``.
af810431bdac Merged revisions 80659 via svnmerge from
Ronald Oussoren <ronaldoussoren@mac.com>
parents: 59740
diff changeset
262 If you do that, ensure that ``/Library/Frameworks/Python.framework/Versions/Current``
af810431bdac Merged revisions 80659 via svnmerge from
Ronald Oussoren <ronaldoussoren@mac.com>
parents: 59740
diff changeset
263 is a symlink that points to an installed version of Python.
af810431bdac Merged revisions 80659 via svnmerge from
Ronald Oussoren <ronaldoussoren@mac.com>
parents: 59740
diff changeset
264
af810431bdac Merged revisions 80659 via svnmerge from
Ronald Oussoren <ronaldoussoren@mac.com>
parents: 59740
diff changeset
265 A framework install also installs some applications in ``/Applications/Python X.Y``,
af810431bdac Merged revisions 80659 via svnmerge from
Ronald Oussoren <ronaldoussoren@mac.com>
parents: 59740
diff changeset
266
af810431bdac Merged revisions 80659 via svnmerge from
Ronald Oussoren <ronaldoussoren@mac.com>
parents: 59740
diff changeset
267 And lastly a framework installation installs files in ``/usr/local/bin``, all of
af810431bdac Merged revisions 80659 via svnmerge from
Ronald Oussoren <ronaldoussoren@mac.com>
parents: 59740
diff changeset
268 them symbolic links to files in ``/Library/Frameworks/Python.framework/Versions/X.Y/bin``.
af810431bdac Merged revisions 80659 via svnmerge from
Ronald Oussoren <ronaldoussoren@mac.com>
parents: 59740
diff changeset
269
38673
a19c20c5e5c7 Merge the rest of the trunk.
Thomas Wouters <thomas@python.org>
parents:
diff changeset
270 Odds and ends
a19c20c5e5c7 Merge the rest of the trunk.
Thomas Wouters <thomas@python.org>
parents:
diff changeset
271 =============
a19c20c5e5c7 Merge the rest of the trunk.
Thomas Wouters <thomas@python.org>
parents:
diff changeset
272
a19c20c5e5c7 Merge the rest of the trunk.
Thomas Wouters <thomas@python.org>
parents:
diff changeset
273 Something to take note of is that the ".rsrc" files in the distribution are
a19c20c5e5c7 Merge the rest of the trunk.
Thomas Wouters <thomas@python.org>
parents:
diff changeset
274 not actually resource files, they're AppleSingle encoded resource files. The
a19c20c5e5c7 Merge the rest of the trunk.
Thomas Wouters <thomas@python.org>
parents:
diff changeset
275 macresource module and the Mac/OSX/Makefile cater for this, and create
a19c20c5e5c7 Merge the rest of the trunk.
Thomas Wouters <thomas@python.org>
parents:
diff changeset
276 ".rsrc.df.rsrc" files on the fly that are normal datafork-based resource
a19c20c5e5c7 Merge the rest of the trunk.
Thomas Wouters <thomas@python.org>
parents:
diff changeset
277 files.
a19c20c5e5c7 Merge the rest of the trunk.
Thomas Wouters <thomas@python.org>
parents:
diff changeset
278
a19c20c5e5c7 Merge the rest of the trunk.
Thomas Wouters <thomas@python.org>
parents:
diff changeset
279 Jack Jansen, Jack.Jansen@cwi.nl, 15-Jul-2004.
61126
af810431bdac Merged revisions 80659 via svnmerge from
Ronald Oussoren <ronaldoussoren@mac.com>
parents: 59740
diff changeset
280 Ronald Oussoren, RonaldOussoren@mac.com, 30-April-2010