luo980/libuv
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

windows: fix PYTHON environment variable usage

Browse Source 
- (README.md) The PYTHON environment variable should point to python.exe
not the python directory.

- (vcvars.bat) The PYTHON environment variable should be quoted on
expansion in case there's spaces in the path.
This commit is contained in:
Jay Satiro 2014-06-06 21:53:55 -04:00 committed by Saúl Ibarra Corretgé
parent 2d45af8b25
commit 90e4afd4fa
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
README.md
View File

@ -66,10 +66,9 @@ To build with autotools:
### Windows ### Windows
First, Python 2.6 or 2.7 must be installed as it is required by [GYP][]. First, [Python][] 2.6 or 2.7 must be installed as it is required by [GYP][].
If python is not in your path set the environment variable `PYTHON` to its
Also, the directory for the preferred Python executable must be specified location. For example: `set PYTHON=C:\Python27\python.exe`
by the `PYTHON` or `Path` environment variables.
To build with Visual Studio, launch a git shell (e.g. Cmd or PowerShell) To build with Visual Studio, launch a git shell (e.g. Cmd or PowerShell)
and run vcbuild.bat which will checkout the GYP code into build/gyp and and run vcbuild.bat which will checkout the GYP code into build/gyp and
@ -139,5 +138,6 @@ See the [guidelines for contributing][].
[node.js]: http://nodejs.org/ [node.js]: http://nodejs.org/
[GYP]: http://code.google.com/p/gyp/ [GYP]: http://code.google.com/p/gyp/
[Python]: https://www.python.org/downloads/
[Visual Studio Express 2010]: http://www.microsoft.com/visualstudio/eng/products/visual-studio-2010-express [Visual Studio Express 2010]: http://www.microsoft.com/visualstudio/eng/products/visual-studio-2010-express
[guidelines for contributing]: https://github.com/joyent/libuv/blob/master/CONTRIBUTING.md [guidelines for contributing]: https://github.com/joyent/libuv/blob/master/CONTRIBUTING.md

4
vcbuild.bat
View File

@ -101,8 +101,8 @@ echo manually install gyp into %~dp0build\gyp.
exit /b 1 exit /b 1
:have_gyp :have_gyp
if not defined PYTHON set PYTHON="python" if not defined PYTHON set PYTHON=python
%PYTHON% gyp_uv.py -Dtarget_arch=%target_arch% -Duv_library=%library% "%PYTHON%" gyp_uv.py -Dtarget_arch=%target_arch% -Duv_library=%library%
if errorlevel 1 goto create-msvs-files-failed if errorlevel 1 goto create-msvs-files-failed
if not exist uv.sln goto create-msvs-files-failed if not exist uv.sln goto create-msvs-files-failed
echo Project files generated. echo Project files generated.