From e174e4b7c1433d0c2552a4ee0cec1f9d3b8655dd Mon Sep 17 00:00:00 2001
From: RomanSteinberg <romanofficial@yandex.ru>
Date: Wed, 2 Sep 2015 18:30:40 +0300
Subject: [PATCH] FIX: local gulp usage in makefile

---
 Makefile              | 12 ++++++------
 db/Makefile           |  4 +++-
 db/fixes/01_09_15.sql | 12 ++++--------
 3 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/Makefile b/Makefile
index b44347a20..aef38b7b0 100644
--- a/Makefile
+++ b/Makefile
@@ -1,21 +1,21 @@
 include ./config/path.makefile
-
+GULP = ./node_modules/gulp/bin/gulp.js
 
 default: deploy
 	@
 
 # install local gulp and packages, empty db and static site files
 install: DB_install Tasker_deploy
-	gulp install
+	$(GULP) install
 	@
 
 # install local gulp and packages, update db routines and static site files
 deploy: DB_deploy Tasker_deploy
-	gulp
+	$(GULP)
 	
 # copy server files
 copy_files: Tasker_deploy
-	gulp --release --force
+	$(GULP) --release --force
 	rsync -ru  --exclude="application/config" --exclude="news.md" --exclude="updates.md"  \
 \~dev_rating/ $(DST_PATH)
 
@@ -26,7 +26,7 @@ release_no_fix: DB_deploy copy_files
 release: DB_fix server_deploy 
 
 # server deploy with dump load
-load_deploy: DB_deploy_test copy_files
+load_deploy: DB_deployTest copy_files
 	
 
 # -----------------------
@@ -39,4 +39,4 @@ Tasker_deploy:
 # database forwarding
 
 DB_%:
-	@$(MAKE) $* -C ./db
\ No newline at end of file
+	@$(MAKE) $* -C ./db
diff --git a/db/Makefile b/db/Makefile
index 86b73429d..20c165d50 100644
--- a/db/Makefile
+++ b/db/Makefile
@@ -56,16 +56,18 @@ hideData:
 ActivationCode= null, \
 EMail= null" | mysql --database=$(DB) $(FLAGS)
 
-deploy_test: \
+deployTest: \
 clear \
 ../../mmcs_rating \
 fix \
 deploy \
 hideData
+	@
 
 update: \
 deploy \
 fix
+	@
 
 %:
 	@ mysql --database=$(DB) $(FLAGS)  < $@.sql
diff --git a/db/fixes/01_09_15.sql b/db/fixes/01_09_15.sql
index a5cca162b..7c290ddb3 100644
--- a/db/fixes/01_09_15.sql
+++ b/db/fixes/01_09_15.sql
@@ -1,6 +1,4 @@
-DELIMITER //
-
-DROP TABLE IF EXISTS `compound_disciplines`//
+DROP TABLE IF EXISTS `compound_disciplines`;
 
 CREATE TABLE IF NOT EXISTS `compound_disciplines` (
   `ID` int(11) NOT NULL AUTO_INCREMENT,
@@ -8,20 +6,18 @@ CREATE TABLE IF NOT EXISTS `compound_disciplines` (
   `GradeID` int(11) NOT NULL,
   `SpecializationID` int(11) NOT NULL,
   PRIMARY KEY (`ID`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 //
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 
 ALTER TABLE `disciplines`
   ADD `CompoundDiscID` INT(11) DEFAULT NULL,
-  ADD KEY `CompoundDiscID` (`CompoundDiscID`)//
+  ADD KEY `CompoundDiscID` (`CompoundDiscID`);
 
 ALTER TABLE `disciplines`
-  ADD CONSTRAINT `disciplines_ibfk_6` FOREIGN KEY (`CompoundDiscID`) REFERENCES `compound_disciplines` (`ID`) //
+  ADD CONSTRAINT `disciplines_ibfk_6` FOREIGN KEY (`CompoundDiscID`) REFERENCES `compound_disciplines` (`ID`);
 
 ALTER TABLE `compound_disciplines`
   ADD CONSTRAINT `compound_disciplines_ibfk_1` FOREIGN KEY (`SpecializationID`) REFERENCES `specializations` (`ID`),
   ADD CONSTRAINT `compound_disciplines_ibfk_2` FOREIGN KEY (`GradeID`) REFERENCES `grades` (`ID`);
 
-DELIMITER ;
-
 
-- 
GitLab