From 249966a9d7c5ca5acda7a57222bf119c5cbc2a97 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Konstantin=20K=C3=A4fer?= <mail@kkaefer.com>
Date: Wed, 9 Dec 2015 11:54:04 -0800
Subject: [PATCH] [node] don't go through npm to debug in Xcode

---
 Makefile                                                    | 3 +++
 scripts/main.mk                                             | 4 ++--
 .../node/{create_npm_scheme.sh => create_node_scheme.sh}    | 5 +++--
 scripts/node/{npm.xcscheme => node.xcscheme}                | 6 +-----
 4 files changed, 9 insertions(+), 9 deletions(-)
 rename scripts/node/{create_npm_scheme.sh => create_node_scheme.sh} (64%)
 rename scripts/node/{npm.xcscheme => node.xcscheme} (95%)

diff --git a/Makefile b/Makefile
index 40dc9be30..3b0824a2b 100644
--- a/Makefile
+++ b/Makefile
@@ -101,6 +101,9 @@ Xcode/node: ; $(RUN) HTTP=none ASSET=none CACHE=none Xcode/node
 
 .PHONY: xnode
 xnode: Xcode/node ; @open ./build/binding.xcodeproj
+nproj:
+	$(RUN) HTTP=none ASSET=none CACHE=none node/xproj
+	@open ./build/binding.xcodeproj
 
 .PHONY: test
 test: ; $(RUN) Makefile/test
diff --git a/scripts/main.mk b/scripts/main.mk
index aefd2690e..c65a7aedd 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
similarity index 64%
rename from scripts/node/create_npm_scheme.sh
rename to scripts/node/create_node_scheme.sh
index e5dae401c..c0907f5d2 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
similarity index 95%
rename from scripts/node/npm.xcscheme
rename to scripts/node/node.xcscheme
index e7ae4ece3..52a89fb81 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>