Commit Graph

2963 Commits

Author SHA1 Message Date
Ned Deily 53c460d5fb Merged revisions 88004,88006,88235 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r88004 | ned.deily | 2011-01-14 20:44:12 -0800 (Fri, 14 Jan 2011) | 4 lines

  #10907: Update OS X installer build README to better reflect
          current build practices.
........
  r88006 | ned.deily | 2011-01-14 21:29:12 -0800 (Fri, 14 Jan 2011) | 6 lines

  #10843: Update third-party library versions used in OS X 32-bit
          installer builds: bzip2 1.0.6, readline 6.1.2, SQLite 3.7.4
          (with FTS3/FTS4 and RTREE enabled), and ncursesw 5.5 (wide-char
          support enabled).
........
  r88235 | ned.deily | 2011-01-29 10:56:28 -0800 (Sat, 29 Jan 2011) | 5 lines

  Issue #11054: Allow Mac OS X installer builds to again work on 10.5 with
  the system-provided Python.  Also, properly guard a new Python 3 only
  installer build step so that build-installer.py can stay compatible
  with the 2.7 version.  (with release manager approval for 3.2rc2)
........
2011-01-30 01:43:40 +00:00
Ned Deily 2a6f4b3327 Merged revisions 88003 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r88003 | ned.deily | 2011-01-14 20:37:12 -0800 (Fri, 14 Jan 2011) | 5 lines

  #10907: Warn OS X 10.6 IDLE users to use ActiveState Tcl/Tk 8.5,
          rather than the currently problematic Apple-supplied one,
          when running with the 64-/32-bit installer variant.
........
2011-01-30 00:18:47 +00:00
Georg Brandl 0b95c3b1f9 Merged revisions 87791 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r87791 | georg.brandl | 2011-01-06 11:05:26 +0100 (Do, 06 Jan 2011) | 1 line

  #10844: update copyright years in Mac plists.
........
2011-01-09 08:00:33 +00:00
Ronald Oussoren 517858adb5 Fix for issue #10406: enable Rstrip extension on OSX
Without this patch the Rstrip extension for IDLE is not enabled on OSX,
while it is enabled on other platforms.

Patch by Ned Deily.
2010-12-07 16:13:17 +00:00
Ronald Oussoren 1e0a998d13 Merged revisions 85742 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r85742 | ronald.oussoren | 2010-10-20 14:56:56 +0200 (Wed, 20 Oct 2010) | 8 lines

  Don't lie about the supported architectures in the OSX installer

  Without this patch the i386/x86_64 installer for OSX 10.6
  lies in the ReadMe file and the "Important Information" screen
  of the installer (that is, the installer claims it supports
  the i386 and ppc architectures insetead of the ones it really
  supports)
........
2010-10-20 13:01:04 +00:00
Georg Brandl c9a6320b00 Fix compiler warning about unused variables. 2010-10-17 06:13:26 +00:00
Ronald Oussoren 8928e32cb0 Merged revisions 85062 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r85062 | ronald.oussoren | 2010-09-28 16:38:31 +0200 (Tue, 28 Sep 2010) | 3 lines

  Fix for issue #9568.
........
2010-09-28 14:43:59 +00:00
Ronald Oussoren ec2fe00639 Merged revisions 85059 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r85059 | ronald.oussoren | 2010-09-28 15:57:58 +0200 (Tue, 28 Sep 2010) | 5 lines

  Add support for the ZSH shell to the "Update Shell Profile" script
  on MacOSX.

  Patch by Sylvain Mora, issue #9701.
........
2010-09-28 14:01:49 +00:00
Ronald Oussoren 0969c67bf5 Fix for issue 9392: without this patch a framework build will not install
2to3-2.7, while a versioned copy is installed of other tools and a versioned copy of2to3 is installed by python 2.6, 3.1 and the 3.2 alpha.
2010-07-29 13:18:19 +00:00
Ronald Oussoren 2f4f63a453 Fix for issue 9275: the OSX installer no longer installs links in /usr/local
This was an unintentional change to the 2.7 installer, and confuses users.
2010-07-23 11:11:26 +00:00
Ronald Oussoren 3ceab01cef The code in _scproxy (a mac specific helper module to
detect proxy settings) had the wrong logic for detecting
if the checkbox 'Exclude simple hostnames' is checked. This
checkin fixes that.

As a result the test failure 'Issue8455' goes away on systems
where the checkbox is not checked.

I'm carefully avoiding saying that is fixes that issue,
test_urllib2_localnet assumes that system proxy settings are
empty (not just on OSX, see Issue8455 for details).
2010-06-22 09:32:22 +00:00
Ronald Oussoren 27c72e9e5c Fix for issue8868: without this patch 'MacOS.WMAvailable()' will return
False on MacOSX 10.5 or earlier and scripts won't be able to access GUI
functionality.
2010-06-02 03:47:14 +00:00
Antoine Pitrou c83ea137d7 Untabify C files. Will watch buildbots. 2010-05-09 14:46:46 +00:00
Ronald Oussoren 9545a23c7f In a number of places code still revers
to "sys.platform == 'mac'" and that is
dead code because it refers to a platform
that is no longer supported (and hasn't been
supported for several releases).

Fixes issue #7908 for the trunk.
2010-05-05 19:09:31 +00:00
Ronald Oussoren 9663ddaa74 Add notes about uninstalling a framework install to
Mac/README. Fixes issue 7107.
2010-04-30 15:11:22 +00:00
Ronald Oussoren 5d18cc6b46 Fix for issue 8476 2010-04-30 14:58:39 +00:00
Ronald Oussoren 01d149fc1f Fix for issue #3646: with this patch it is possible to do a
framework install of Python in your home directory (on OSX):

   $ configure --enable-framework=${HOME}/Library/Frameworks
   $ make && make install

Without this patch the framework would get installed just fine,
but 'make install' would try to install the application bundles
and command-line tools outside the user's home, which doesn't work
for non-admin users (and is bad form anyway).
2010-04-30 11:20:14 +00:00
Martin v. Löwis 896c4777c6 Issue #8475: Pass absolute interpreter path to
"make html".
2010-04-22 11:34:36 +00:00
Ronald Oussoren 1c3d193960 This patch fixes the handling of a weak-linked
variable and should fix issue #8095.
2010-04-20 08:54:48 +00:00
Ronald Oussoren 1bf02022fe The PythonLauncher change is needed due
to changes in how the BASECFLAGS and CFLAGS
variables get filled by configure.

The Mac/Makefile.in change ensures that
pythonw gets build with the rigth deployment
targets.
2010-04-20 08:53:12 +00:00
Ronald Oussoren ac4b7adadf Explicitly set system default for $PATH to
ensure we have a clean build environment (OSX installer)
2010-04-20 05:50:44 +00:00
Ronald Oussoren 287128aadc Add check to build-installer.py to ensure that
the right version of Tcl/Tk is available (on OSX)

Fixes issue #5651
2010-04-18 14:01:05 +00:00
Ronald Oussoren 7591285fc3 This check-in fixes two problems:
1) A non-critical off-by-one error in pythonw

2) A problem in the configure script that caused
   builds with '--enable-framework --enable-universalsdk=/'
   to fail on OSX 10.6.
2010-04-08 08:13:31 +00:00
Mark Dickinson 920fd66ac6 Ensure 'module removed' warning messages contain the word 'module' or 'package'.
This should fix the test_py3kwarn failure on OS X.  test_support.import_module
also requires this.
2010-04-03 16:41:20 +00:00
Benjamin Peterson 9cf41d0c9d normalize shebang lines to #!/usr/bin/env python 2010-03-11 22:33:25 +00:00
Benjamin Peterson cd0ace391c remove svn:executable from scripts without a shebang line 2010-03-08 02:11:06 +00:00
Ronald Oussoren 2a4ab81633 Fix for issue #7998: pythonw didn't work when --with-framework-name was
specified
2010-03-07 09:04:06 +00:00
Andrew M. Kuchling f2055ae43d Remove Tools/modulator, a reference to it in the docs, and a screenshot of it.
(I asked the BDFL first, and he approved removing it.  The last actual bugfix
to Tools/modulator was in 2001; since then all changes have been search-and-replace:
string methods, whitespace fixes, etc.)
2010-02-22 21:04:02 +00:00
Ronald Oussoren a55af9a9db - Issue #7658: Ensure that the new pythonw executable works on OSX 10.4
- Issue #7714: Use ``gcc -dumpversion`` to detect the version of GCC on
  MacOSX.

- Make configure look for util.h as well as libutil.h. The former
  is the header file that on OSX contains the defition of openpty.

  (Needed to compile for OSX 10.4 on OSX 10.6)

- Use the correct definition of CC to compile the pythonw executable
2010-01-17 16:25:57 +00:00
Ronald Oussoren 724c5b2e7f Add text to Mac/README to warn about non-universal libraries when
building a universal Python. Based on issue7679.
2010-01-17 12:38:11 +00:00
Georg Brandl 8cdc9bc901 More yearly updates. 2010-01-01 13:07:05 +00:00
Ronald Oussoren 92919a66d2 Issue #6834: replace the implementation for the 'python' and 'pythonw' executables on OSX.
The previous implementation used execv(2) to run the real interpreter, which means that
you cannot use the arch(1) tool to select the architecture you want to use for a
universal build because that only affects the python/pythonw wrapper and not the actual
interpreter.

The new version uses posix_spawnv with a number of OSX-specific options that ensure that
the real interpreter is started using the same CPU architecture as the wrapper, and that
means that 'arch -ppc python' now actually works.

I've also changed the way that the wrapper looks for the framework: it is now linked to
the framework rather than hardcoding the framework path. This should make it easier to
provide pythonw support in tools like virtualenv.
2009-12-24 13:30:58 +00:00
Ronald Oussoren 1a13cff7a5 An update to the script that's used to build the binary installer: don't install files in
/usr/local by default. Users can still choose to install files into /usr/local, but by
default we'll only install files in /Library/Framework/Python.framework and
/Applications/Python X.Y/
2009-12-24 13:30:42 +00:00
Ronald Oussoren 3934619da7 Don't use the '==' operator with test, that's an unportable bash-ism.
(Issue 7179)
2009-11-19 17:42:51 +00:00
Ronald Oussoren 209d4c3151 Fix for issue6957: ensure that the OSX installer
installs a version of Python that can build
extensions on OSX 10.6.
2009-09-29 19:34:13 +00:00
Ronald Oussoren 9ebd242fbb * Update the Mac/README file. Add the list of OSX-specific configure options
to that README file with some explanation.

* Be more strict in the configure script: complain loudly when the user has
  specified invalid combinations of OSX-specific configure arguments.

  The error message refers to the Mac/README file for more information.
2009-09-29 13:00:44 +00:00
Ronald Oussoren e50a9fdd2a The 'Navigation Toolbox' is not available at all for 64-bit
code, make this explicit in the C code to avoid confusing
error messages during the build.
2009-09-22 14:24:57 +00:00
Ronald Oussoren c66ced30be * Make it easier to build custom installers (such as a 3-way universal build)
* Upgrade bzip dependency to 1.0.5
2009-09-20 20:16:11 +00:00
Ronald Oussoren 956f4b2520 For for issue 6934: failures in postflight script in OSX installer 2009-09-20 11:19:00 +00:00
Ronald Oussoren 51f0633efd Fix for issue 6851: urllib.urlopen crashes in a thread on OSX 10.6 2009-09-20 10:31:22 +00:00
Ronald Oussoren 2596758cb4 Fix build issues on OSX 10.6 (issue 6802) 2009-09-06 10:00:26 +00:00
Jeffrey Yasskin 7937d939b1 Fix nearly all compilation warnings under Apple gcc-4.0. Tested with OPT="-g
-Wall -Wstrict-prototypes -Werror" in both --with-pydebug mode and --without.
There's still a batch of non-prototype warnings in Xlib.h that I don't know how
to fix.
2009-05-29 03:44:31 +00:00
Ronald Oussoren 364b22183c Remove some old MacPython files that are no longer relevant. 2009-05-19 20:12:17 +00:00
Ronald Oussoren cc00a262a6 Remove some traces of 'MacPython' 2009-05-19 19:29:24 +00:00
Ronald Oussoren e392b357e9 Minor update to OSX build-installer script, needed
to ensure that the build will succeed in a clean
checkout and with a non-default deployment target.
2009-03-31 13:20:45 +00:00
Ronald Oussoren 008af85dc0 Fix for issue 13095 2009-03-30 20:02:08 +00:00
Ronald Oussoren 354bb5ca67 Fixes issue 5270 2009-03-30 19:56:25 +00:00
Ronald Oussoren 508282e897 * Set a custom icon on the Python installer DMG
* Remove last traces of "MacPython"
* Add options to build different flavors of the installer
  (still defaulting to a 2-way universal build that
  runs on OSX 10.3)
2009-03-30 19:34:51 +00:00
Ronald Oussoren 451e82439d Remove usage of the deprecated '-cString' and '+stringWithCString:' API's
in PythonLauncher, replacing them with the correct counterparts.
2009-03-30 19:22:56 +00:00
Ronald Oussoren 648a4feced * Updates installed dependencies to latest releaases (bzip, zlib, ...)
* Changes code for updating folder icons from Python code
  that uses the deprecated Carbon module to a much simpler
  Cocoa program in Objective-C
2009-03-30 17:15:29 +00:00
Ronald Oussoren 506e6b0657 This patch fixes issue 1254695 (wrong argument type conversion in Carbon.Qt) 2009-03-30 15:20:46 +00:00
Ronald Oussoren 1ea79913b9 Fix for issue #1113328. 2009-03-04 22:49:36 +00:00
Ronald Oussoren a97063a108 Fixes issues 3883 and 5194 2009-03-04 21:35:05 +00:00
Ronald Oussoren 9ff3042650 Fix for issue 5226. 2009-03-04 21:12:17 +00:00
Ronald Oussoren 799868e8a7 Fix issue 5224. 2009-03-04 21:07:19 +00:00
Ronald Oussoren 6290178fc9 Fix issue776533. 2009-02-17 12:38:42 +00:00
Ronald Oussoren 0238497e93 Fix for issue1594 2009-01-02 14:10:20 +00:00
Ronald Oussoren 862359e2e6 Fix for issue 3433 2009-01-02 11:46:05 +00:00
Benjamin Peterson 16a2a1d2ce revert unrelated change to installer script 2008-12-09 02:05:11 +00:00
Benjamin Peterson d729aada6a specify how things are copied 2008-12-09 02:03:03 +00:00
Benjamin Peterson c310476802 update the mac installer script 2008-10-03 11:52:06 +00:00
Benjamin Peterson 218c6662a4 we're in 2.7 now 2008-10-02 19:00:31 +00:00
Ronald Oussoren aa8efbf084 Another fix for 4-way universal builds, use the right #ifndef guard
to detect the OSX 10.5 SDK.
2008-08-12 12:41:45 +00:00
Ronald Oussoren 5aa0b4d766 Fix build issue on OSX 10.4, somehow this wasn't committed before. 2008-07-22 07:06:33 +00:00
Ronald Oussoren 0bd10fd5cc Last bit of a fix for issue3381 (addon for my patch in r65061) 2008-07-18 05:48:03 +00:00
Mark Dickinson 1b6c4c80a3 issue #3199: Fix typo in Mac/Makefile.in 2008-06-25 15:29:32 +00:00
Gregory P. Smith dd96db63f6 This reverts r63675 based on the discussion in this thread:
http://mail.python.org/pipermail/python-dev/2008-June/079988.html

Python 2.6 should stick with PyString_* in its codebase.  The PyBytes_* names
in the spirit of 3.0 are available via a #define only.  See the email thread.
2008-06-09 04:58:54 +00:00
Ronald Oussoren 0d236eb05a Fix build issue on OSX 10.4 2008-06-06 21:31:33 +00:00
Ronald Oussoren 5640ce2f1e MacOS X: Enable 4-way universal builds
This patch adds a new configure argument on OSX:
        --with-universal-archs=[32-bit|64-bit|all]

When used with the --enable-universalsdk option this controls which
CPU architectures are includes in the framework. The default is 32-bit,
meaning i386 and ppc. The most useful alternative is 'all', which includes
all 4 CPU architectures supported by MacOS X (i386, ppc, x86_64 and ppc64).

This includes limited support for the Carbon bindings in 64-bit mode as well,
limited because (a) I haven't done extensive testing and (b) a large portion
of the Carbon API's aren't available in 64-bit mode anyway.

I've also duplicated a feature of Apple's build of python: setting the
environment variable 'ARCHFLAGS' controls the '-arch' flags used for building
extensions using distutils.
2008-06-05 12:58:24 +00:00
Christian Heimes 593daf545b Renamed PyString to PyBytes 2008-05-26 12:51:38 +00:00
Ronald Oussoren 6cc9fd7bd5 Make gestaltmodule.c 64-bit safe. 2008-05-18 20:47:13 +00:00
Benjamin Peterson 236819310d Add warnings to and deprecated all those Mac modules 2008-05-12 21:42:13 +00:00
Ronald Oussoren f2ef92cee7 Fix for #1905: PythonLauncher not working correctly on OSX 10.5/Leopard
This fixes both Python Launchar and the terminalcommand module.
2008-05-02 21:42:35 +00:00
Ronald Oussoren 85f19709f9 Finish fix for issue2573, previous patch was incomplete. 2008-05-02 19:58:56 +00:00
Ronald Oussoren 580c7fec67 Fix for issue #2573: Can't change the framework name on OS X builds
This introduces a new configure option: --with-framework-name=NAME
(defaulting to 'Python'). This allows you to install several copies
of the Python framework with different names (such as a normal build
and a debug build).
2008-05-02 19:45:11 +00:00
Benjamin Peterson 5b63acd31e #2503 make singletons compared with "is" not == or !=
Thanks to Wummel for the patch
2008-03-29 15:24:25 +00:00
Christian Heimes c5f05e45cf Patch #2167 from calvin: Remove unused imports 2008-02-23 17:40:11 +00:00
Christian Heimes 000a074c95 Modified PyImport_Import and PyImport_ImportModule to always use absolute imports by calling __import__ with an explicit level of 0
Added a new API function PyImport_ImportModuleNoBlock. It solves the problem with dead locks when mixing threads and imports
2008-01-03 22:16:32 +00:00
Ronald Oussoren ba687525c5 This "fixes" compilation issues for the Carbon._OSA module on OSX Leopard
by purging bindings to OSA's debug API's. Those APIs we're completely
unsupported on OSX 10.4 and are no longer available on OSX 10.5.

Note that this patches a generated file. This is somewhat acceptable because
regenerating the file is non-trivial and wouldn't use system headers anyway.
2007-12-05 20:07:36 +00:00
Georg Brandl 07752aba5e bug #1154: release memory allocated by "es" PyArg_ParseTuple format specifier. 2007-09-12 18:29:18 +00:00
Ronald Oussoren 158ad59937 Whitespace changes to make the source more compliant with PEP8 (SF#1589070) 2006-11-07 16:00:34 +00:00
Ronald Oussoren aa56096aa0 Fix a number of typos in strings and comments (sf#1589070) 2006-11-07 15:53:38 +00:00
Tim Peters ef3f32f965 Whitespace normalization. 2006-10-18 05:09:12 +00:00
Ronald Oussoren 74d3eef73e MacOSX: fix permission problem in the generated installer 2006-10-10 07:55:06 +00:00
Ronald Oussoren b80b6e1e12 MacOSX: add more logic to recognize the correct startup file to patch to the
shell profile patching post-install script.
2006-10-08 18:18:26 +00:00
Ronald Oussoren 3778bf526c Fix for bug #1570284 2006-10-08 17:40:02 +00:00
Ronald Oussoren 5b5d110be6 Add version number to the link to the python documentation in
/Developer/Documentation/Python, better for users that install multiple versions
of python.
2006-10-08 17:37:58 +00:00
Ronald Oussoren a6790f1aab Tweak Mac/Makefile in to ensure that pythonw gets rebuild when the major version
of python changes (2.5 -> 2.6). Bug #1552935.
2006-09-17 19:23:27 +00:00
Ronald Oussoren 3564c4622f Port of revision 51902 in release25-maint to the trunk 2006-09-17 18:42:53 +00:00
Ronald Oussoren 63083c3dad Fix a glaring error and update some version numbers. 2006-09-07 12:03:10 +00:00
Ronald Oussoren 5fb9c20f2a Updated documentation for the script that builds the OSX installer. 2006-08-02 06:10:10 +00:00
Ronald Oussoren 26cad08748 This fixes bug #1527397: PythonLauncher runs scripts with the wrong working
directory. It also fixes a bug where PythonLauncher failed to launch scripts
when the scriptname (or the path to the script) contains quotes.
2006-08-01 21:00:57 +00:00
Ronald Oussoren 0f53bb1cbe Make sure the postinstall action that optionally updates the user's profile
on MacOS X actually works correctly in all cases.
2006-08-01 20:30:31 +00:00
Ronald Oussoren 3075e16c51 Fix bug #1517990: IDLE keybindings on OSX
This adds a new key definition for OSX, which is slightly different from the
classic mac definition.

Also add NEWS item for a couple of bugfixes I added recently.
2006-07-25 20:28:55 +00:00
Ronald Oussoren bfbfe1f8b9 Fix for bug #1525447 (renaming to MacOSmodule.c would also work, but not
without causing problems for anyone that is on a case-insensitive filesystem).

Setup.py tries to compile the MacOS extension from MacOSmodule.c, while the
actual file is named macosmodule.c. This is no problem on the (default)
case-insensitive filesystem, but doesn't work on case-sensitive filesystems.
2006-07-25 19:20:54 +00:00
Thomas Heller dd82734aa1 Add missing Py_DECREF. 2006-07-11 16:42:05 +00:00
Ronald Oussoren 9b8b619491 Use staticly build copies of zlib and bzip2 to build the OSX installer, that
way the resulting binaries have a better change of running on 10.3.

This patch also updates the search logic for sleepycat db3/4, without this
patch you cannot use a sleepycat build with a non-standard prefix; with this
you can (at least on OSX) if you add the prefix to CPPFLAGS/LDFLAGS at
configure-time. This change is needed to build the binary installer for OSX.
2006-06-27 12:53:52 +00:00
Ronald Oussoren 3e8d2f6e16 Use a path without a double slash to compile the .py files after installation
(macosx, binary installer). This fixes bug #1508369 for python 2.5.
2006-06-25 21:15:58 +00:00
Ronald Oussoren f3f31abd45 Drop the calldll demo's for macos, calldll isn't present anymore, no need
to keep the demo's around.
2006-06-25 21:14:19 +00:00
Ronald Oussoren d2842a6e86 MacOSX: Add a message to the first screen of the installer that tells
users how to avoid updates to their shell profile.
2006-06-22 18:33:54 +00:00