diff options
| author | Konstantin Käfer <mail@kkaefer.com> | 2015-12-09 11:54:04 -0800 |
|---|---|---|
| committer | Konstantin Käfer <mail@kkaefer.com> | 2015-12-09 11:54:04 -0800 |
| commit | 249966a9d7c5ca5acda7a57222bf119c5cbc2a97 (patch) | |
| tree | 91e4ca23c260b4de79aa6189cb6b4ac3d03cabed /scripts | |
| parent | 9bd6abb023dd4393fe72acfd49a116a5ef4b90a5 (diff) | |
| download | qtlocation-mapboxgl-249966a9d7c5ca5acda7a57222bf119c5cbc2a97.tar.gz | |
[node] don't go through npm to debug in Xcode
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/main.mk | 4 | ||||
| -rwxr-xr-x | scripts/node/create_node_scheme.sh (renamed from scripts/node/create_npm_scheme.sh) | 5 | ||||
| -rw-r--r-- | scripts/node/node.xcscheme (renamed from scripts/node/npm.xcscheme) | 6 |
3 files changed, 6 insertions, 9 deletions
diff --git a/scripts/main.mk b/scripts/main.mk index aefd2690ed..c65a7aedde 100644 --- a/scripts/main.mk +++ b/scripts/main.mk @@ -112,8 +112,8 @@ node/configure: node/xproj: $(QUIET)$(ENV) $(NODE_PRE_GYP) configure --clang -- \ $(GYP_FLAGS) -f xcode -Dlibuv_cflags= -Dlibuv_ldflags= -Dlibuv_static_libs= - $(QUIET)$(ENV) ./scripts/node/create_npm_scheme.sh test - $(QUIET)$(ENV) ./scripts/node/create_npm_scheme.sh run test-suite + $(QUIET)$(ENV) ./scripts/node/create_node_scheme.sh "node test" "`npm bin tape`/tape platform/node/test/js/**/*.test.js" + $(QUIET)$(ENV) ./scripts/node/create_node_scheme.sh "npm run test-suite" "platform/node/test/render.test.js" Makefile/node: Makefile/__project__ node/configure @printf "$(TEXT_BOLD)$(COLOR_GREEN)* Building target node...$(FORMAT_END)\n" diff --git a/scripts/node/create_npm_scheme.sh b/scripts/node/create_node_scheme.sh index e5dae401c4..c0907f5d20 100755 --- a/scripts/node/create_npm_scheme.sh +++ b/scripts/node/create_node_scheme.sh @@ -1,7 +1,8 @@ #!/usr/bin/env bash +NAME=$1 +shift CMD=$@ DIR="build/binding.xcodeproj/xcshareddata/xcschemes" -FILE="${DIR}/npm ${CMD}.xcscheme" mkdir -p "${DIR}" -sed "s#{{NODE_PATH}}#$(dirname `which node`)#;s#{{BLUEPRINT_IDENTIFIER}}#$(hexdump -n 12 -v -e '/1 "%02X"' /dev/urandom)#;s#{{WORKING_DIRECTORY}}#$(pwd)#;s#{{NPM_COMMAND}}#${CMD}#" scripts/node/npm.xcscheme > "${FILE}"
\ No newline at end of file +sed "s#{{NODE_PATH}}#$(dirname `which node`)#;s#{{BLUEPRINT_IDENTIFIER}}#$(hexdump -n 12 -v -e '/1 "%02X"' /dev/urandom)#;s#{{WORKING_DIRECTORY}}#$(pwd)#;s#{{NODE_ARGUMENT}}#${CMD}#" scripts/node/node.xcscheme > "${DIR}/${NAME}.xcscheme" diff --git a/scripts/node/npm.xcscheme b/scripts/node/node.xcscheme index e7ae4ece3d..52a89fb81f 100644 --- a/scripts/node/npm.xcscheme +++ b/scripts/node/node.xcscheme @@ -58,11 +58,7 @@ </MacroExpansion> <CommandLineArguments> <CommandLineArgument - argument = "{{NODE_PATH}}/npm" - isEnabled = "YES"> - </CommandLineArgument> - <CommandLineArgument - argument = "{{NPM_COMMAND}}" + argument = "{{NODE_ARGUMENT}}" isEnabled = "YES"> </CommandLineArgument> </CommandLineArguments> |