Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

merge windows support

  • Loading branch information...
commit 22991df5d84eb8129301907b0df9cda54ccb7589 1 parent 14d8267
@lancejpollard lancejpollard authored
Showing with 2 additions and 10 deletions.
  1. +1 −9 Makefile
  2. +1 −1  package.json
View
10 Makefile
@@ -1,10 +1,10 @@
+PATH_SEP = $(shell node -e "console.log(require('path').sep)")
SRC = $(shell find test/cases -name client -prune -o -name '*Test.coffee' -print)
STORES = memory mongodb
CMD = node_modules/mocha/bin/mocha
DIR = $(shell pwd)
GRUNT = grunt
FOREVER = forever
-PATH_SEP = $(shell node -e "console.log(require('path').sep)")
# darwin (mac), linux, win32 (windows)
OS = $(shell node -e "console.log(require('os').platform())")
DEPENDENCIES = bin$(PATH_SEP)dependencies
@@ -56,13 +56,6 @@ ifeq ($(shell which phantomjs),) # if it's blank
$(error PhantomJS is not installed. Download from http://phantomjs.org or run `brew install phantomjs` if you have Homebrew)
endif
-install-dependencies:
-ifeq (win32,$(OS))
- $(shell $(DEPENDENCIES))
-else
- $(shell $(DEPENDENCIES))
-endif
-
test: test-server test-client
test-server: test-memory test-mongodb
@@ -139,7 +132,6 @@ whitespace:
install:
npm install
- npm install-dev
watch: clean
$(GRUNT) start --config $(RUN)grunt.coffee
View
2  package.json
@@ -123,6 +123,6 @@
"test": "make test",
"start": "grunt start --config ./grunt.coffee",
"docs": "make docs",
- "postinstall": "node bin/dependencies"
+ "postinstall": "make install-dependencies"
}
}
Please sign in to comment.
Something went wrong with that request. Please try again.