1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

GYP: rename options.gypi to config.gypi

Browse Source 
Sounds more familiar to unix users used to config.h
This commit is contained in:
Ryan Dahl 2011-12-23 14:24:50 -08:00
parent 6ac22bfb04
commit 624f70e88f
4 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -31,7 +31,7 @@ ipch/
*.sdf *.sdf
*.opensdf *.opensdf
/options.gypi /config.gypi
*-nodegyp* *-nodegyp*
/gyp-mac-tool /gyp-mac-tool
/dist-osx /dist-osx

8
Makefile
View File

@ -21,21 +21,21 @@ node_g:
out/Debug/node: out/Debug/node:
$(MAKE) -C out BUILDTYPE=Debug $(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 tools/gyp_node -f make
install: all install: all
out/Release/node tools/installer.js ./options.gypi install out/Release/node tools/installer.js ./config.gypi install
uninstall: uninstall:
out/Release/node tools/installer.js ./options.gypi uninstall out/Release/node tools/installer.js ./config.gypi uninstall
clean: clean:
-rm -rf out/Makefile node node_g out/**/*.o out/**/*.a out/$(BUILDTYPE)/node -rm -rf out/Makefile node node_g out/**/*.o out/**/*.a out/$(BUILDTYPE)/node
distclean: distclean:
-rm -rf out -rm -rf out
-rm options.gypi -rm config.gypi
test: all test: all
python tools/test.py --mode=release simple message python tools/test.py --mode=release simple message

5
configure vendored
View File

@ -231,8 +231,6 @@ def configure_openssl(o):
libs or cflags or options.openssl_libpath or options.openssl_includes) libs or cflags or options.openssl_libpath or options.openssl_includes)
print "configure options:", options
output = { output = {
'variables': {}, 'variables': {},
'include_dirs': [], 'include_dirs': [],
@ -255,8 +253,9 @@ output = {
'variables': variables, 'variables': variables,
'target_defaults': output '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 print "creating ", fn
f = open(fn, 'w+') f = open(fn, 'w+')

4
tools/gyp_node
View File

@ -29,11 +29,11 @@ if __name__ == '__main__':
if sys.platform == 'win32': if sys.platform == 'win32':
args.append(os.path.join(node_root, 'node.gyp')) args.append(os.path.join(node_root, 'node.gyp'))
common_fn = os.path.join(node_root, 'common.gypi') 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: else:
args.append(os.path.join(os.path.abspath(node_root), 'node.gyp')) args.append(os.path.join(os.path.abspath(node_root), 'node.gyp'))
common_fn = os.path.join(os.path.abspath(node_root), 'common.gypi') 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): if os.path.exists(common_fn):
args.extend(['-I', common_fn]) args.extend(['-I', common_fn])