Merge lp:~garyvdm/bzr/bzrw into lp:bzr/2.2

[Gary van der Merwe]

(GaryvdM) Add bzrw as gui_target. Blackhole it's stderr with a custom py2exe boot script.

This addes py2exe windows target ``bzrw.exe``. This allow for starting a Bazaar GUI with out have a console open in the background.

Previous discussions about this:
https://lists.launchpad.net/bzr-windows/msg00095.html
https://lists.launchpad.net/bzr-windows/msg00307.html

As you can see, we have been trying to do this for a while now.

On of the problems that we had, is that, by default, if something is written to stderr, it is written to a log file, and a message box prompt is given. This is annoying, as the are many thing that may be written to stderr, which are not necessarily errors, while most errors are logged to .bzr.log anyway. I have overridden the py2exe script which does this, so that stderr, as well as stdout go to a blackhole.

There are still some issues where some prompts go to the console, which the user will not see when they are using this. I.e. when using openssh, and when using gpg (bug 336910).

[lp:~garyvdm/bzr/bzrw]

5348. By Gary van der Merwe on 2010-08-02

Move boot_common.py => tools/win32/py2exe_boot_common.py

[Gary van der Merwe (garyvdm)]

Bailix reviewed & approved this. Please see: https://lists.launchpad.net/bzr-windows/msg00350.html

I've moved boot_common.py as per his recommendation, and built and test a new installer, to check that py2exe picks up the moved file.

I'll try submit to lp:bzr/2.2, but I think I might not have permissions to it.

[Alexander Belchenko (bialix)]

review: Approve

[Gary van der Merwe (garyvdm)]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 02/08/2010 20:09, Gary van der Merwe wrote:
> I'll try submit to lp:bzr/2.2, but I think I might not have permissions to it.

I don't have permissions to lp:bzr/2.2. Please will someone who does
submit for me.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAkxXENwACgkQd/3EdwGKOh0a7QCgpObxI6MQ73PbHE4eqk+NGawv
NJAAn1aFTEZ/di6KC6NntMd0gPIF04jK
=5/HG
-----END PGP SIGNATURE-----

[John A Meinel (jameinel)]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Gary van der Merwe wrote:
> Bailix reviewed & approved this. Please see: https://lists.launchpad.net/bzr-windows/msg00350.html
>
> I've moved boot_common.py as per his recommendation, and built and test a new installer, to check that py2exe picks up the moved file.
>
> I'll try submit to lp:bzr/2.2, but I think I might not have permissions to it.

I'm pretty sure we changed the submit rights so that if you *have*
rights, you have rights to all pqm managed branches.

John
=:->

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAkxXGuMACgkQJdeBCYSNAAP2vwCfYpKa2K5WQ0UJ4knFrRUp2YWM
AT0AnAlDRnEWs+cR7KHBugiu9vf5ZOfS
=LI8U
-----END PGP SIGNATURE-----

[Gary van der Merwe (garyvdm)]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 02/08/2010 21:22, John Arbash Meinel wrote:
> Gary van der Merwe wrote:
>> I'll try submit to lp:bzr/2.2, but I think I might not have permissions to it.
>
> I'm pretty sure we changed the submit rights so that if you *have*
> rights, you have rights to all pqm managed branches.

Ah - sorry. I had my pubic location set to a lp: url, which I think
breaks. Will try agin.

On 02/08/2010 20:36, Bazaar Patch Queue Manager wrote:
>
> merge lp:~garyvdm/bzr/bzrw http://bazaar.launchpad.net/~bzr-pqm/bzr/2.2
> Command failed!
> running 0 tests...
>
> ----------------------------------------------------------------------
> Ran 0 tests in 0.002s
>
> OK
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAkxXHBQACgkQd/3EdwGKOh2pqwCcCe1o4ZTreS+ddUnOC4nNAsb7
mKUAnRQeVA/I+6ZsH26cnhsWAizRpkpf
=3pEh
-----END PGP SIGNATURE-----

[Gary van der Merwe (garyvdm)]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 02/08/2010 21:27, Gary van der Merwe wrote:
> On 02/08/2010 21:22, John Arbash Meinel wrote:
>> Gary van der Merwe wrote:
>>> I'll try submit to lp:bzr/2.2, but I think I might not have permissions to it.
>
>> I'm pretty sure we changed the submit rights so that if you *have*
>> rights, you have rights to all pqm managed branches.
>
> Ah - sorry. I had my pubic location set to a lp: url, which I think
> breaks. Will try agin.

Nope. That did not matter:

On 02/08/2010 21:30, Bazaar Patch Queue Manager wrote:
>
> merge http://bazaar.launchpad.net/~garyvdm/bzr/bzrw
http://bazaar.launchpad.net/~bzr-pqm/bzr/2.2
> Command failed!
> running 0 tests...
>
> ----------------------------------------------------------------------
> Ran 0 tests in 0.000s
>
> OK

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAkxXHPgACgkQd/3EdwGKOh2lfgCgtY0uhd21xzoT0nufh752KEBn
rLEAn0SeBopJQLLNKimmbN6v6usF6ULU
=L1N0
-----END PGP SIGNATURE-----

[lp:~garyvdm/bzr/bzrw]

5349. By Gary van der Merwe on 2010-08-02

Merge lp:bzr/2.2.

=== modified file 'NEWS'
--- NEWS	2010-07-29 06:45:20 +0000
+++ NEWS	2010-08-02 19:59:41 +0000
@@ -59,6 +59,10 @@
 * Add ``bzrlib.merge.MergeIntoMerger``, which can merge part or all of a
   tree, and works with unrelated branches.  (Andrew Bennetts)
 
+* Add py2exe windows target ``bzrw.exe``. This allow for starting a Bazaar
+  GUI with out have a console open in the background.
+  (Gary van der Merwe, #433781)
+
 Documentation
 *************
 

=== modified file 'setup.py'
--- setup.py	2010-07-26 10:15:32 +0000
+++ setup.py	2010-08-02 19:59:41 +0000
@@ -9,6 +9,7 @@
 import os
 import os.path
 import sys
+import copy
 
 if sys.version_info < (2, 4):
     sys.stderr.write("[ERROR] Not a supported Python version. Need 2.4+\n")
@@ -557,6 +558,8 @@
                                      company_name = "Canonical Ltd.",
                                      comments = META_INFO['description'],
                                     )
+    gui_target = copy.copy(target)
+    gui_target.dest_base = "bzrw"
 
     packages = BZRLIB['packages']
     packages.remove('bzrlib')
@@ -647,7 +650,7 @@
     console_targets = [target,
                        'tools/win32/bzr_postinstall.py',
                        ]
-    gui_targets = []
+    gui_targets = [gui_target]
     data_files = topics_files + plugins_files
 
     if 'qbzr' in plugins:
@@ -692,6 +695,8 @@
                                "dll_excludes": dll_excludes,
                                "dist_dir": "win32_bzr.exe",
                                "optimize": 2,
+                               "custom_boot_script":
+                                        "tools/win32/py2exe_boot_common.py",
                               },
                    }
 

=== added file 'tools/win32/py2exe_boot_common.py'
--- tools/win32/py2exe_boot_common.py	1970-01-01 00:00:00 +0000
+++ tools/win32/py2exe_boot_common.py	2010-08-02 19:59:41 +0000
@@ -0,0 +1,35 @@
+# Common py2exe boot script - executed for all target types.
+
+# In the standard py2exe boot script, it setup stderr so that anything written
+# to it will be written to exe.log, and a message dialog is shown.
+# For Bazaar, we log most things to .bzr.log, and there are many things that
+# write to stderr, that are not errors, and so we don't want the py2exe dialog
+# message, So also blackhole stderr.
+
+import sys
+if sys.frozen == "windows_exe":
+
+    class Blackhole(object):
+        softspace = 0
+        def write(self, text):
+            pass
+        def flush(self):
+            pass
+    sys.stdout = Blackhole()
+    sys.stderr = Blackhole()
+    del Blackhole
+del sys
+
+# Disable linecache.getline() which is called by
+# traceback.extract_stack() when an exception occurs to try and read
+# the filenames embedded in the packaged python code.  This is really
+# annoying on windows when the d: or e: on our build box refers to
+# someone elses removable or network drive so the getline() call
+# causes it to ask them to insert a disk in that drive.
+import linecache
+def fake_getline(filename, lineno, module_globals=None):
+    return ''
+linecache.orig_getline = linecache.getline
+linecache.getline = fake_getline
+
+del linecache, fake_getline