Rev 1906: (bialix) Create a nice win32 installer in /home/pqm/archives/thelove/bzr/+trunk/

Canonical.com Patch Queue Manager pqm at pqm.ubuntu.com
Tue Aug 1 21:07:50 BST 2006


------------------------------------------------------------
revno: 1906
revision-id: pqm at pqm.ubuntu.com-20060801200749-e0bd496331bb4d2b
parent: pqm at pqm.ubuntu.com-20060801131706-e6e4daaef24c3da3
parent: john at arbash-meinel.com-20060801200018-cafa6272d9b8cac4
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2006-08-01 21:07:49 +0100
message:
  (bialix) Create a nice win32 installer
added:
  COPYING.txt                    gpl.txt-20060725144612-kxut42v3nkatynfv-1
  bzr.ico                        bzr.ico-20060629083000-q18ip0hk7lq55i4y-1
  doc/default.css                default.css-20060622101119-tgwtdci8z769bjb9-1
  doc/index.txt                  index.txt-20060622101119-tgwtdci8z769bjb9-2
  tools/win32/                   win32-20060622100836-b3yup582rt3y0nvm-2
  tools/win32/__init__.py        __init__.py-20060622100836-b3yup582rt3y0nvm-3
  tools/win32/bazaar.url         bazaar.url-20060622100836-b3yup582rt3y0nvm-4
  tools/win32/bzr-win32-bdist-postinstall.py bzrwin32bdistpostinstall.py-20060629085133-098bsfj3va8jc0ql-1
  tools/win32/bzr.iss.cog        bzr.iss.cog-20060622100836-b3yup582rt3y0nvm-5
  tools/win32/bzr_postinstall.py bzr_postinstall.py-20060622100836-b3yup582rt3y0nvm-6
  tools/win32/file_version.py    file_version.py-20060622100836-b3yup582rt3y0nvm-8
  tools/win32/ostools.py         ostools.py-20060731163025-npjffm46rgnkl50d-1
  tools/win32/start_bzr.bat      start_bzr.bat-20060622100836-b3yup582rt3y0nvm-9
modified:
  .bzrignore                     bzrignore-20050311232317-81f7b71efa2db11a
  HACKING                        HACKING-20050805200004-2a5dc975d870f78c
  Makefile                       Makefile-20050805140406-d96e3498bb61c5bb
  bzr                            bzr.py-20050313053754-5485f144c7006fa6
  bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
  bzrlib/doc/api/__init__.py     __init__.py-20051224020744-7b87d590843855bc
  bzrlib/help.py                 help.py-20050505025907-4dd7a6d63912f894
  bzrlib/osutils.py              osutils.py-20050309040759-eeaff12fbf77ac86
  bzrlib/store/__init__.py       store.py-20050309040759-164dc5173d6406c2
  bzrlib/tests/blackbox/test_help.py test_help.py-20060216004358-4ee8a2a338f75a62
  bzrlib/tests/blackbox/test_too_much.py blackbox.py-20050620052131-a7370d756399f615
  bzrlib/tests/test_setup.py     test_setup.py-20051208073730-4a59a6368c4efa04
  bzrlib/textui.py               textui.py-20050309040759-5d0cebe09c528e7d
  bzrlib/urlutils.py             urlutils.py-20060502195429-e8a161ecf8fac004
  doc/README.1st                 README.1st-20060314161707-b943d5d4cce669b6
  doc/configuration.txt          configuration.txt-20060314161707-868350809502af01
  doc/plugins.txt                plugins.txt-20060314145616-525099a747f3ffdd
  doc/setting_up_email.txt       setting_up_email.txt-20060314161707-fd242c8944346173
  doc/specifying_revisions.txt   specifying_revisions.txt-20060314161707-19deb139101bea33
  doc/tutorial.txt               tutorial.txt-20050804190939-9dcbba2ef053bc84
  doc/using_aliases.txt          using_aliases.txt-20060314161707-c21d27fa2939e039
  generate_docs.py               bzrinfogen.py-20051211224525-78e7c14f2c955e55
  setup.py                       setup.py-20050314065409-02f8a0a6e3f9bc70
  tools/doc_generate/autodoc_bash_completion.py big_bash_completion.py-20051211223059-00ecfbfcc8056b78
  tools/doc_generate/autodoc_man.py bzrman.py-20050601153041-0ff7f74de456d15e
  tools/doc_generate/autodoc_rstx.py autodoc_rstx.py-20060420024836-3e0d4a526452193c
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060801200018-cafa6272d9b8cac4
    parent: john at arbash-meinel.com-20060801194923-8c0c2e00f83668ef
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: jam-integration
    timestamp: Tue 2006-08-01 15:00:18 -0500
    message:
      Fix broken test
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060801194923-8c0c2e00f83668ef
    parent: john at arbash-meinel.com-20060801194747-f99a4873adfe4bfe
    parent: bialix at ukr.net-20060801190918-a82c09bb845b56e5
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: jam-integration
    timestamp: Tue 2006-08-01 14:49:23 -0500
    message:
      [merge] bialix: add a win32 installer
        ------------------------------------------------------------
        merged: bialix at ukr.net-20060801190918-a82c09bb845b56e5
        parent: bialix at ukr.net-20060801183536-7e9c769ac1e5268e
        parent: pqm at pqm.ubuntu.com-20060801131706-e6e4daaef24c3da3
        committer: Alexander Belchenko <bialix at ukr.net>
        branch nick: installer.integration
        timestamp: Tue 2006-08-01 22:09:18 +0300
        message:
          merge bzr.dev.revno.1905
        ------------------------------------------------------------
        merged: bialix at ukr.net-20060801183536-7e9c769ac1e5268e
        parent: bialix at ukr.net-20060801183408-5f0deb2ce1853675
        committer: Alexander Belchenko <bialix at ukr.net>
        branch nick: installer
        timestamp: Tue 2006-08-01 21:35:36 +0300
        message:
          minor polishing after review
        ------------------------------------------------------------
        merged: bialix at ukr.net-20060801183408-5f0deb2ce1853675
        parent: bialix at ukr.net-20060801182742-b28d2edf7eea75d1
        committer: Alexander Belchenko <bialix at ukr.net>
        branch nick: installer
        timestamp: Tue 2006-08-01 21:34:08 +0300
        message:
          setup.py: automatically grab version info from bzrlib
        ------------------------------------------------------------
        merged: bialix at ukr.net-20060801182742-b28d2edf7eea75d1
        parent: bialix at ukr.net-20060731175921-8a6f892a1c2befdb
        committer: Alexander Belchenko <bialix at ukr.net>
        branch nick: installer
        timestamp: Tue 2006-08-01 21:27:42 +0300
        message:
          English
        ------------------------------------------------------------
        merged: bialix at ukr.net-20060731175921-8a6f892a1c2befdb
        parent: bialix at ukr.net-20060731174817-d829b8135e197aa5
        committer: Alexander Belchenko <bialix at ukr.net>
        branch nick: installer
        timestamp: Mon 2006-07-31 20:59:21 +0300
        message:
          HACKING: mention where to get instructions for building windows installers
        ------------------------------------------------------------
        merged: bialix at ukr.net-20060731174817-d829b8135e197aa5
        parent: bialix at ukr.net-20060731161954-9677501c228e65e8
        committer: Alexander Belchenko <bialix at ukr.net>
        branch nick: installer
        timestamp: Mon 2006-07-31 20:48:17 +0300
        message:
          Makefile: cross-platform actions for building installer
        ------------------------------------------------------------
        merged: bialix at ukr.net-20060731161954-9677501c228e65e8
        parent: bialix at ukr.net-20060731161257-91a231523255332c
        committer: Alexander Belchenko <bialix at ukr.net>
        branch nick: installer
        timestamp: Mon 2006-07-31 19:19:54 +0300
        message:
          No full path to iscc (Inno Setup compiler).
          You should have directory where Inno Setup installed listed in $PATH
        ------------------------------------------------------------
        merged: bialix at ukr.net-20060731161257-91a231523255332c
        parent: bialix at ukr.net-20060731155850-3082cd432aa9c09c
        committer: Alexander Belchenko <bialix at ukr.net>
        branch nick: installer
        timestamp: Mon 2006-07-31 19:12:57 +0300
        message:
          new official bzr.ico
        ------------------------------------------------------------
        merged: bialix at ukr.net-20060731155850-3082cd432aa9c09c
        parent: bialix at ukr.net-20060731061323-1ac4a03334df1ee0
        committer: Alexander Belchenko <bialix at ukr.net>
        branch nick: installer
        timestamp: Mon 2006-07-31 18:58:50 +0300
        message:
          English phrases corrected as John Meinel suggested.
        ------------------------------------------------------------
        merged: bialix at ukr.net-20060731061323-1ac4a03334df1ee0
        parent: bialix at ukr.net-20060730215735-31c47c2281f7f4e4
        committer: Alexander Belchenko <bialix at ukr.net>
        branch nick: installer
        timestamp: Mon 2006-07-31 09:13:23 +0300
        message:
          generate_docs (man/rstx): fixed description of configuration file
          (as John Meinel suggested)
        ------------------------------------------------------------
        merged: bialix at ukr.net-20060730215735-31c47c2281f7f4e4
        parent: bialix at ukr.net-20060730184700-cfc979f8f530908d
        committer: Alexander Belchenko <bialix at ukr.net>
        branch nick: installer
        timestamp: Mon 2006-07-31 00:57:35 +0300
        message:
          generate_docs (man/rstx): get help with .help() method, otherwise help for merge incomplete
        ------------------------------------------------------------
        merged: bialix at ukr.net-20060730184700-cfc979f8f530908d
        parent: bialix at ukr.net-20060730174223-0ca6148aa4a070f7
        committer: Alexander Belchenko <bialix at ukr.net>
        branch nick: installer
        timestamp: Sun 2006-07-30 21:47:00 +0300
        message:
          setup.py: get version info from bzrlib
        ------------------------------------------------------------
        merged: bialix at ukr.net-20060730174223-0ca6148aa4a070f7
        parent: bialix at ukr.net-20060730165740-b3ce4419930f549b
        committer: Alexander Belchenko <bialix at ukr.net>
        branch nick: installer
        timestamp: Sun 2006-07-30 20:42:23 +0300
        message:
          improved postinstall script for python installer; added minimal support of win98
        ------------------------------------------------------------
        merged: bialix at ukr.net-20060730165740-b3ce4419930f549b
        parent: bialix at ukr.net-20060730164312-b025fd3ff0cee59e
        committer: Alexander Belchenko <bialix at ukr.net>
        branch nick: installer
        timestamp: Sun 2006-07-30 19:57:40 +0300
        message:
          setup.py: improved bzr.bat creation
        ------------------------------------------------------------
        merged: bialix at ukr.net-20060730164312-b025fd3ff0cee59e
        parent: bialix at ukr.net-20060730072336-3e9fd7ddb67b5f47
        committer: Alexander Belchenko <bialix at ukr.net>
        branch nick: installer
        timestamp: Sun 2006-07-30 19:43:12 +0300
        message:
          rename  gpl.txt => COPYING.txt
        ------------------------------------------------------------
        merged: bialix at ukr.net-20060730072336-3e9fd7ddb67b5f47
        parent: bialix at ukr.net-20060730070222-43d32b9b36d9316b
        committer: Alexander Belchenko <bialix at ukr.net>
        branch nick: installer
        timestamp: Sun 2006-07-30 10:23:36 +0300
        message:
          More branding: bazaar-ng -> Bazaar; bazaar-ng.org -> bazaar-vcs.org
        ------------------------------------------------------------
        merged: bialix at ukr.net-20060730070222-43d32b9b36d9316b
        parent: bialix at ukr.net-20060730065239-03b4ac02d9f56202
        parent: pqm at pqm.ubuntu.com-20060729144556-473b3c46dfa061a7
        committer: Alexander Belchenko <bialix at ukr.net>
        branch nick: installer
        timestamp: Sun 2006-07-30 10:02:22 +0300
        message:
          merge bzr.dev
        ------------------------------------------------------------
        merged: bialix at ukr.net-20060730065239-03b4ac02d9f56202
        parent: bialix at ukr.net-20060725150047-8b55995d14b15635
        committer: Alexander Belchenko <bialix at ukr.net>
        branch nick: installer
        timestamp: Sun 2006-07-30 09:52:39 +0300
        message:
          branding: change Bazaar-NG to Bazaar
        ------------------------------------------------------------
        merged: bialix at ukr.net-20060725150047-8b55995d14b15635
        parent: bialix at ukr.net-20060725144234-5bb714854e3b6a53
        committer: Alexander Belchenko <bialix at ukr.net>
        branch nick: installer
        timestamp: Tue 2006-07-25 18:00:47 +0300
        message:
          show text of GPL license during installation of standalone bzr.exe
        ------------------------------------------------------------
        merged: bialix at ukr.net-20060725144234-5bb714854e3b6a53
        parent: bialix at ukr.net-20060725143941-c26bbfafc5862ad4
        parent: bialix at ukr.net-20060725140702-7009b9790e2cb141
        committer: Alexander Belchenko <bialix at ukr.net>
        branch nick: installer.integration
        timestamp: Tue 2006-07-25 17:42:34 +0300
        message:
          merge improvements to doc-generator: show aliases, more environment variables
            ------------------------------------------------------------
            merged: bialix at ukr.net-20060725140702-7009b9790e2cb141
            parent: bialix at ukr.net-20060721092035-b67c94cf7601f741
            committer: Alexander Belchenko <bialix at ukr.net>
            branch nick: doc-generator
            timestamp: Tue 2006-07-25 17:07:02 +0300
            message:
              more environment variables for man page
            ------------------------------------------------------------
            merged: bialix at ukr.net-20060721092035-b67c94cf7601f741
            parent: bialix at ukr.net-20060717100258-ef80f4fe1bf02a0e
            committer: Alexander Belchenko <bialix at ukr.net>
            branch nick: doc-generator
            timestamp: Fri 2006-07-21 12:20:35 +0300
            message:
              more environment variables
            ------------------------------------------------------------
            merged: bialix at ukr.net-20060717100258-ef80f4fe1bf02a0e
            parent: bialix at ukr.net-20060717093049-9e17bc672d612b83
            committer: Alexander Belchenko <bialix at ukr.net>
            branch nick: doc-generator
            timestamp: Mon 2006-07-17 13:02:58 +0300
            message:
              bzr.1 man page: show aliases for commands; fixed description of bazaar.conf
            ------------------------------------------------------------
            merged: bialix at ukr.net-20060717093049-9e17bc672d612b83
            parent: bialix at ukr.net-20060717090858-f83f07725d95492e
            committer: Alexander Belchenko <bialix at ukr.net>
            branch nick: doc-generator
            timestamp: Mon 2006-07-17 12:30:49 +0300
            message:
              bzr_man.rstx: show aliases for commands
        ------------------------------------------------------------
        merged: bialix at ukr.net-20060725143941-c26bbfafc5862ad4
        parent: bialix at ukr.net-20060725141148-ecd1976cb617e4cf
        parent: bialix at ukr.net-20060716065825-8688beba0ca97583
        committer: Alexander Belchenko <bialix at ukr.net>
        branch nick: installer.integration
        timestamp: Tue 2006-07-25 17:39:41 +0300
        message:
          - merge improvements to python-based installer
          - don't restrict python-based installer to python 2.4 only because 2.5 is coming
            ------------------------------------------------------------
            merged: bialix at ukr.net-20060716065825-8688beba0ca97583
            parent: bialix at ukr.net-20060713054334-4afffc450675f46c
            committer: Alexander Belchenko <bialix at ukr.net>
            branch nick: win32.python-installer
            timestamp: Sun 2006-07-16 09:58:25 +0300
            message:
              python-installer:
              - install html docs to C:\Python24\Doc\Bazaar-NG
              - make entry in Start => Programs => Bazaar-NG:
                  * link to documentation index
                  * start bzr help in cmd shell
        ------------------------------------------------------------
        merged: bialix at ukr.net-20060725141148-ecd1976cb617e4cf
        parent: bialix at ukr.net-20060717090858-f83f07725d95492e
        committer: Alexander Belchenko <bialix at ukr.net>
        branch nick: installer
        timestamp: Tue 2006-07-25 17:11:48 +0300
        message:
          script bzr_test_dependencies.py removed from installer.
          TODO: push that functionality to plugin 'dependencies'
        ------------------------------------------------------------
        merged: bialix at ukr.net-20060717090858-f83f07725d95492e
        parent: pqm at pqm.ubuntu.com-20060712215300-126aea223e34b65c
        parent: bialix at ukr.net-20060713054334-4afffc450675f46c
        committer: Alexander Belchenko <bialix at ukr.net>
        branch nick: installer
        timestamp: Mon 2006-07-17 12:08:58 +0300
        message:
          merged installer work
        ------------------------------------------------------------
        merged: bialix at ukr.net-20060713054334-4afffc450675f46c
        parent: bialix at ukr.net-20060713050923-cfd07df9a9119176
        committer: Alexander Belchenko <bialix at ukr.net>
        branch nick: win32.installer
        timestamp: Thu 2006-07-13 08:43:34 +0300
        message:
          setup.py:
          - make 3 branches of setup (standard, py2exe, bdist_wininst)
          - exclude Tkinter and medusa from py2exe build
        ------------------------------------------------------------
        merged: bialix at ukr.net-20060713050923-cfd07df9a9119176
        parent: pqm at pqm.ubuntu.com-20060712152038-043e16bab49a5b50
        parent: bialix at ukr.net-20060629091547-540fc31b864d5b26
        committer: Alexander Belchenko <bialix at ukr.net>
        branch nick: win32.installer
        timestamp: Thu 2006-07-13 08:09:23 +0300
        message:
          merge with bzr.dev revno.1860
        ------------------------------------------------------------
        merged: bialix at ukr.net-20060629091547-540fc31b864d5b26
        parent: bialix at ukr.net-20060629084131-3ea4d44e3204e36f
        committer: Alexander Belchenko <bialix at ukr.net>
        branch nick: installer
        timestamp: Thu 2006-06-29 12:15:47 +0300
        message:
          resurrected python's distutils based installer for win32
        ------------------------------------------------------------
        merged: bialix at ukr.net-20060629084131-3ea4d44e3204e36f
        parent: pqm at pqm.ubuntu.com-20060629034618-75fa8c0c1b44421e
        committer: Alexander Belchenko <bialix at ukr.net>
        branch nick: installer
        timestamp: Thu 2006-06-29 11:41:31 +0300
        message:
          win32 installer for bzr.dev.0.9
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060801194747-f99a4873adfe4bfe
    parent: john at arbash-meinel.com-20060731143156-1508e14154ce48d8
    parent: pqm at pqm.ubuntu.com-20060801131706-e6e4daaef24c3da3
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: jam-integration
    timestamp: Tue 2006-08-01 14:47:47 -0500
    message:
      [merge] bzr.dev 1905



More information about the bazaar-commits mailing list