Skip to content
This repository has been archived by the owner on Apr 22, 2023. It is now read-only.

Commit

Permalink
Browse files Browse the repository at this point in the history
GYP: rename options.gypi to config.gypi
Sounds more familiar to unix users used to config.h
  • Loading branch information
ry committed Dec 23, 2011
1 parent 6ac22bf commit 624f70e
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Expand Up @@ -31,7 +31,7 @@ ipch/
*.sdf
*.opensdf

/options.gypi
/config.gypi
*-nodegyp*
/gyp-mac-tool
/dist-osx
Expand Down
8 changes: 4 additions & 4 deletions Makefile
Expand Up @@ -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
Expand Down
5 changes: 2 additions & 3 deletions configure
Expand Up @@ -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': [],
Expand All @@ -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+')
Expand Down
4 changes: 2 additions & 2 deletions tools/gyp_node
Expand Up @@ -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])
Expand Down

0 comments on commit 624f70e

Please sign in to comment.