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

configure: remove --ninja switch

Browse Source 
It is unknown if there are any users of the ninja build and keeping it
around makes refactoring the build system more difficult.  It's partly
broken (or at least, deeply inefficient) because it touches out/Makefile
every time.

PR-URL: https://github.com/iojs/io.js/pull/467
Reviewed-By: Chris Dickinson <christopher.s.dickinson@gmail.com>
Reviewed-By: Rod Vagg <rod@vagg.org>
This commit is contained in:
Ben Noordhuis 2015-01-16 12:56:30 +01:00
parent 48774ec027
commit de224d6e6c
2 changed files with 1 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Makefile
View File

@ -2,7 +2,6 @@
BUILDTYPE ?= Release BUILDTYPE ?= Release
PYTHON ?= python PYTHON ?= python
NINJA ?= ninja
DESTDIR ?= DESTDIR ?=
SIGN ?= SIGN ?=
PREFIX ?= /usr/local PREFIX ?= /usr/local
@ -20,13 +19,6 @@ NODE_G_EXE = iojs_g$(EXEEXT)
# or set the V environment variable to an empty string. # or set the V environment variable to an empty string.
V ?= 1 V ?= 1
USE_NINJA ?= 0
ifeq ($(USE_NINJA),1)
ifneq ($(V),)
NINJA := $(NINJA) -v
endif
endif
# BUILDTYPE=Debug builds both release and debug builds. If you want to compile # BUILDTYPE=Debug builds both release and debug builds. If you want to compile
# just the debug build, run `make -C out BUILDTYPE=Debug` instead. # just the debug build, run `make -C out BUILDTYPE=Debug` instead.
ifeq ($(BUILDTYPE),Release) ifeq ($(BUILDTYPE),Release)
@ -39,15 +31,6 @@ endif
# to check for changes. # to check for changes.
.PHONY: $(NODE_EXE) $(NODE_G_EXE) .PHONY: $(NODE_EXE) $(NODE_G_EXE)
ifeq ($(USE_NINJA),1)
$(NODE_EXE): config.gypi
$(NINJA) -C out/Release/
ln -fs out/Release/$(NODE_EXE) $@
$(NODE_G_EXE): config.gypi
$(NINJA) -C out/Debug/
ln -fs out/Debug/$(NODE_EXE) $@
else
$(NODE_EXE): config.gypi out/Makefile $(NODE_EXE): config.gypi out/Makefile
$(MAKE) -C out BUILDTYPE=Release V=$(V) $(MAKE) -C out BUILDTYPE=Release V=$(V)
ln -fs out/Release/$(NODE_EXE) $@ ln -fs out/Release/$(NODE_EXE) $@
@ -55,15 +38,9 @@ $(NODE_EXE): config.gypi out/Makefile
$(NODE_G_EXE): config.gypi out/Makefile $(NODE_G_EXE): config.gypi out/Makefile
$(MAKE) -C out BUILDTYPE=Debug V=$(V) $(MAKE) -C out BUILDTYPE=Debug V=$(V)
ln -fs out/Debug/$(NODE_EXE) $@ ln -fs out/Debug/$(NODE_EXE) $@
endif
out/Makefile: common.gypi deps/uv/uv.gyp deps/http_parser/http_parser.gyp deps/zlib/zlib.gyp deps/v8/build/toolchain.gypi deps/v8/build/features.gypi deps/v8/tools/gyp/v8.gyp node.gyp config.gypi out/Makefile: common.gypi deps/uv/uv.gyp deps/http_parser/http_parser.gyp deps/zlib/zlib.gyp deps/v8/build/toolchain.gypi deps/v8/build/features.gypi deps/v8/tools/gyp/v8.gyp node.gyp config.gypi
ifeq ($(USE_NINJA),1)
touch out/Makefile
$(PYTHON) tools/gyp_node.py -f ninja
else
$(PYTHON) tools/gyp_node.py -f make $(PYTHON) tools/gyp_node.py -f make
endif
config.gypi: configure config.gypi: configure
if [ -f $@ ]; then if [ -f $@ ]; then

10
configure vendored
View File

@ -51,11 +51,6 @@ parser.add_option('--gdb',
dest='gdb', dest='gdb',
help='add gdb support') help='add gdb support')
parser.add_option('--ninja',
action='store_true',
dest='use_ninja',
help='generate files for the ninja build system')
parser.add_option('--no-ifaddrs', parser.add_option('--no-ifaddrs',
action='store_true', action='store_true',
dest='no_ifaddrs', dest='no_ifaddrs',
@ -972,7 +967,6 @@ write('config.gypi', do_not_edit +
config = { config = {
'BUILDTYPE': 'Debug' if options.debug else 'Release', 'BUILDTYPE': 'Debug' if options.debug else 'Release',
'USE_NINJA': str(int(options.use_ninja or 0)),
'USE_XCODE': str(int(options.use_xcode or 0)), 'USE_XCODE': str(int(options.use_xcode or 0)),
'PYTHON': sys.executable, 'PYTHON': sys.executable,
} }
@ -987,9 +981,7 @@ write('config.mk',
gyp_args = [sys.executable, 'tools/gyp_node.py', '--no-parallel'] gyp_args = [sys.executable, 'tools/gyp_node.py', '--no-parallel']
if options.use_ninja: if options.use_xcode:
gyp_args += ['-f', 'ninja-' + flavor]
elif options.use_xcode:
gyp_args += ['-f', 'xcode'] gyp_args += ['-f', 'xcode']
elif flavor == 'win' and sys.platform != 'msys': elif flavor == 'win' and sys.platform != 'msys':
gyp_args += ['-f', 'msvs', '-G', 'msvs_version=auto'] gyp_args += ['-f', 'msvs', '-G', 'msvs_version=auto']