From 51e126882b57bf050351237ead2a868a4a255c27 Mon Sep 17 00:00:00 2001 From: David Majda Date: Sat, 10 Nov 2012 15:08:38 +0100 Subject: [PATCH] Assume development dependencies are installed locally This is compatible with what "npm install" does and allows for isolated development environment. --- .gitignore | 1 + Makefile | 20 +++++++++++--------- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index e423b4a..681cc0c 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ browser/* +node_modules/* diff --git a/Makefile b/Makefile index 41a6f5f..5df7cd9 100644 --- a/Makefile +++ b/Makefile @@ -19,12 +19,14 @@ MODULES = utils \ # ===== Directories ===== -SRC_DIR = src -LIB_DIR = lib -BIN_DIR = bin -BROWSER_DIR = browser -SPEC_DIR = spec -BENCHMARK_DIR = benchmark +SRC_DIR = src +LIB_DIR = lib +BIN_DIR = bin +BROWSER_DIR = browser +SPEC_DIR = spec +BENCHMARK_DIR = benchmark +NODE_MODULES_DIR = node_modules +NODE_MODULES_BIN_DIR = $(NODE_MODULES_DIR)/.bin # ===== Files ===== @@ -38,9 +40,9 @@ VERSION_FILE = VERSION # ===== Executables ===== -JSHINT = jshint -UGLIFYJS = uglifyjs -JASMINE_NODE = jasmine-node +JSHINT = $(NODE_MODULES_BIN_DIR)/jshint +UGLIFYJS = $(NODE_MODULES_BIN_DIR)/uglifyjs +JASMINE_NODE = $(NODE_MODULES_BIN_DIR)/jasmine-node PEGJS = $(BIN_DIR)/pegjs BENCHMARK_RUN = $(BENCHMARK_DIR)/run