hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-24 02:13:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use npm packages for build

Browse Source
This commit is contained in:
Romain Neutron
2014-02-13 19:10:44 +01:00
parent 41ec3907c5
commit 3e3a1765fa
3 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.travis.yml
View File

@@ -17,7 +17,6 @@ before_script:
- node --version - node --version
- npm --version - npm --version
- travis_retry npm install - travis_retry npm install
- travis_retry npm install grunt-cli jake -g
- echo '' > ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini - 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;' - 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 - echo 'extension="redis.so"' > ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/redis.ini
@@ -62,5 +61,5 @@ script:
- php hudson/cleanupSubdefs.php - php hudson/cleanupSubdefs.php
#sqlite db generation should occur once Phraseanet is up to date : #sqlite db generation should occur once Phraseanet is up to date :
- bin/developer phraseanet:regenerate-sqlite - bin/developer phraseanet:regenerate-sqlite
- grunt test - ./node_modules/.bin/grunt test
- bin/phpunit - bin/phpunit

6
Gruntfile.js
View File

@@ -28,9 +28,9 @@ module.exports = function(grunt) {
dist: { dist: {
options: { options: {
components: { components: {
"jquery.ui": ["npm", {"grunt": "build"}], "jquery.ui": ["npm", {"../../node_modules/.bin/grunt": "build"}],
"jquery-mobile": ["npm", {"grunt": "dist"}], "jquery-mobile": ["npm", {"../../node_modules/.bin/grunt": "dist"}],
"tinymce": ["npm", "jake"], "tinymce": ["npm", "../../node_modules/.bin/jake"],
"bootstrap": ["npm", {"make": "bootstrap"}], "bootstrap": ["npm", {"make": "bootstrap"}],
"autobahnjs": [{"make":"build"}] "autobahnjs": [{"make":"build"}]
} }

2
package.json
View File

@@ -2,7 +2,7 @@
"name": "phraseanet", "name": "phraseanet",
"version": "3.9.0", "version": "3.9.0",
"devDependencies": { "devDependencies": {
"bower-canary": "latest", "bower": "latest",
"mocha-phantomjs": ">=2.0 <3.0", "mocha-phantomjs": ">=2.0 <3.0",
"recess": ">=1.1.0 <1.1.7", "recess": ">=1.1.0 <1.1.7",
"uglify-js": "latest", "uglify-js": "latest",