Skip to content

Commit

Permalink
make a few changes to package.json (add make test to makefile)
Browse files Browse the repository at this point in the history
  • Loading branch information
fat committed Apr 19, 2012
1 parent de9271b commit 1160935
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 7 deletions.
3 changes: 1 addition & 2 deletions .travis.yml
@@ -1,4 +1,3 @@
language: node_js
node_js:
- 0.6
script: "make build"
- 0.6
8 changes: 8 additions & 0 deletions Makefile
Expand Up @@ -36,6 +36,14 @@ build:
@echo "Thanks for using Bootstrap,"
@echo "<3 @mdo and @fat\n"

#
# RUN JSHINT
# TODO: run unittests
#

test:
jshint js/*.js --config js/.jshintrc
jshint js/tests/unit/*.js --config js/.jshintrc

#
# BUILD SIMPLE BOOTSTRAP DIRECTORY
Expand Down
12 changes: 7 additions & 5 deletions package.json
@@ -1,22 +1,24 @@
{
"name": "bootstrap"
"name": "bootstrap"
, "description": "HTML, CSS, and JS toolkit from Twitter."
, "version": "2.0.3"
, "keywords": ["bootstrap", "css"]
, "homepage": "http://twitter.github.com/bootstrap/"
, "author": "Twitter Inc."
, "scripts": { "test": "make test" }
, "repository": {
"type": "git"
"type": "git"
, "url": "https://github.com/twitter/bootstrap.git"
}
, "licenses": [
{ "type": "Apache-2.0"
{
"type": "Apache-2.0"
, "url": "http://www.apache.org/licenses/LICENSE-2.0"
}
]
, "devDependencies": {
"uglify-js": "*"
"uglify-js": "*"
, "jshint": "*"
, "recess": "*"
}
}
}

0 comments on commit 1160935

Please sign in to comment.