Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

GYP: rename options.gypi to config.gypi

Sounds more familiar to unix users used to config.h
  • Loading branch information...
commit 624f70e88f42a69b78e08278b5037359fe3a514b 1 parent 6ac22bf
@ry ry authored
Showing with 9 additions and 10 deletions.
  1. +1 −1  .gitignore
  2. +4 −4 Makefile
  3. +2 −3 configure
  4. +2 −2 tools/gyp_node
View
2  .gitignore
@@ -31,7 +31,7 @@ ipch/
*.sdf
*.opensdf
-/options.gypi
+/config.gypi
*-nodegyp*
/gyp-mac-tool
/dist-osx
View
8 Makefile
@@ -21,21 +21,21 @@ node_g:
out/Debug/node:
$(MAKE) -C out BUILDTYPE=Debug
-out/Makefile: common.gypi deps/uv/uv.gyp deps/http_parser/http_parser.gyp deps/zlib/zlib.gyp deps/v8/build/common.gypi deps/v8/tools/gyp/v8.gyp node.gyp options.gypi
+out/Makefile: common.gypi deps/uv/uv.gyp deps/http_parser/http_parser.gyp deps/zlib/zlib.gyp deps/v8/build/common.gypi deps/v8/tools/gyp/v8.gyp node.gyp config.gypi
tools/gyp_node -f make
install: all
- out/Release/node tools/installer.js ./options.gypi install
+ out/Release/node tools/installer.js ./config.gypi install
uninstall:
- out/Release/node tools/installer.js ./options.gypi uninstall
+ out/Release/node tools/installer.js ./config.gypi uninstall
clean:
-rm -rf out/Makefile node node_g out/**/*.o out/**/*.a out/$(BUILDTYPE)/node
distclean:
-rm -rf out
- -rm options.gypi
+ -rm config.gypi
test: all
python tools/test.py --mode=release simple message
View
5 configure
@@ -231,8 +231,6 @@ def configure_openssl(o):
libs or cflags or options.openssl_libpath or options.openssl_includes)
-print "configure options:", options
-
output = {
'variables': {},
'include_dirs': [],
@@ -255,8 +253,9 @@ output = {
'variables': variables,
'target_defaults': output
}
+pprint.pprint(output, indent=2)
-fn = os.path.join(root_dir, 'options.gypi')
+fn = os.path.join(root_dir, 'config.gypi')
print "creating ", fn
f = open(fn, 'w+')
View
4 tools/gyp_node
@@ -29,11 +29,11 @@ if __name__ == '__main__':
if sys.platform == 'win32':
args.append(os.path.join(node_root, 'node.gyp'))
common_fn = os.path.join(node_root, 'common.gypi')
- options_fn = os.path.join(node_root, 'options.gypi')
+ options_fn = os.path.join(node_root, 'config.gypi')
else:
args.append(os.path.join(os.path.abspath(node_root), 'node.gyp'))
common_fn = os.path.join(os.path.abspath(node_root), 'common.gypi')
- options_fn = os.path.join(os.path.abspath(node_root), 'options.gypi')
+ options_fn = os.path.join(os.path.abspath(node_root), 'config.gypi')
if os.path.exists(common_fn):
args.extend(['-I', common_fn])
Please sign in to comment.
Something went wrong with that request. Please try again.