From 0cfb726f84d097b4a041b9ab757263e9b0e0ad40 Mon Sep 17 00:00:00 2001 From: PavelBegunkov <asml.Silence@gmail.com> Date: Wed, 1 Jul 2015 09:39:25 +0300 Subject: [PATCH] Gulp installation optimization --- deploy/Makefile | 2 ++ deploy/gulp/Makefile | 8 ++------ deploy/gulp/gulp-install.bat | 7 +------ deploy/gulp/gulp-install.sh | 7 +------ 4 files changed, 6 insertions(+), 18 deletions(-) diff --git a/deploy/Makefile b/deploy/Makefile index 38158c95e..d25cd2c91 100644 --- a/deploy/Makefile +++ b/deploy/Makefile @@ -1,5 +1,7 @@ all: install_gulp @ +install: install_gulp + install_gulp: $(MAKE) build -C ./gulp diff --git a/deploy/gulp/Makefile b/deploy/gulp/Makefile index 5e7e2cda7..163c3a37d 100644 --- a/deploy/gulp/Makefile +++ b/deploy/gulp/Makefile @@ -2,11 +2,7 @@ GULP_DEP := gulp gulp-rename gulp-concat-css gulp-minify-css gulp-less gulp-auto INSTALL_PATH := ../ LOCAL_FLAGS := --save-dev --prefix $(INSTALL_PATH) -build: global $(GULP_DEP) - @ - -global: +build: npm install -g gulp + npm install $(LOCAL_FLAGS) $(GULP_DEP) -%: - npm install $(LOCAL_FLAGS) $@ diff --git a/deploy/gulp/gulp-install.bat b/deploy/gulp/gulp-install.bat index d1733260a..be1c5eb68 100644 --- a/deploy/gulp/gulp-install.bat +++ b/deploy/gulp/gulp-install.bat @@ -1,7 +1,2 @@ call npm install -g gulp -call npm install --save-dev --prefix ../ gulp -call npm install --save-dev --prefix ../ gulp-rename -call npm install --save-dev --prefix ../ gulp-concat-css -call npm install --save-dev --prefix ../ gulp-minify-css -call npm install --save-dev --prefix ../ gulp-less -call npm install --save-dev --prefix ../ gulp-autoprefixer +call npm install --save-dev --prefix ../ gulp gulp-rename gulp-concat-css gulp-minify-css gulp-less gulp-autoprefixer diff --git a/deploy/gulp/gulp-install.sh b/deploy/gulp/gulp-install.sh index 0d9effd9a..abecf162f 100644 --- a/deploy/gulp/gulp-install.sh +++ b/deploy/gulp/gulp-install.sh @@ -1,7 +1,2 @@ npm install -g gulp -npm install --save-dev --prefix ../ gulp -npm install --save-dev --prefix ../ gulp-rename -npm install --save-dev --prefix ../ gulp-concat-css -npm install --save-dev --prefix ../ gulp-minify-css -npm install --save-dev --prefix ../ gulp-less -npm install --save-dev --prefix ../ gulp-autoprefixer +npm install --save-dev --prefix ../ gulp gulp-rename gulp-concat-css gulp-minify-css gulp-less gulp-autoprefixer -- GitLab