From 3e3a1765fa6690fb0319b23dff5be234644d663e Mon Sep 17 00:00:00 2001
From: Romain Neutron <imprec@gmail.com>
Date: Thu, 13 Feb 2014 19:10:44 +0100
Subject: [PATCH] Use npm packages for build

---
 .travis.yml  | 3 +--
 Gruntfile.js | 6 +++---
 package.json | 2 +-
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index f5c0583328..5d874940d2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,7 +17,6 @@ before_script:
   - node --version
   - npm --version
   - travis_retry npm install
-  - travis_retry npm install grunt-cli jake -g
   - echo '' > ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini
   - sh -c 'if [ $(php -r "echo PHP_MINOR_VERSION;") -le 4 ]; then echo "extension = apc.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini; fi;'
   - echo 'extension="redis.so"' > ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/redis.ini
@@ -62,5 +61,5 @@ script:
   - php hudson/cleanupSubdefs.php
 #sqlite db generation should occur once Phraseanet is up to date :
   - bin/developer phraseanet:regenerate-sqlite
-  - grunt test
+  - ./node_modules/.bin/grunt test
   - bin/phpunit
diff --git a/Gruntfile.js b/Gruntfile.js
index cd1faa113f..40ec58a4cf 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -28,9 +28,9 @@ module.exports = function(grunt) {
             dist: {
                 options: {
                     components: {
-                        "jquery.ui": ["npm", {"grunt": "build"}],
-                        "jquery-mobile": ["npm", {"grunt": "dist"}],
-                        "tinymce": ["npm", "jake"],
+                        "jquery.ui": ["npm", {"../../node_modules/.bin/grunt": "build"}],
+                        "jquery-mobile": ["npm", {"../../node_modules/.bin/grunt": "dist"}],
+                        "tinymce": ["npm", "../../node_modules/.bin/jake"],
                         "bootstrap": ["npm", {"make": "bootstrap"}],
                         "autobahnjs": [{"make":"build"}]
                     }
diff --git a/package.json b/package.json
index fbc55fcb0a..5d2f403eb4 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
     "name": "phraseanet",
     "version": "3.9.0",
     "devDependencies": {
-        "bower-canary": "latest",
+        "bower": "latest",
         "mocha-phantomjs": ">=2.0 <3.0",
         "recess": ">=1.1.0 <1.1.7",
         "uglify-js": "latest",