mirror of
https://github.com/python/cpython.git
synced 2025-10-25 18:54:53 +00:00
svn+ssh://pythondev@svn.python.org/python/trunk
................
r62425 | andrew.kuchling | 2008-04-21 03:45:57 +0200 (Mon, 21 Apr 2008) | 1 line
Comment typo
................
r62426 | mark.dickinson | 2008-04-21 03:55:50 +0200 (Mon, 21 Apr 2008) | 2 lines
Silence 'r may be used uninitialized' compiler warning.
................
r62427 | andrew.kuchling | 2008-04-21 04:08:00 +0200 (Mon, 21 Apr 2008) | 1 line
Markup fix
................
r62428 | andrew.kuchling | 2008-04-21 04:08:13 +0200 (Mon, 21 Apr 2008) | 1 line
Wording changes
................
r62429 | andrew.kuchling | 2008-04-21 04:14:24 +0200 (Mon, 21 Apr 2008) | 1 line
Add various items
................
r62434 | thomas.heller | 2008-04-21 15:46:55 +0200 (Mon, 21 Apr 2008) | 1 line
Fix typo.
................
r62435 | david.goodger | 2008-04-21 16:40:22 +0200 (Mon, 21 Apr 2008) | 1 line
corrections ("reStructuredText" is one word)
................
r62436 | david.goodger | 2008-04-21 16:43:33 +0200 (Mon, 21 Apr 2008) | 1 line
capitalization
................
r62441 | gregory.p.smith | 2008-04-21 19:46:40 +0200 (Mon, 21 Apr 2008) | 2 lines
explicitly flush after the ... since there wasn't a newline
................
r62444 | jeroen.ruigrok | 2008-04-21 22:15:39 +0200 (Mon, 21 Apr 2008) | 2 lines
Windows x64 also falls under VER_PLATFORM_WIN32_NT.
................
r62446 | gregory.p.smith | 2008-04-21 23:31:08 +0200 (Mon, 21 Apr 2008) | 3 lines
If sys.stdin is not a tty, fall back to default_getpass after printing
a warning instead of failing with a termios.error.
................
r62447 | mark.dickinson | 2008-04-22 00:32:24 +0200 (Tue, 22 Apr 2008) | 8 lines
test_math and test_cmath are failing on the FreeBSD 6.2 trunk buildbot,
apparently because tanh(-0.) loses the sign of zero on that platform.
If true, this is a bug in FreeBSD.
Added a configure test to verify this. I still need to figure out
how best to deal with this failure.
................
r62448 | amaury.forgeotdarc | 2008-04-22 00:35:30 +0200 (Tue, 22 Apr 2008) | 7 lines
Issue 2665: On Windows, sys.stderr does not contain a valid file when running without a console.
It seems to work, but will fail at the first flush.
This causes IDLE to crash when too many warnings are printed.
Will backport.
................
r62450 | benjamin.peterson | 2008-04-22 00:57:00 +0200 (Tue, 22 Apr 2008) | 2 lines
Fix Sphinx warnings
................
r62451 | mark.dickinson | 2008-04-22 02:54:27 +0200 (Tue, 22 Apr 2008) | 3 lines
Make configure test for tanh(-0.) == -0. committed in r62447 actually
work. (The test wasn't properly linked with libm. Sigh.)
................
r62452 | benjamin.peterson | 2008-04-22 04:16:03 +0200 (Tue, 22 Apr 2008) | 2 lines
Various io doc updates
................
r62453 | neal.norwitz | 2008-04-22 07:07:47 +0200 (Tue, 22 Apr 2008) | 1 line
Add Thomas Lee
................
r62454 | gregory.p.smith | 2008-04-22 10:08:41 +0200 (Tue, 22 Apr 2008) | 8 lines
Major improvements:
* Default to using /dev/tty for the password prompt and input before
falling back to sys.stdin and sys.stderr.
* Use sys.stderr instead of sys.stdout.
* print the 'password may be echoed' warning to stream used to display
the prompt rather than always sys.stderr.
* warn() with GetPassWarning when input may be echoed.
................
r62455 | gregory.p.smith | 2008-04-22 10:11:33 +0200 (Tue, 22 Apr 2008) | 2 lines
update the getpass entry
................
r62463 | amaury.forgeotdarc | 2008-04-22 23:14:41 +0200 (Tue, 22 Apr 2008) | 5 lines
Issue #2670: urllib2.build_opener() failed when two handlers
derive the same default base class.
Will backport.
................
r62465 | skip.montanaro | 2008-04-23 00:45:09 +0200 (Wed, 23 Apr 2008) | 3 lines
Factor in documentation changes from issue 1753732.
................
r62466 | gregory.p.smith | 2008-04-23 03:06:42 +0200 (Wed, 23 Apr 2008) | 2 lines
syntax fixup
................
r62469 | benjamin.peterson | 2008-04-23 22:38:06 +0200 (Wed, 23 Apr 2008) | 2 lines
#2673 Fix example typo in optparse docs
................
r62474 | martin.v.loewis | 2008-04-24 11:50:50 +0200 (Thu, 24 Apr 2008) | 2 lines
Add Guilherme Polo.
................
r62476 | martin.v.loewis | 2008-04-24 15:16:36 +0200 (Thu, 24 Apr 2008) | 3 lines
Remove Py_Refcnt, Py_Type, Py_Size, as they were added only
for backwards compatibility, yet 2.5 did not have them at all.
................
r62477 | martin.v.loewis | 2008-04-24 15:17:24 +0200 (Thu, 24 Apr 2008) | 2 lines
Fix typo.
................
r62478 | martin.v.loewis | 2008-04-24 15:18:03 +0200 (Thu, 24 Apr 2008) | 2 lines
Add Jesus Cea.
................
r62480 | amaury.forgeotdarc | 2008-04-24 20:07:05 +0200 (Thu, 24 Apr 2008) | 4 lines
Issue2681: the literal 0o8 was wrongly accepted, and evaluated as float(0.0).
This happened only when 8 is the first digit.
Credits go to Lukas Meuser.
................
r62485 | amaury.forgeotdarc | 2008-04-24 22:10:26 +0200 (Thu, 24 Apr 2008) | 5 lines
Disable gc when running test_trace, or we may record the __del__ of collected objects.
See http://mail.python.org/pipermail/python-checkins/2008-April/068633.html
the extra events perfectly match several calls to socket._fileobject.__del__()
................
r62492 | neal.norwitz | 2008-04-25 05:40:17 +0200 (Fri, 25 Apr 2008) | 1 line
Fix typo (now -> no)
................
r62497 | armin.rigo | 2008-04-25 11:35:18 +0200 (Fri, 25 Apr 2008) | 2 lines
A new crasher.
................
r62498 | thomas.heller | 2008-04-25 17:44:16 +0200 (Fri, 25 Apr 2008) | 1 line
Add from_buffer and from_buffer_copy class methods to ctypes types.
................
r62500 | mark.dickinson | 2008-04-25 18:59:09 +0200 (Fri, 25 Apr 2008) | 3 lines
Issue 2635: fix bug in the fix_sentence_endings option to textwrap.fill.
................
r62507 | benjamin.peterson | 2008-04-25 23:43:56 +0200 (Fri, 25 Apr 2008) | 2 lines
Allow test_import to work when it is invoked directly
................
r62513 | georg.brandl | 2008-04-26 20:31:07 +0200 (Sat, 26 Apr 2008) | 2 lines
#2691: document PyLong (s)size_t APIs, patch by Alexander Belopolsky.
................
r62514 | georg.brandl | 2008-04-26 20:32:17 +0200 (Sat, 26 Apr 2008) | 2 lines
Add missing return type to dealloc.
................
r62516 | alexandre.vassalotti | 2008-04-27 02:52:24 +0200 (Sun, 27 Apr 2008) | 2 lines
Fixed URL of PEP 205 in weakref's module docstring.
................
r62521 | georg.brandl | 2008-04-27 11:39:59 +0200 (Sun, 27 Apr 2008) | 2 lines
#2677: add note that not all functions may accept keyword args.
................
r62531 | georg.brandl | 2008-04-27 19:38:55 +0200 (Sun, 27 Apr 2008) | 2 lines
Use correct XHTML tags.
................
r62535 | benjamin.peterson | 2008-04-27 20:14:39 +0200 (Sun, 27 Apr 2008) | 2 lines
#2700 Document PyNumber_ToBase
................
r62545 | skip.montanaro | 2008-04-27 22:53:57 +0200 (Sun, 27 Apr 2008) | 1 line
minor wording changes, rewrap a few lines
................
r62546 | kurt.kaiser | 2008-04-27 23:07:41 +0200 (Sun, 27 Apr 2008) | 7 lines
Home / Control-A toggles between left margin and end of leading white
space. Patch 1196903 Jeff Shute.
M idlelib/PyShell.py
M idlelib/EditorWindow.py
M idlelib/NEWS.txt
................
r62548 | kurt.kaiser | 2008-04-27 23:38:05 +0200 (Sun, 27 Apr 2008) | 2 lines
Improved AutoCompleteWindow logic. Patch 2062 Tal Einat.
................
r62549 | kurt.kaiser | 2008-04-27 23:52:19 +0200 (Sun, 27 Apr 2008) | 4 lines
Autocompletion of filenames now support alternate separators, e.g. the
'/' char on Windows. Patch 2061 Tal Einat.
................
r62550 | skip.montanaro | 2008-04-28 00:49:56 +0200 (Mon, 28 Apr 2008) | 6 lines
A few small changes:
* The only exception we should catch when trying to import cStringIO is an
ImportError.
* Delete the function signatures embedded in the mk*temp docstrings.
* The tempdir global variable was initialized twice.
................
r62551 | skip.montanaro | 2008-04-28 00:52:02 +0200 (Mon, 28 Apr 2008) | 4 lines
Wrap some long paragraphs and include the default values for optional
function parameters.
................
r62553 | skip.montanaro | 2008-04-28 04:57:23 +0200 (Mon, 28 Apr 2008) | 7 lines
Minor cleanups:
* Avoid creating unused local variables where we can. Where we can't prefix
the unused variables with '_'.
* Avoid shadowing builtins where it won't change the external interface of a
function.
* Use None as default path arg to readmodule and readmodule_ex.
................
r62554 | skip.montanaro | 2008-04-28 04:59:45 +0200 (Mon, 28 Apr 2008) | 6 lines
Correct documentation to match implementation: "Class" instead of
"class_descriptor", "Function" instead of "function_descriptor". Note
default path value for readmodule*. Wrap some long paragraphs. Don't
mention 'inpackage' which isn't part of the public API.
................
r62555 | brett.cannon | 2008-04-28 05:23:50 +0200 (Mon, 28 Apr 2008) | 5 lines
Fix a bug introduced by the warnings rewrite where tracebacks were being
improperly indented.
Closes issue #2699.
................
r62556 | skip.montanaro | 2008-04-28 05:25:37 +0200 (Mon, 28 Apr 2008) | 2 lines
Wrap some long lines.
................
r62557 | skip.montanaro | 2008-04-28 05:27:53 +0200 (Mon, 28 Apr 2008) | 6 lines
Get rid of _test(), _main(), _debug() and _check(). Tests are no longer
needed (better set available in Lib/test/test_robotparser.py). Clean up a
few PEP 8 nits (compound statements on a single line, whitespace around
operators).
................
r62558 | brett.cannon | 2008-04-28 06:50:06 +0200 (Mon, 28 Apr 2008) | 3 lines
Rename the test_traceback_print() function to traceback_print() to prevent
test_capi from automatically calling the function.
................
r62559 | georg.brandl | 2008-04-28 07:16:30 +0200 (Mon, 28 Apr 2008) | 2 lines
Fix markup.
................
r62569 | amaury.forgeotdarc | 2008-04-28 23:07:06 +0200 (Mon, 28 Apr 2008) | 5 lines
test_sundry performs minimal tests (a simple import...) on modules that are not tested otherwise.
Some of them now have tests and can be removed.
Only 70 to go...
................
r62574 | andrew.kuchling | 2008-04-29 04:03:54 +0200 (Tue, 29 Apr 2008) | 1 line
Strip down SSL docs; I'm not managing to get test programs working, so I'll just give a minimal description
................
r62577 | martin.v.loewis | 2008-04-29 08:10:53 +0200 (Tue, 29 Apr 2008) | 2 lines
Add Rodrigo and Heiko.
................
r62593 | nick.coghlan | 2008-04-30 16:23:36 +0200 (Wed, 30 Apr 2008) | 1 line
Update command line usage documentation to reflect 2.6 changes (also includes some minor cleanups). Addresses TODO list issue 2258
................
r62595 | andrew.kuchling | 2008-04-30 18:19:55 +0200 (Wed, 30 Apr 2008) | 1 line
Typo fix
................
r62604 | benjamin.peterson | 2008-04-30 23:03:58 +0200 (Wed, 30 Apr 2008) | 2 lines
make test_support's captured_output a bit more robust when exceptions happen
................
r62605 | georg.brandl | 2008-04-30 23:08:42 +0200 (Wed, 30 Apr 2008) | 2 lines
#1748: use functools.wraps instead of rolling own metadata update.
................
r62606 | benjamin.peterson | 2008-04-30 23:25:55 +0200 (Wed, 30 Apr 2008) | 2 lines
Remove some from __future__ import with_statements
................
r62608 | benjamin.peterson | 2008-05-01 00:03:36 +0200 (Thu, 01 May 2008) | 2 lines
Fix typo in whatsnew
................
r62616 | georg.brandl | 2008-05-01 20:24:32 +0200 (Thu, 01 May 2008) | 2 lines
Fix synopsis.
................
r62626 | brett.cannon | 2008-05-02 04:25:09 +0200 (Fri, 02 May 2008) | 6 lines
Fix a backwards-compatibility mistake where a new optional argument for
warnings.showwarning() was being used. This broke pre-existing replacements for
the function since they didn't support the extra argument.
Closes issue 2705.
................
r62627 | gregory.p.smith | 2008-05-02 09:26:52 +0200 (Fri, 02 May 2008) | 20 lines
This should fix issue2632. A long description of the two competing
problems is in the bug report (one old, one recently introduced trying
to fix the old one). In short:
buffer data during socket._fileobject.read() and readlines() within a
cStringIO object instead of a [] of str()s returned from the recv()
call.
This prevents excessive memory use due to the size parameter being
passed to recv() being grossly larger than the actual size of the data
returned *and* prevents excessive cpu usage due to looping in python
calling recv() with a very tiny size value if min() is used as the
previous memory-use bug "fix" did.
It also documents what the socket._fileobject._rbufsize member is
actually used for.
This is a candidate for back porting to 2.5.
................
r62636 | mark.hammond | 2008-05-02 14:48:15 +0200 (Fri, 02 May 2008) | 2 lines
#2581: Vista UAC/elevation support for bdist_wininst
................
r62638 | facundo.batista | 2008-05-02 19:39:00 +0200 (Fri, 02 May 2008) | 3 lines
Fixed some test structures. Thanks Mark Dickinson.
................
r62644 | ronald.oussoren | 2008-05-02 21:45:11 +0200 (Fri, 02 May 2008) | 7 lines
Fix for issue #2573: Can't change the framework name on OS X builds
This introduces a new configure option: --with-framework-name=NAME
(defaulting to 'Python'). This allows you to install several copies
of the Python framework with different names (such as a normal build
and a debug build).
................
r62645 | ronald.oussoren | 2008-05-02 21:58:56 +0200 (Fri, 02 May 2008) | 2 lines
Finish fix for issue2573, previous patch was incomplete.
................
r62647 | martin.v.loewis | 2008-05-02 23:30:20 +0200 (Fri, 02 May 2008) | 13 lines
Merged revisions 62263-62646 via svnmerge from
svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3
........
r62470 | david.wolever | 2008-04-24 02:11:07 +0200 (Do, 24 Apr 2008) | 3 lines
Fixed up and applied the patch for #2431 -- speeding up 2to3 with a lookup table.
........
r62646 | martin.v.loewis | 2008-05-02 23:29:27 +0200 (Fr, 02 Mai 2008) | 2 lines
Fix whitespace.
........
................
r62648 | ronald.oussoren | 2008-05-02 23:42:35 +0200 (Fri, 02 May 2008) | 4 lines
Fix for #1905: PythonLauncher not working correctly on OSX 10.5/Leopard
This fixes both Python Launchar and the terminalcommand module.
................
r62651 | ronald.oussoren | 2008-05-02 23:54:56 +0200 (Fri, 02 May 2008) | 2 lines
Fix for issue #2520 (cannot import macerrors)
................
r62652 | benjamin.peterson | 2008-05-03 00:12:58 +0200 (Sat, 03 May 2008) | 2 lines
capitalization nit for reStructuredText
................
r62653 | brett.cannon | 2008-05-03 03:02:41 +0200 (Sat, 03 May 2008) | 2 lines
Fix some indentation errors.
................
r62656 | brett.cannon | 2008-05-03 05:19:39 +0200 (Sat, 03 May 2008) | 6 lines
Fix the C implementation of 'warnings' to infer the filename of the module that
raised an exception properly when __file__ is not set, __name__ == '__main__',
and sys.argv[0] is a false value.
Closes issue2743.
................
r62661 | amaury.forgeotdarc | 2008-05-03 14:21:13 +0200 (Sat, 03 May 2008) | 8 lines
In test_io, StatefulIncrementalDecoderTest was not part of the test suite.
And of course, the test failed:
a bytearray was used without reason in io.TextIOWrapper.tell().
The difference is that iterating over bytes (i.e. str in python2.6) returns 1-char bytes,
whereas bytearrays yield integers.
This code should still work with python3.0
................
r62663 | benjamin.peterson | 2008-05-03 17:56:42 +0200 (Sat, 03 May 2008) | 2 lines
The compiling struct is now passed around to all AST helpers (see issue 2720)
................
r62680 | benjamin.peterson | 2008-05-03 23:35:18 +0200 (Sat, 03 May 2008) | 2 lines
Moved testing of builtin types out of test_builtin and into type specific modules
................
r62686 | mark.dickinson | 2008-05-04 04:25:46 +0200 (Sun, 04 May 2008) | 4 lines
Make sure that Context traps and flags dictionaries have values 0 and 1
(as documented) rather than True and False.
................
r62687 | benjamin.peterson | 2008-05-04 05:05:49 +0200 (Sun, 04 May 2008) | 2 lines
Fix typo in whatsnew
................
r62696 | georg.brandl | 2008-05-04 11:15:04 +0200 (Sun, 04 May 2008) | 2 lines
#2752: wrong meaning of '' for socket host.
................
r62699 | christian.heimes | 2008-05-04 13:50:53 +0200 (Sun, 04 May 2008) | 1 line
Added note that Python requires at least Win2k SP4
................
r62700 | gerhard.haering | 2008-05-04 14:59:57 +0200 (Sun, 04 May 2008) | 3 lines
SQLite requires 64-bit integers in order to build. So the whole HAVE_LONG_LONG
#ifdefing was useless.
................
r62701 | gerhard.haering | 2008-05-04 15:15:12 +0200 (Sun, 04 May 2008) | 3 lines
Applied sqliterow-richcmp.diff patch from Thomas Heller in Issue2152. The
sqlite3.Row type is now correctly hashable.
................
r62702 | gerhard.haering | 2008-05-04 15:42:44 +0200 (Sun, 04 May 2008) | 5 lines
Implemented feature request 2157: Converter names are cut off at '('
characters. This avoids the common case of something like 'NUMBER(10)' not
being parsed as 'NUMBER', like expected. Also corrected the docs about
converter names being case-sensitive. They aren't any longer.
................
r62703 | georg.brandl | 2008-05-04 17:45:05 +0200 (Sun, 04 May 2008) | 2 lines
#2757: Remove spare newline.
................
r62711 | benjamin.peterson | 2008-05-04 21:10:02 +0200 (Sun, 04 May 2008) | 2 lines
Fix typo in bugs.rst
................
1067 lines
34 KiB
Python
Executable file
1067 lines
34 KiB
Python
Executable file
#!/usr/bin/python2.3
|
|
"""
|
|
This script is used to build the "official unofficial" universal build on
|
|
Mac OS X. It requires Mac OS X 10.4, Xcode 2.2 and the 10.4u SDK to do its
|
|
work.
|
|
|
|
Please ensure that this script keeps working with Python 2.3, to avoid
|
|
bootstrap issues (/usr/bin/python is Python 2.3 on OSX 10.4)
|
|
|
|
Usage: see USAGE variable in the script.
|
|
"""
|
|
import platform, os, sys, getopt, textwrap, shutil, urllib2, stat, time, pwd
|
|
import grp
|
|
|
|
INCLUDE_TIMESTAMP = 1
|
|
VERBOSE = 1
|
|
|
|
from plistlib import Plist
|
|
|
|
import MacOS
|
|
import Carbon.File
|
|
import Carbon.Icn
|
|
import Carbon.Res
|
|
from Carbon.Files import kCustomIconResource, fsRdWrPerm, kHasCustomIcon
|
|
from Carbon.Files import kFSCatInfoFinderInfo
|
|
|
|
try:
|
|
from plistlib import writePlist
|
|
except ImportError:
|
|
# We're run using python2.3
|
|
def writePlist(plist, path):
|
|
plist.write(path)
|
|
|
|
def shellQuote(value):
|
|
"""
|
|
Return the string value in a form that can safely be inserted into
|
|
a shell command.
|
|
"""
|
|
return "'%s'"%(value.replace("'", "'\"'\"'"))
|
|
|
|
def grepValue(fn, variable):
|
|
variable = variable + '='
|
|
for ln in open(fn, 'r'):
|
|
if ln.startswith(variable):
|
|
value = ln[len(variable):].strip()
|
|
return value[1:-1]
|
|
|
|
def getVersion():
|
|
return grepValue(os.path.join(SRCDIR, 'configure'), 'PACKAGE_VERSION')
|
|
|
|
def getFullVersion():
|
|
fn = os.path.join(SRCDIR, 'Include', 'patchlevel.h')
|
|
for ln in open(fn):
|
|
if 'PY_VERSION' in ln:
|
|
return ln.split()[-1][1:-1]
|
|
|
|
raise RuntimeError("Cannot find full version??")
|
|
|
|
# The directory we'll use to create the build (will be erased and recreated)
|
|
WORKDIR = "/tmp/_py"
|
|
|
|
# The directory we'll use to store third-party sources. Set this to something
|
|
# else if you don't want to re-fetch required libraries every time.
|
|
DEPSRC = os.path.join(WORKDIR, 'third-party')
|
|
DEPSRC = os.path.expanduser('~/Universal/other-sources')
|
|
|
|
# Location of the preferred SDK
|
|
SDKPATH = "/Developer/SDKs/MacOSX10.4u.sdk"
|
|
#SDKPATH = "/"
|
|
|
|
ARCHLIST = ('i386', 'ppc',)
|
|
|
|
# Source directory (asume we're in Mac/BuildScript)
|
|
SRCDIR = os.path.dirname(
|
|
os.path.dirname(
|
|
os.path.dirname(
|
|
os.path.abspath(__file__
|
|
))))
|
|
|
|
USAGE = textwrap.dedent("""\
|
|
Usage: build_python [options]
|
|
|
|
Options:
|
|
-? or -h: Show this message
|
|
-b DIR
|
|
--build-dir=DIR: Create build here (default: %(WORKDIR)r)
|
|
--third-party=DIR: Store third-party sources here (default: %(DEPSRC)r)
|
|
--sdk-path=DIR: Location of the SDK (default: %(SDKPATH)r)
|
|
--src-dir=DIR: Location of the Python sources (default: %(SRCDIR)r)
|
|
""")% globals()
|
|
|
|
|
|
# Instructions for building libraries that are necessary for building a
|
|
# batteries included python.
|
|
LIBRARY_RECIPES = [
|
|
dict(
|
|
name="Bzip2 1.0.3",
|
|
url="http://www.bzip.org/1.0.3/bzip2-1.0.3.tar.gz",
|
|
configure=None,
|
|
install='make install PREFIX=%s/usr/local/ CFLAGS="-arch %s -isysroot %s"'%(
|
|
shellQuote(os.path.join(WORKDIR, 'libraries')),
|
|
' -arch '.join(ARCHLIST),
|
|
SDKPATH,
|
|
),
|
|
),
|
|
dict(
|
|
name="ZLib 1.2.3",
|
|
url="http://www.gzip.org/zlib/zlib-1.2.3.tar.gz",
|
|
configure=None,
|
|
install='make install prefix=%s/usr/local/ CFLAGS="-arch %s -isysroot %s"'%(
|
|
shellQuote(os.path.join(WORKDIR, 'libraries')),
|
|
' -arch '.join(ARCHLIST),
|
|
SDKPATH,
|
|
),
|
|
),
|
|
dict(
|
|
# Note that GNU readline is GPL'd software
|
|
name="GNU Readline 5.1.4",
|
|
url="http://ftp.gnu.org/pub/gnu/readline/readline-5.1.tar.gz" ,
|
|
patchlevel='0',
|
|
patches=[
|
|
# The readline maintainers don't do actual micro releases, but
|
|
# just ship a set of patches.
|
|
'http://ftp.gnu.org/pub/gnu/readline/readline-5.1-patches/readline51-001',
|
|
'http://ftp.gnu.org/pub/gnu/readline/readline-5.1-patches/readline51-002',
|
|
'http://ftp.gnu.org/pub/gnu/readline/readline-5.1-patches/readline51-003',
|
|
'http://ftp.gnu.org/pub/gnu/readline/readline-5.1-patches/readline51-004',
|
|
]
|
|
),
|
|
|
|
dict(
|
|
name="SQLite 3.3.5",
|
|
url="http://www.sqlite.org/sqlite-3.3.5.tar.gz",
|
|
checksum='93f742986e8bc2dfa34792e16df017a6feccf3a2',
|
|
configure_pre=[
|
|
'--enable-threadsafe',
|
|
'--enable-tempstore',
|
|
'--enable-shared=no',
|
|
'--enable-static=yes',
|
|
'--disable-tcl',
|
|
]
|
|
),
|
|
|
|
dict(
|
|
name="NCurses 5.5",
|
|
url="http://ftp.gnu.org/pub/gnu/ncurses/ncurses-5.5.tar.gz",
|
|
configure_pre=[
|
|
"--without-cxx",
|
|
"--without-ada",
|
|
"--without-progs",
|
|
"--without-curses-h",
|
|
"--enable-shared",
|
|
"--with-shared",
|
|
"--datadir=/usr/share",
|
|
"--sysconfdir=/etc",
|
|
"--sharedstatedir=/usr/com",
|
|
"--with-terminfo-dirs=/usr/share/terminfo",
|
|
"--with-default-terminfo-dir=/usr/share/terminfo",
|
|
"--libdir=/Library/Frameworks/Python.framework/Versions/%s/lib"%(getVersion(),),
|
|
"--enable-termcap",
|
|
],
|
|
patches=[
|
|
"ncurses-5.5.patch",
|
|
],
|
|
useLDFlags=False,
|
|
install='make && make install DESTDIR=%s && cd %s/usr/local/lib && ln -fs ../../../Library/Frameworks/Python.framework/Versions/%s/lib/lib* .'%(
|
|
shellQuote(os.path.join(WORKDIR, 'libraries')),
|
|
shellQuote(os.path.join(WORKDIR, 'libraries')),
|
|
getVersion(),
|
|
),
|
|
),
|
|
dict(
|
|
name="Sleepycat DB 4.4",
|
|
url="http://downloads.sleepycat.com/db-4.4.20.tar.gz",
|
|
#name="Sleepycat DB 4.3.29",
|
|
#url="http://downloads.sleepycat.com/db-4.3.29.tar.gz",
|
|
buildDir="build_unix",
|
|
configure="../dist/configure",
|
|
configure_pre=[
|
|
'--includedir=/usr/local/include/db4',
|
|
]
|
|
),
|
|
]
|
|
|
|
|
|
# Instructions for building packages inside the .mpkg.
|
|
PKG_RECIPES = [
|
|
dict(
|
|
name="PythonFramework",
|
|
long_name="Python Framework",
|
|
source="/Library/Frameworks/Python.framework",
|
|
readme="""\
|
|
This package installs Python.framework, that is the python
|
|
interpreter and the standard library. This also includes Python
|
|
wrappers for lots of Mac OS X API's.
|
|
""",
|
|
postflight="scripts/postflight.framework",
|
|
),
|
|
dict(
|
|
name="PythonApplications",
|
|
long_name="GUI Applications",
|
|
source="/Applications/Python %(VER)s",
|
|
readme="""\
|
|
This package installs IDLE (an interactive Python IDE),
|
|
Python Launcher and Build Applet (create application bundles
|
|
from python scripts).
|
|
|
|
It also installs a number of examples and demos.
|
|
""",
|
|
required=False,
|
|
),
|
|
dict(
|
|
name="PythonUnixTools",
|
|
long_name="UNIX command-line tools",
|
|
source="/usr/local/bin",
|
|
readme="""\
|
|
This package installs the unix tools in /usr/local/bin for
|
|
compatibility with older releases of MacPython. This package
|
|
is not necessary to use MacPython.
|
|
""",
|
|
required=False,
|
|
),
|
|
dict(
|
|
name="PythonDocumentation",
|
|
long_name="Python Documentation",
|
|
topdir="/Library/Frameworks/Python.framework/Versions/%(VER)s/Resources/English.lproj/Documentation",
|
|
source="/pydocs",
|
|
readme="""\
|
|
This package installs the python documentation at a location
|
|
that is useable for pydoc and IDLE. If you have installed Xcode
|
|
it will also install a link to the documentation in
|
|
/Developer/Documentation/Python
|
|
""",
|
|
postflight="scripts/postflight.documentation",
|
|
required=False,
|
|
),
|
|
dict(
|
|
name="PythonProfileChanges",
|
|
long_name="Shell profile updater",
|
|
readme="""\
|
|
This packages updates your shell profile to make sure that
|
|
the MacPython tools are found by your shell in preference of
|
|
the system provided Python tools.
|
|
|
|
If you don't install this package you'll have to add
|
|
"/Library/Frameworks/Python.framework/Versions/%(VER)s/bin"
|
|
to your PATH by hand.
|
|
""",
|
|
postflight="scripts/postflight.patch-profile",
|
|
topdir="/Library/Frameworks/Python.framework",
|
|
source="/empty-dir",
|
|
required=False,
|
|
),
|
|
dict(
|
|
name="PythonSystemFixes",
|
|
long_name="Fix system Python",
|
|
readme="""\
|
|
This package updates the system python installation on
|
|
Mac OS X 10.3 to ensure that you can build new python extensions
|
|
using that copy of python after installing this version.
|
|
""",
|
|
postflight="../Tools/fixapplepython23.py",
|
|
topdir="/Library/Frameworks/Python.framework",
|
|
source="/empty-dir",
|
|
required=False,
|
|
)
|
|
]
|
|
|
|
def fatal(msg):
|
|
"""
|
|
A fatal error, bail out.
|
|
"""
|
|
sys.stderr.write('FATAL: ')
|
|
sys.stderr.write(msg)
|
|
sys.stderr.write('\n')
|
|
sys.exit(1)
|
|
|
|
def fileContents(fn):
|
|
"""
|
|
Return the contents of the named file
|
|
"""
|
|
return open(fn, 'rb').read()
|
|
|
|
def runCommand(commandline):
|
|
"""
|
|
Run a command and raise RuntimeError if it fails. Output is surpressed
|
|
unless the command fails.
|
|
"""
|
|
fd = os.popen(commandline, 'r')
|
|
data = fd.read()
|
|
xit = fd.close()
|
|
if xit is not None:
|
|
sys.stdout.write(data)
|
|
raise RuntimeError("command failed: %s"%(commandline,))
|
|
|
|
if VERBOSE:
|
|
sys.stdout.write(data); sys.stdout.flush()
|
|
|
|
def captureCommand(commandline):
|
|
fd = os.popen(commandline, 'r')
|
|
data = fd.read()
|
|
xit = fd.close()
|
|
if xit is not None:
|
|
sys.stdout.write(data)
|
|
raise RuntimeError("command failed: %s"%(commandline,))
|
|
|
|
return data
|
|
|
|
def checkEnvironment():
|
|
"""
|
|
Check that we're running on a supported system.
|
|
"""
|
|
|
|
if platform.system() != 'Darwin':
|
|
fatal("This script should be run on a Mac OS X 10.4 system")
|
|
|
|
if platform.release() <= '8.':
|
|
fatal("This script should be run on a Mac OS X 10.4 system")
|
|
|
|
if not os.path.exists(SDKPATH):
|
|
fatal("Please install the latest version of Xcode and the %s SDK"%(
|
|
os.path.basename(SDKPATH[:-4])))
|
|
|
|
|
|
|
|
def parseOptions(args=None):
|
|
"""
|
|
Parse arguments and update global settings.
|
|
"""
|
|
global WORKDIR, DEPSRC, SDKPATH, SRCDIR
|
|
|
|
if args is None:
|
|
args = sys.argv[1:]
|
|
|
|
try:
|
|
options, args = getopt.getopt(args, '?hb',
|
|
[ 'build-dir=', 'third-party=', 'sdk-path=' , 'src-dir='])
|
|
except getopt.error as msg:
|
|
print(msg)
|
|
sys.exit(1)
|
|
|
|
if args:
|
|
print("Additional arguments")
|
|
sys.exit(1)
|
|
|
|
for k, v in options:
|
|
if k in ('-h', '-?'):
|
|
print(USAGE)
|
|
sys.exit(0)
|
|
|
|
elif k in ('-d', '--build-dir'):
|
|
WORKDIR=v
|
|
|
|
elif k in ('--third-party',):
|
|
DEPSRC=v
|
|
|
|
elif k in ('--sdk-path',):
|
|
SDKPATH=v
|
|
|
|
elif k in ('--src-dir',):
|
|
SRCDIR=v
|
|
|
|
else:
|
|
raise NotImplementedError(k)
|
|
|
|
SRCDIR=os.path.abspath(SRCDIR)
|
|
WORKDIR=os.path.abspath(WORKDIR)
|
|
SDKPATH=os.path.abspath(SDKPATH)
|
|
DEPSRC=os.path.abspath(DEPSRC)
|
|
|
|
print("Settings:")
|
|
print(" * Source directory:", SRCDIR)
|
|
print(" * Build directory: ", WORKDIR)
|
|
print(" * SDK location: ", SDKPATH)
|
|
print(" * third-party source:", DEPSRC)
|
|
print("")
|
|
|
|
|
|
|
|
|
|
def extractArchive(builddir, archiveName):
|
|
"""
|
|
Extract a source archive into 'builddir'. Returns the path of the
|
|
extracted archive.
|
|
|
|
XXX: This function assumes that archives contain a toplevel directory
|
|
that is has the same name as the basename of the archive. This is
|
|
save enough for anything we use.
|
|
"""
|
|
curdir = os.getcwd()
|
|
try:
|
|
os.chdir(builddir)
|
|
if archiveName.endswith('.tar.gz'):
|
|
retval = os.path.basename(archiveName[:-7])
|
|
if os.path.exists(retval):
|
|
shutil.rmtree(retval)
|
|
fp = os.popen("tar zxf %s 2>&1"%(shellQuote(archiveName),), 'r')
|
|
|
|
elif archiveName.endswith('.tar.bz2'):
|
|
retval = os.path.basename(archiveName[:-8])
|
|
if os.path.exists(retval):
|
|
shutil.rmtree(retval)
|
|
fp = os.popen("tar jxf %s 2>&1"%(shellQuote(archiveName),), 'r')
|
|
|
|
elif archiveName.endswith('.tar'):
|
|
retval = os.path.basename(archiveName[:-4])
|
|
if os.path.exists(retval):
|
|
shutil.rmtree(retval)
|
|
fp = os.popen("tar xf %s 2>&1"%(shellQuote(archiveName),), 'r')
|
|
|
|
elif archiveName.endswith('.zip'):
|
|
retval = os.path.basename(archiveName[:-4])
|
|
if os.path.exists(retval):
|
|
shutil.rmtree(retval)
|
|
fp = os.popen("unzip %s 2>&1"%(shellQuote(archiveName),), 'r')
|
|
|
|
data = fp.read()
|
|
xit = fp.close()
|
|
if xit is not None:
|
|
sys.stdout.write(data)
|
|
raise RuntimeError("Cannot extract %s"%(archiveName,))
|
|
|
|
return os.path.join(builddir, retval)
|
|
|
|
finally:
|
|
os.chdir(curdir)
|
|
|
|
KNOWNSIZES = {
|
|
"http://ftp.gnu.org/pub/gnu/readline/readline-5.1.tar.gz": 7952742,
|
|
"http://downloads.sleepycat.com/db-4.4.20.tar.gz": 2030276,
|
|
}
|
|
|
|
def downloadURL(url, fname):
|
|
"""
|
|
Download the contents of the url into the file.
|
|
"""
|
|
try:
|
|
size = os.path.getsize(fname)
|
|
except OSError:
|
|
pass
|
|
else:
|
|
if KNOWNSIZES.get(url) == size:
|
|
print("Using existing file for", url)
|
|
return
|
|
fpIn = urllib2.urlopen(url)
|
|
fpOut = open(fname, 'wb')
|
|
block = fpIn.read(10240)
|
|
try:
|
|
while block:
|
|
fpOut.write(block)
|
|
block = fpIn.read(10240)
|
|
fpIn.close()
|
|
fpOut.close()
|
|
except:
|
|
try:
|
|
os.unlink(fname)
|
|
except:
|
|
pass
|
|
|
|
def buildRecipe(recipe, basedir, archList):
|
|
"""
|
|
Build software using a recipe. This function does the
|
|
'configure;make;make install' dance for C software, with a possibility
|
|
to customize this process, basically a poor-mans DarwinPorts.
|
|
"""
|
|
curdir = os.getcwd()
|
|
|
|
name = recipe['name']
|
|
url = recipe['url']
|
|
configure = recipe.get('configure', './configure')
|
|
install = recipe.get('install', 'make && make install DESTDIR=%s'%(
|
|
shellQuote(basedir)))
|
|
|
|
archiveName = os.path.split(url)[-1]
|
|
sourceArchive = os.path.join(DEPSRC, archiveName)
|
|
|
|
if not os.path.exists(DEPSRC):
|
|
os.mkdir(DEPSRC)
|
|
|
|
|
|
if os.path.exists(sourceArchive):
|
|
print("Using local copy of %s"%(name,))
|
|
|
|
else:
|
|
print("Downloading %s"%(name,))
|
|
downloadURL(url, sourceArchive)
|
|
print("Archive for %s stored as %s"%(name, sourceArchive))
|
|
|
|
print("Extracting archive for %s"%(name,))
|
|
buildDir=os.path.join(WORKDIR, '_bld')
|
|
if not os.path.exists(buildDir):
|
|
os.mkdir(buildDir)
|
|
|
|
workDir = extractArchive(buildDir, sourceArchive)
|
|
os.chdir(workDir)
|
|
if 'buildDir' in recipe:
|
|
os.chdir(recipe['buildDir'])
|
|
|
|
|
|
for fn in recipe.get('patches', ()):
|
|
if fn.startswith('http://'):
|
|
# Download the patch before applying it.
|
|
path = os.path.join(DEPSRC, os.path.basename(fn))
|
|
downloadURL(fn, path)
|
|
fn = path
|
|
|
|
fn = os.path.join(curdir, fn)
|
|
runCommand('patch -p%s < %s'%(recipe.get('patchlevel', 1),
|
|
shellQuote(fn),))
|
|
|
|
if configure is not None:
|
|
configure_args = [
|
|
"--prefix=/usr/local",
|
|
"--enable-static",
|
|
"--disable-shared",
|
|
#"CPP=gcc -arch %s -E"%(' -arch '.join(archList,),),
|
|
]
|
|
|
|
if 'configure_pre' in recipe:
|
|
args = list(recipe['configure_pre'])
|
|
if '--disable-static' in args:
|
|
configure_args.remove('--enable-static')
|
|
if '--enable-shared' in args:
|
|
configure_args.remove('--disable-shared')
|
|
configure_args.extend(args)
|
|
|
|
if recipe.get('useLDFlags', 1):
|
|
configure_args.extend([
|
|
"CFLAGS=-arch %s -isysroot %s -I%s/usr/local/include"%(
|
|
' -arch '.join(archList),
|
|
shellQuote(SDKPATH)[1:-1],
|
|
shellQuote(basedir)[1:-1],),
|
|
"LDFLAGS=-syslibroot,%s -L%s/usr/local/lib -arch %s"%(
|
|
shellQuote(SDKPATH)[1:-1],
|
|
shellQuote(basedir)[1:-1],
|
|
' -arch '.join(archList)),
|
|
])
|
|
else:
|
|
configure_args.extend([
|
|
"CFLAGS=-arch %s -isysroot %s -I%s/usr/local/include"%(
|
|
' -arch '.join(archList),
|
|
shellQuote(SDKPATH)[1:-1],
|
|
shellQuote(basedir)[1:-1],),
|
|
])
|
|
|
|
if 'configure_post' in recipe:
|
|
configure_args = configure_args = list(recipe['configure_post'])
|
|
|
|
configure_args.insert(0, configure)
|
|
configure_args = [ shellQuote(a) for a in configure_args ]
|
|
|
|
print("Running configure for %s"%(name,))
|
|
runCommand(' '.join(configure_args) + ' 2>&1')
|
|
|
|
print("Running install for %s"%(name,))
|
|
runCommand('{ ' + install + ' ;} 2>&1')
|
|
|
|
print("Done %s"%(name,))
|
|
print("")
|
|
|
|
os.chdir(curdir)
|
|
|
|
def buildLibraries():
|
|
"""
|
|
Build our dependencies into $WORKDIR/libraries/usr/local
|
|
"""
|
|
print("")
|
|
print("Building required libraries")
|
|
print("")
|
|
universal = os.path.join(WORKDIR, 'libraries')
|
|
os.mkdir(universal)
|
|
os.makedirs(os.path.join(universal, 'usr', 'local', 'lib'))
|
|
os.makedirs(os.path.join(universal, 'usr', 'local', 'include'))
|
|
|
|
for recipe in LIBRARY_RECIPES:
|
|
buildRecipe(recipe, universal, ARCHLIST)
|
|
|
|
|
|
|
|
def buildPythonDocs():
|
|
# This stores the documentation as Resources/English.lproj/Docuentation
|
|
# inside the framwork. pydoc and IDLE will pick it up there.
|
|
print("Install python documentation")
|
|
rootDir = os.path.join(WORKDIR, '_root')
|
|
version = getVersion()
|
|
docdir = os.path.join(rootDir, 'pydocs')
|
|
|
|
name = 'html-%s.tar.bz2'%(getFullVersion(),)
|
|
sourceArchive = os.path.join(DEPSRC, name)
|
|
if os.path.exists(sourceArchive):
|
|
print("Using local copy of %s"%(name,))
|
|
|
|
else:
|
|
print("Downloading %s"%(name,))
|
|
downloadURL('http://www.python.org/ftp/python/doc/%s/%s'%(
|
|
getFullVersion(), name), sourceArchive)
|
|
print("Archive for %s stored as %s"%(name, sourceArchive))
|
|
|
|
extractArchive(os.path.dirname(docdir), sourceArchive)
|
|
os.rename(
|
|
os.path.join(
|
|
os.path.dirname(docdir), 'Python-Docs-%s'%(getFullVersion(),)),
|
|
docdir)
|
|
|
|
|
|
def buildPython():
|
|
print("Building a universal python")
|
|
|
|
buildDir = os.path.join(WORKDIR, '_bld', 'python')
|
|
rootDir = os.path.join(WORKDIR, '_root')
|
|
|
|
if os.path.exists(buildDir):
|
|
shutil.rmtree(buildDir)
|
|
if os.path.exists(rootDir):
|
|
shutil.rmtree(rootDir)
|
|
os.mkdir(buildDir)
|
|
os.mkdir(rootDir)
|
|
os.mkdir(os.path.join(rootDir, 'empty-dir'))
|
|
curdir = os.getcwd()
|
|
os.chdir(buildDir)
|
|
|
|
# Not sure if this is still needed, the original build script
|
|
# claims that parts of the install assume python.exe exists.
|
|
os.symlink('python', os.path.join(buildDir, 'python.exe'))
|
|
|
|
# Extract the version from the configure file, needed to calculate
|
|
# several paths.
|
|
version = getVersion()
|
|
|
|
print("Running configure...")
|
|
runCommand("%s -C --enable-framework --enable-universalsdk=%s LDFLAGS='-g -L%s/libraries/usr/local/lib' OPT='-g -O3 -I%s/libraries/usr/local/include' 2>&1"%(
|
|
shellQuote(os.path.join(SRCDIR, 'configure')),
|
|
shellQuote(SDKPATH), shellQuote(WORKDIR)[1:-1],
|
|
shellQuote(WORKDIR)[1:-1]))
|
|
|
|
print("Running make")
|
|
runCommand("make")
|
|
|
|
print("Running make frameworkinstall")
|
|
runCommand("make frameworkinstall DESTDIR=%s"%(
|
|
shellQuote(rootDir)))
|
|
|
|
print("Running make frameworkinstallextras")
|
|
runCommand("make frameworkinstallextras DESTDIR=%s"%(
|
|
shellQuote(rootDir)))
|
|
|
|
print("Copying required shared libraries")
|
|
if os.path.exists(os.path.join(WORKDIR, 'libraries', 'Library')):
|
|
runCommand("mv %s/* %s"%(
|
|
shellQuote(os.path.join(
|
|
WORKDIR, 'libraries', 'Library', 'Frameworks',
|
|
'Python.framework', 'Versions', getVersion(),
|
|
'lib')),
|
|
shellQuote(os.path.join(WORKDIR, '_root', 'Library', 'Frameworks',
|
|
'Python.framework', 'Versions', getVersion(),
|
|
'lib'))))
|
|
|
|
print("Fix file modes")
|
|
frmDir = os.path.join(rootDir, 'Library', 'Frameworks', 'Python.framework')
|
|
gid = grp.getgrnam('admin').gr_gid
|
|
|
|
for dirpath, dirnames, filenames in os.walk(frmDir):
|
|
for dn in dirnames:
|
|
os.chmod(os.path.join(dirpath, dn), 0775)
|
|
os.chown(os.path.join(dirpath, dn), -1, gid)
|
|
|
|
|
|
for fn in filenames:
|
|
if os.path.islink(fn):
|
|
continue
|
|
|
|
# "chmod g+w $fn"
|
|
p = os.path.join(dirpath, fn)
|
|
st = os.stat(p)
|
|
os.chmod(p, stat.S_IMODE(st.st_mode) | stat.S_IWGRP)
|
|
os.chown(p, -1, gid)
|
|
|
|
# We added some directories to the search path during the configure
|
|
# phase. Remove those because those directories won't be there on
|
|
# the end-users system.
|
|
path =os.path.join(rootDir, 'Library', 'Frameworks', 'Python.framework',
|
|
'Versions', version, 'lib', 'python%s'%(version,),
|
|
'config', 'Makefile')
|
|
fp = open(path, 'r')
|
|
data = fp.read()
|
|
fp.close()
|
|
|
|
data = data.replace('-L%s/libraries/usr/local/lib'%(WORKDIR,), '')
|
|
data = data.replace('-I%s/libraries/usr/local/include'%(WORKDIR,), '')
|
|
fp = open(path, 'w')
|
|
fp.write(data)
|
|
fp.close()
|
|
|
|
# Add symlinks in /usr/local/bin, using relative links
|
|
usr_local_bin = os.path.join(rootDir, 'usr', 'local', 'bin')
|
|
to_framework = os.path.join('..', '..', '..', 'Library', 'Frameworks',
|
|
'Python.framework', 'Versions', version, 'bin')
|
|
if os.path.exists(usr_local_bin):
|
|
shutil.rmtree(usr_local_bin)
|
|
os.makedirs(usr_local_bin)
|
|
for fn in os.listdir(
|
|
os.path.join(frmDir, 'Versions', version, 'bin')):
|
|
os.symlink(os.path.join(to_framework, fn),
|
|
os.path.join(usr_local_bin, fn))
|
|
|
|
os.chdir(curdir)
|
|
|
|
|
|
|
|
def patchFile(inPath, outPath):
|
|
data = fileContents(inPath)
|
|
data = data.replace('$FULL_VERSION', getFullVersion())
|
|
data = data.replace('$VERSION', getVersion())
|
|
data = data.replace('$MACOSX_DEPLOYMENT_TARGET', '10.3 or later')
|
|
data = data.replace('$ARCHITECTURES', "i386, ppc")
|
|
data = data.replace('$INSTALL_SIZE', installSize())
|
|
|
|
# This one is not handy as a template variable
|
|
data = data.replace('$PYTHONFRAMEWORKINSTALLDIR', '/Library/Frameworks/Python.framework')
|
|
fp = open(outPath, 'wb')
|
|
fp.write(data)
|
|
fp.close()
|
|
|
|
def patchScript(inPath, outPath):
|
|
data = fileContents(inPath)
|
|
data = data.replace('@PYVER@', getVersion())
|
|
fp = open(outPath, 'wb')
|
|
fp.write(data)
|
|
fp.close()
|
|
os.chmod(outPath, 0755)
|
|
|
|
|
|
|
|
def packageFromRecipe(targetDir, recipe):
|
|
curdir = os.getcwd()
|
|
try:
|
|
# The major version (such as 2.5) is included in the package name
|
|
# because having two version of python installed at the same time is
|
|
# common.
|
|
pkgname = '%s-%s'%(recipe['name'], getVersion())
|
|
srcdir = recipe.get('source')
|
|
pkgroot = recipe.get('topdir', srcdir)
|
|
postflight = recipe.get('postflight')
|
|
readme = textwrap.dedent(recipe['readme'])
|
|
isRequired = recipe.get('required', True)
|
|
|
|
print("- building package %s"%(pkgname,))
|
|
|
|
# Substitute some variables
|
|
textvars = dict(
|
|
VER=getVersion(),
|
|
FULLVER=getFullVersion(),
|
|
)
|
|
readme = readme % textvars
|
|
|
|
if pkgroot is not None:
|
|
pkgroot = pkgroot % textvars
|
|
else:
|
|
pkgroot = '/'
|
|
|
|
if srcdir is not None:
|
|
srcdir = os.path.join(WORKDIR, '_root', srcdir[1:])
|
|
srcdir = srcdir % textvars
|
|
|
|
if postflight is not None:
|
|
postflight = os.path.abspath(postflight)
|
|
|
|
packageContents = os.path.join(targetDir, pkgname + '.pkg', 'Contents')
|
|
os.makedirs(packageContents)
|
|
|
|
if srcdir is not None:
|
|
os.chdir(srcdir)
|
|
runCommand("pax -wf %s . 2>&1"%(shellQuote(os.path.join(packageContents, 'Archive.pax')),))
|
|
runCommand("gzip -9 %s 2>&1"%(shellQuote(os.path.join(packageContents, 'Archive.pax')),))
|
|
runCommand("mkbom . %s 2>&1"%(shellQuote(os.path.join(packageContents, 'Archive.bom')),))
|
|
|
|
fn = os.path.join(packageContents, 'PkgInfo')
|
|
fp = open(fn, 'w')
|
|
fp.write('pmkrpkg1')
|
|
fp.close()
|
|
|
|
rsrcDir = os.path.join(packageContents, "Resources")
|
|
os.mkdir(rsrcDir)
|
|
fp = open(os.path.join(rsrcDir, 'ReadMe.txt'), 'w')
|
|
fp.write(readme)
|
|
fp.close()
|
|
|
|
if postflight is not None:
|
|
patchScript(postflight, os.path.join(rsrcDir, 'postflight'))
|
|
|
|
vers = getFullVersion()
|
|
major, minor = map(int, getVersion().split('.', 2))
|
|
pl = Plist(
|
|
CFBundleGetInfoString="MacPython.%s %s"%(pkgname, vers,),
|
|
CFBundleIdentifier='org.python.MacPython.%s'%(pkgname,),
|
|
CFBundleName='MacPython.%s'%(pkgname,),
|
|
CFBundleShortVersionString=vers,
|
|
IFMajorVersion=major,
|
|
IFMinorVersion=minor,
|
|
IFPkgFormatVersion=0.10000000149011612,
|
|
IFPkgFlagAllowBackRev=False,
|
|
IFPkgFlagAuthorizationAction="RootAuthorization",
|
|
IFPkgFlagDefaultLocation=pkgroot,
|
|
IFPkgFlagFollowLinks=True,
|
|
IFPkgFlagInstallFat=True,
|
|
IFPkgFlagIsRequired=isRequired,
|
|
IFPkgFlagOverwritePermissions=False,
|
|
IFPkgFlagRelocatable=False,
|
|
IFPkgFlagRestartAction="NoRestart",
|
|
IFPkgFlagRootVolumeOnly=True,
|
|
IFPkgFlagUpdateInstalledLangauges=False,
|
|
)
|
|
writePlist(pl, os.path.join(packageContents, 'Info.plist'))
|
|
|
|
pl = Plist(
|
|
IFPkgDescriptionDescription=readme,
|
|
IFPkgDescriptionTitle=recipe.get('long_name', "MacPython.%s"%(pkgname,)),
|
|
IFPkgDescriptionVersion=vers,
|
|
)
|
|
writePlist(pl, os.path.join(packageContents, 'Resources', 'Description.plist'))
|
|
|
|
finally:
|
|
os.chdir(curdir)
|
|
|
|
|
|
def makeMpkgPlist(path):
|
|
|
|
vers = getFullVersion()
|
|
major, minor = map(int, getVersion().split('.', 2))
|
|
|
|
pl = Plist(
|
|
CFBundleGetInfoString="MacPython %s"%(vers,),
|
|
CFBundleIdentifier='org.python.MacPython',
|
|
CFBundleName='MacPython',
|
|
CFBundleShortVersionString=vers,
|
|
IFMajorVersion=major,
|
|
IFMinorVersion=minor,
|
|
IFPkgFlagComponentDirectory="Contents/Packages",
|
|
IFPkgFlagPackageList=[
|
|
dict(
|
|
IFPkgFlagPackageLocation='%s-%s.pkg'%(item['name'], getVersion()),
|
|
IFPkgFlagPackageSelection='selected'
|
|
)
|
|
for item in PKG_RECIPES
|
|
],
|
|
IFPkgFormatVersion=0.10000000149011612,
|
|
IFPkgFlagBackgroundScaling="proportional",
|
|
IFPkgFlagBackgroundAlignment="left",
|
|
IFPkgFlagAuthorizationAction="RootAuthorization",
|
|
)
|
|
|
|
writePlist(pl, path)
|
|
|
|
|
|
def buildInstaller():
|
|
|
|
# Zap all compiled files
|
|
for dirpath, _, filenames in os.walk(os.path.join(WORKDIR, '_root')):
|
|
for fn in filenames:
|
|
if fn.endswith('.pyc') or fn.endswith('.pyo'):
|
|
os.unlink(os.path.join(dirpath, fn))
|
|
|
|
outdir = os.path.join(WORKDIR, 'installer')
|
|
if os.path.exists(outdir):
|
|
shutil.rmtree(outdir)
|
|
os.mkdir(outdir)
|
|
|
|
pkgroot = os.path.join(outdir, 'MacPython.mpkg', 'Contents')
|
|
pkgcontents = os.path.join(pkgroot, 'Packages')
|
|
os.makedirs(pkgcontents)
|
|
for recipe in PKG_RECIPES:
|
|
packageFromRecipe(pkgcontents, recipe)
|
|
|
|
rsrcDir = os.path.join(pkgroot, 'Resources')
|
|
|
|
fn = os.path.join(pkgroot, 'PkgInfo')
|
|
fp = open(fn, 'w')
|
|
fp.write('pmkrpkg1')
|
|
fp.close()
|
|
|
|
os.mkdir(rsrcDir)
|
|
|
|
makeMpkgPlist(os.path.join(pkgroot, 'Info.plist'))
|
|
pl = Plist(
|
|
IFPkgDescriptionTitle="Universal MacPython",
|
|
IFPkgDescriptionVersion=getVersion(),
|
|
)
|
|
|
|
writePlist(pl, os.path.join(pkgroot, 'Resources', 'Description.plist'))
|
|
for fn in os.listdir('resources'):
|
|
if fn == '.svn': continue
|
|
if fn.endswith('.jpg'):
|
|
shutil.copy(os.path.join('resources', fn), os.path.join(rsrcDir, fn))
|
|
else:
|
|
patchFile(os.path.join('resources', fn), os.path.join(rsrcDir, fn))
|
|
|
|
shutil.copy("../../LICENSE", os.path.join(rsrcDir, 'License.txt'))
|
|
|
|
|
|
def installSize(clear=False, _saved=[]):
|
|
if clear:
|
|
del _saved[:]
|
|
if not _saved:
|
|
data = captureCommand("du -ks %s"%(
|
|
shellQuote(os.path.join(WORKDIR, '_root'))))
|
|
_saved.append("%d"%((0.5 + (int(data.split()[0]) / 1024.0)),))
|
|
return _saved[0]
|
|
|
|
|
|
def buildDMG():
|
|
"""
|
|
Create DMG containing the rootDir.
|
|
"""
|
|
outdir = os.path.join(WORKDIR, 'diskimage')
|
|
if os.path.exists(outdir):
|
|
shutil.rmtree(outdir)
|
|
|
|
imagepath = os.path.join(outdir,
|
|
'python-%s-macosx'%(getFullVersion(),))
|
|
if INCLUDE_TIMESTAMP:
|
|
imagepath = imagepath + '%04d-%02d-%02d'%(time.localtime()[:3])
|
|
imagepath = imagepath + '.dmg'
|
|
|
|
os.mkdir(outdir)
|
|
runCommand("hdiutil create -volname 'Universal MacPython %s' -srcfolder %s %s"%(
|
|
getFullVersion(),
|
|
shellQuote(os.path.join(WORKDIR, 'installer')),
|
|
shellQuote(imagepath)))
|
|
|
|
return imagepath
|
|
|
|
|
|
def setIcon(filePath, icnsPath):
|
|
"""
|
|
Set the custom icon for the specified file or directory.
|
|
|
|
For a directory the icon data is written in a file named 'Icon\r' inside
|
|
the directory. For both files and directories write the icon as an 'icns'
|
|
resource. Furthermore set kHasCustomIcon in the finder flags for filePath.
|
|
"""
|
|
ref, isDirectory = Carbon.File.FSPathMakeRef(icnsPath)
|
|
icon = Carbon.Icn.ReadIconFile(ref)
|
|
del ref
|
|
|
|
#
|
|
# Open the resource fork of the target, to add the icon later on.
|
|
# For directories we use the file 'Icon\r' inside the directory.
|
|
#
|
|
|
|
ref, isDirectory = Carbon.File.FSPathMakeRef(filePath)
|
|
|
|
if isDirectory:
|
|
# There is a problem with getting this into the pax(1) archive,
|
|
# just ignore directory icons for now.
|
|
return
|
|
|
|
tmpPath = os.path.join(filePath, "Icon\r")
|
|
if not os.path.exists(tmpPath):
|
|
fp = open(tmpPath, 'w')
|
|
fp.close()
|
|
|
|
tmpRef, _ = Carbon.File.FSPathMakeRef(tmpPath)
|
|
spec = Carbon.File.FSSpec(tmpRef)
|
|
|
|
else:
|
|
spec = Carbon.File.FSSpec(ref)
|
|
|
|
try:
|
|
Carbon.Res.HCreateResFile(*spec.as_tuple())
|
|
except MacOS.Error:
|
|
pass
|
|
|
|
# Try to create the resource fork again, this will avoid problems
|
|
# when adding an icon to a directory. I have no idea why this helps,
|
|
# but without this adding the icon to a directory will fail sometimes.
|
|
try:
|
|
Carbon.Res.HCreateResFile(*spec.as_tuple())
|
|
except MacOS.Error:
|
|
pass
|
|
|
|
refNum = Carbon.Res.FSpOpenResFile(spec, fsRdWrPerm)
|
|
|
|
Carbon.Res.UseResFile(refNum)
|
|
|
|
# Check if there already is an icon, remove it if there is.
|
|
try:
|
|
h = Carbon.Res.Get1Resource('icns', kCustomIconResource)
|
|
except MacOS.Error:
|
|
pass
|
|
|
|
else:
|
|
h.RemoveResource()
|
|
del h
|
|
|
|
# Add the icon to the resource for of the target
|
|
res = Carbon.Res.Resource(icon)
|
|
res.AddResource('icns', kCustomIconResource, '')
|
|
res.WriteResource()
|
|
res.DetachResource()
|
|
Carbon.Res.CloseResFile(refNum)
|
|
|
|
# And now set the kHasCustomIcon property for the target. Annoyingly,
|
|
# python doesn't seem to have bindings for the API that is needed for
|
|
# this. Cop out and call SetFile
|
|
os.system("/Developer/Tools/SetFile -a C %s"%(
|
|
shellQuote(filePath),))
|
|
|
|
if isDirectory:
|
|
os.system('/Developer/Tools/SetFile -a V %s'%(
|
|
shellQuote(tmpPath),
|
|
))
|
|
|
|
def main():
|
|
# First parse options and check if we can perform our work
|
|
parseOptions()
|
|
checkEnvironment()
|
|
|
|
os.environ['MACOSX_DEPLOYMENT_TARGET'] = '10.3'
|
|
|
|
if os.path.exists(WORKDIR):
|
|
shutil.rmtree(WORKDIR)
|
|
os.mkdir(WORKDIR)
|
|
|
|
# Then build third-party libraries such as sleepycat DB4.
|
|
buildLibraries()
|
|
|
|
# Now build python itself
|
|
buildPython()
|
|
buildPythonDocs()
|
|
fn = os.path.join(WORKDIR, "_root", "Applications",
|
|
"MacPython %s"%(getVersion(),), "Update Shell Profile.command")
|
|
patchFile("scripts/postflight.patch-profile", fn)
|
|
os.chmod(fn, 0755)
|
|
|
|
folder = os.path.join(WORKDIR, "_root", "Applications", "MacPython %s"%(
|
|
getVersion(),))
|
|
os.chmod(folder, 0755)
|
|
setIcon(folder, "../Icons/Python Folder.icns")
|
|
|
|
# Create the installer
|
|
buildInstaller()
|
|
|
|
# And copy the readme into the directory containing the installer
|
|
patchFile('resources/ReadMe.txt', os.path.join(WORKDIR, 'installer', 'ReadMe.txt'))
|
|
|
|
# Ditto for the license file.
|
|
shutil.copy('../../LICENSE', os.path.join(WORKDIR, 'installer', 'License.txt'))
|
|
|
|
fp = open(os.path.join(WORKDIR, 'installer', 'Build.txt'), 'w')
|
|
print("# BUILD INFO", file=fp)
|
|
print("# Date:", time.ctime(), file=fp)
|
|
print("# By:", pwd.getpwuid(os.getuid()).pw_gecos, file=fp)
|
|
fp.close()
|
|
|
|
# Custom icon for the DMG, shown when the DMG is mounted.
|
|
shutil.copy("../Icons/Disk Image.icns",
|
|
os.path.join(WORKDIR, "installer", ".VolumeIcon.icns"))
|
|
os.system("/Developer/Tools/SetFile -a C %s"%(
|
|
os.path.join(WORKDIR, "installer", ".VolumeIcon.icns")))
|
|
|
|
|
|
# And copy it to a DMG
|
|
buildDMG()
|
|
|
|
|
|
if __name__ == "__main__":
|
|
main()
|