Skip to content

Commit f9e3a54

Browse files
committed
See issue #960 Added initial `gyp.js` support with --gypjs command line option. Environment variable `npm_config_gypjs` also turns this option on. Update configure and build usage strings depending on `npm_config_gypjs` environment variable
1 parent 77383dd commit f9e3a54

27 files changed

+157
-94
lines changed

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -181,6 +181,7 @@ Command Options
181181
| `--python=$path` | Set path to the python (2) binary
182182
| `--msvs_version=$version` | Set Visual Studio version (win)
183183
| `--solution=$solution` | Set Visual Studio Solution version (win)
184+
| `--gypjs` | Use gyp.js instead of gyp
184185

185186

186187
License

gyp/buildbot/buildbot_run.py

100755100644
File mode changed.

gyp/gyp

100755100644
File mode changed.

gyp/gyp.bat

100755100644
Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
@rem Copyright (c) 2009 Google Inc. All rights reserved.
2-
@rem Use of this source code is governed by a BSD-style license that can be
3-
@rem found in the LICENSE file.
4-
5-
@python "%~dp0gyp_main.py" %*
1+
@rem Copyright (c) 2009 Google Inc. All rights reserved.
2+
@rem Use of this source code is governed by a BSD-style license that can be
3+
@rem found in the LICENSE file.
4+
5+
@python "%~dp0gyp_main.py" %*

gyp/gyp_main.py

100755100644
File mode changed.

gyp/gyptest.py

100755100644
File mode changed.

gyp/pylib/gyp/MSVSSettings_test.py

100755100644
File mode changed.

gyp/pylib/gyp/__init__.py

100755100644
File mode changed.

gyp/pylib/gyp/common_test.py

100755100644
File mode changed.

gyp/pylib/gyp/easy_xml_test.py

100755100644
File mode changed.

0 commit comments

Comments
 (0)