From d68323d7bbc3406e0b4b22ca746be8ff38e04612 Mon Sep 17 00:00:00 2001 From: knsv Date: Sat, 24 Oct 2015 20:45:42 +0200 Subject: [PATCH] Using the latest jison in build --- gulp/tasks/jison.js | 12 ++++++------ package.json | 2 +- scripts/jison.sh | 1 + 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/gulp/tasks/jison.js b/gulp/tasks/jison.js index 4beb57b3b..b31315ef5 100644 --- a/gulp/tasks/jison.js +++ b/gulp/tasks/jison.js @@ -11,11 +11,11 @@ gulp.task('jison', function() { }); gulp.task('jison_legacy', shell.task([ - 'jison src/diagrams/flowchart/parser/flow.jison -o src/diagrams/flowchart/parser/flow.js', - 'jison src/diagrams/flowchart/parser/dot.jison -o src/diagrams/flowchart/parser/dot.js', - 'jison src/diagrams/sequenceDiagram/parser/sequenceDiagram.jison -o src/diagrams/sequenceDiagram/parser/sequenceDiagram.js', - 'jison src/diagrams/example/parser/example.jison -o src/diagrams/example/parser/example.js', - 'jison src/diagrams/gantt/parser/gantt.jison -o src/diagrams/gantt/parser/gantt.js', - //'jison src/diagrams/sequenceDiagram/parser/sequenceDiagram.jison -o src/diagrams/sequenceDiagram/parser/sequenceDiagram.js' + //'node node_modules/jison/lib/cli.js src/diagrams/classDiagram/parser/classDiagram.jison -o src/diagrams/classDiagram/parser/classDiagram.js', + 'node node_modules/jison/lib/cli.js src/diagrams/sequenceDiagram/parser/sequenceDiagram.jison -o src/diagrams/sequenceDiagram/parser/sequenceDiagram.js', + 'node node_modules/jison/lib/cli.js src/diagrams/example/parser/example.jison -o src/diagrams/example/parser/example.js', + 'node node_modules/jison/lib/cli.js src/diagrams/flowchart/parser/flow.jison -o src/diagrams/flowchart/parser/flow.js', + 'node node_modules/jison/lib/cli.js src/diagrams/flowchart/parser/dot.jison -o src/diagrams/flowchart/parser/dot.js', + 'node node_modules/jison/lib/cli.js src/diagrams/gantt/parser/gantt.jison -o src/diagrams/gantt/parser/gantt.js' ])); diff --git a/package.json b/package.json index 0cd7ee2aa..308904928 100644 --- a/package.json +++ b/package.json @@ -16,7 +16,7 @@ "scripts": { "live": "live-server ./test/examples", "lint": "node node_modules/eslint/bin/eslint.js src", - "jison": "source ./scripts/jison.sh", + "jison": "gulp jison_legacy", "watch": "source ./scripts/watch.sh", "doc": "rm -r build;rm -r dist/www;gulp vartree;cp dist/www/all.html ../mermaid-pages/index.html;cp dist/mermaid.js ../mermaid-pages/javascripts/lib;cp dist/mermaid.forest.css ../mermaid-pages/stylesheets", "tape": "node node_modules/.bin/tape test/cli_test-*.js", diff --git a/scripts/jison.sh b/scripts/jison.sh index c1a8b2e07..a2f125f3f 100644 --- a/scripts/jison.sh +++ b/scripts/jison.sh @@ -1,3 +1,4 @@ +node node_modules/jison/lib/cli.js src/diagrams/classDiagram/parser/classDiagram.jison -o src/diagrams/classDiagram/parser/classDiagram.js node node_modules/jison/lib/cli.js src/diagrams/sequenceDiagram/parser/sequenceDiagram.jison -o src/diagrams/sequenceDiagram/parser/sequenceDiagram.js node node_modules/jison/lib/cli.js src/diagrams/example/parser/example.jison -o src/diagrams/example/parser/example.js node node_modules/jison/lib/cli.js src/diagrams/flowchart/parser/flow.jison -o src/diagrams/flowchart/parser/flow.js