[MERGE] Fix how cog.py is invoked on Windows

[John Arbash Meinel]

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

Mark Hammond wrote:
> Hi all,
>   Attached is a patch to how cog.py is executed by the build process.
> Specifically, Makefile currently specifies the following command be
> executed:
> 
> 	cog.py -d -o tools/win32/bzr.iss tools/win32/bzr.iss.cog
> 
> But this fails to work for me when not using a cygwin or similar shell.
> Further, adding .py to PATHEXT and ensuring the Python Scripts directory is
> on the path doesn't help.
> 
> My solution was to introduce a new script - tools\win32\run_script.py - that
> script will attempt to locate the real script you want to run and execute
> it.  As a result, the new command for cog.py looks like:
> 
> 	python tools/win32/run_script.py cog.py -d -o tools/win32/bzr.iss
> tools/win32/bzr.iss.cog
> 
> This has the benefit of having no requirements other than a 'python.exe' be
> on your PATH (which is already assumed elsewhere) - no need for the scripts
> directory to be on the path, nor for other funky environment variables or
> settings be used.
> 
> Cheers,
> 
> Mark
> 
> 
> 

BB:approve

Care to send it as a real bundle instead of just a patch?

Getting cog.py to work for me was one of those annoying things to get working.
(I ended up writing a shell script with that name to thunk over to the real
python, etc.)

John
=:->

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

iD8DBQFIdKbPJdeBCYSNAAMRArCDAJ9BTJCZP6+/cjoEuV2fycyDKjHVewCgy+TO
DMS+Kn0+fzLipPpA8tfs1P4=
=AjR4
-----END PGP SIGNATURE-----