Rev 2971: uninstall action shortcut for windows python-based installer in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 2971
revision-id: pqm at pqm.ubuntu.com-20071106093253-8f3a6b1nhw56f3mk
parent: pqm at pqm.ubuntu.com-20071106084351-qj6b4ji7e7avzqda
parent: bialix at ukr.net-20071106073029-h4gqz55szi1motes
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-11-06 09:32:53 +0000
message:
  uninstall action shortcut for windows python-based installer
modified:
  Makefile                       Makefile-20050805140406-d96e3498bb61c5bb
  tools/win32/bzr-win32-bdist-postinstall.py bzrwin32bdistpostinstall.py-20060629085133-098bsfj3va8jc0ql-1
    ------------------------------------------------------------
    revno: 2946.2.2
    merged: bialix at ukr.net-20071106073029-h4gqz55szi1motes
    parent: bialix at ukr.net-20071026214915-5eacqh9k2ps6jagj
    parent: pqm at pqm.ubuntu.com-20071106070621-hu1s7o5fphvhxw8m
    committer: Alexander Belchenko <bialix at ukr.net>
    branch nick: installer
    timestamp: Tue 2007-11-06 09:30:29 +0200
    message:
      merge bzr.dev
    ------------------------------------------------------------
    revno: 2946.2.1
    merged: bialix at ukr.net-20071026214915-5eacqh9k2ps6jagj
    parent: pqm at pqm.ubuntu.com-20071026085609-c3r8skfrmjj21j0m
    committer: Alexander Belchenko <bialix at ukr.net>
    branch nick: installer
    timestamp: Sat 2007-10-27 00:49:15 +0300
    message:
      windows python-based installer: shortcut for uninstall action
=== modified file 'Makefile'
--- a/Makefile	2007-10-24 08:00:25 +0000
+++ b/Makefile	2007-10-26 21:49:15 +0000
@@ -167,10 +167,15 @@
 
 # win32 Python's distutils-based installer
 # require to have Python interpreter installed on win32
-python-installer: docs
+py-inst-24: docs
 	python24 setup.py bdist_wininst --install-script="bzr-win32-bdist-postinstall.py" -d .
+
+py-inst-25: docs
 	python25 setup.py bdist_wininst --install-script="bzr-win32-bdist-postinstall.py" -d .
 
+python-installer: py-inst-24 py-inst-25
+
+
 copy-docs: docs
 	$(PYTHON) tools/win32/ostools.py copytodir README win32_bzr.exe/doc
 	$(PYTHON) tools/win32/ostools.py copytree $(WEB_DOCS) win32_bzr.exe

=== modified file 'tools/win32/bzr-win32-bdist-postinstall.py'
--- a/tools/win32/bzr-win32-bdist-postinstall.py	2007-08-02 10:28:36 +0000
+++ b/tools/win32/bzr-win32-bdist-postinstall.py	2007-10-26 21:49:15 +0000
@@ -132,3 +132,14 @@
                     args,
                     os.path.join(sys.exec_prefix, 'Scripts'))
     file_created(dst)
+
+    # uninstall shortcut
+    uninst = os.path.join(sys.exec_prefix, 'Removebzr.exe')
+    dst = os.path.join(fldr, 'Uninstall Bazaar.lnk')
+    create_shortcut(uninst,
+                    'Uninstall Bazaar',
+                    dst,
+                    '-u bzr-wininst.log',
+                    sys.exec_prefix,
+                    )
+    file_created(dst)