# MACOSX_DEPLOYMENT_TARGET: configure bases some choices on it so
# it needs to be compatible.
# If it isn't set we set it to the configure-time value
- if sys.platform == 'darwin' and g.has_key('CONFIGURE_MACOSX_DEPLOYMENT_TARGET'):
- cfg_target = g['CONFIGURE_MACOSX_DEPLOYMENT_TARGET']
+ if sys.platform == 'darwin' and g.has_key('MACOSX_DEPLOYMENT_TARGET'):
+ cfg_target = g['MACOSX_DEPLOYMENT_TARGET']
cur_target = os.getenv('MACOSX_DEPLOYMENT_TARGET', '')
if cur_target == '':
cur_target = cfg_target
_config_vars['prefix'] = PREFIX
_config_vars['exec_prefix'] = EXEC_PREFIX
+ if sys.platform == 'darwin':
+ kernel_version = os.uname()[2] # Kernel version (8.4.3)
+ major_version = int(kernel_version.split('.')[0])
+
+ if major_version < 8:
+ # On Mac OS X before 10.4, check if -arch and -isysroot
+ # are in CFLAGS or LDFLAGS and remove them if they are.
+ # This is needed when building extensions on a 10.3 system
+ # using a universal build of python.
+ for key in ('LDFLAGS', 'BASECFLAGS',
+ # The values below are derived from the earlier ones,
+ # but subsitution has been by now.
+ 'CFLAGS', 'PY_CFLAGS', 'BLDSHARED'):
+ flags = _config_vars[key]
+ flags = re.sub('-arch\s+\w+\s', ' ', flags)
+ flags = re.sub('-isysroot [^ \t]*', ' ', flags)
+ _config_vars[key] = flags
+
if args:
vals = []
for name in args:
# should just happily stuff them into the preprocessor/compiler/linker
# options and carry on.
+def _darwin_compiler_fixup(compiler_so, cc_args):
+ """
+ This function will strip '-isysroot PATH' and '-arch ARCH' from the
+ compile flag if the user has specified one of them in extra_compile_flags.
+
+ This is needed because '-arch ARCH' adds another architecture to the
+ build, without a way to remove an architecture. Furthermore GCC will
+ barf if multiple '-isysroot' arguments are present.
+ """
+ stripArch = stripSysroot = 0
+
+ compiler_so = list(compiler_so)
+ kernel_version = os.uname()[2] # 8.4.3
+ major_version = int(kernel_version.split('.')[0])
+
+ if major_version < 8:
+ # OSX before 10.4.0, these don't support -arch and -isysroot at
+ # all.
+ stripArch = stripSysroot = True
+ else:
+ stripArch = '-arch' in cc_args
+ stripSysroot = '-isysroot' in cc_args
+
+ if stripArch:
+ while 1:
+ try:
+ index = compiler_so.index('-arch')
+ # Strip this argument and the next one:
+ del compiler_so[index:index+2]
+ except ValueError:
+ break
+
+ if stripSysroot:
+ try:
+ index = compiler_so.index('-isysroot')
+ # Strip this argument and the next one:
+ del compiler_so[index:index+2]
+ except ValueError:
+ pass
+
+ return compiler_so
+
+
class UnixCCompiler(CCompiler):
compiler_type = 'unix'
raise CompileError, msg
def _compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts):
+ compiler_so = self.compiler_so
+ if sys.platform == 'darwin':
+ compiler_so = _darwin_compiler_fixup(compiler_so, cc_args + extra_postargs)
try:
- self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
+ self.spawn(compiler_so + cc_args + [src, '-o', obj] +
extra_postargs)
except DistutilsExecError, msg:
raise CompileError, msg
linker = self.linker_so[:]
if target_lang == "c++" and self.compiler_cxx:
linker[0] = self.compiler_cxx[0]
+
+ if sys.platform == 'darwin':
+ linker = _darwin_compiler_fixup(linker, ld_args)
+
self.spawn(linker + ld_args)
except DistutilsExecError, msg:
raise LinkError, msg
m = rel_re.match(release)
if m:
release = m.group()
+ elif osname[:6] == "darwin":
+ #
+ # For our purposes, we'll assume that the system version from
+ # distutils' perspective is what MACOSX_DEPLOYMENT_TARGET is set
+ # to. This makes the compatibility story a bit more sane because the
+ # machine is going to compile and link as if it were
+ # MACOSX_DEPLOYMENT_TARGET.
+ from distutils.sysconfig import get_config_vars
+ cfgvars = get_config_vars()
+
+ macver = os.environ.get('MACOSX_DEPLOYMENT_TARGET')
+ if not macver:
+ macver = cfgvars.get('MACOSX_DEPLOYMENT_TARGET')
+
+ if not macver:
+ # Get the system version. Reading this plist is a documented
+ # way to get the system version (see the documentation for
+ # the Gestalt Manager)
+ try:
+ f = open('/System/Library/CoreServices/SystemVersion.plist')
+ except IOError:
+ # We're on a plain darwin box, fall back to the default
+ # behaviour.
+ pass
+ else:
+ m = re.search(
+ r'<key>ProductUserVisibleVersion</key>\s*' +
+ r'<string>(.*?)</string>', f.read())
+ f.close()
+ if m is not None:
+ macver = '.'.join(m.group(1).split('.')[:2])
+ # else: fall back to the default behaviour
+
+ if macver:
+ from distutils.sysconfig import get_config_vars
+ release = macver
+ osname = 'macosx'
+ platver = os.uname()[2]
+ osmajor = int(platver.split('.')[0])
+
+ if osmajor >= 8 and \
+ get_config_vars().get('UNIVERSALSDK', '').strip():
+ # The universal build will build fat binaries, but not on
+ # systems before 10.4
+ machine = 'fat'
+
+ elif machine in ('PowerPC', 'Power_Macintosh'):
+ # Pick a sane name for the PPC architecture
+ machine = 'ppc'
return "%s-%s-%s" % (osname, release, machine)
'Python%d%d.chm' % sys.version_info[:2])
if os.path.isfile(chmfile):
dochome = chmfile
+
+ elif sys.platform == 'darwin':
+ dochome = os.path.join(sys.prefix,
+ 'Resources/English.lproj/Documentation/index.html')
dochome = os.path.normpath(dochome)
if os.path.isfile(dochome):
EditorWindow.help_url = dochome
+ if sys.platform == 'darwin':
+ # Safari requires real file:-URLs
+ EditorWindow.help_url = 'file://' + EditorWindow.help_url
else:
EditorWindow.help_url = "http://www.python.org/doc/current"
currentTheme=idleConf.CurrentTheme()
dft_icnsname = os.path.join(sys.prefix, 'Resources/Python.app/Contents/Resources/PythonApplet.icns')
if os.path.exists(dft_icnsname):
icnsname = dft_icnsname
+ else:
+ # This part will work when we're in the build environment
+ import __main__
+ dft_icnsname = os.path.join(
+ os.path.dirname(__main__.__file__),
+ 'PythonApplet.icns')
+ if os.paht.exists(dft_icnsname):
+ icnsname = dft_icnsname
+
if not os.path.exists(rsrcname):
rsrcname = None
if progress:
versioninfo = (version,stage,nonrel)
if sysa:
machine = {0x1: '68k',
- 0x2: 'PowerPC'}.get(sysa,'')
+ 0x2: 'PowerPC',
+ 0xa: 'i386'}.get(sysa,'')
return release,versioninfo,machine
def _java_getprop(name,default):
dataforkdata = 'hello\r\0world\n'
resourceforkdata = 'goodbye\ncruel\0world\r'
-applesingledata = struct.pack("ll16sh", AS_MAGIC, AS_VERSION, "foo", 2) + \
- struct.pack("llllll", 1, 50, len(dataforkdata),
+applesingledata = struct.pack(">ll16sh", AS_MAGIC, AS_VERSION, "foo", 2) + \
+ struct.pack(">llllll", 1, 50, len(dataforkdata),
2, 50+len(dataforkdata), len(resourceforkdata)) + \
dataforkdata + \
resourceforkdata
--- /dev/null
+Building a MacPython distribution
+=================================
+
+The ``build-install.py`` script creates MacPython distributions, including
+sleepycat db4, sqlite3 and readline support. It builds a complete
+framework-based Python out-of-tree, installs it in a funny place with
+$DESTROOT, massages that installation to remove .pyc files and such, creates
+an Installer package from the installation plus other files in ``resources``
+and ``scripts`` and placed that on a ``.dmg`` disk image.
+
+Here are the steps you ned to follow to build a MacPython installer:
+
+- Run ``./build-installer.py``. Optionally you can pass a number of arguments
+ to specify locations of various files. Please see the top of
+ ``build-installer.py`` for its usage.
+- When done the script will tell you where the DMG image is.
+
+The script needs to be run on Mac OS X 10.4 with Xcode 2.2 or later and
+the 10.4u SDK.
+
+When all is done, announcements can be posted to at least the following
+places:
+- pythonmac-sig@python.org
+- python-dev@python.org
+- python-announce@python.org
+- archivist@info-mac.org
+- adcnews@apple.com
+- news@macnn.com
+- http://www.macupdate.com
+- http://guide.apple.com/usindex.lasso
+- http://www.apple.com/downloads/macosx/submit
+- http://www.versiontracker.com/ (userid Jack.Jansen@oratrix.com)
+- http://www.macshareware.net (userid jackjansen)
+
+Also, check out Stephan Deibels http://pythonology.org/market contact list
--- /dev/null
+#!/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
+
+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 savely 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="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/MacPython %(VER)s",
+ readme="""\
+ This package installs IDLE (an interactive Python IDLE),
+ 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 of
+ python.
+ """,
+ postflight="../OSX/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 != 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 != 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, 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 "Runing make frameworkinstall"
+ runCommand("make frameworkinstall DESTDIR=%s"%(
+ shellQuote(rootDir)))
+
+ print "Runing make frameworkinstallextras"
+ runCommand("make frameworkinstallextras DESTDIR=%s"%(
+ shellQuote(rootDir)))
+
+ print "Copy 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')
+ for dirpath, dirnames, filenames in os.walk(frmDir):
+ for dn in dirnames:
+ os.chmod(os.path.join(dirpath, dn), 0775)
+
+ 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_IXGRP)
+
+ # 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 pacakge name
+ # because haveing 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)
+ time.sleep(1)
+ runCommand("hdiutil create -volname 'Univeral 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 >> fp, "# BUILD INFO"
+ print >> fp, "# Date:", time.ctime()
+ print >> fp, "# By:", pwd.getpwuid(os.getuid()).pw_gecos
+ 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()
--- /dev/null
+diff -r -u ncurses-5.5-orig/test/Makefile.in ncurses-5.5/test/Makefile.in
+--- ncurses-5.5-orig/test/Makefile.in 2006-03-24 12:47:40.000000000 +0100
++++ ncurses-5.5/test/Makefile.in 2006-03-24 12:47:50.000000000 +0100
+@@ -75,7 +75,7 @@
+ MATH_LIB = @MATH_LIB@
+
+ LD = @LD@
+-LINK = @LINK_TESTS@ $(LIBTOOL_LINK) $(CC) $(CFLAGS)
++LINK = @LINK_TESTS@ $(LIBTOOL_LINK) $(CC)
+
+ usFLAGS = @LD_MODEL@ @LOCAL_LDFLAGS@ @LDFLAGS@
+
+diff -ru ncurses-5.5-orig/ncurses/tinfo/read_entry.c ncurses-5.5/ncurses/tinfo/read_entry.c
+--- ncurses-5.5-orig/ncurses/tinfo/read_entry.c 2004-01-11 02:57:05.000000000 +0100
++++ ncurses-5.5/ncurses/tinfo/read_entry.c 2006-03-25 22:49:39.000000000 +0100
+@@ -474,7 +474,7 @@
+ }
+
+ /* truncate the terminal name to prevent buffer overflow */
+- (void) sprintf(ttn, "%c/%.*s", *tn, (int) sizeof(ttn) - 3, tn);
++ (void) sprintf(ttn, "%x/%.*s", *tn, (int) sizeof(ttn) - 3, tn);
+
+ /* This is System V behavior, in conjunction with our requirements for
+ * writing terminfo entries.
+diff -ru ncurses-5.5-orig/configure ncurses-5.5/configure
+--- ncurses-5.5-orig/configure 2005-09-24 23:50:50.000000000 +0200
++++ ncurses-5.5/configure 2006-03-26 22:24:59.000000000 +0200
+@@ -5027,7 +5027,7 @@
+ darwin*)
+ EXTRA_CFLAGS="-no-cpp-precomp"
+ CC_SHARED_OPTS="-dynamic"
+- MK_SHARED_LIB='$(CC) -dynamiclib -install_name $(DESTDIR)$(libdir)/`basename $@` -compatibility_version $(ABI_VERSION) -current_version $(ABI_VERSION) -o $@'
++ MK_SHARED_LIB='$(CC) $(CFLAGS) -dynamiclib -install_name $(DESTDIR)$(libdir)/`basename $@` -compatibility_version $(ABI_VERSION) -current_version $(ABI_VERSION) -o $@'
+ test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=abi
+ cf_cv_shlib_version_infix=yes
+ ;;
--- /dev/null
+This package will install MacPython $FULL_VERSION for Mac OS X
+$MACOSX_DEPLOYMENT_TARGET for the following
+architecture(s): $ARCHITECTURES.
+
+Separate installers are available for older versions
+of Mac OS X, see the homepage, below.
+
+Installation requires approximately $INSTALL_SIZE MB of disk
+space, ignore the message that it will take zero bytes.
+
+You must install onto your current boot disk, even
+though the installer does not enforce this, otherwise
+things will not work.
+
+MacPython consists of the Python programming language
+interpreter, plus a set of programs to allow easy
+access to it for Mac users (an integrated development
+environment, an applet builder), plus a set of pre-built
+extension modules that open up specific Macintosh technologies
+to Python programs (Carbon, AppleScript, Quicktime, more).
+
+The installer puts the applications in "MacPython $VERSION"
+in your Applications folder, command-line tools in
+/usr/local/bin and the underlying machinery in
+$PYTHONFRAMEWORKINSTALLDIR.
+
+More information on MacPython can be found at
+http://www.cwi.nl/~jack/macpython and
+http://pythonmac.org/. More information on
+Python in general can be found at
+http://www.python.org.
--- /dev/null
+{\rtf1\mac\ansicpg10000\cocoartf824\cocoasubrtf330
+{\fonttbl\f0\fswiss\fcharset77 Helvetica;\f1\fswiss\fcharset77 Helvetica-Bold;}
+{\colortbl;\red255\green255\blue255;}
+\paperw11900\paperh16840\margl1440\margr1440\vieww9920\viewh10660\viewkind0
+\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural
+
+\f0\fs24 \cf0 This package will install
+\f1\b MacPython $FULL_VERSION
+\f0\b0 for
+\f1\b Mac OS X $MACOSX_DEPLOYMENT_TARGET
+\f0\b0 .\
+\
+MacPython consists of the Python programming language interpreter, plus a set of programs to allow easy access to it for Mac users (an integrated development environment, an applet builder), plus a set of pre-built extension modules that open up specific Macintosh technologies to Python programs (Carbon, AppleScript, Quicktime, more).\
+\
+See the ReadMe file for more information.}
\ No newline at end of file
--- /dev/null
+#!/bin/sh
+
+# FIXME
+PYVER="@PYVER@"
+
+if [ -d /Developer/Documentation ]; then
+ if [ ! -d /Developer/Documentation/Python ]; then
+ mkdir -p /Developer/Documentation/Python
+ fi
+
+ ln -fhs /Library/Frameworks/Python.framework/Versions/${PYVER}/Resources/English.lproj/Documentation "/Developer/Documentation/Python/Reference Documentation @PYVER@"
+fi
--- /dev/null
+#!/bin/sh
+#
+# Recompile the .py files.
+#
+
+PYVER="@PYVER@"
+FWK="/Library/Frameworks/Python.framework/Versions/@PYVER@/"
+
+"${FWK}/bin/python" -Wi -tt \
+ "${FWK}/lib/python${PYVER}/compileall.py" \
+ -x badsyntax -x site-packages \
+ "${FWK}/lib/python${PYVER}"
+
+"${FWK}/bin/python" -Wi -tt -O \
+ "${FWK}/lib/python${PYVER}/compileall.py" \
+ -x badsyntax -x site-packages \
+ "${FWK}/lib/python${PYVER}"
+
+"${FWK}/bin/python" -Wi -tt \
+ "${FWK}/lib/python${PYVER}/compileall.py" \
+ -x badsyntax -x site-packages \
+ "${FWK}/Mac/Tools"
+
+"${FWK}/bin/python" -Wi -tt -O \
+ "${FWK}/lib/python${PYVER}/compileall.py" \
+ -x badsyntax -x site-packages \
+ "${FWK}/Mac/Tools"
+
+
+chown -R admin "${FWK}"
+chmod -R g+w "${FWK}"
+
+exit 0
--- /dev/null
+#!/bin/sh
+
+echo "This script will update your shell profile when the 'bin' directory"
+echo "of python is not early enough of the PATH of your shell."
+echo "These changes will be effective only in shell windows that you open"
+echo "after running this script."
+
+PYVER=@PYVER@
+PYTHON_ROOT="/Library/Frameworks/Python.framework/Versions/Current"
+
+# Make sure the directory ${PYTHON_ROOT}/bin is on the users PATH.
+BSH="`basename "${SHELL}"`"
+case "${BSH}" in
+bash|ksh|sh|*csh)
+ P="`${SHELL} -c 'echo $PATH'`"
+ ;;
+*)
+ echo "Sorry, I don't know how to patch $BSH shells"
+ exit 0
+ ;;
+esac
+
+# Now ensure that our bin directory is on $P and before /usr/bin at that
+for elem in `echo $P | tr ':' ' '`
+do
+ if [ "${elem}" == "${PYTHON_ROOT}/bin" ]; then
+ echo "All right, you're a python lover already"
+ exit 0
+ elif [ "${elem}" == "/usr/bin" ]; then
+ break
+ fi
+done
+
+echo "${PYTHON_ROOT}/bin is not on your PATH or at least not early enough"
+case "${BSH}" in
+*csh)
+ # Create backup copy before patching
+ if [ -f "${HOME}/.cshrc" ]; then
+ cp -fp "${HOME}/.cshrc" "${HOME}/.cshrc.pysave"
+ fi
+ echo "" >> "${HOME}/.cshrc"
+ echo "# Setting PATH for MacPython ${PYVER}" >> "${HOME}/.cshrc"
+ echo "# The orginal version is saved in .cshrc.pysave" >> "${HOME}/.cshrc"
+ echo "set path=(${PYTHON_ROOT}/bin "'$path'")" >> "${HOME}/.cshrc"
+ exit 0
+ ;;
+bash)
+ if [ -e "${HOME}/.profile" ]; then
+ PR="${HOME}/.profile"
+ else
+ PR="${HOME}/.bash_profile"
+ fi
+ ;;
+*sh)
+ PR="${HOME}/.profile"
+ ;;
+esac
+
+# Create backup copy before patching
+if [ -f "${PR}" ]; then
+ cp -fp "${PR}" "${PR}.pysave"
+fi
+echo "" >> "${PR}"
+echo "# Setting PATH for MacPython ${PYVER}" >> "${PR}"
+echo "# The orginal version is saved in `basename ${PR}`.pysave" >> "${PR}"
+echo 'PATH="'"${PYTHON_ROOT}/bin"':${PATH}"' >> "${PR}"
+echo 'export PATH' >> "${PR}"
+if [ `id -ur` = 0 ]; then
+ chown "${LOGNAME}" "${PR}"
+fi
+exit 0
PyObject *EventRef_New(EventRef itself);
/********** EventTypeSpec *******/
+#if 0
static PyObject*
EventTypeSpec_New(EventTypeSpec *in)
{
return Py_BuildValue("ll", in->eventClass, in->eventKind);
}
+#endif
static int
EventTypeSpec_Convert(PyObject *v, EventTypeSpec *out)
PyMac_GetOSType, &(out->eventClass),
&(out->eventKind)))
return 1;
- return NULL;
+ return 0;
}
/********** end EventTypeSpec *******/
{
if (PyArg_ParseTuple(v, "ff", &(out->x), &(out->y)))
return 1;
- return NULL;
+ return 0;
}
#endif
/********** end HIPoint *******/
/********** EventHotKeyID *******/
-
+#if 0
static PyObject*
EventHotKeyID_New(EventHotKeyID *in)
{
return Py_BuildValue("ll", in->signature, in->id);
}
+#endif
static int
EventHotKeyID_Convert(PyObject *v, EventHotKeyID *out)
PyObject *EventRef_New(EventRef itself);
/********** EventTypeSpec *******/
+#if 0
static PyObject*
EventTypeSpec_New(EventTypeSpec *in)
{
return Py_BuildValue("ll", in->eventClass, in->eventKind);
}
+#endif
static int
EventTypeSpec_Convert(PyObject *v, EventTypeSpec *out)
PyMac_GetOSType, &(out->eventClass),
&(out->eventKind)))
return 1;
- return NULL;
+ return 0;
}
/********** end EventTypeSpec *******/
/********** end HIPoint *******/
/********** EventHotKeyID *******/
-
+#if 0
static PyObject*
EventHotKeyID_New(EventHotKeyID *in)
{
return Py_BuildValue("ll", in->signature, in->id);
}
+#endif
static int
EventHotKeyID_Convert(PyObject *v, EventHotKeyID *out)
{
if (PyArg_ParseTuple(v, "ll", &out->signature, &out->id))
return 1;
- return NULL;
+ return 0;
}
/********** end EventHotKeyID *******/
if (PyString_Check(v)) {
char *cStr;
if (!PyArg_Parse(v, "es", "ascii", &cStr))
- return NULL;
+ return 0;
*p_itself = CFStringCreateWithCString((CFAllocatorRef)NULL, cStr, kCFStringEncodingASCII);
return 1;
}
if (PyString_Check(v)) {
char *cStr;
if (!PyArg_Parse(v, "es", "ascii", &cStr))
- return NULL;
+ return 0;
*p_itself = CFStringCreateWithCString((CFAllocatorRef)NULL, cStr, kCFStringEncodingASCII);
return 1;
}
if (PyString_Check(src)) {
if (!PyArg_Parse(src, "es", "ascii", &chars))
- return NULL; /* This error is more descriptive than the general one below */
+ return 0; /* This error is more descriptive than the general one below */
*dst = CFStringCreateWithCString((CFAllocatorRef)NULL, chars, kCFStringEncodingASCII);
return 1;
}
gestalt_gestalt(PyObject *self, PyObject *args)
{
OSErr iErr;
- char *str;
- int size;
OSType selector;
long response;
- if (!PyArg_Parse(args, "s#", &str, &size))
+ if (!PyArg_Parse(args, "O&", PyMac_GetOSType, &selector))
return NULL;
- if (size != 4) {
- PyErr_SetString(PyExc_TypeError, "gestalt arg must be 4-char string");
- return NULL;
- }
- selector = *(OSType*)str;
iErr = Gestalt ( selector, &response );
if (iErr != 0)
return PyMac_Error(iErr);
debug = 0
def isclean(name):
+ if name == '.svn': return 0
if name == 'CVS': return 0
if name == '.cvsignore': return 0
if name == '.DS_store': return 0
--- /dev/null
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+ <key>CFBundleDevelopmentRegion</key>
+ <string>English</string>
+ <key>CFBundleExecutable</key>
+ <string>IDLE</string>
+ <key>CFBundleGetInfoString</key>
+ <string>2.5, © 001-2006 Python Software Foundation</string>
+ <key>CFBundleIconFile</key>
+ <string>PythonApplet.icns</string>
+ <key>CFBundleIdentifier</key>
+ <string>org.python.IDLE</string>
+ <key>CFBundleInfoDictionaryVersion</key>
+ <string>6.0</string>
+ <key>CFBundleName</key>
+ <string>IDLE</string>
+ <key>CFBundlePackageType</key>
+ <string>APPL</string>
+ <key>CFBundleShortVersionString</key>
+ <string>2.5</string>
+ <key>CFBundleVersion</key>
+ <string>2.5</string>
+</dict>
+</plist>
--- /dev/null
+prefix=@prefix@
+CC=@CC@
+LD=@CC@
+BASECFLAGS=@BASECFLAGS@
+OPT=@OPT@
+CFLAGS=$(BASECFLAGS) $(OPT)
+LDFLAGS=@LDFLAGS@
+srcdir= @srcdir@
+VERSION= @VERSION@
+UNIVERSALSDK=@UNIVERSALSDK@
+builddir= ../../..
+
+RUNSHARED= @RUNSHARED@
+BUILDEXE= @BUILDEXEEXT@
+BUILDPYTHON= ../../../python$(BUILDEXE)
+
+# Deployment target selected during configure, to be checked
+# by distutils
+MACOSX_DEPLOYMENT_TARGET=@CONFIGURE_MACOSX_DEPLOYMENT_TARGET@
+@EXPORT_MACOSX_DEPLOYMENT_TARGET@export MACOSX_DEPLOYMENT_TARGET
+
+BUNDLEBULDER=$(srcdir)/../../../Lib/plat-mac/bundlebuilder.py
+
+PYTHONAPPSDIR=/Applications/MacPython $(VERSION)
+
+all: IDLE.app
+
+install: IDLE.app
+ test -d "$(DESTDIR)$(PYTHONAPPSDIR)" || mkdir -p "$(DESTDIR)$(PYTHONAPPSDIR)"
+ -test -d "$(DESTDIR)$(PYTHONAPPSDIR)/IDLE.app" && rm -r "$(DESTDIR)$(PYTHONAPPSDIR)/IDLE.app"
+ cp -PR IDLE.app "$(DESTDIR)$(PYTHONAPPSDIR)"
+ touch "$(DESTDIR)$(PYTHONAPPSDIR)/IDLE.app"
+
+clean:
+ rm -rf IDLE.app
+
+IDLE.app: \
+ $(srcdir)/../../OSXResources/app/Resources/PythonApplet.icns \
+ $(srcdir)/idlemain.py
+ rm -fr PythonLauncher.app
+ $(RUNSHARED) $(BUILDPYTHON) $(BUNDLEBULDER) \
+ --builddir=. \
+ --name=IDLE \
+ --link-exec \
+ --plist=$(srcdir)/Info.plist \
+ --mainprogram=$(srcdir)/idlemain.py \
+ --iconfile=$(srcdir)/IDLE.icns \
+ --python=$(prefix)/Resources/Python.app/Contents/MacOS/Python \
+ build
--- /dev/null
+"""
+Bootstrap script for IDLE as an application bundle.
+"""
+import sys, os
+
+from idlelib.PyShell import main
+
+# Change the current directory the user's home directory, that way we'll get
+# a more useful default location in the open/save dialogs.
+os.chdir(os.path.expanduser('~/Documents'))
+
+
+# Make sure sys.executable points to the python interpreter inside the
+# framework, instead of at the helper executable inside the application
+# bundle (the latter works, but doesn't allow access to the window server)
+sys.executable = os.path.join(sys.prefix, 'bin', 'python')
+
+# Look for the -psn argument that the launcher adds and remove it, it will
+# only confuse the IDLE startup code.
+for idx, value in enumerate(sys.argv):
+ if value.startswith('-psn_'):
+ del sys.argv[idx]
+ break
+
+#argvemulator.ArgvCollector().mainloop()
+if __name__ == '__main__':
+ main()
+++ /dev/null
-# This file can be invoked from the various frameworkinstall... targets in the
-# main Makefile. The next couple of variables are overridden on the
-# commandline in that case.
-
-VERSION=2.4
-builddir = ../..
-srcdir = ../..
-prefix=/Library/Frameworks/Python.framework/Versions/$(VERSION)
-LIBDEST=$(prefix)/lib/python$(VERSION)
-BUILDPYTHON=$(builddir)/python.exe
-DESTDIR=
-# Test whether to use xcodebuild (preferred) or pbxbuild:
-ifeq ($(shell ls /usr/bin/xcodebuild),/usr/bin/xcodebuild)
-PBXBUILD=xcodebuild
-else
-PBXBUILD=pbxbuild
-endif
-
-# These are normally glimpsed from the previous set
-bindir=/usr/local/bin
-PYTHONAPPSPATH=/Applications/MacPython-$(VERSION)
-PYTHONAPPSDIR=$(PYTHONAPPSPATH)
-APPINSTALLDIR=$(prefix)/Resources/Python.app
-
-# Variables for installing the "normal" unix binaries
-INSTALLED_PYTHON=$(prefix)/bin/python
-INSTALLED_PYTHONW=$(APPINSTALLDIR)/Contents/MacOS/Python
-
-# Items more-or-less copied from the main Makefile
-DIRMODE=755
-FILEMODE=644
-INSTALL=/usr/bin/install -c
-INSTALL_SYMLINK=ln -fsn
-INSTALL_PROGRAM=${INSTALL}
-INSTALL_SCRIPT= ${INSTALL_PROGRAM}
-INSTALL_DATA= ${INSTALL} -m ${FILEMODE}
-LN=ln
-STRIPFLAG=-s
-##OPT=-g -O3 -Wall -Wstrict-prototypes -Wno-long-double -no-cpp-precomp \
-## -fno-common -dynamic
-##INCLUDES=-I$(builddir) -I$(srcdir)/Include -I$(srcdir)/Mac/Include
-##DEFINES=
-##
-##CFLAGS=$(OPT) $(DEFINES) $(INCLUDES)
-##LDFLAGS=-F$(builddir) -framework System -framework Python -framework Carbon \
-## -framework Foundation
-##CC=cc
-##LD=cc
-CPMAC=/Developer/Tools/CpMac
-
-APPTEMPLATE=$(srcdir)/Mac/OSXResources/app
-APPSUBDIRS=MacOS Resources Resources/English.lproj \
- Resources/English.lproj/Documentation \
- Resources/English.lproj/Documentation/doc \
- Resources/English.lproj/Documentation/ide
-DOCDIR=$(srcdir)/Mac/OSXResources/app/Resources/English.lproj/Documentation
-DOCINDEX=$(DOCDIR)/"Documentation idx"
-CACHERSRC=$(srcdir)/Mac/scripts/cachersrc.py
-compileall=$(srcdir)/Lib/compileall.py
-bundlebuilder=$(srcdir)/Lib/plat-mac/bundlebuilder.py
-
-installapps: install_PythonLauncher install_Python install_BuildApplet install_IDE \
- install_IDLE install_PackageManager checkapplepython
-
-install_PythonLauncher:
- cd $(srcdir)/Mac/OSX/PythonLauncher/PythonLauncher.pbproj ; \
- $(PBXBUILD) -target PythonLauncher -buildstyle Deployment install \
- DSTROOT=$(DESTDIR)/ INSTALL_PATH=$(PYTHONAPPSPATH)
-
-install_Python:
- @if test ! -f $(DOCINDEX); then \
- echo WARNING: you should run Apple Help Indexing Tool on $(DOCDIR); \
- fi
- @for i in $(PYTHONAPPSDIR) $(APPINSTALLDIR) $(APPINSTALLDIR)/Contents; do \
- if test ! -d $(DESTDIR)$$i; then \
- echo "Creating directory $(DESTDIR)$$i"; \
- $(INSTALL) -d -m $(DIRMODE) $(DESTDIR)$$i; \
- fi;\
- done
- @for i in $(APPSUBDIRS); do \
- if test ! -d $(DESTDIR)$(APPINSTALLDIR)/Contents/$$i; then \
- echo "Creating directory $(DESTDIR)$(APPINSTALLDIR)/Contents/$$i"; \
- $(INSTALL) -d -m $(DIRMODE) $(DESTDIR)$(APPINSTALLDIR)/Contents/$$i; \
- else true; \
- fi; \
- done
- @for d in . $(APPSUBDIRS); \
- do \
- a=$(APPTEMPLATE)/$$d; \
- if test ! -d $$a; then continue; else true; fi; \
- b=$(DESTDIR)$(APPINSTALLDIR)/Contents/$$d; \
- for i in $$a/*; \
- do \
- case $$i in \
- *CVS) ;; \
- *.py[co]) ;; \
- *.orig) ;; \
- *~) ;; \
- *idx) \
- echo $(CPMAC) "$$i" $$b; \
- $(CPMAC) "$$i" $$b; \
- ;; \
- *) \
- if test -d $$i; then continue; fi; \
- if test -x $$i; then \
- echo $(INSTALL_SCRIPT) $$i $$b; \
- $(INSTALL_SCRIPT) $$i $$b; \
- else \
- echo $(INSTALL_DATA) $$i $$b; \
- $(INSTALL_DATA) $$i $$b; \
- fi;; \
- esac; \
- done; \
- done
- $(INSTALL_PROGRAM) $(STRIPFLAG) $(BUILDPYTHON) $(DESTDIR)$(APPINSTALLDIR)/Contents/MacOS/Python
-
-install_IDE:
- @if ! $(BUILDPYTHON) -c "import waste"; then \
- echo PythonIDE needs the \"waste\" extension module; \
- echo See Mac/OSX/README for details; \
- else \
- echo $(BUILDPYTHON) $(srcdir)/Mac/scripts/BuildApplet.py \
- --destroot "$(DESTDIR)" \
- --python $(INSTALLED_PYTHONW) \
- --output $(DESTDIR)$(PYTHONAPPSDIR)/PythonIDE.app --noargv \
- $(srcdir)/Mac/Tools/IDE/PythonIDE.py ; \
- $(BUILDPYTHON) $(srcdir)/Mac/scripts/BuildApplet.py \
- --destroot "$(DESTDIR)" \
- --python $(INSTALLED_PYTHONW) \
- --output $(DESTDIR)$(PYTHONAPPSDIR)/PythonIDE.app --noargv \
- $(srcdir)/Mac/Tools/IDE/PythonIDE.py; \
- fi
-
-install_PackageManager:
- @if ! $(BUILDPYTHON) -c "import waste"; then \
- echo PackageManager needs the \"waste\" extension module; \
- echo See Mac/OSX/README for details; \
- else \
- echo $(BUILDPYTHON) $(bundlebuilder) \
- --builddir $(DESTDIR)$(PYTHONAPPSDIR)/ \
- --destroot "$(DESTDIR)" \
- --python $(INSTALLED_PYTHONW) \
- --resource $(srcdir)/Mac/Tools/IDE/PythonIDE.rsrc \
- --mainprogram $(srcdir)/Mac/Tools/IDE/PackageManager.py \
- --iconfile $(srcdir)/Mac/Tools/IDE/PackageManager.icns \
- --creator Pimp build; \
- $(BUILDPYTHON) $(bundlebuilder) \
- --builddir $(DESTDIR)$(PYTHONAPPSDIR)/ \
- --destroot "$(DESTDIR)" \
- --python $(INSTALLED_PYTHONW) \
- --resource $(srcdir)/Mac/Tools/IDE/PythonIDE.rsrc \
- --mainprogram $(srcdir)/Mac/Tools/IDE/PackageManager.py \
- --iconfile $(srcdir)/Mac/Tools/IDE/PackageManager.icns \
- --creator Pimp build; \
- fi
-
-install_IDLE:
- @if ! $(BUILDPYTHON) -c "import _tkinter"; then \
- echo IDLE needs the \"Tkinter\" extension module; \
- echo See Mac/OSX/README for details; \
- else \
- echo $(BUILDPYTHON) $(srcdir)/Mac/scripts/BuildApplet.py \
- --python $(INSTALLED_PYTHONW) \
- --destroot "$(DESTDIR)" \
- --output $(DESTDIR)$(PYTHONAPPSDIR)/IDLE.app \
- --extra $(srcdir)/Lib/idlelib \
- $(srcdir)/Tools/scripts/idle ; \
- $(BUILDPYTHON) $(srcdir)/Mac/scripts/BuildApplet.py \
- --python $(INSTALLED_PYTHONW) \
- --destroot "$(DESTDIR)" \
- --output $(DESTDIR)$(PYTHONAPPSDIR)/IDLE.app \
- --extra $(srcdir)/Lib/idlelib:Contents/Resources/idlelib \
- $(srcdir)/Tools/scripts/idle ; \
- fi
-
-
-install_BuildApplet:
- $(BUILDPYTHON) $(srcdir)/Mac/scripts/BuildApplet.py \
- --destroot "$(DESTDIR)" \
- --python $(INSTALLED_PYTHONW) \
- --output $(DESTDIR)$(PYTHONAPPSDIR)/BuildApplet.app \
- $(srcdir)/Mac/scripts/BuildApplet.py
-
-MACLIBDEST=$(LIBDEST)/plat-mac
-MACTOOLSDEST=$(prefix)/Mac/Tools
-MACTOOLSSRC=$(srcdir)/Mac/Tools
-MACTOOLSSUBDIRS=IDE
-installmacsubtree:
- @for i in $(MACTOOLSDEST); \
- do \
- if test ! -d $(DESTDIR)$$i; then \
- echo "Creating directory $(DESTDIR)$$i"; \
- $(INSTALL) -d -m $(DIRMODE) $(DESTDIR)$$i; \
- else true; \
- fi; \
- done
- @for d in $(MACTOOLSSUBDIRS); \
- do \
- a=$(MACTOOLSSRC)/$$d; \
- if test ! -d $$a; then continue; else true; fi; \
- b=$(DESTDIR)$(MACTOOLSDEST)/$$d; \
- if test ! -d $$b; then \
- echo "Creating directory $$b"; \
- $(INSTALL) -d -m $(DIRMODE) $$b; \
- else true; \
- fi; \
- done
- @for d in $(MACTOOLSSUBDIRS); \
- do \
- a=$(MACTOOLSSRC)/$$d; \
- if test ! -d $$a; then continue; else true; fi; \
- b=$(DESTDIR)$(MACTOOLSDEST)/$$d; \
- for i in $$a/*; \
- do \
- case $$i in \
- *CVS) ;; \
- *.py[co]) ;; \
- *.orig) ;; \
- *~) ;; \
- *.rsrc) \
- echo $(CPMAC) $$i $$b ; \
- $(CPMAC) $$i $$b ; \
- ;; \
- *) \
- if test -d $$i; then continue; fi; \
- if test -x $$i; then \
- echo $(INSTALL_SCRIPT) $$i $$b; \
- $(INSTALL_SCRIPT) $$i $$b; \
- else \
- echo $(INSTALL_DATA) $$i $$b; \
- $(INSTALL_DATA) $$i $$b; \
- fi;; \
- esac; \
- done; \
- done
-
-
- $(BUILDPYTHON) $(CACHERSRC) -v $(DESTDIR)$(MACLIBDEST) $(DESTDIR)$(MACTOOLSDEST)
- $(BUILDPYTHON) -Wi -tt $(compileall) -d $(MACTOOLSDEST) -x badsyntax $(DESTDIR)$(MACTOOLSDEST)
- $(BUILDPYTHON) -O -Wi -tt $(compileall) -d $(MACTOOLSDEST) -x badsyntax $(DESTDIR)$(MACTOOLSDEST)
-
-#
-# We use the full name here in stead of $(INSTALLED_PYTHONW), because
-# the latter may be overridden by Makefile.jaguar when building for a pre-installed
-# /usr/bin/python
-$(APPINSTALLDIR)/Contents/MacOS/Python: install_Python
-
-# $(INSTALLED_PYTHON) has to be done by the main Makefile, we cannot do that here.
-# At least this rule will give an error if it doesn't exist.
-
-installunixtools:
- $(INSTALL) -d $(DESTDIR)$(bindir)
- $(INSTALL_SYMLINK) $(INSTALLED_PYTHON) $(DESTDIR)$(bindir)/python$(VERSION)
- $(INSTALL_SYMLINK) python$(VERSION) $(DESTDIR)$(bindir)/python
- echo "#!/bin/sh" > pythonw.sh
- echo "exec \"$(INSTALLED_PYTHONW)\" \"\$$@\"" >> pythonw.sh
- $(INSTALL) pythonw.sh $(DESTDIR)$(bindir)/pythonw$(VERSION)
- $(INSTALL_SYMLINK) pythonw$(VERSION) $(DESTDIR)$(bindir)/pythonw
-
-installextras:
- $(INSTALL) -d $(DESTDIR)$(PYTHONAPPSDIR)/Extras
- $(INSTALL) $(srcdir)/Mac/OSX/Extras.ReadMe.txt $(DESTDIR)$(PYTHONAPPSDIR)/Extras/ReadMe
- $(BUILDPYTHON) $(srcdir)/Mac/OSX/Extras.install.py $(srcdir)/Demo \
- $(DESTDIR)$(PYTHONAPPSDIR)/Extras/Demo
- $(BUILDPYTHON) $(srcdir)/Mac/OSX/Extras.install.py $(srcdir)/Tools \
- $(DESTDIR)$(PYTHONAPPSDIR)/Extras/Tools
-
-checkapplepython:
- @if ! $(BUILDPYTHON) $(srcdir)/Mac/OSX/fixapplepython23.py -n; then \
- echo "* WARNING: Apple-installed Python 2.3 will have trouble building extensions from now on."; \
- echo "* WARNING: Run $(srcdir)/Mac/OSX/fixapplepython23.py with \"sudo\" to fix this."; \
- fi
-
--- /dev/null
+# This file can be invoked from the various frameworkinstall... targets in the
+# main Makefile. The next couple of variables are overridden on the
+# commandline in that case.
+
+VERSION=@VERSION@
+builddir = ../..
+srcdir = @srcdir@
+prefix=/Library/Frameworks/Python.framework/Versions/$(VERSION)
+LIBDEST=$(prefix)/lib/python$(VERSION)
+BUILDPYTHON=$(builddir)/python.exe
+RUNSHARED= @RUNSHARED@
+DESTDIR=
+LDFLAGS=@LDFLAGS@
+FRAMEWORKUNIXTOOLSPREFIX=@FRAMEWORKUNIXTOOLSPREFIX@
+
+
+# These are normally glimpsed from the previous set
+bindir=@exec_prefix@/bin
+PYTHONAPPSPATH=/Applications/MacPython $(VERSION)
+PYTHONAPPSDIR=$(PYTHONAPPSPATH)
+APPINSTALLDIR=$(prefix)/Resources/Python.app
+
+# Variables for installing the "normal" unix binaries
+INSTALLED_PYDOC=$(prefix)/bin/pydoc
+INSTALLED_PYTHON=$(prefix)/bin/python
+INSTALLED_PYTHONW=$(prefix)/bin/pythonw
+INSTALLED_PYTHONAPP=$(APPINSTALLDIR)/Contents/MacOS/Python
+
+# Items more-or-less copied from the main Makefile
+DIRMODE=755
+FILEMODE=644
+INSTALL=@INSTALL@
+INSTALL_SYMLINK=ln -fsn
+INSTALL_PROGRAM=@INSTALL_PROGRAM@
+INSTALL_SCRIPT=@INSTALL_SCRIPT@
+INSTALL_DATA=@INSTALL_DATA@
+LN=@LN@
+STRIPFLAG=-s
+CPMAC=/Developer/Tools/CpMac
+
+APPTEMPLATE=$(srcdir)/../OSXResources/app
+APPSUBDIRS=MacOS Resources Resources/English.lproj \
+ Resources/English.lproj/Documentation \
+ Resources/English.lproj/Documentation/doc \
+ Resources/English.lproj/Documentation/ide
+DOCDIR=$(srcdir)/../OSXResources/app/Resources/English.lproj/Documentation
+DOCINDEX=$(DOCDIR)/"Documentation idx"
+CACHERSRC=$(srcdir)/../scripts/cachersrc.py
+compileall=$(srcdir)/../../Lib/compileall.py
+
+installapps: install_PythonLauncher install_Python install_BuildApplet install_IDE \
+ install_IDLE install_PackageManager checkapplepython install_pythonw \
+ install_versionedtools
+
+install_pythonw: pythonw
+ $(INSTALL_PROGRAM) $(STRIPFLAG) pythonw "$(DESTDIR)$(prefix)/bin/pythonw$(VERSION)"
+ $(INSTALL_PROGRAM) $(STRIPFLAG) pythonw "$(DESTDIR)$(prefix)/bin/python$(VERSION)"
+ ln -sf python$(VERSION) "$(DESTDIR)$(prefix)/bin/python"
+ ln -sf pythonw$(VERSION) "$(DESTDIR)$(prefix)/bin/pythonw"
+
+pythonw: $(srcdir)/pythonw.c
+ $(CC) $(LDFLAGS) -o $@ $(srcdir)/pythonw.c \
+ -DPYTHONWEXECUTABLE='"$(APPINSTALLDIR)/Contents/MacOS/Python"'
+
+install_PythonLauncher:
+ cd PythonLauncher && make install
+
+install_Python:
+ @if test ! -f $(DOCINDEX); then \
+ echo WARNING: you should run Apple Help Indexing Tool on $(DOCDIR); \
+ fi
+ @for i in "$(PYTHONAPPSDIR)" "$(APPINSTALLDIR)" "$(APPINSTALLDIR)/Contents"; do \
+ if test ! -d $(DESTDIR)$$i; then \
+ echo "Creating directory $(DESTDIR)$$i"; \
+ $(INSTALL) -d -m $(DIRMODE) "$(DESTDIR)$$i"; \
+ fi;\
+ done
+ @for i in $(APPSUBDIRS); do \
+ if test ! -d $(DESTDIR)$(APPINSTALLDIR)/Contents/$$i; then \
+ echo "Creating directory $(DESTDIR)$(APPINSTALLDIR)/Contents/$$i"; \
+ $(INSTALL) -d -m $(DIRMODE) "$(DESTDIR)$(APPINSTALLDIR)/Contents/$$i"; \
+ else true; \
+ fi; \
+ done
+ @for d in . $(APPSUBDIRS); \
+ do \
+ a=$(APPTEMPLATE)/$$d; \
+ if test ! -d $$a; then continue; else true; fi; \
+ b="$(DESTDIR)$(APPINSTALLDIR)/Contents/$$d"; \
+ for i in $$a/*; \
+ do \
+ case $$i in \
+ *CVS) ;; \
+ *.py[co]) ;; \
+ *.orig) ;; \
+ *~) ;; \
+ *idx) \
+ echo $(CPMAC) "$$i" $$b; \
+ $(CPMAC) "$$i" $$b; \
+ ;; \
+ *) \
+ if test -d "$$i"; then continue; fi; \
+ if test -x "$$i"; then \
+ echo $(INSTALL_SCRIPT) "$$i" "$$b"; \
+ $(INSTALL_SCRIPT) "$$i" "$$b"; \
+ else \
+ echo $(INSTALL_DATA) "$$i" "$$b"; \
+ $(INSTALL_DATA) "$$i" "$$b"; \
+ fi;; \
+ esac; \
+ done; \
+ done
+ $(INSTALL_PROGRAM) $(STRIPFLAG) "$(BUILDPYTHON)" "$(DESTDIR)$(APPINSTALLDIR)/Contents/MacOS/Python"
+
+install_IDE:
+ @if ! $(RUNSHARED) $(BUILDPYTHON) -c "import waste"; then \
+ echo PythonIDE needs the \"waste\" extension module; \
+ echo See Mac/OSX/README for details; \
+ else \
+ echo $(RUNSHARED) $(BUILDPYTHON) $(srcdir)/../scripts/BuildApplet.py \
+ --destroot "$(DESTDIR)" \
+ --python "$(INSTALLED_PYTHONAPP)" \
+ --output "$(DESTDIR)$(PYTHONAPPSDIR)/PythonIDE.app" --noargv \
+ $(srcdir)/Mac/Tools/IDE/PythonIDE.py ; \
+ $(RUNSHARED) $(BUILDPYTHON) $(srcdir)/../scripts/BuildApplet.py \
+ --destroot "$(DESTDIR)" \
+ --python "$(INSTALLED_PYTHONAPP)" \
+ --output "$(DESTDIR)$(PYTHONAPPSDIR)/PythonIDE.app" --noargv \
+ $(srcdir)/Mac/Tools/IDE/PythonIDE.py; \
+ fi
+
+install_PackageManager:
+ @if ! $(RUNSHARED) $(BUILDPYTHON) -c "import waste"; then \
+ echo PackageManager needs the \"waste\" extension module; \
+ echo See Mac/OSX/README for details; \
+ else \
+ echo $(RUNSHARED) $(BUILDPYTHON) $(bundlebuilder) \
+ --builddir $(DESTDIR)$(PYTHONAPPSDIR)/ \
+ --destroot "$(DESTDIR)" \
+ --python $(INSTALLED_PYTHONAPP) \
+ --resource $(srcdir)/Mac/Tools/IDE/PythonIDE.rsrc \
+ --mainprogram $(srcdir)/Mac/Tools/IDE/PackageManager.py \
+ --iconfile $(srcdir)/Mac/Tools/IDE/PackageManager.icns \
+ --creator Pimp build; \
+ $(RUNSHARED) $(BUILDPYTHON) $(bundlebuilder) \
+ --builddir $(DESTDIR)$(PYTHONAPPSDIR)/ \
+ --destroot "$(DESTDIR)" \
+ --python $(INSTALLED_PYTHONAPP) \
+ --resource $(srcdir)/Mac/Tools/IDE/PythonIDE.rsrc \
+ --mainprogram $(srcdir)/Mac/Tools/IDE/PackageManager.py \
+ --iconfile $(srcdir)/Mac/Tools/IDE/PackageManager.icns \
+ --creator Pimp build; \
+ fi
+
+install_IDLE:
+ @if ! $(RUNSHARED) $(BUILDPYTHON) -c "import _tkinter"; then \
+ echo IDLE needs the \"Tkinter\" extension module; \
+ echo See Mac/OSX/README for details; \
+ else \
+ cd IDLE && make install ;\
+ fi
+
+
+install_BuildApplet:
+ $(RUNSHARED) $(BUILDPYTHON) $(srcdir)/../scripts/BuildApplet.py \
+ --destroot "$(DESTDIR)" \
+ --python "$(INSTALLED_PYTHONAPP)" \
+ --output "$(DESTDIR)$(PYTHONAPPSDIR)/BuildApplet.app" \
+ "$(srcdir)/../scripts/BuildApplet.py"
+
+MACLIBDEST=$(LIBDEST)/plat-mac
+MACTOOLSDEST=$(prefix)/Mac/Tools
+MACTOOLSSRC=$(srcdir)/Mac/Tools
+MACTOOLSSUBDIRS=IDE
+installmacsubtree:
+ @for i in $(MACTOOLSDEST); \
+ do \
+ if test ! -d $(DESTDIR)$$i; then \
+ echo "Creating directory $(DESTDIR)$$i"; \
+ $(INSTALL) -d -m $(DIRMODE) $(DESTDIR)$$i; \
+ else true; \
+ fi; \
+ done
+ @for d in $(MACTOOLSSUBDIRS); \
+ do \
+ a=$(MACTOOLSSRC)/$$d; \
+ if test ! -d $$a; then continue; else true; fi; \
+ b=$(DESTDIR)$(MACTOOLSDEST)/$$d; \
+ if test ! -d $$b; then \
+ echo "Creating directory $$b"; \
+ $(INSTALL) -d -m $(DIRMODE) $$b; \
+ else true; \
+ fi; \
+ done
+ @for d in $(MACTOOLSSUBDIRS); \
+ do \
+ a=$(MACTOOLSSRC)/$$d; \
+ if test ! -d $$a; then continue; else true; fi; \
+ b=$(DESTDIR)$(MACTOOLSDEST)/$$d; \
+ for i in $$a/*; \
+ do \
+ case $$i in \
+ *CVS) ;; \
+ *.py[co]) ;; \
+ *.orig) ;; \
+ *~) ;; \
+ *.rsrc) \
+ echo $(CPMAC) $$i $$b ; \
+ $(CPMAC) $$i $$b ; \
+ ;; \
+ *) \
+ if test -d $$i; then continue; fi; \
+ if test -x $$i; then \
+ echo $(INSTALL_SCRIPT) $$i $$b; \
+ $(INSTALL_SCRIPT) $$i $$b; \
+ else \
+ echo $(INSTALL_DATA) $$i $$b; \
+ $(INSTALL_DATA) $$i $$b; \
+ fi;; \
+ esac; \
+ done; \
+ done
+
+
+ $(RUNSHARED) $(BUILDPYTHON) $(CACHERSRC) -v $(DESTDIR)$(MACLIBDEST) $(DESTDIR)$(MACTOOLSDEST)
+ $(RUNSHARED) $(BUILDPYTHON) -Wi -tt $(compileall) -d $(MACTOOLSDEST) -x badsyntax $(DESTDIR)$(MACTOOLSDEST)
+ $(RUNSHARED) $(BUILDPYTHON) -O -Wi -tt $(compileall) -d $(MACTOOLSDEST) -x badsyntax $(DESTDIR)$(MACTOOLSDEST)
+
+#
+# We use the full name here in stead of $(INSTALLED_PYTHONAPP), because
+# the latter may be overridden by Makefile.jaguar when building for a pre-installed
+# /usr/bin/python
+$(APPINSTALLDIR)/Contents/MacOS/Python: install_Python
+
+# $(INSTALLED_PYTHON) has to be done by the main Makefile, we cannot do that here.
+# At least this rule will give an error if it doesn't exist.
+
+installunixtools:
+ if [ ! -d "$(DESTDIR)$(FRAMEWORKUNIXTOOLSPREFIX)/bin" ]; then \
+ $(INSTALL) -d -m $(DIRMODE) "$(DESTDIR)$(FRAMEWORKUNIXTOOLSPREFIX)/bin" ;\
+ fi
+ for fn in python pythonw idle pydoc smtpd.py \
+ python$(VERSION) pythonw$(VERSION) idle$(VERSION) \
+ pydoc$(VERSION) smtpd$(VERSION).py ;\
+ do \
+ ln -fs "$(prefix)/bin/$${fn}" "$(DESTDIR)$(FRAMEWORKUNIXTOOLSPREFIX)/bin/$${fn}" ;\
+ done
+
+#
+# Like installunixtools, but only install links to the versioned binaries.
+
+altinstallunixtools:
+ if [ ! -d "$(DESTDIR)$(FRAMEWORKUNIXTOOLSPREFIX)/bin" ]; then \
+ $(INSTALL) -d -m $(DIRMODE) "$(DESTDIR)$(FRAMEWORKUNIXTOOLSPREFIX)/bin" ;\
+ fi
+ for fn in python$(VERSION) pythonw$(VERSION) idle$(VERSION) \
+ pydoc$(VERSION) smtpd$(VERSION).py ;\
+ do \
+ ln -fs "$(prefix)/bin/$${fn}" "$(DESTDIR)$(FRAMEWORKUNIXTOOLSPREFIX)/bin/$${fn}" ;\
+ done
+
+
+
+installextras:$(srcdir)/Extras.ReadMe.txt $(srcdir)/Extras.install.py
+ $(INSTALL) -d "$(DESTDIR)$(PYTHONAPPSDIR)/Extras"
+ $(INSTALL) $(srcdir)/Extras.ReadMe.txt "$(DESTDIR)$(PYTHONAPPSDIR)/Extras/ReadMe"
+ $(RUNSHARED) $(BUILDPYTHON) $(srcdir)/Extras.install.py $(srcdir)/../Demo \
+ "$(DESTDIR)$(PYTHONAPPSDIR)/Extras/Demo.Mac"
+ $(RUNSHARED) $(BUILDPYTHON) $(srcdir)/Extras.install.py $(srcdir)/../../Demo \
+ "$(DESTDIR)$(PYTHONAPPSDIR)/Extras/Demo"
+
+checkapplepython:
+ @if ! $(RUNSHARED) $(BUILDPYTHON) $(srcdir)/fixapplepython23.py -n; then \
+ echo "* WARNING: Apple-installed Python 2.3 will have trouble building extensions from now on."; \
+ echo "* WARNING: Run $(srcdir)/fixapplepython23.py with \"sudo\" to fix this."; \
+ fi
+
+# By default most tools are installed without a version in their basename, to
+# make it easier to install (and use) several python versions side-by-side move
+# the tools to a version-specific name and add the non-versioned name as an
+# alias.
+install_versionedtools:
+ for fn in idle pydoc ;\
+ do \
+ if [ -h "$(DESTDIR)$(prefix)/bin/$${fn}" ]; then \
+ continue ;\
+ fi ;\
+ mv "$(DESTDIR)$(prefix)/bin/$${fn}" "$(DESTDIR)$(prefix)/bin/$${fn}$(VERSION)" ;\
+ ln -sf "$${fn}$(VERSION)" "$(DESTDIR)$(prefix)/bin/$${fn}" ;\
+ done
+ if [ ! -h "$(DESTDIR)$(prefix)/bin/smtpd.py" ]; then \
+ mv "$(DESTDIR)$(prefix)/bin/smtpd.py" "$(DESTDIR)$(prefix)/bin/smtpd$(VERSION).py" ;\
+ ln -sf "smtpd$(VERSION).py" "$(DESTDIR)$(prefix)/bin/smtpd.py" ;\
+ fi
[NSNumber numberWithBool: inspect], @"inspect",
[NSNumber numberWithBool: optimize], @"optimize",
[NSNumber numberWithBool: nosite], @"nosite",
- [NSNumber numberWithBool: nosite], @"nosite",
+ [NSNumber numberWithBool: tabs], @"tabs",
others, @"others",
scriptargs, @"scriptargs",
[NSNumber numberWithBool: with_terminal], @"with_terminal",
if (value) optimize = [value boolValue];
value = [dict objectForKey: @"nosite"];
if (value) nosite = [value boolValue];
- value = [dict objectForKey: @"nosite"];
+ value = [dict objectForKey: @"tabs"];
if (value) tabs = [value boolValue];
value = [dict objectForKey: @"others"];
if (value) others = [value retain];
if (value) with_terminal = [value boolValue];
}
+- (NSString*)_replaceSingleQuotes: (NSString*)string
+{
+ /* Replace all single-quotes by '"'"', that way shellquoting will
+ * be correct when the result value is delimited using single quotes.
+ */
+ NSArray* components = [string componentsSeparatedByString:@"'"];
+
+ return [components componentsJoinedByString:@"'\"'\"'"];
+}
+
- (NSString *)commandLineForScript: (NSString *)script
{
NSString *cur_interp = NULL;
+ NSString* script_dir = NULL;
char hashbangbuf[1024];
FILE *fp;
char *p;
+
+ script_dir = [script substringToIndex:
+ [script length]-[[script lastPathComponent] length]];
if (honourhashbang &&
(fp=fopen([script cString], "r")) &&
cur_interp = interpreter;
return [NSString stringWithFormat:
- @"\"%@\"%s%s%s%s%s%s %@ \"%@\" %@ %s",
- cur_interp,
+ @"cd '%@' && '%@'%s%s%s%s%s%s %@ '%@' %@ %s",
+ [self _replaceSingleQuotes:script_dir],
+ [self _replaceSingleQuotes:cur_interp],
debug?" -d":"",
verbose?" -v":"",
inspect?" -i":"",
nosite?" -S":"",
tabs?" -t":"",
others,
- script,
+ [self _replaceSingleQuotes:script],
scriptargs,
with_terminal? "&& echo Exit status: $? && exit 1" : " &"];
}
--- /dev/null
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+ <key>CFBundleDevelopmentRegion</key>
+ <string>English</string>
+ <key>CFBundleDocumentTypes</key>
+ <array>
+ <dict>
+ <key>CFBundleTypeExtensions</key>
+ <array>
+ <string>py</string>
+ <string>pyw</string>
+ </array>
+ <key>CFBundleTypeIconFile</key>
+ <string>PythonSource.icns</string>
+ <key>CFBundleTypeName</key>
+ <string>Python Script</string>
+ <key>CFBundleTypeRole</key>
+ <string>Viewer</string>
+ <key>NSDocumentClass</key>
+ <string>MyDocument</string>
+ </dict>
+ <dict>
+ <key>CFBundleTypeExtensions</key>
+ <array>
+ <string>pyc</string>
+ <string>pyo</string>
+ </array>
+ <key>CFBundleTypeIconFile</key>
+ <string>PythonCompiled.icns</string>
+ <key>CFBundleTypeName</key>
+ <string>Python Bytecode Document</string>
+ <key>CFBundleTypeRole</key>
+ <string>Viewer</string>
+ <key>NSDocumentClass</key>
+ <string>MyDocument</string>
+ </dict>
+ </array>
+ <key>CFBundleExecutable</key>
+ <string>PythonLauncher</string>
+ <key>CFBundleGetInfoString</key>
+ <string>2.4, © 2001-2006 Python Software Foundation</string>
+ <key>CFBundleIconFile</key>
+ <string>PythonInterpreter.icns</string>
+ <key>CFBundleIdentifier</key>
+ <string>org.python.PythonLauncher</string>
+ <key>CFBundleInfoDictionaryVersion</key>
+ <string>6.0</string>
+ <key>CFBundleName</key>
+ <string>Python Launcher</string>
+ <key>CFBundlePackageType</key>
+ <string>APPL</string>
+ <key>CFBundleShortVersionString</key>
+ <string>2.4</string>
+ <key>CFBundleSignature</key>
+ <string>PytL</string>
+ <key>CFBundleVersion</key>
+ <string>2.4</string>
+ <key>NSMainNibFile</key>
+ <string>MainMenu</string>
+ <key>NSPrincipalClass</key>
+ <string>NSApplication</string>
+</dict>
+</plist>
--- /dev/null
+CC=@CC@
+LD=@CC@
+BASECFLAGS=@BASECFLAGS@
+OPT=@OPT@
+CFLAGS=$(BASECFLAGS) $(OPT)
+LDFLAGS=@LDFLAGS@
+srcdir= @srcdir@
+VERSION= @VERSION@
+UNIVERSALSDK=@UNIVERSALSDK@
+builddir= ../../..
+
+RUNSHARED= @RUNSHARED@
+BUILDEXE= @BUILDEXEEXT@
+BUILDPYTHON= ../../../python$(BUILDEXE)
+
+# Deployment target selected during configure, to be checked
+# by distutils
+MACOSX_DEPLOYMENT_TARGET=@CONFIGURE_MACOSX_DEPLOYMENT_TARGET@
+@EXPORT_MACOSX_DEPLOYMENT_TARGET@export MACOSX_DEPLOYMENT_TARGET
+
+BUNDLEBULDER=$(srcdir)/../../../Lib/plat-mac/bundlebuilder.py
+
+PYTHONAPPSDIR=/Applications/MacPython $(VERSION)
+OBJECTS=FileSettings.o MyAppDelegate.o MyDocument.o PreferencesWindowController.o doscript.o main.o
+
+all: PythonLauncher.app
+
+install: PythonLauncher.app
+ test -d "$(DESTDIR)$(PYTHONAPPSDIR)" || mkdir -p "$(DESTDIR)$(PYTHONAPPSDIR)"
+ -test -d "$(DESTDIR)$(PYTHONAPPSDIR)/PythonLauncher.app" && rm -r "$(DESTDIR)$(PYTHONAPPSDIR)/PythonLauncher.app"
+ cp -r "PythonLauncher.app" "$(DESTDIR)$(PYTHONAPPSDIR)"
+ touch "$(DESTDIR)$(PYTHONAPPSDIR)/PythonLauncher.app"
+
+clean:
+ rm -f *.o "PythonLauncher"
+ rm -rf "PythonLauncher.app"
+
+PythonLauncher.app: \
+ PythonLauncher $(srcdir)/PythonInterpreter.icns \
+ $(srcdir)/PythonSource.icns \
+ $(srcdir)/PythonWSource.icns \
+ $(srcdir)/PythonCompiled.icns \
+ $(srcdir)/factorySettings.plist
+ rm -fr "PythonLauncher.app"
+ $(RUNSHARED) $(BUILDPYTHON) $(BUNDLEBULDER) \
+ --builddir=. \
+ --name="PythonLauncher" \
+ --executable="PythonLauncher" \
+ --iconfile=$(srcdir)/PythonInterpreter.icns \
+ --bundle-id=org.python.PythonLauncher \
+ --resource=$(srcdir)/PythonSource.icns \
+ --resource=$(srcdir)/PythonWSource.icns \
+ --resource=$(srcdir)/PythonCompiled.icns \
+ --resource=$(srcdir)/English.lproj \
+ --resource=$(srcdir)/PreferenceWindow.nib \
+ --resource=$(srcdir)/factorySettings.plist \
+ --plist=$(srcdir)/Info.plist \
+ build
+ find "PythonLauncher.app" -name '.svn' -print0 | xargs -0 rm -r
+
+
+FileSettings.o: $(srcdir)/FileSettings.m
+ $(CC) $(CFLAGS) -o $@ -c $(srcdir)/FileSettings.m
+
+MyAppDelegate.o: $(srcdir)/MyAppDelegate.m
+ $(CC) $(CFLAGS) -o $@ -c $(srcdir)/MyAppDelegate.m
+
+MyDocument.o: $(srcdir)/MyDocument.m
+ $(CC) $(CFLAGS) -o $@ -c $(srcdir)/MyDocument.m
+
+PreferencesWindowController.o: $(srcdir)/PreferencesWindowController.m
+ $(CC) $(CFLAGS) -o $@ -c $(srcdir)/PreferencesWindowController.m
+
+doscript.o: $(srcdir)/doscript.m
+ $(CC) $(CFLAGS) -o $@ -c $(srcdir)/doscript.m
+
+main.o: $(srcdir)/main.m
+ $(CC) $(CFLAGS) -o $@ -c $(srcdir)/main.m
+
+PythonLauncher: $(OBJECTS)
+ $(CC) $(LDFLAGS) -o "PythonLauncher" $(OBJECTS) -framework AppKit -framework Carbon
+#!/usr/bin/python
"""fixapplepython23 - Fix Apple-installed Python 2.3 (on Mac OS X 10.3)
Python 2.3 (and 2.3.X for X<5) have the problem that building an extension
else:
do_apply = True
# First check OS version
+ if sys.byteorder == 'little':
+ # All intel macs are fine
+ print "fixapplypython23: no fix is needed on MacOSX on Intel"
+ sys.exit(0)
+
if gestalt.gestalt('sysv') < 0x1030:
print 'fixapplepython23: no fix needed on MacOSX < 10.3'
sys.exit(0)
+
+ if gestalt.gestalt('sysv') >= 0x1040:
+ print 'fixapplepython23: no fix needed on MacOSX >= 10.4'
+ sys.exit(0)
+
# Test that a framework Python is indeed installed
if not os.path.exists(MAKEFILE):
print 'fixapplepython23: Python framework does not appear to be installed (?), nothing fixed'
makescript(GXX_SCRIPT, "g++")
# Finally fix the makefile
rv = fix(MAKEFILE, do_apply)
- sys.exit(rv)
+ #sys.exit(rv)
+ sys.exit(0)
if __name__ == '__main__':
main()
--- /dev/null
+/*
+ * This wrapper program executes a python executable hidden inside an
+ * application bundle inside the Python framework. This is needed to run
+ * GUI code: some GUI API's don't work unless the program is inside an
+ * application bundle.
+ */
+#include <unistd.h>
+#include <err.h>
+
+static char Python[] = PYTHONWEXECUTABLE;
+
+int main(int argc, char **argv) {
+ argv[0] = Python;
+ execv(Python, argv);
+ err(1, "execv: %s", Python);
+ /* NOTREACHED */
+}
BUILDEXE= @BUILDEXEEXT@
# Short name and location for Mac OS X Python framework
+UNIVERSALSDK=@UNIVERSALSDK@
PYTHONFRAMEWORK= @PYTHONFRAMEWORK@
PYTHONFRAMEWORKDIR= @PYTHONFRAMEWORKDIR@
PYTHONFRAMEWORKPREFIX= @PYTHONFRAMEWORKPREFIX@
PYTHONFRAMEWORKINSTALLDIR= @PYTHONFRAMEWORKINSTALLDIR@
# Deployment target selected during configure, to be checked
-# by distutils
-CONFIGURE_MACOSX_DEPLOYMENT_TARGET=@CONFIGURE_MACOSX_DEPLOYMENT_TARGET@
+# by distutils. The export statement is needed to ensure that the
+# deployment target is active during build.
+MACOSX_DEPLOYMENT_TARGET=@CONFIGURE_MACOSX_DEPLOYMENT_TARGET@
+@EXPORT_MACOSX_DEPLOYMENT_TARGET@export MACOSX_DEPLOYMENT_TARGET
+
# Options to enable prebinding (for fast startup prior to Mac OS X 10.3)
OTHER_LIBTOOL_OPT=@OTHER_LIBTOOL_OPT@
$(RESSRCDIR)/version.plist \
$(RESSRCDIR)/English.lproj/InfoPlist.strings
$(INSTALL) -d -m $(DIRMODE) $(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)
- libtool -o $(LDLIBRARY) -dynamic $(OTHER_LIBTOOL_OPT) $(LIBRARY) \
- @LIBTOOL_CRUFT@
+ if test "${UNIVERSALSDK}"; then \
+ $(CC) -o $(LDLIBRARY) -arch i386 -arch ppc -dynamiclib \
+ -isysroot "${UNIVERSALSDK}" \
+ -all_load $(LIBRARY) -Wl,-single_module \
+ -install_name $(DESTDIR)$(PYTHONFRAMEWORKINSTALLDIR)/Versions/$(VERSION)/Python \
+ -compatibility_version $(VERSION) \
+ -current_version $(VERSION); \
+ else \
+ libtool -o $(LDLIBRARY) -dynamic $(OTHER_LIBTOOL_OPT) $(LIBRARY) \
+ @LIBTOOL_CRUFT@ ;\
+ fi
$(INSTALL) -d -m $(DIRMODE) \
$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/Resources/English.lproj
$(INSTALL_DATA) $(RESSRCDIR)/Info.plist \
-$(TESTPYTHON) $(TESTPROG) $(TESTOPTS) -uall
$(TESTPYTHON) $(TESTPROG) $(TESTOPTS) -uall
+# Run the unitests for both architectures in a Universal build on OSX
+# Must be run on an Intel box.
+testuniversal: all platform
+ if [ `arch` != 'i386' ];then \
+ echo "This can only be used on OSX/i386" ;\
+ exit 1 ;\
+ fi
+ -find $(srcdir)/Lib -name '*.py[co]' -print | xargs rm -f
+ -$(TESTPYTHON) $(TESTPROG) $(TESTOPTS) -uall
+ $(TESTPYTHON) $(TESTPROG) $(TESTOPTS) -uall
+ $(RUNSHARED) /usr/libexec/oah/translate ./$(BUILDPYTHON) -E -tt $(TESTPROG) $(TESTOPTS) -uall
+
+
# Like testall, but with a single pass only
buildbottest: all platform
$(TESTPYTHON) $(TESTPROG) $(TESTOPTS) -uall -rw
$(TESTPYTHON) $(TESTPROG) $(MEMTESTOPTS)
# Install everything
-install: altinstall bininstall maninstall
+install: @FRAMEWORKINSTALLFIRST@ altinstall bininstall maninstall @FRAMEWORKINSTALLLAST@
# Install almost everything without disturbing previous versions
-altinstall: altbininstall libinstall inclinstall libainstall \
- sharedinstall oldsharedinstall
+altinstall: @FRAMEWORKALTINSTALLFIRST@ altbininstall libinstall inclinstall libainstall \
+ sharedinstall oldsharedinstall @FRAMEWORKALTINSTALLLAST@
# Install shared libraries enabled by Setup
DESTDIRS= $(exec_prefix) $(LIBDIR) $(BINLIBDEST) $(DESTSHARED)
# This installs Mac/Lib into the framework
frameworkinstallmaclib:
- $(MAKE) -f $(srcdir)/Mac/OSX/Makefile installmacsubtree \
- $(RUNSHARED) BUILDPYTHON=./$(BUILDPYTHON) DIRMODE=$(DIRMODE) FILEMODE=$(FILEMODE) \
- srcdir=$(srcdir) builddir=. prefix=$(prefix) LIBDEST=$(LIBDEST) \
- DESTDIR=$(DESTDIR)
+ ln -sf ../../../Python $(DESTDIR)$(prefix)/lib/python$(VERSION)/config/libpython$(VERSION).a
+ cd Mac/OSX && $(MAKE) installmacsubtree \
+ $(RUNSHARED) DESTDIR=$(DESTDIR)
# This installs the IDE, the Launcher and other apps into /Applications
frameworkinstallapps:
- $(MAKE) -f $(srcdir)/Mac/OSX/Makefile installapps \
- $(RUNSHARED) BUILDPYTHON=./$(BUILDPYTHON) DIRMODE=$(DIRMODE) FILEMODE=$(FILEMODE) \
- srcdir=$(srcdir) builddir=. DESTDIR=$(DESTDIR) prefix=$(prefix)
+ cd Mac/OSX && $(MAKE) installapps DESTDIR=$(DESTDIR)
# This install the unix python and pythonw tools in /usr/local/bin
frameworkinstallunixtools:
- $(MAKE) -f $(srcdir)/Mac/OSX/Makefile installunixtools \
- DIRMODE=$(DIRMODE) FILEMODE=$(FILEMODE) \
- srcdir=$(srcdir) builddir=. DESTDIR=$(DESTDIR) prefix=$(prefix)
+ cd Mac/OSX && $(MAKE) installunixtools DESTDIR=$(DESTDIR)
+
+frameworkaltinstallunixtools:
+ cd Mac/OSX && $(MAKE) altinstallunixtools DESTDIR=$(DESTDIR)
# This installs the Demos and Tools into the applications directory.
# It is not part of a normal frameworkinstall
frameworkinstallextras:
- $(MAKE) -f $(srcdir)/Mac/OSX/Makefile installextras \
- $(RUNSHARED) BUILDPYTHON=./$(BUILDPYTHON) DIRMODE=$(DIRMODE) FILEMODE=$(FILEMODE) \
- srcdir=$(srcdir) builddir=. DESTDIR=$(DESTDIR)
+ cd Mac/OSX && $(MAKE) installextras DESTDIR=$(DESTDIR)
# This installs a few of the useful scripts in Tools/scripts
scriptsinstall:
--- /dev/null
+/*
+ * Expat configuration for python. This file is not part of the expat
+ * distribution.
+ */
+#ifndef EXPAT_CONFIG_H
+#define EXPAT_CONFIG_H
+
+#include <pyconfig.h>
+#ifdef WORDS_BIGENDIAN
+#define BYTEORDER 4321
+#else
+#define BYTEORDER 1234
+#endif
+
+#define XML_NS 1
+#define XML_DTD 1
+#define XML_CONTEXT_BYTES 1024
+
+#endif /* EXPAT_CONFIG_H */
/* See also ../Dos/dosmodule.c */
+#ifdef __APPLE__
+ /*
+ * Step 1 of support for weak-linking a number of symbols existing on
+ * OSX 10.4 and later, see the comment in the #ifdef __APPLE__ block
+ * at the end of this file for more information.
+ */
+# pragma weak lchown
+# pragma weak statvfs
+# pragma weak fstatvfs
+
+#endif /* __APPLE__ */
+
#include "Python.h"
#include "structseq.h"
Py_INCREF((PyObject*) &StatVFSResultType);
PyModule_AddObject(m, "statvfs_result",
(PyObject*) &StatVFSResultType);
+
+#ifdef __APPLE__
+ /*
+ * Step 2 of weak-linking support on Mac OS X.
+ *
+ * The code below removes functions that are not available on the
+ * currently active platform.
+ *
+ * This block allow one to use a python binary that was build on
+ * OSX 10.4 on OSX 10.3, without loosing access to new APIs on
+ * OSX 10.4.
+ */
+#ifdef HAVE_FSTATVFS
+ if (fstatvfs == NULL) {
+ if (PyObject_DelAttrString(m, "fstatvfs") == -1) {
+ return;
+ }
+ }
+#endif /* HAVE_FSTATVFS */
+
+#ifdef HAVE_STATVFS
+ if (statvfs == NULL) {
+ if (PyObject_DelAttrString(m, "statvfs") == -1) {
+ return;
+ }
+ }
+#endif /* HAVE_STATVFS */
+
+# ifdef HAVE_LCHOWN
+ if (lchown == NULL) {
+ if (PyObject_DelAttrString(m, "lchown") == -1) {
+ return;
+ }
+ }
+#endif /* HAVE_LCHOWN */
+
+#endif /* __APPLE__ */
}
*/
+#ifdef __APPLE__
+ /*
+ * inet_aton is not available on OSX 10.3, yet we want to use a binary
+ * that was build on 10.4 or later to work on that release, weak linking
+ * comes to the rescue.
+ */
+# pragma weak inet_aton
+#endif
+
#include "Python.h"
#undef MAX
older releases don't have */
#undef HAVE_GETADDRINFO
#endif
+
+#ifdef HAVE_INET_ATON
+#define USE_INET_ATON_WEAKLINK
+#endif
+
#endif
/* I know this is a bad practice, but it is the easiest... */
#endif
#ifdef HAVE_INET_ATON
struct in_addr buf;
-#else
+#endif
+
+#if !defined(HAVE_INET_ATON) || defined(USE_INET_ATON_WEAKLINK)
/* Have to use inet_addr() instead */
unsigned long packed_addr;
#endif
#ifdef HAVE_INET_ATON
+
+#ifdef USE_INET_ATON_WEAKLINK
+ if (inet_aton != NULL) {
+#endif
if (inet_aton(ip_addr, &buf))
return PyString_FromStringAndSize((char *)(&buf),
sizeof(buf));
"illegal IP address string passed to inet_aton");
return NULL;
-#else /* ! HAVE_INET_ATON */
+#ifdef USE_INET_ATON_WEAKLINK
+ } else {
+#endif
+
+#endif
+
+#if !defined(HAVE_INET_ATON) || defined(USE_INET_ATON_WEAKLINK)
+
/* special-case this address as inet_addr might return INADDR_NONE
* for this */
if (strcmp(ip_addr, "255.255.255.255") == 0) {
}
return PyString_FromStringAndSize((char *) &packed_addr,
sizeof(packed_addr));
+
+#ifdef USE_INET_ATON_WEAKLINK
+ }
+#endif
+
#endif
}
#include "structseq.h"
#include "timefuncs.h"
+#ifdef __APPLE__
+#if defined(HAVE_GETTIMEOFDAY) && defined(HAVE_FTIME)
+ /*
+ * floattime falls back to ftime when getttimeofday fails because the latter
+ * might fail on some platforms. This fallback is unwanted on MacOSX because
+ * that makes it impossible to use a binary build on OSX 10.4 on earlier
+ * releases of the OS. Therefore claim we don't support ftime.
+ */
+# undef HAVE_FTIME
+#endif
+#endif
+
+
#include <ctype.h>
#include <sys/types.h>
{
struct timeval t;
#ifdef GETTIMEOFDAY_NO_TZ
- if (gettimeofday(&t) == 0)
- return (double)t.tv_sec + t.tv_usec*0.000001;
+ gettimeofday(&t);
+ return (double)t.tv_sec + t.tv_usec*0.000001;
#else /* !GETTIMEOFDAY_NO_TZ */
- if (gettimeofday(&t, (struct timezone *)NULL) == 0)
- return (double)t.tv_sec + t.tv_usec*0.000001;
+ gettimeofday(&t, (struct timezone *)NULL);
+ return (double)t.tv_sec + t.tv_usec*0.000001;
#endif /* !GETTIMEOFDAY_NO_TZ */
}
-#endif /* !HAVE_GETTIMEOFDAY */
+
+#else /* !HAVE_GETTIMEOFDAY */
+
{
#if defined(HAVE_FTIME)
struct timeb t;
return (double)secs;
#endif /* !HAVE_FTIME */
}
+
+#endif /* !HAVE_GETTIMEOFDAY */
}
#include "Python.h"
#include "pymactoolbox.h"
-
+#include <arpa/inet.h> /* for ntohl, htonl */
/* Like strerror() but for Mac OS error numbers */
char *
int
PyMac_GetOSType(PyObject *v, OSType *pr)
{
+ int32_t tmp;
if (!PyString_Check(v) || PyString_Size(v) != 4) {
PyErr_SetString(PyExc_TypeError,
"OSType arg must be string of 4 chars");
return 0;
}
- memcpy((char *)pr, PyString_AsString(v), 4);
+ memcpy((char *)&tmp, PyString_AsString(v), 4);
+ *pr = (OSType)ntohl(tmp);
return 1;
}
PyObject *
PyMac_BuildOSType(OSType t)
{
- return PyString_FromStringAndSize((char *)&t, 4);
+ uint32_t tmp = htonl((uint32_t)t);
+ return PyString_FromStringAndSize((char *)&tmp, 4);
}
/* Convert an NumVersion value to a 4-element tuple */
\
int routinename(PyObject *pyobj, object *cobj) { \
if (!PyMacGluePtr_##routinename) { \
- if (!PyImport_ImportModule(module)) return NULL; \
+ if (!PyImport_ImportModule(module)) return 0; \
if (!PyMacGluePtr_##routinename) { \
PyErr_SetString(PyExc_ImportError, "Module did not provide routine: " module ": " #routinename); \
- return NULL; \
+ return 0; \
} \
} \
return (*PyMacGluePtr_##routinename)(pyobj, cobj); \
/Library/Frameworks). A framework install is probably needed if you
want to use any Aqua-based GUI toolkit (whether Tkinter, wxPython,
Carbon, Cocoa or anything else).
-
+
+ You may also want to try the configure option "--enable-universalsdk"
+ which builds Python as a universal binary with support for the
+ i386 and PPC architetures. This requires Xcode 2.1 or later to build.
+
See Mac/OSX/README for more information on framework builds.
Cygwin: With recent (relative to the time of writing, 2001-12-19)
#! /bin/sh
-# From configure.in Revision: 52088 .
+# From configure.in Revision: 52098 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.59 for python 2.4.
#
# include <unistd.h>
#endif"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS VERSION SOVERSION CONFIG_ARGS PYTHONFRAMEWORK PYTHONFRAMEWORKDIR PYTHONFRAMEWORKPREFIX PYTHONFRAMEWORKINSTALLDIR MACHDEP SGI_ABI EXTRAPLATDIR EXTRAMACHDEPPATH CONFIGURE_MACOSX_DEPLOYMENT_TARGET CXX MAINOBJ EXEEXT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC OBJEXT CPP EGREP BUILDEXEEXT LIBRARY LDLIBRARY DLLLIBRARY BLDLIBRARY LDLIBRARYDIR INSTSONAME RUNSHARED LINKCC RANLIB ac_ct_RANLIB AR INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN OPT BASECFLAGS OTHER_LIBTOOL_OPT LIBTOOL_CRUFT SO LDSHARED BLDSHARED CCSHARED LINKFORSHARED CFLAGSFORSHARED SHLIBS USE_SIGNAL_MODULE SIGNAL_OBJS USE_THREAD_MODULE LDLAST THREADOBJ DLINCLDIR DYNLOADFILE MACHDEP_OBJS TRUE LIBOBJS HAVE_GETHOSTBYNAME_R_6_ARG HAVE_GETHOSTBYNAME_R_5_ARG HAVE_GETHOSTBYNAME_R_3_ARG HAVE_GETHOSTBYNAME_R HAVE_GETHOSTBYNAME LIBM LIBC UNICODE_OBJS THREADHEADERS SRCDIRS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS VERSION SOVERSION CONFIG_ARGS UNIVERSALSDK PYTHONFRAMEWORK PYTHONFRAMEWORKDIR PYTHONFRAMEWORKPREFIX PYTHONFRAMEWORKINSTALLDIR FRAMEWORKINSTALLFIRST FRAMEWORKINSTALLLAST FRAMEWORKALTINSTALLFIRST FRAMEWORKALTINSTALLLAST FRAMEWORKUNIXTOOLSPREFIX MACHDEP SGI_ABI EXTRAPLATDIR EXTRAMACHDEPPATH CONFIGURE_MACOSX_DEPLOYMENT_TARGET EXPORT_MACOSX_DEPLOYMENT_TARGET CXX MAINOBJ EXEEXT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC OBJEXT CPP EGREP BUILDEXEEXT LIBRARY LDLIBRARY DLLLIBRARY BLDLIBRARY LDLIBRARYDIR INSTSONAME RUNSHARED LINKCC RANLIB ac_ct_RANLIB AR INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN OPT BASECFLAGS OTHER_LIBTOOL_OPT LIBTOOL_CRUFT SO LDSHARED BLDSHARED CCSHARED LINKFORSHARED CFLAGSFORSHARED SHLIBS USE_SIGNAL_MODULE SIGNAL_OBJS USE_THREAD_MODULE LDLAST THREADOBJ DLINCLDIR DYNLOADFILE MACHDEP_OBJS TRUE LIBOBJS HAVE_GETHOSTBYNAME_R_6_ARG HAVE_GETHOSTBYNAME_R_5_ARG HAVE_GETHOSTBYNAME_R_3_ARG HAVE_GETHOSTBYNAME_R HAVE_GETHOSTBYNAME LIBM LIBC UNICODE_OBJS THREADHEADERS SRCDIRS LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
Optional Features:
--disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
+ --enable-universalsdk[=SDKDIR]
+ Build agains Mac OS X 10.4u SDK (ppc/i386)
--enable-framework[=INSTALLDIR]
Build (MacOSX|Darwin) framework
--enable-shared disable/enable building shared python library
CONFIG_ARGS="$ac_configure_args"
+# Check whether --enable-universalsdk or --disable-universalsdk was given.
+if test "${enable_universalsdk+set}" = set; then
+ enableval="$enable_universalsdk"
+
+ case $enableval in
+ yes)
+ enableval=/Developer/SDKs/MacOSX10.4u.sdk
+ ;;
+ esac
+ case $enableval in
+ no)
+ UNIVERSALSDK=
+ enable_universalsdk=
+ ;;
+ *)
+ UNIVERSALSDK=$enableval
+ ;;
+ esac
+
+else
+
+ UNIVERSALSDK=
+ enable_universalsdk=
+
+fi;
+
+
# Check whether --enable-framework or --disable-framework was given.
if test "${enable_framework+set}" = set; then
enableval="$enable_framework"
PYTHONFRAMEWORKDIR=no-framework
PYTHONFRAMEWORKPREFIX=
PYTHONFRAMEWORKINSTALLDIR=
+ FRAMEWORKINSTALLFIRST=
+ FRAMEWORKINSTALLLAST=
+ FRAMEWORKALTINSTALLFIRST=
+ FRAMEWORKALTINSTALLLAST=
enable_framework=
;;
*)
PYTHONFRAMEWORKDIR=Python.framework
PYTHONFRAMEWORKPREFIX=$enableval
PYTHONFRAMEWORKINSTALLDIR=$PYTHONFRAMEWORKPREFIX/$PYTHONFRAMEWORKDIR
+ FRAMEWORKINSTALLFIRST="frameworkinstallstructure"
+ FRAMEWORKINSTALLLAST="frameworkinstallmaclib frameworkinstallapps frameworkinstallunixtools"
+ FRAMEWORKALTINSTALLFIRST="${FRAMEWORKINSTALLFIRST} bininstall maninstall"
+ FRAMEWORKALTINSTALLLAST="frameworkinstallmaclib frameworkinstallapps frameworkaltinstallunixtools"
+ if test "x${prefix}" = "xNONE" ; then
+ FRAMEWORKUNIXTOOLSPREFIX="${ac_default_prefix}"
+ else
+ FRAMEWORKUNIXTOOLSPREFIX="${prefix}"
+ fi
+
prefix=$PYTHONFRAMEWORKINSTALLDIR/Versions/$VERSION
+
+ # Add makefiles for Mac specific code to the list of output
+ # files:
+ ac_config_files="$ac_config_files Mac/OSX/Makefile"
+
+ ac_config_files="$ac_config_files Mac/OSX/PythonLauncher/Makefile"
+
+ ac_config_files="$ac_config_files Mac/OSX/IDLE/Makefile"
+
esac
else
PYTHONFRAMEWORKDIR=no-framework
PYTHONFRAMEWORKPREFIX=
PYTHONFRAMEWORKINSTALLDIR=
+ FRAMEWORKINSTALLFIRST=
+ FRAMEWORKINSTALLLAST=
+ FRAMEWORKALTINSTALLFIRST=
+ FRAMEWORKALTINSTALLLAST=
+ if test "x${prefix}" = "xNONE" ; then
+ FRAMEWORKUNIXTOOLSPREFIX="${ac_default_prefix}"
+ else
+ FRAMEWORKUNIXTOOLSPREFIX="${prefix}"
+ fi
enable_framework=
fi;
+
+
+
+
+
##AC_ARG_WITH(dyld,
## AC_HELP_STRING(--with-dyld,
## Use (OpenStep|Rhapsody) dynamic linker))
# disables platform specific features beyond repair.
# On Mac OS X 10.3, defining _POSIX_C_SOURCE or _XOPEN_SOURCE
# has no effect, don't bother defining them
- Darwin/[78].*)
+ Darwin/[789].*)
define_xopen_source=no
;;
# it may influence the way we can build extensions, so distutils
# needs to check it
+
CONFIGURE_MACOSX_DEPLOYMENT_TARGET=
+EXPORT_MACOSX_DEPLOYMENT_TARGET='#'
# checks for alternative programs
# is there any other compiler on Darwin besides gcc?
Darwin*)
BASECFLAGS="$BASECFLAGS -Wno-long-double -no-cpp-precomp -mno-fused-madd"
+ if test "${enable_universalsdk}"; then
+ BASECFLAGS="-arch ppc -arch i386 -isysroot ${UNIVERSALSDK} ${BASECFLAGS}"
+ fi
+
;;
OSF*)
BASECFLAGS="$BASECFLAGS -mieee"
case $ac_sys_system/$ac_sys_release in
Darwin/[01234567].*)
- LIBTOOL_CRUFT="-framework System -lcc_dynamic -arch_only ppc"
+ LIBTOOL_CRUFT="-framework System -lcc_dynamic"
+ if test -z "${enable_universalsdk}"; then
+ LIBTOOL_CRUFT="${LIBTOOL_CRUFT} -arch_only `arch`"
+ fi
LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -install_name $(PYTHONFRAMEWORKINSTALLDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -compatibility_version $(VERSION) -current_version $(VERSION)';;
Darwin/*)
# Use -undefined dynamic_lookup whenever possible (10.3 and later).
# This allows an extension to be used in any Python
cur_target=`sw_vers -productVersion | sed 's/\(10\.[0-9]*\).*/\1/'`
+ if test ${cur_target} '>' 10.2; then
+ cur_target=10.3
+ fi
CONFIGURE_MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET-${cur_target}}
+ EXPORT_MACOSX_DEPLOYMENT_TARGET=''
if test ${MACOSX_DEPLOYMENT_TARGET-${cur_target}} '>' 10.2
then
+ if test "${enable_universalsdk}"; then
+ LDFLAGS="-arch i386 -arch ppc -isysroot ${UNIVERSALSDK} ${LDFLAGS}"
+ fi
LDSHARED='$(CC) $(LDFLAGS) -bundle -undefined dynamic_lookup'
BLDSHARED="$LDSHARED"
else
esac
+
+
# Check whether right shifting a negative integer extends the sign bit
# or fills with zeros (like the Cray J90, according to Tim Peters).
echo "$as_me:$LINENO: checking whether right shift extends the sign bit" >&5
do
case "$ac_config_target" in
# Handling of arguments.
+ "Mac/OSX/Makefile" ) CONFIG_FILES="$CONFIG_FILES Mac/OSX/Makefile" ;;
+ "Mac/OSX/PythonLauncher/Makefile" ) CONFIG_FILES="$CONFIG_FILES Mac/OSX/PythonLauncher/Makefile" ;;
+ "Mac/OSX/IDLE/Makefile" ) CONFIG_FILES="$CONFIG_FILES Mac/OSX/IDLE/Makefile" ;;
"Makefile.pre" ) CONFIG_FILES="$CONFIG_FILES Makefile.pre" ;;
"Modules/Setup.config" ) CONFIG_FILES="$CONFIG_FILES Modules/Setup.config" ;;
"pyconfig.h" ) CONFIG_HEADERS="$CONFIG_HEADERS pyconfig.h" ;;
s,@VERSION@,$VERSION,;t t
s,@SOVERSION@,$SOVERSION,;t t
s,@CONFIG_ARGS@,$CONFIG_ARGS,;t t
+s,@UNIVERSALSDK@,$UNIVERSALSDK,;t t
s,@PYTHONFRAMEWORK@,$PYTHONFRAMEWORK,;t t
s,@PYTHONFRAMEWORKDIR@,$PYTHONFRAMEWORKDIR,;t t
s,@PYTHONFRAMEWORKPREFIX@,$PYTHONFRAMEWORKPREFIX,;t t
s,@PYTHONFRAMEWORKINSTALLDIR@,$PYTHONFRAMEWORKINSTALLDIR,;t t
+s,@FRAMEWORKINSTALLFIRST@,$FRAMEWORKINSTALLFIRST,;t t
+s,@FRAMEWORKINSTALLLAST@,$FRAMEWORKINSTALLLAST,;t t
+s,@FRAMEWORKALTINSTALLFIRST@,$FRAMEWORKALTINSTALLFIRST,;t t
+s,@FRAMEWORKALTINSTALLLAST@,$FRAMEWORKALTINSTALLLAST,;t t
+s,@FRAMEWORKUNIXTOOLSPREFIX@,$FRAMEWORKUNIXTOOLSPREFIX,;t t
s,@MACHDEP@,$MACHDEP,;t t
s,@SGI_ABI@,$SGI_ABI,;t t
s,@EXTRAPLATDIR@,$EXTRAPLATDIR,;t t
s,@EXTRAMACHDEPPATH@,$EXTRAMACHDEPPATH,;t t
s,@CONFIGURE_MACOSX_DEPLOYMENT_TARGET@,$CONFIGURE_MACOSX_DEPLOYMENT_TARGET,;t t
+s,@EXPORT_MACOSX_DEPLOYMENT_TARGET@,$EXPORT_MACOSX_DEPLOYMENT_TARGET,;t t
s,@CXX@,$CXX,;t t
s,@MAINOBJ@,$MAINOBJ,;t t
s,@EXEEXT@,$EXEEXT,;t t
AC_SUBST(CONFIG_ARGS)
CONFIG_ARGS="$ac_configure_args"
+AC_ARG_ENABLE(universalsdk,
+ AC_HELP_STRING(--enable-universalsdk@<:@=SDKDIR@:>@, Build agains Mac OS X 10.4u SDK (ppc/i386)),
+[
+ case $enableval in
+ yes)
+ enableval=/Developer/SDKs/MacOSX10.4u.sdk
+ ;;
+ esac
+ case $enableval in
+ no)
+ UNIVERSALSDK=
+ enable_universalsdk=
+ ;;
+ *)
+ UNIVERSALSDK=$enableval
+ ;;
+ esac
+],[
+ UNIVERSALSDK=
+ enable_universalsdk=
+])
+AC_SUBST(UNIVERSALSDK)
+
dnl quadrigraphs "@<:@" and "@:>@" produce "[" and "]" in the output
AC_ARG_ENABLE(framework,
AC_HELP_STRING(--enable-framework@<:@=INSTALLDIR@:>@, Build (MacOSX|Darwin) framework),
PYTHONFRAMEWORKDIR=no-framework
PYTHONFRAMEWORKPREFIX=
PYTHONFRAMEWORKINSTALLDIR=
+ FRAMEWORKINSTALLFIRST=
+ FRAMEWORKINSTALLLAST=
+ FRAMEWORKALTINSTALLFIRST=
+ FRAMEWORKALTINSTALLLAST=
enable_framework=
;;
*)
PYTHONFRAMEWORKDIR=Python.framework
PYTHONFRAMEWORKPREFIX=$enableval
PYTHONFRAMEWORKINSTALLDIR=$PYTHONFRAMEWORKPREFIX/$PYTHONFRAMEWORKDIR
+ FRAMEWORKINSTALLFIRST="frameworkinstallstructure"
+ FRAMEWORKINSTALLLAST="frameworkinstallmaclib frameworkinstallapps frameworkinstallunixtools"
+ FRAMEWORKALTINSTALLFIRST="${FRAMEWORKINSTALLFIRST} bininstall maninstall"
+ FRAMEWORKALTINSTALLLAST="frameworkinstallmaclib frameworkinstallapps frameworkaltinstallunixtools"
+ if test "x${prefix}" = "xNONE" ; then
+ FRAMEWORKUNIXTOOLSPREFIX="${ac_default_prefix}"
+ else
+ FRAMEWORKUNIXTOOLSPREFIX="${prefix}"
+ fi
+
prefix=$PYTHONFRAMEWORKINSTALLDIR/Versions/$VERSION
+
+ # Add makefiles for Mac specific code to the list of output
+ # files:
+ AC_CONFIG_FILES(Mac/OSX/Makefile)
+ AC_CONFIG_FILES(Mac/OSX/PythonLauncher/Makefile)
+ AC_CONFIG_FILES(Mac/OSX/IDLE/Makefile)
esac
],[
PYTHONFRAMEWORK=
PYTHONFRAMEWORKDIR=no-framework
PYTHONFRAMEWORKPREFIX=
PYTHONFRAMEWORKINSTALLDIR=
+ FRAMEWORKINSTALLFIRST=
+ FRAMEWORKINSTALLLAST=
+ FRAMEWORKALTINSTALLFIRST=
+ FRAMEWORKALTINSTALLLAST=
+ if test "x${prefix}" = "xNONE" ; then
+ FRAMEWORKUNIXTOOLSPREFIX="${ac_default_prefix}"
+ else
+ FRAMEWORKUNIXTOOLSPREFIX="${prefix}"
+ fi
enable_framework=
])
AC_SUBST(PYTHONFRAMEWORK)
AC_SUBST(PYTHONFRAMEWORKDIR)
AC_SUBST(PYTHONFRAMEWORKPREFIX)
AC_SUBST(PYTHONFRAMEWORKINSTALLDIR)
+AC_SUBST(FRAMEWORKINSTALLFIRST)
+AC_SUBST(FRAMEWORKINSTALLLAST)
+AC_SUBST(FRAMEWORKALTINSTALLFIRST)
+AC_SUBST(FRAMEWORKALTINSTALLLAST)
+AC_SUBST(FRAMEWORKUNIXTOOLSPREFIX)
##AC_ARG_WITH(dyld,
## AC_HELP_STRING(--with-dyld,
# disables platform specific features beyond repair.
# On Mac OS X 10.3, defining _POSIX_C_SOURCE or _XOPEN_SOURCE
# has no effect, don't bother defining them
- Darwin/@<:@78@:>@.*)
+ Darwin/@<:@789@:>@.*)
define_xopen_source=no
;;
# it may influence the way we can build extensions, so distutils
# needs to check it
AC_SUBST(CONFIGURE_MACOSX_DEPLOYMENT_TARGET)
+AC_SUBST(EXPORT_MACOSX_DEPLOYMENT_TARGET)
CONFIGURE_MACOSX_DEPLOYMENT_TARGET=
+EXPORT_MACOSX_DEPLOYMENT_TARGET='#'
# checks for alternative programs
# is there any other compiler on Darwin besides gcc?
Darwin*)
BASECFLAGS="$BASECFLAGS -Wno-long-double -no-cpp-precomp -mno-fused-madd"
+ if test "${enable_universalsdk}"; then
+ BASECFLAGS="-arch ppc -arch i386 -isysroot ${UNIVERSALSDK} ${BASECFLAGS}"
+ fi
+
;;
OSF*)
BASECFLAGS="$BASECFLAGS -mieee"
AC_SUBST(LIBTOOL_CRUFT)
case $ac_sys_system/$ac_sys_release in
Darwin/@<:@01234567@:>@.*)
- LIBTOOL_CRUFT="-framework System -lcc_dynamic -arch_only ppc"
+ LIBTOOL_CRUFT="-framework System -lcc_dynamic"
+ if test -z "${enable_universalsdk}"; then
+ LIBTOOL_CRUFT="${LIBTOOL_CRUFT} -arch_only `arch`"
+ fi
LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -install_name $(PYTHONFRAMEWORKINSTALLDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -compatibility_version $(VERSION) -current_version $(VERSION)';;
Darwin/*)
# Use -undefined dynamic_lookup whenever possible (10.3 and later).
# This allows an extension to be used in any Python
cur_target=`sw_vers -productVersion | sed 's/\(10\.[[0-9]]*\).*/\1/'`
+ if test ${cur_target} '>' 10.2; then
+ cur_target=10.3
+ fi
CONFIGURE_MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET-${cur_target}}
+ EXPORT_MACOSX_DEPLOYMENT_TARGET=''
if test ${MACOSX_DEPLOYMENT_TARGET-${cur_target}} '>' 10.2
then
+ if test "${enable_universalsdk}"; then
+ LDFLAGS="-arch i386 -arch ppc -isysroot ${UNIVERSALSDK} ${LDFLAGS}"
+ fi
LDSHARED='$(CC) $(LDFLAGS) -bundle -undefined dynamic_lookup'
BLDSHARED="$LDSHARED"
else
# check for endianness
AC_C_BIGENDIAN
+AH_VERBATIM([WORDS_BIGENDIAN],
+[
+ /* Define to 1 if your processor stores words with the most significant byte
+ first (like Motorola and SPARC, unlike Intel and VAX).
+
+ The block below does compile-time checking for endianness on platforms
+ that use GCC and therefore allows compiling fat binaries on OSX by using
+ '-arch ppc -arch i386' as the compile flags. The phrasing was choosen
+ such that the configure-result is used on systems that don't use GCC.
+ */
+#ifdef __BIG_ENDIAN__
+#define WORDS_BIGENDIAN 1
+#else
+#ifndef __LITTLE_ENDIAN__
+#undef WORDS_BIGENDIAN
+#endif
+#endif])
# Check whether right shifting a negative integer extends the sign bit
# or fills with zeros (like the Cray J90, according to Tim Peters).
/* Define to profile with the Pentium timestamp counter */
#undef WITH_TSC
-/* Define to 1 if your processor stores words with the most significant byte
- first (like Motorola and SPARC, unlike Intel and VAX). */
+
+ /* Define to 1 if your processor stores words with the most significant byte
+ first (like Motorola and SPARC, unlike Intel and VAX).
+
+ The block below does compile-time checking for endianness on platforms
+ that use GCC and therefore allows compiling fat binaries on OSX by using
+ '-arch ppc -arch i386' as the compile flags. The phrasing was choosen
+ such that the configure-result is used on systems that don't use GCC.
+ */
+#ifdef __BIG_ENDIAN__
+#define WORDS_BIGENDIAN 1
+#else
+#ifndef __LITTLE_ENDIAN__
#undef WORDS_BIGENDIAN
+#endif
+#endif
/* Define to 1 if on AIX 3.
System headers sometimes define this.
add_dir_to_list(self.compiler.library_dirs, '/sw/lib')
add_dir_to_list(self.compiler.include_dirs, '/sw/include')
# DarwinPorts installs into /opt/local by default
- add_dir_to_list(self.compiler.library_dirs, '/opt/local/lib')
- add_dir_to_list(self.compiler.include_dirs, '/opt/local/include')
+ #add_dir_to_list(self.compiler.library_dirs, '/opt/local/lib')
+ #add_dir_to_list(self.compiler.include_dirs, '/opt/local/include')
if os.path.normpath(sys.prefix) != '/usr':
add_dir_to_list(self.compiler.library_dirs,
if platform in ['osf1', 'unixware7', 'openunix8']:
lib_dirs += ['/usr/ccs/lib']
+ if platform == 'darwin':
+ # This should work on any unixy platform ;-)
+ # If the user has bothered specifying additional -I and -L flags
+ # in OPT and LDFLAGS we might as well use them here.
+ # NOTE: using shlex.split would technically be more correct, but
+ # also gives a bootstrap problem. Let's hope nobody uses directories
+ # with whitespace in the name to store libraries.
+ cflags, ldflags = sysconfig.get_config_vars(
+ 'CFLAGS', 'LDFLAGS')
+ for item in cflags.split():
+ if item.startswith('-I'):
+ inc_dirs.append(item[2:])
+
+ for item in ldflags.split():
+ if item.startswith('-L'):
+ lib_dirs.append(item[2:])
+
# Check for MacOS X, which doesn't need libm.a at all
math_libs = ['m']
if platform in ['darwin', 'beos', 'mac']:
['/usr/lib/termcap'],
'termcap'):
readline_libs.append('termcap')
+
+ if sys.platform == 'darwin':
+ # In every directory on the search path search for a dynamic
+ # library and then a static library, instead of first looking
+ # for dynamic libraries on the entiry path.
+ # This way a staticly linked custom readline gets picked up
+ # before the (broken) dynamic library in /usr/lib.
+ readline_extra_link_args = ('-Wl,-search_paths_first',)
+ else:
+ readline_extra_link_args = ()
+
exts.append( Extension('readline', ['readline.c'],
library_dirs=['/usr/lib/termcap'],
+ extra_link_args=readline_extra_link_args,
libraries=readline_libs) )
if platform not in ['mac']:
# crypt module.
db_inc_paths.append('/pkg/db-3.%d/include' % x)
db_inc_paths.append('/opt/db-3.%d/include' % x)
+ # Add some common subdirectories for Sleepycat DB to the list,
+ # based on the standard include directories. This way DB3/4 gets
+ # picked up when it is installed in a non-standard prefix and
+ # the user has added that prefix into inc_dirs.
+ std_variants = []
+ for dn in inc_dirs:
+ std_variants.append(os.path.join(dn, 'db3'))
+ std_variants.append(os.path.join(dn, 'db4'))
+ for x in (0,1,2,3,4):
+ std_variants.append(os.path.join(dn, "db4%d"%x))
+ std_variants.append(os.path.join(dn, "db4.%d"%x))
+ for x in (2,3):
+ std_variants.append(os.path.join(dn, "db3%d"%x))
+ std_variants.append(os.path.join(dn, "db3.%d"%x))
+
+ db_inc_paths = std_variants + db_inc_paths
+
db_ver_inc_map = {}
class db_found(Exception): pass
#
# More information on Expat can be found at www.libexpat.org.
#
- if sys.byteorder == "little":
- xmlbo = "1234"
- else:
- xmlbo = "4321"
expatinc = os.path.join(os.getcwd(), srcdir, 'Modules', 'expat')
define_macros = [
- ('XML_NS', '1'),
- ('XML_DTD', '1'),
- ('BYTEORDER', xmlbo),
- ('XML_CONTEXT_BYTES','1024'),
+ ('HAVE_EXPAT_CONFIG_H', '1'),
]
- config_h = sysconfig.get_config_h_filename()
- config_h_vars = sysconfig.parse_config_h(open(config_h))
- for feature_macro in ['HAVE_MEMMOVE', 'HAVE_BCOPY']:
- if config_h_vars.has_key(feature_macro):
- define_macros.append((feature_macro, '1'))
exts.append(Extension('pyexpat',
define_macros = define_macros,
include_dirs = [expatinc],
projects / thirdparty / Python / cpython.git / commitdiff
