Merge lp:~vila/bzr-gtk/388790-windows-setup into lp:bzr-gtk/gtk2

This is a cleaned up version of the patch proposed in https://bugs.edge.launchpad.net/bzr/+bug/388790.

Guilhem, can you test it again on the two cited envs (Vladislav's and yours) and report here.

Bialix, can you comment again about the validity of the approach (the path needs to be tweaked for bzr.exe *only*) ?

If no bzr-gtk dev objects, I'll land this patch as soon as I get confirmation from both of you plus a little delay (for objections).

Yes, that's correct, sys.path manipulations needed only for bzr.exe. This approach assumes that all extra libs required for <email address hidden> is placed in _lib subdirectory inside directory where plugin resides.

And:

#sys.path.append(here)

^-- yep, you really don't need this append. I dunno why it was there.

> Yes, that's correct, sys.path manipulations needed only for bzr.exe. This
> approach assumes that all extra libs required for <email address hidden> is placed in
> _lib subdirectory inside directory where plugin resides.

Oh my, I understand the intent now :-(
So that's really a workaround waiting for a better windows packaging that can provide
the needed gtk libraries, I'll add a comment to clarify that.

>
> And:
>
> #sys.path.append(here)
>
> ^-- yep, you really don't need this append. I dunno why it was there.

Ok. Good.

Vincent Ladeuil пишет:
>> Yes, that's correct, sys.path manipulations needed only for bzr.exe. This
>> approach assumes that all extra libs required for <email address hidden> is placed in
>> _lib subdirectory inside directory where plugin resides.
>
> Oh my, I understand the intent now :-(

And why it makes you sad? We did this for QBzr for couple of years long
before QBzr was accepted to be a part of TortoiseBzr and therefore
starting bundled into bzr.exe installer.

> So that's really a workaround waiting for a better windows packaging that can provide
> the needed gtk libraries, I'll add a comment to clarify that.

To be clear, yes, this is workaround, and it required not only for
bzr-gtk. But for bzr-git as well, and many other plugins which dare to
use some extra libs. This is how py2exe worked. There is nothing special
about bzr-gtk. We all in the same boat.

But please, don't start the thread about "bzr.exe must die". Pretty please.

__________ Information from ESET NOD32 Antivirus, version of virus signature database 4469 (20090930) __________

The message was checked by ESET NOD32 Antivirus.

http://www.esetnod32.ru

Vladislav Vaintroub my colleague and me confirm that the patch works. I branched Vincent's bzr-gtk branch into my plugins directory, also put there (inside bzr-gtk) the _lib directory found in Kevin Light's package (available at http://bazaar-vcs.org/bzr-gtk?action=show&redirect=BzrGtk), and then gannotate/viz/gcommit work.
Vincent: about what your patch does. We had observed that when using the standalone bzr Windows installer, bzr-gtk cannot find pygtk (even though pygtk is properly installed). Looks like that version of bzr cannot look for modules out of certain predefined places. Kevin Light's solution is
1) to bundle pygtk and other modules in one directory (makes a quicker install than installing pygtk, pygobject, etc etc)
2) to instruct bzr to look into that directory (which is done through a patch to bzr-gtk adding the directory to the search path).
He created a patched version of bzr-gtk available at http://bazaar-vcs.org/bzr-gtk?action=show&redirect=BzrGtk, but that is based on bzr-gtk 0.96. And it's annoying to have to use the old 0.96 for us.
With your patch, we can use Kevin's approach (put a _lib directory when you install) but without using 0.96: we can do it with the bzr-gtk dev branch, which is better.

Guilhem, bzr.exe can't find pygtk because it working with bundled python interpreter and therefore even don't try to find your installed Python. Therefore you need to place any extra libs to _lib.

Alexander: yes, this is what we are doing and it works :-)

Yes, I know that it works, we do the same in qbzr. I'm just trying to explain why bzr.exe "can't" find installed pygtk.