summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJohn Firebaugh <john.firebaugh@gmail.com>2016-05-23 18:42:42 -0700
committerJohn Firebaugh <john.firebaugh@gmail.com>2016-05-23 19:15:03 -0700
commitb611a6f5dc1e4d292eeb18e8be61b3fe327ab1e5 (patch)
tree1d50fb3a8685b9982baffb04950860fa587d1a1e /Makefile
parentc4ba219581bfaa5c9ef5ffa1280a7879d8122f2d (diff)
downloadqtlocation-mapboxgl-b611a6f5dc1e4d292eeb18e8be61b3fe327ab1e5.tar.gz
[build] Inline main.mk node targets into Makefile
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile22
1 files changed, 16 insertions, 6 deletions
diff --git a/Makefile b/Makefile
index bbda2a5731..537c840fce 100644
--- a/Makefile
+++ b/Makefile
@@ -2,8 +2,10 @@ export BUILDTYPE ?= Release
export ENABLE_COVERAGE ?= 0
ifeq ($(shell uname -s), Darwin)
+ HOST_PLATFORM = osx
export JOBS ?= $(shell sysctl -n hw.ncpu)
else ifeq ($(shell uname -s), Linux)
+ HOST_PLATFORM = linux
export JOBS ?= $(shell grep --count processor /proc/cpuinfo)
else
$(error Cannot determine host platform)
@@ -167,16 +169,24 @@ test-android:
#### Node targets #####################################################
+NODE_PRE_GYP = $(shell npm bin)/node-pre-gyp
+NODE_OUTPUT_PATH = build/node-$(HOST_PLATFORM)-$(shell uname -m)
+
node_modules: package.json
npm update # Install dependencies but don't run our own install script.
-.PHONY: node
-node: node_modules
- $(RUN) PLATFORM=node Makefile/node
+$(NODE_OUTPUT_PATH)/config.gypi: platform/$(HOST_PLATFORM)/scripts/configure.sh .mason configure
+ ./configure $< $@ $(HOST_PLATFORM) $(shell uname -m)
+
+node: $(NODE_OUTPUT_PATH)/config.gypi node_modules
+ $(NODE_PRE_GYP) configure --clang -- -I$< \
+ -Dcoverage= -Dlibuv_cflags= -Dlibuv_ldflags= -Dlibuv_static_libs=
+ $(NODE_PRE_GYP) build --clang
-.PHONY: xnode
-xnode:
- $(RUN) Xcode/node
+xnode: $(NODE_OUTPUT_PATH)/config.gypi
+ $(NODE_PRE_GYP) configure --clang -- -I$< \
+ -Dcoverage= -Dlibuv_cflags= -Dlibuv_ldflags= -Dlibuv_static_libs= \
+ -f xcode
./platform/node/scripts/create_node_scheme.sh "node test" "`npm bin tape`/tape platform/node/test/js/**/*.test.js"
./platform/node/scripts/create_node_scheme.sh "npm run test-suite" "platform/node/test/render.test.js"
open ./build/binding.xcodeproj