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

build: determine and use EXEEXT on windows

Browse Source 
PR-URL: https://github.com/joyent/node/pull/8294
Reviewed-By: Fedor Indutny <fedor@indutny.com>
This commit is contained in:
Ray Donnelly 2014-08-30 23:59:05 +01:00 committed by Fedor Indutny
parent 6f94b3db91
commit eccb101193
3 changed files with 39 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
Makefile
View File

@ -7,7 +7,12 @@ DESTDIR ?=
SIGN ?= SIGN ?=
PREFIX ?= /usr/local PREFIX ?= /usr/local
NODE ?= ./node # Determine EXEEXT
EXEEXT=$(shell $(PYTHON) -c "import sysconfig; print(sysconfig.get_config_var('EXE'))")
NODE ?= ./node$(EXEEXT)
NODE_EXE = node$(EXEEXT)
NODE_G_EXE = node_g$(EXEEXT)
# Default to verbose builds. # Default to verbose builds.
# To do quiet/pretty builds, run `make V=` to set V to an empty string, # To do quiet/pretty builds, run `make V=` to set V to an empty string,
@ -23,31 +28,31 @@ 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)
all: out/Makefile node all: out/Makefile $(NODE_EXE)
else else
all: out/Makefile node node_g all: out/Makefile $(NODE_EXE) $(NODE_G_EXE)
endif endif
# The .PHONY is needed to ensure that we recursively use the out/Makefile # The .PHONY is needed to ensure that we recursively use the out/Makefile
# to check for changes. # to check for changes.
.PHONY: node node_g .PHONY: $(NODE_EXE) $(NODE_G_EXE)
ifeq ($(USE_NINJA),1) ifeq ($(USE_NINJA),1)
node: config.gypi $(NODE_EXE): config.gypi
$(NINJA) -C out/Release/ $(NINJA) -C out/Release/
ln -fs out/Release/node node ln -fs out/Release/$(NODE_EXE) $@
node_g: config.gypi $(NODE_G_EXE): config.gypi
$(NINJA) -C out/Debug/ $(NINJA) -C out/Debug/
ln -fs out/Debug/node $@ ln -fs out/Debug/$(NODE_EXE) $@
else else
node: 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 node ln -fs out/Release/$(NODE_EXE) $@
node_g: 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 $@ ln -fs out/Debug/$(NODE_EXE) $@
endif 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
@ -72,7 +77,7 @@ uninstall:
$(PYTHON) tools/install.py $@ '$(DESTDIR)' '$(PREFIX)' $(PYTHON) tools/install.py $@ '$(DESTDIR)' '$(PREFIX)'
clean: clean:
-rm -rf out/Makefile node node_g out/$(BUILDTYPE)/node blog.html email.md -rm -rf out/Makefile $(NODE_EXE) $(NODE_G_EXE) out/$(BUILDTYPE)/$(NODE_EXE) blog.html email.md
-find out/ -name '*.o' -o -name '*.a' | xargs rm -rf -find out/ -name '*.o' -o -name '*.a' | xargs rm -rf
-rm -rf node_modules -rm -rf node_modules
@ -80,7 +85,7 @@ distclean:
-rm -rf out -rm -rf out
-rm -f config.gypi -rm -f config.gypi
-rm -f config.mk -rm -f config.mk
-rm -rf node node_g blog.html email.md -rm -rf $(NODE_EXE) $(NODE_G_EXE) blog.html email.md
-rm -rf node_modules -rm -rf node_modules
test: all test: all
@ -95,8 +100,8 @@ test-valgrind: all
$(PYTHON) tools/test.py --mode=release --valgrind simple message $(PYTHON) tools/test.py --mode=release --valgrind simple message
test/gc/node_modules/weak/build/Release/weakref.node: test/gc/node_modules/weak/build/Release/weakref.node:
@if [ ! -f node ]; then make all; fi @if [ ! -f $(NODE_EXE) ]; then make all; fi
./node deps/npm/node_modules/node-gyp/bin/node-gyp rebuild \ ./$(NODE_EXE) deps/npm/node_modules/node-gyp/bin/node-gyp rebuild \
--directory="$(shell pwd)/test/gc/node_modules/weak" \ --directory="$(shell pwd)/test/gc/node_modules/weak" \
--nodedir="$(shell pwd)" --nodedir="$(shell pwd)"
@ -146,11 +151,11 @@ test-internet: all
test-debugger: all test-debugger: all
$(PYTHON) tools/test.py debugger $(PYTHON) tools/test.py debugger
test-npm: node test-npm: $(NODE_EXE)
./node deps/npm/test/run.js ./$(NODE_EXE) deps/npm/test/run.js
test-npm-publish: node test-npm-publish: $(NODE_EXE)
npm_package_config_publishtest=true ./node deps/npm/test/run.js npm_package_config_publishtest=true ./$(NODE_EXE) deps/npm/test/run.js
test-addons: test-build test-addons: test-build
$(PYTHON) tools/test.py --mode=release addons $(PYTHON) tools/test.py --mode=release addons
@ -174,7 +179,7 @@ website_files = \
out/doc/sh_main.js \ out/doc/sh_main.js \
out/doc/sh_javascript.min.js out/doc/sh_javascript.min.js
doc: $(apidoc_dirs) $(website_files) $(apiassets) $(apidocs) tools/doc/ out/doc/changelog.html node doc: $(apidoc_dirs) $(website_files) $(apiassets) $(apidocs) tools/doc/ out/doc/changelog.html $(NODE_EXE)
$(apidoc_dirs): $(apidoc_dirs):
mkdir -p $@ mkdir -p $@
@ -182,24 +187,24 @@ $(apidoc_dirs):
out/doc/api/assets/%: doc/api_assets/% out/doc/api/assets/ out/doc/api/assets/%: doc/api_assets/% out/doc/api/assets/
cp $< $@ cp $< $@
out/doc/changelog.html: ChangeLog doc/changelog-head.html doc/changelog-foot.html tools/build-changelog.sh node out/doc/changelog.html: ChangeLog doc/changelog-head.html doc/changelog-foot.html tools/build-changelog.sh $(NODE_EXE)
bash tools/build-changelog.sh bash tools/build-changelog.sh
out/doc/%: doc/% out/doc/%: doc/%
cp -r $< $@ cp -r $< $@
out/doc/api/%.json: doc/api/%.markdown node out/doc/api/%.json: doc/api/%.markdown $(NODE_EXE)
out/Release/node tools/doc/generate.js --format=json $< > $@ out/Release/$(NODE_EXE) tools/doc/generate.js --format=json $< > $@
out/doc/api/%.html: doc/api/%.markdown node out/doc/api/%.html: doc/api/%.markdown $(NODE_EXE)
out/Release/node tools/doc/generate.js --format=html --template=doc/template.html $< > $@ out/Release/$(NODE_EXE) tools/doc/generate.js --format=html --template=doc/template.html $< > $@
email.md: ChangeLog tools/email-footer.md email.md: ChangeLog tools/email-footer.md
bash tools/changelog-head.sh | sed 's|^\* #|* \\#|g' > $@ bash tools/changelog-head.sh | sed 's|^\* #|* \\#|g' > $@
cat tools/email-footer.md | sed -e 's|__VERSION__|'$(VERSION)'|g' >> $@ cat tools/email-footer.md | sed -e 's|__VERSION__|'$(VERSION)'|g' >> $@
blog.html: email.md blog.html: email.md
cat $< | ./node tools/doc/node_modules/.bin/marked > $@ cat $< | ./$(NODE_EXE) tools/doc/node_modules/.bin/marked > $@
website-upload: doc website-upload: doc
rsync -r out/doc/ node@nodejs.org:~/web/nodejs.org/ rsync -r out/doc/ node@nodejs.org:~/web/nodejs.org/
@ -300,7 +305,7 @@ $(PKG): release-only
--out $(PKG) --out $(PKG)
SIGN="$(INT_SIGN)" PKG="$(PKG)" bash tools/osx-productsign.sh SIGN="$(INT_SIGN)" PKG="$(PKG)" bash tools/osx-productsign.sh
$(TARBALL): release-only node doc $(TARBALL): release-only $(NODE_EXE) doc
git archive --format=tar --prefix=$(TARNAME)/ HEAD | tar xf - git archive --format=tar --prefix=$(TARNAME)/ HEAD | tar xf -
mkdir -p $(TARNAME)/doc/api mkdir -p $(TARNAME)/doc/api
cp doc/node.1 $(TARNAME)/doc/node.1 cp doc/node.1 $(TARNAME)/doc/node.1
@ -387,9 +392,9 @@ bench-http-simple:
benchmark/http_simple_bench.sh benchmark/http_simple_bench.sh
bench-idle: bench-idle:
./node benchmark/idle_server.js & ./$(NODE_EXE) benchmark/idle_server.js &
sleep 1 sleep 1
./node benchmark/idle_clients.js & ./$(NODE_EXE) benchmark/idle_clients.js &
jslintfix: jslintfix:
PYTHONPATH=tools/closure_linter/ $(PYTHON) tools/closure_linter/closure_linter/fixjsstyle.py --strict --nojsdoc -r lib/ -r src/ --exclude_files lib/punycode.js PYTHONPATH=tools/closure_linter/ $(PYTHON) tools/closure_linter/closure_linter/fixjsstyle.py --strict --nojsdoc -r lib/ -r src/ --exclude_files lib/punycode.js

2
configure vendored
View File

@ -905,7 +905,7 @@ if options.use_ninja:
gyp_args += ['-f', 'ninja-' + flavor] gyp_args += ['-f', 'ninja-' + flavor]
elif options.use_xcode: elif options.use_xcode:
gyp_args += ['-f', 'xcode'] gyp_args += ['-f', 'xcode']
elif flavor == 'win': elif flavor == 'win' and sys.platform != 'msys':
gyp_args += ['-f', 'msvs', '-G', 'msvs_version=auto'] gyp_args += ['-f', 'msvs', '-G', 'msvs_version=auto']
else: else:
gyp_args += ['-f', 'make-' + flavor] gyp_args += ['-f', 'make-' + flavor]

4
tools/install.py
View File

@ -11,6 +11,7 @@ import os
import re import re
import shutil import shutil
import sys import sys
import sysconfig
# set at init time # set at init time
node_prefix = '/usr/local' # PREFIX variable from Makefile node_prefix = '/usr/local' # PREFIX variable from Makefile
@ -127,7 +128,8 @@ def subdir_files(path, dest, action):
action(files, subdir + '/') action(files, subdir + '/')
def files(action): def files(action):
action(['out/Release/node'], 'bin/node') exeext=sysconfig.get_config_var('EXE')
action(['out/Release/node' + exeext], 'bin/node' + exeext)
if 'true' == variables.get('node_use_dtrace'): if 'true' == variables.get('node_use_dtrace'):
action(['out/Release/node.d'], 'lib/dtrace/node.d') action(['out/Release/node.d'], 'lib/dtrace/node.d')