Skip to content

Commit

Permalink
Add Emscripten version number to release.
Browse files Browse the repository at this point in the history
  • Loading branch information
mdaines committed May 20, 2017
1 parent 1f12dfe commit 83740b6
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 4 deletions.
5 changes: 3 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/boilerplate/pre-lite.js
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/boilerplate/pre.js
Original file line number Diff line number Diff line change
@@ -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
Expand Down

0 comments on commit 83740b6

Please sign in to comment.