From 3ad698058b0717e740d060980234a30b366b1c16 Mon Sep 17 00:00:00 2001 From: Toxicat Date: Sat, 30 May 2015 14:16:28 +0200 Subject: [PATCH 1/4] Fix dependencies and commands - Fix 'gulp-scp2' dependencies problem - Add serve-win gulp command (for thoose want to contribute with a windows dev environment) --- gulpfile.js | 11 +++++++++++ package.json | 1 + 2 files changed, 12 insertions(+) diff --git a/gulpfile.js b/gulpfile.js index 7c6b3530..80780bb2 100755 --- a/gulpfile.js +++ b/gulpfile.js @@ -159,6 +159,17 @@ gulp.task('serve', function(cb) { }); }); +// Windows command to launch nginx serv +gulp.task('serve-win', function(cb) { + exec('nginx -p %cd% -c nginx.conf', function (err, stdout, stderr) { + if (stderr) { + console.warn(stderr); + console.warn('Is NGINX already running?\n'); + } + cb(); + }); +}); + gulp.task('serve-stop', function(cb) { exec('kill -QUIT $(cat nginx.pid)', function (err, stdout, stderr) { if (stderr) console.log(stderr); else cb(err); diff --git a/package.json b/package.json index 2069e7d5..603f2e06 100644 --- a/package.json +++ b/package.json @@ -20,6 +20,7 @@ "gulp-manifest": "0.0.6", "gulp-minify-css": "^1.0.0", "gulp-rev-all": "^0.8.18", + "gulp-scp2": "^0.1.3", "gulp-sourcemaps": "^1.5.1", "gulp-svgmin": "^1.1.2", "gulp-svgstore": "^5.0.1", From f5639ad74e2327ae968d5bd23b107dc0f5e5214e Mon Sep 17 00:00:00 2001 From: Toxicat Date: Sun, 31 May 2015 15:39:56 +0200 Subject: [PATCH 2/4] Compatibility with #31 --- package.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 603f2e06..49ec4e6e 100644 --- a/package.json +++ b/package.json @@ -8,6 +8,9 @@ "private": true, "dependencies": {}, "devDependencies": { + "gulp-manifest": "^0.0.6", + "angular": "^1.4.0", + "gulp-scp2": "^0.1.3", "async": "^0.9.0", "del": "^1.1.1", "gulp": "^3.8.11", @@ -20,7 +23,6 @@ "gulp-manifest": "0.0.6", "gulp-minify-css": "^1.0.0", "gulp-rev-all": "^0.8.18", - "gulp-scp2": "^0.1.3", "gulp-sourcemaps": "^1.5.1", "gulp-svgmin": "^1.1.2", "gulp-svgstore": "^5.0.1", From a35fc74542471640d07efe9b1f029f33cae8f443 Mon Sep 17 00:00:00 2001 From: PanzerKadaver Date: Wed, 3 Jun 2015 09:18:12 +0200 Subject: [PATCH 3/4] Update package to compatibility with master --- package.json | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 49ec4e6e..64cf2931 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "coriolis_shipyard", - "version": "0.9.0", + "version": "0.10.0", "repository": { "type": "git", "url": "https://github.com/cmmcleod/coriolis" @@ -8,9 +8,8 @@ "private": true, "dependencies": {}, "devDependencies": { - "gulp-manifest": "^0.0.6", - "angular": "^1.4.0", - "gulp-scp2": "^0.1.3", + "gulp-manifest": "^0.0.6", + "angular": "^1.4.0", "async": "^0.9.0", "del": "^1.1.1", "gulp": "^3.8.11", From d150cdf2a57a4f3f1e07d345ce227cb963034a1f Mon Sep 17 00:00:00 2001 From: Toxicat Date: Wed, 3 Jun 2015 18:39:19 +0200 Subject: [PATCH 4/4] Reset package.json --- package.json | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/package.json b/package.json index 64cf2931..2069e7d5 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "coriolis_shipyard", - "version": "0.10.0", + "version": "0.9.0", "repository": { "type": "git", "url": "https://github.com/cmmcleod/coriolis" @@ -8,8 +8,6 @@ "private": true, "dependencies": {}, "devDependencies": { - "gulp-manifest": "^0.0.6", - "angular": "^1.4.0", "async": "^0.9.0", "del": "^1.1.1", "gulp": "^3.8.11",