Merge lp:~jameinel/bzr/jam-integration into lp:~bzr/bzr/trunk-old

Proposed by John A Meinel
Status: Merged
Approved by: Martin Pool
Approved revision: no longer in the source branch.
Merged at revision: not available
Proposed branch: lp:~jameinel/bzr/jam-integration
Merge into: lp:~bzr/bzr/trunk-old
Diff against target: 15 lines
To merge this branch: bzr merge lp:~jameinel/bzr/jam-integration
Reviewer Review Type Date Requested Status
Vincent Ladeuil Approve
Review via email: mp+7626@code.launchpad.net
To post a comment you must log in.
Revision history for this message
John A Meinel (jameinel) wrote :

Simple patch to Makefile to include python-2.6 as a development target.

Note that this probably doesn't fix 32-bit versus 64-bit installer issues. But at least it gets 2.6 out there.

Revision history for this message
Vincent Ladeuil (vila) :
review: Approve

Updating diff...

An updated diff will be available in a few minutes. Reload to see the changes.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Makefile'
2--- Makefile 2009-06-10 09:34:02 +0000
3+++ Makefile 2009-06-18 15:35:10 +0000
4@@ -254,7 +254,10 @@
5 py-inst-25: docs
6 python25 setup.py bdist_wininst --install-script="bzr-win32-bdist-postinstall.py" -d .
7
8-python-installer: py-inst-24 py-inst-25
9+py-inst-26: docs
10+ python26 setup.py bdist_wininst --install-script="bzr-win32-bdist-postinstall.py" -d .
11+
12+python-installer: py-inst-24 py-inst-25 py-inst-26
13
14
15 copy-docs: docs