Browse Source

MPIDE-29: remove postinstall script

Gulp now handles entire build process. The --nopush flag allows for test
deploys (which are stored in .publish).
Austin Meagher 10 years ago
parent
commit
e8e84038ad
4 changed files with 15 additions and 27 deletions
  1. 1 0
      .gitignore
  2. 12 6
      gulpfile.js
  3. 2 1
      package.json
  4. 0 20
      postinstall.sh

+ 1 - 0
.gitignore

@@ -4,6 +4,7 @@
 
 # outputs
 build/
+.publish/
 src/web/bower_components/
 
 # node

+ 12 - 6
gulpfile.js

@@ -43,8 +43,8 @@ gulp
 	return gulp.src("src/web/index.html")
 	.pipe(plumber(errLogger))
 	.pipe(assets)
-	.pipe(gulpif("*.js", babel({blacklist: ["useStrict"]})))
-	.pipe(gulpif("*.js", ngAnnotate()))
+	.pipe(gulpif("index.min.js", babel({blacklist: ["useStrict"]})))
+	.pipe(gulpif("index.min.js", ngAnnotate()))
 	.pipe(gulpif("*.js", uglify()))
 	.pipe(gulpif("*.css", minifyCss()))
 	.pipe(assets.restore())
@@ -75,12 +75,18 @@ gulp
 	.pipe(gulp.dest(opts.buildDir + "/web/assets/scripts"));
 })
 
-.task("default", ["minify", "parser", "generator"], function() {
+.task("default", ["parser", "generator"], function() {
 	return;
 })
 
-.task("deploy", ["default"], function() {
-	return gulp.src(opts.buildDir + "/**/*")
-	.pipe(deploy());
+.task("build", ["minify", "parser", "generator"], function() {
+	return;
+})
+
+.task("deploy", ["build"], function() {
+	return gulp.src(opts.buildDir + "/web/**/*")
+	.pipe(deploy({
+		push: gutil.env.nopush ? false : true,
+	}));
 })
 ;

+ 2 - 1
package.json

@@ -26,7 +26,8 @@
   },
   "scripts": {
     "postinstall": "gulp",
-    "start": "gulp; http-server build/web/ -p 8000 -c-1",
+    "build": "gulp build",
+    "start": "http-server build/web/ -p 8000 -c-1",
     "test": "karma start karma.conf.js",
     "test-single-run": "karma start karma.conf.js --single-run",
     "preupdate-webdriver": "npm install",

+ 0 - 20
postinstall.sh

@@ -1,20 +0,0 @@
-#!/bin/bash
-# A postinstall script for npm to trigger additional build steps
-###############################################################################
-set -o errexit -o pipefail
-
-CMD_DIR="$(cd "$(dirname "$0")"; pwd -P)"
-cd "$CMD_DIR"
-
-PATH="$PATH:$(npm bin)"
-
-echo "Build: bower ..."
-bower install
-
-echo "Build: parser ..."
-mkdir -p "build/lib/parser/"
-pegjs -e "modellangParser" "src/lib/parser/modellang.pegjs" "build/lib/parser/modellang.js"
-
-echo "Build: generator ..."
-mkdir -p "build/lib/generator/"
-babel -m umd --module-id "modellangGenerator" -s -L --stage 0 "src/lib/generator/modellang.es6" > "build/lib/generator/modellang.js"