[Pkg-javascript-commits] [rainloop] 18/38: Moved build clean step into Makefile to reduce dependencies.

[Daniel Ring]

This is an automated email from the git hooks/post-receive script.

techwolf-guest pushed a commit to branch master
in repository rainloop.

commit 458fdce26921c31cb9df7a52e1c167bc8cb9503d
Author: Techwolf <dring at g33kworld.net>
Date:   Tue May 23 17:29:59 2017 -0700

    Moved build clean step into Makefile to reduce dependencies.
---
 debian/patches/build.patch | 23 ++++++++++++-----------
 debian/rules               |  5 +++++
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/debian/patches/build.patch b/debian/patches/build.patch
index 917e384..e711a4d 100644
--- a/debian/patches/build.patch
+++ b/debian/patches/build.patch
@@ -118,8 +118,9 @@ Simplified build process to reduce dependencies.
  {
 -	return gulp.src(sDir, {read: false})
 -		.pipe(require('gulp-rimraf')());
--}
--
++	return rimraf.sync(sDir);
+ }
+ 
 -function copyFile(sFile, sNewFile, callback)
 -{
 -	fs.writeFileSync(sNewFile, fs.readFileSync(sFile));
@@ -135,9 +136,8 @@ Simplified build process to reduce dependencies.
 -		}
 -		callback();
 -	});
-+	return rimraf.sync(sDir);
- }
- 
+-}
+-
 -function signFileTask(callback) {
 -	if (argv.sign)
 -	{
@@ -425,7 +425,7 @@ Simplified build process to reduce dependencies.
  	}
  
  	cfg.destPath = cfg.releasesPath + '/webmail/' + versionFull + '/';
-@@ -498,131 +404,22 @@
+@@ -498,131 +404,20 @@
  	cfg.rainloopBuilded = true;
  });
  
@@ -537,9 +537,9 @@ Simplified build process to reduce dependencies.
 -	'rainloop:owncloud:setup', 'rainloop:owncloud:zip', 'rainloop:owncloud:clean', 'rainloop:owncloud:shortname', 'rainloop:owncloud:sign']);
 -
  // default
- gulp.task('default', function(callback) {
- 	runSequence('clean', ['js', 'css', 'vendors'], callback);
- });
+-gulp.task('default', function(callback) {
+-	runSequence('clean', ['js', 'css', 'vendors'], callback);
+-});
 -
 -// watch
 -gulp.task('watch', ['css:main', 'js:validate'], function() {
@@ -559,9 +559,10 @@ Simplified build process to reduce dependencies.
 -
 -gulp.task('b', ['build']);
 -gulp.task('o', ['owncloud']);
++gulp.task('default', ['js', 'css', 'vendors']);
 --- a/package.json
 +++ b/package.json
-@@ -54,48 +54,27 @@
+@@ -54,48 +54,26 @@
    ],
    "devDependencies": {
      "babel-core": "6.24.1",
@@ -604,7 +605,7 @@ Simplified build process to reduce dependencies.
 -    "node-notifier": "5.1.2",
      "raw-loader": "0.5.1",
 -    "rimraf": "2.6.1",
-     "run-sequence": "1.2.2",
+-    "run-sequence": "1.2.2",
      "style-loader": "0.16.1",
 -    "webpack": "2.4.1",
 -    "webpack-notifier": "1.5.0"
diff --git a/debian/rules b/debian/rules
index 1b00d54..b246b92 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,8 +12,13 @@ override_dh_auto_build:
 	rm -rf rainloop/v/0.0.0/app/libraries/phpseclib/
 	rm -rf rainloop/v/0.0.0/app/libraries/Predis/
 	rm -rf rainloop/v/0.0.0/app/libraries/SabreForRainLoop/
+	node_modules/gulp/bin/gulp.js clean
 	node_modules/gulp/bin/gulp.js rainloop:start
 
 override_dh_fixperms:
 	dh_fixperms
 	chown -R www-data:www-data debian/rainloop/var/lib/rainloop
+
+override_dh_auto_clean:
+	node_modules/gulp/bin/gulp.js clean
+	dh_auto_clean

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/rainloop.git