From 83740b6b39ad50427bc62505d4489f928d2b4e67 Mon Sep 17 00:00:00 2001 From: Michael Daines Date: Sat, 20 May 2017 09:26:31 -0400 Subject: [PATCH] Add Emscripten version number to release. --- Makefile | 5 +++-- src/boilerplate/pre-lite.js | 2 +- src/boilerplate/pre.js | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 7a3d347d..f8ba92ca 100644 --- a/Makefile +++ b/Makefile @@ -7,6 +7,7 @@ PREFIX_LITE = $(abspath ./prefix-lite) VIZ_VERSION = 1.7.1 EXPAT_VERSION = 2.1.0 GRAPHVIZ_VERSION = 2.40.1 +EMSCRIPTEN_VERSION = $(notdir $(EMSCRIPTEN)) .PHONY: all lite clean clobber expat graphviz graphviz-lite @@ -23,14 +24,14 @@ clobber: | clean viz.js: src/boilerplate/pre.js $(BUILD)/module.js src/api.js src/boilerplate/post.js - sed -e s/{{VIZ_VERSION}}/$(VIZ_VERSION)/ -e s/{{EXPAT_VERSION}}/$(EXPAT_VERSION)/ -e s/{{GRAPHVIZ_VERSION}}/$(GRAPHVIZ_VERSION)/ $^ > $@ + sed -e s/{{VIZ_VERSION}}/$(VIZ_VERSION)/ -e s/{{EXPAT_VERSION}}/$(EXPAT_VERSION)/ -e s/{{GRAPHVIZ_VERSION}}/$(GRAPHVIZ_VERSION)/ -e s/{{EMSCRIPTEN_VERSION}}/$(EMSCRIPTEN_VERSION)/ $^ > $@ $(BUILD)/module.js: src/viz.c emcc -Os --closure 1 --memory-init-file 0 -s USE_ZLIB=1 -s MODULARIZE=1 -s EXPORTED_FUNCTIONS="['_vizRenderFromString', '_vizCreateFile', '_vizLastErrorMessage', '_dtextract', '_Dtqueue']" -s EXPORTED_RUNTIME_METHODS="['Pointer_stringify', 'ccall', 'UTF8ToString']" -o $@ $< -I$(PREFIX)/include -I$(PREFIX)/include/graphviz -L$(PREFIX)/lib -L$(PREFIX)/lib/graphviz -lgvplugin_core -lgvplugin_dot_layout -lgvplugin_neato_layout -lcdt -lcgraph -lgvc -lgvpr -lpathplan -lexpat -lxdot viz-lite.js: src/boilerplate/pre-lite.js $(BUILD_LITE)/module.js src/api.js src/boilerplate/post.js - sed -e s/{{VIZ_VERSION}}/$(VIZ_VERSION)/ -e s/{{GRAPHVIZ_VERSION}}/$(GRAPHVIZ_VERSION)/ $^ > $@ + sed -e s/{{VIZ_VERSION}}/$(VIZ_VERSION)/ -e s/{{GRAPHVIZ_VERSION}}/$(GRAPHVIZ_VERSION)/ -e s/{{EMSCRIPTEN_VERSION}}/$(EMSCRIPTEN_VERSION)/ $^ > $@ $(BUILD_LITE)/module.js: src/viz.c emcc -D VIZ_LITE -Os --closure 1 --memory-init-file 0 -s USE_ZLIB=1 -s MODULARIZE=1 -s EXPORTED_FUNCTIONS="['_vizRenderFromString', '_vizCreateFile', '_vizLastErrorMessage', '_dtextract', '_Dtqueue', '_dtopen', '_dtdisc', '_Dtobag', '_Dtoset', '_Dttree']" -s EXPORTED_RUNTIME_METHODS="['Pointer_stringify', 'ccall', 'UTF8ToString']" -o $@ $< -I$(PREFIX_LITE)/include -I$(PREFIX_LITE)/include/graphviz -L$(PREFIX_LITE)/lib -L$(PREFIX_LITE)/lib/graphviz -lgvplugin_core -lgvplugin_dot_layout -lcdt -lcgraph -lgvc -lgvpr -lpathplan -lxdot diff --git a/src/boilerplate/pre-lite.js b/src/boilerplate/pre-lite.js index cbb00fb8..0057a377 100644 --- a/src/boilerplate/pre-lite.js +++ b/src/boilerplate/pre-lite.js @@ -1,5 +1,5 @@ /* -Viz.js {{VIZ_VERSION}} (Graphviz {{GRAPHVIZ_VERSION}}) +Viz.js {{VIZ_VERSION}} (Graphviz {{GRAPHVIZ_VERSION}}, Emscripten {{EMSCRIPTEN_VERSION}}) Copyright (c) 2014-2017 Michael Daines Licensed under MIT license diff --git a/src/boilerplate/pre.js b/src/boilerplate/pre.js index ca0d2b56..6ea8a36f 100644 --- a/src/boilerplate/pre.js +++ b/src/boilerplate/pre.js @@ -1,5 +1,5 @@ /* -Viz.js {{VIZ_VERSION}} (Graphviz {{GRAPHVIZ_VERSION}}, Expat {{EXPAT_VERSION}}) +Viz.js {{VIZ_VERSION}} (Graphviz {{GRAPHVIZ_VERSION}}, Expat {{EXPAT_VERSION}}, Emscripten {{EMSCRIPTEN_VERSION}}) Copyright (c) 2014-2017 Michael Daines Licensed under MIT license