Merge lp://staging/~garyvdm/bzr-windows-installers/maybe into lp://staging/bzr-windows-installers
Proposed by
Gary van der Merwe
| Status: | Merged | ||||||||
|---|---|---|---|---|---|---|---|---|---|
| Merged at revision: | 128 | ||||||||
| Proposed branch: | lp://staging/~garyvdm/bzr-windows-installers/maybe | ||||||||
| Merge into: | lp://staging/bzr-windows-installers | ||||||||
| Diff against target: |
2916 lines (+108/-2599) 20 files modified
bazaar_releases.py (+89/-33) build.py (+5/-5) filesets/bootstrap/buildout.cfg (+2/-2) issgen.py (+2/-0) templates/inno/bzr.iss (+10/-0) tools/win32/__init__.py (+0/-1) tools/win32/bazaar.url (+0/-7) tools/win32/bootstrap.py (+0/-77) tools/win32/build_release.py (+0/-207) tools/win32/buildout-templates/bin/build-installer.bat.in (+0/-160) tools/win32/buildout.cfg (+0/-288) tools/win32/bzr-win32-bdist-postinstall.py (+0/-145) tools/win32/bzr.iss.cog (+0/-372) tools/win32/bzr_postinstall.py (+0/-353) tools/win32/file_version.py (+0/-38) tools/win32/hacks/setup.py (+0/-714) tools/win32/info.txt (+0/-6) tools/win32/ostools.py (+0/-144) tools/win32/run_script.py (+0/-16) tools/win32/start_bzr.bat (+0/-31) |
||||||||
| To merge this branch: | bzr merge lp://staging/~garyvdm/bzr-windows-installers/maybe | ||||||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Bazaar Developers | Pending | ||
|
Review via email:
|
|||
Description of the change
This branch has varies fixes that I need to get 2.2b3 and 2.2b4 to build.
For what is changed, please see the log.
It is bad that I'm submitting this as one big patch. I could split it up, but I'm hoping that wont be needed.
To post a comment you must log in.
Revision history for this message
| John A Meinel (jameinel) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Gary van der Merwe wrote:
> Gary van der Merwe has proposed merging lp:~garyvdm/bzr-windows-installers/maybe into lp:bzr-windows-installers.
>
> Requested reviews:
> Bazaar Developers (bzr)
> Related bugs:
> #569077 Bazaar 2.2b2 install fails, Vista SP2 x64
> https:/
> #600803 Plugin pyo files may be ignored and recreated from source
> https:/
>
>
> This branch has varies fixes that I need to get 2.2b3 and 2.2b4 to build.
>
> For what is changed, please see the log.
>
> It is bad that I'm submitting this as one big patch. I could split it up, but I'm hoping that wont be needed.
>
Ultimately, I think because it is what built the actual installers, we
should just land this. We can always discuss cleaning it up, etc at a
later time.
I'm a bit concerned about just deleting all of the 'tools' directory.
Stuff like the icon bitmaps, etc are in there. I guess we are actually
pulling those out of the bzr source?
I suppose we can always just revert and move them once we fix the
installer to grab them from the install script, rather than the bzr source.
John
=:->
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://
iEYEARECAAYFAkx
xRUAoMqM8FNmsGZ
=YChS
-----END PGP SIGNATURE-----