openstack
/
fuel-main
Code Issues Proposed changes

Replace Grunt with Gulp 

(fuel-main part)

Implements blueprint move-to-gulp

Change-Id: If15610a6a4043b3bf91aadb4e99b929abc4e4ffb
This commit is contained in:
Vitaly Kramskikh 2015-03-21 00:47:37 +03:00
parent cd9dd3757b
commit bbc0c1230b
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/module.mk
View File

@ -25,7 +25,7 @@ $(BUILD_DIR)/packages/sources/$1/$2: $(call find-files,$3)
mkdir -p $(BUILD_DIR)/packages/sources/$1 mkdir -p $(BUILD_DIR)/packages/sources/$1
ifeq ($1,nailgun) ifeq ($1,nailgun)
mkdir -p $(BUILD_DIR)/npm-cache mkdir -p $(BUILD_DIR)/npm-cache
cd $3 && npm --cache $(BUILD_DIR)/npm-cache install && grunt build --static-dir=compressed_static cd $3 && npm --cache $(BUILD_DIR)/npm-cache install && ./node_modules/.bin/gulp build --static-dir=compressed_static
rm -rf $3/static rm -rf $3/static
mv $3/compressed_static $3/static mv $3/compressed_static $3/static
endif endif

2
prepare-build-env.sh
View File

@ -115,7 +115,7 @@ sudo apt-get -y install build-essential make git $GEMPKG debootstrap createrepo
sudo gem install bundler -v 1.2.1 sudo gem install bundler -v 1.2.1
sudo gem install builder sudo gem install builder
sudo pip install xmlbuilder jinja2 pbr sudo pip install xmlbuilder jinja2 pbr
sudo npm install -g grunt-cli sudo npm install -g gulp
sudo chown -R `whoami`.`id -gn` `npm config get cache` sudo chown -R `whoami`.`id -gn` `npm config get cache`
# Add account to sudoers # Add account to sudoers

2
utils/jenkins/fuelweb_fakeui.sh
View File

@ -25,7 +25,7 @@ npm install
./manage.py loaddata nailgun/fixtures/sample_environment.json ./manage.py loaddata nailgun/fixtures/sample_environment.json
# Compressing javascript # Compressing javascript
grunt build --static-dir=static_compressed ./node_modules/.bin/gulp build --static-dir=static_compressed
# Replace static path with the one pointing to compressed static content folder # Replace static path with the one pointing to compressed static content folder
STATIC_DIR=$WORKSPACE/build/repos/nailgun/nailgun/static_compressed STATIC_DIR=$WORKSPACE/build/repos/nailgun/nailgun/static_compressed