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: [node] don't go through npm to debug in Xcode

---
 scripts/main.mk                    |   4 +-
 scripts/node/create_node_scheme.sh |   8 +++
 scripts/node/create_npm_scheme.sh  |   7 ---
 scripts/node/node.xcscheme         |  98 +++++++++++++++++++++++++++++++++++
 scripts/node/npm.xcscheme          | 102 -------------------------------------
 5 files changed, 108 insertions(+), 111 deletions(-)
 create mode 100755 scripts/node/create_node_scheme.sh
 delete mode 100755 scripts/node/create_npm_scheme.sh
 create mode 100644 scripts/node/node.xcscheme
 delete mode 100644 scripts/node/npm.xcscheme

(limited to 'scripts')

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_node_scheme.sh b/scripts/node/create_node_scheme.sh
new file mode 100755
index 0000000000..c0907f5d20
--- /dev/null
+++ b/scripts/node/create_node_scheme.sh
@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+NAME=$1
+shift
+CMD=$@
+DIR="build/binding.xcodeproj/xcshareddata/xcschemes"
+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#{{NODE_ARGUMENT}}#${CMD}#" scripts/node/node.xcscheme > "${DIR}/${NAME}.xcscheme"
diff --git a/scripts/node/create_npm_scheme.sh b/scripts/node/create_npm_scheme.sh
deleted file mode 100755
index e5dae401c4..0000000000
--- a/scripts/node/create_npm_scheme.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env bash
-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
diff --git a/scripts/node/node.xcscheme b/scripts/node/node.xcscheme
new file mode 100644
index 0000000000..52a89fb81f
--- /dev/null
+++ b/scripts/node/node.xcscheme
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "0700"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "{{BLUEPRINT_IDENTIFIER}}"
+               BuildableName = "action_after_build"
+               BlueprintName = "action_after_build"
+               ReferencedContainer = "container:build/binding.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+      </Testables>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "YES"
+      customWorkingDirectory = "{{WORKING_DIRECTORY}}"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <PathRunnable
+         runnableDebuggingMode = "0"
+         FilePath = "{{NODE_PATH}}/node">
+      </PathRunnable>
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "{{BLUEPRINT_IDENTIFIER}}"
+            BuildableName = "action_after_build"
+            BlueprintName = "action_after_build"
+            ReferencedContainer = "container:build/binding.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+      <CommandLineArguments>
+         <CommandLineArgument
+            argument = "{{NODE_ARGUMENT}}"
+            isEnabled = "YES">
+         </CommandLineArgument>
+      </CommandLineArguments>
+      <EnvironmentVariables>
+         <EnvironmentVariable
+            key = "PATH"
+            value = "{{NODE_PATH}}:$PATH"
+            isEnabled = "YES">
+         </EnvironmentVariable>
+      </EnvironmentVariables>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "{{BLUEPRINT_IDENTIFIER}}"
+            BuildableName = "action_after_build"
+            BlueprintName = "action_after_build"
+            ReferencedContainer = "container:build/binding.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/scripts/node/npm.xcscheme b/scripts/node/npm.xcscheme
deleted file mode 100644
index e7ae4ece3d..0000000000
--- a/scripts/node/npm.xcscheme
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Scheme
-   LastUpgradeVersion = "0700"
-   version = "1.3">
-   <BuildAction
-      parallelizeBuildables = "YES"
-      buildImplicitDependencies = "YES">
-      <BuildActionEntries>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "{{BLUEPRINT_IDENTIFIER}}"
-               BuildableName = "action_after_build"
-               BlueprintName = "action_after_build"
-               ReferencedContainer = "container:build/binding.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
-      </BuildActionEntries>
-   </BuildAction>
-   <TestAction
-      buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES">
-      <Testables>
-      </Testables>
-      <AdditionalOptions>
-      </AdditionalOptions>
-   </TestAction>
-   <LaunchAction
-      buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      launchStyle = "0"
-      useCustomWorkingDirectory = "YES"
-      customWorkingDirectory = "{{WORKING_DIRECTORY}}"
-      ignoresPersistentStateOnLaunch = "NO"
-      debugDocumentVersioning = "YES"
-      debugServiceExtension = "internal"
-      allowLocationSimulation = "YES">
-      <PathRunnable
-         runnableDebuggingMode = "0"
-         FilePath = "{{NODE_PATH}}/node">
-      </PathRunnable>
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "{{BLUEPRINT_IDENTIFIER}}"
-            BuildableName = "action_after_build"
-            BlueprintName = "action_after_build"
-            ReferencedContainer = "container:build/binding.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-      <CommandLineArguments>
-         <CommandLineArgument
-            argument = "{{NODE_PATH}}/npm"
-            isEnabled = "YES">
-         </CommandLineArgument>
-         <CommandLineArgument
-            argument = "{{NPM_COMMAND}}"
-            isEnabled = "YES">
-         </CommandLineArgument>
-      </CommandLineArguments>
-      <EnvironmentVariables>
-         <EnvironmentVariable
-            key = "PATH"
-            value = "{{NODE_PATH}}:$PATH"
-            isEnabled = "YES">
-         </EnvironmentVariable>
-      </EnvironmentVariables>
-      <AdditionalOptions>
-      </AdditionalOptions>
-   </LaunchAction>
-   <ProfileAction
-      buildConfiguration = "Release"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      savedToolIdentifier = ""
-      useCustomWorkingDirectory = "NO"
-      debugDocumentVersioning = "YES">
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "{{BLUEPRINT_IDENTIFIER}}"
-            BuildableName = "action_after_build"
-            BlueprintName = "action_after_build"
-            ReferencedContainer = "container:build/binding.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-   </ProfileAction>
-   <AnalyzeAction
-      buildConfiguration = "Debug">
-   </AnalyzeAction>
-   <ArchiveAction
-      buildConfiguration = "Release"
-      revealArchiveInOrganizer = "YES">
-   </ArchiveAction>
-</Scheme>
-- 
cgit v1.2.1