Skip to content

Commit

Permalink
Rename dist/ directory build/
Browse files Browse the repository at this point in the history
  • Loading branch information
jkintscher committed Sep 21, 2015
1 parent 7b46218 commit 9ca1dba
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
.DS_Store
node_modules
npm-debug.log
dist
build
16 changes: 8 additions & 8 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,25 +2,25 @@ PATH := node_modules/.bin:$(PATH)
SHELL := /bin/bash

source_files := src/ti-auth.js $(wildcard src/lib/*.js)
dist_files := $(source_files:%.js=dist/%.js)
app := dist/ti-auth.js
build_files := $(source_files:%.js=build/%.js)
app := build/ti-auth.js

test_source := $(wildcard test/*.js)
test_dist := $(test_source:%.js=dist/%.js)
tests := dist/tests.js
test_build := $(test_source:%.js=build/%.js)
tests := build/tests.js

.PHONY: all watch test clean

all: $(app) $(tests)

dist/%.js: %.js
build/%.js: %.js
mkdir -p $(dir $@)
babel $< -o $@

$(app): $(dist_files)
$(app): $(build_files)
browserify $< -o $@

$(tests): $(test_dist)
$(tests): $(test_build)
browserify $< -o $@

watch: $(source_files) $(test_source)
Expand All @@ -30,4 +30,4 @@ test: all
testem

clean:
rm -rf dist
rm -rf build
4 changes: 2 additions & 2 deletions testem.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"framework": "mocha",
"src_files": [
"dist/tests.js"
"build/tests.js"
],
"launchers": {
"Mocha": {
"command": "./node_modules/.bin/mocha -R tap dist/tests.js",
"command": "./node_modules/.bin/mocha -R tap build/tests.js",
"protocol": "tap"
}
},
Expand Down

0 comments on commit 9ca1dba

Please sign in to comment.