Skip to content
Snippets Groups Projects
Commit 89fe8d2a authored by PavelBegunkov's avatar PavelBegunkov
Browse files

Add destination path to deploy

parent cef3a2ef
Branches
Tags
No related merge requests found
include ./config/path.makefile
default: deploy default: deploy
@ @
install: DB_install Tasker_install install: DB_install Tasker_deploy
gulp install
@ @
deploy: DB_deploy Tasker_deploy Tasker_run deploy: DB_deploy Tasker_deploy
gulp
@ @
Tasker_install: Tasker_deploy
gulp install serverDeploy: DB_deploy Tasker_deploy
@ rsync -ru --exclude="application/config" --exclude="news.md" --exclude="updates.md" \
~dev_rating/ $(DST_PATH)
gulp --release --force --dst=$(DST_PATH)
# -----------------------
# Tasker section
Tasker_deploy: Tasker_deploy:
npm install npm install
Tasker_run: # -----------------------
gulp # database forwarding
DB_%: DB_%:
@$(MAKE) $* -C ./db @$(MAKE) $* -C ./db
...@@ -16,10 +16,6 @@ ifeq ($(DB),) ...@@ -16,10 +16,6 @@ ifeq ($(DB),)
DB := $(shell bash -c 'read -p "Database: " db; echo $$db') DB := $(shell bash -c 'read -p "Database: " db; echo $$db')
endif endif
default: deploy
@
FLAGS := -u $(LOGIN) FLAGS := -u $(LOGIN)
ifneq ($(PASS),) ifneq ($(PASS),)
ifneq ($(PASS),"") ifneq ($(PASS),"")
...@@ -49,16 +45,22 @@ deploy ...@@ -49,16 +45,22 @@ deploy
deploy: $(call GET_NAMES, stored) deploy: $(call GET_NAMES, stored)
@ @
clear: fix: $(call GET_NAMES, fixes)
@yes | mysqladmin $(FLAGS) drop $(DB) || true @
@mysqladmin $(FLAGS) create $(DB);
clear:
@ yes | mysqladmin $(FLAGS) drop $(DB) || true
@ mysqladmin $(FLAGS) create $(DB);
%: %:
@mysql $(FLAGS) $(DB) < $@.sql @ mysql $(FLAGS) $(DB) < $@.sql
@echo $@.sql @ echo $@.sql
hideData:
@ echo "UPDATE accounts SET Password = sha1('11111'), \
ActivationCode= null, \
EMail= null" | mysql $(FLAGS) $(DB)
deploy_test: \ deploy_test: \
clear \ clear \
...@@ -72,8 +74,5 @@ deploy \ ...@@ -72,8 +74,5 @@ deploy \
fix fix
fix: $(call GET_NAMES, fixes)
@
hideData:
@ echo "UPDATE accounts SET Password = sha1('11111'), ActivationCode= null, EMail= null" | mysql $(FLAGS) $(DB)
# DST_PATH =
...@@ -9,10 +9,12 @@ var varg = minimist(process.argv.slice(2), { ...@@ -9,10 +9,12 @@ var varg = minimist(process.argv.slice(2), {
default: {env: process.env.NODE_ENV || 'debug'} default: {env: process.env.NODE_ENV || 'debug'}
}); });
var options = { var options = {
opt: varg.env !== 'debug' || varg.release, opt: varg.env !== 'debug' || varg.release, // optimize
inc: !varg.force, inc: !varg.force, // incremental build
beauty: varg.beauty || varg.rainbow beauty: varg.beauty || varg.rainbow,
dst: varg.dst
}; };
...@@ -44,15 +46,18 @@ var paths = new (function () { ...@@ -44,15 +46,18 @@ var paths = new (function () {
var self = this; var self = this;
self.root = '.'; self.root = '.';
var src = '.';
var dst = options.dst || self.root + '/~dev_rating';
var app = self.root + '/~dev_rating'; var app = self.root + '/~dev_rating';
var media = self.root + '/media'; var media = src + '/media';
var stat = app + '/static'; var stat = dst + '/static';
self.src = { self.src = {
css: media + '/css/**/*.css', css: media + '/css/**/*.css',
less: media + '/less/**/*.less', less: media + '/less/**/*.less',
js: media + '/js/**/*.js', js: media + '/js/**/*.js',
config: self.root + '/deploy/phpConfig/*', config: src + '/deploy/phpConfig/*',
css_components: media + '/components/**/*.css', css_components: media + '/components/**/*.css',
js_components: media + '/components/**/*.js' js_components: media + '/components/**/*.js'
}; };
...@@ -62,7 +67,7 @@ var paths = new (function () { ...@@ -62,7 +67,7 @@ var paths = new (function () {
css: stat + '/css/', css: stat + '/css/',
less: stat + '/css/', less: stat + '/css/',
js: stat + '/js/', js: stat + '/js/',
config: app + '/application/config/', config: dst + '/application/config/',
css_components: stat + '/components/', css_components: stat + '/components/',
js_components: stat + '/components/' js_components: stat + '/components/'
}; };
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment