chore: Bump versions

* graphviz - v5.0.1 * emsdk - v3.1.19 Signed-off-by: Gordon Smith <GordonJSmith@gmail.com>
hpcc-systems · Aug 21, 2022 · 5904294 · 5904294
1 parent 27c9134
commit 5904294
Show file tree

Hide file tree

Showing 12 changed files with 1,436 additions and 1,114 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -13,14 +13,14 @@ SET(EM_FLAGS
     "-s WASM=1"
     "-s MODULARIZE"
     "-s ENVIRONMENT=web,worker,node"
-    "-s FILESYSTEM=0"
-    "-s MINIMAL_RUNTIME=2"
+    "-s FILESYSTEM=1"
+    # "-s MINIMAL_RUNTIME=1"
     "-s MODULARIZE=1" 
     "-s EXPORT_ES6=1"
     "-s IGNORE_CLOSURE_COMPILER_ERRORS=0"
     "-s USE_ES6_IMPORT_META=0"
-    "--pre-js ${CMAKE_CURRENT_SOURCE_DIR}/cpp/src/pre.js"
-    "--post-js ${CMAKE_CURRENT_SOURCE_DIR}/cpp/src/post.js"
+    # "--pre-js ${CMAKE_CURRENT_SOURCE_DIR}/cpp/src/pre.js"
+    # "--post-js ${CMAKE_CURRENT_SOURCE_DIR}/cpp/src/post.js"
 )
 
 IF (CMAKE_BUILD_TYPE STREQUAL "Debug")

diff --git a/README.md b/README.md
@@ -3,11 +3,11 @@
 ![Test PR](https://github.com/hpcc-systems/hpcc-js-wasm/workflows/Test%20PR/badge.svg)
 
 This repository contains a collection of useful c++ libraries compiled to WASM for (re)use in Node JS, Web Browsers and JavaScript Libraries:
-* [graphviz](https://www.graphviz.org/) - v5.0.0
+* [graphviz](https://www.graphviz.org/) - v5.0.1
 * [expat](https://libexpat.github.io/) - v2.4.8
 
 Built with:
-* [emsdk](https://github.com/emscripten-core/emsdk) - v3.1.15
+* [emsdk](https://github.com/emscripten-core/emsdk) - v3.1.19
 
 ## Quick GraphViz Demos
 * https://raw.githack.com/hpcc-systems/hpcc-js-wasm/trunk/index.html

diff --git a/cpp/expat/expatlib/CMakeLists.txt b/cpp/expat/expatlib/CMakeLists.txt
@@ -5,7 +5,6 @@ find_package(expat CONFIG REQUIRED)
 # See:  https://github.com/emscripten-core/emscripten/blob/main/src/settings.js
 SET(EM_FLAGS 
     ${EM_FLAGS}
-    "-s FILESYSTEM=1"
     "-s EXPORT_NAME='${CMAKE_PROJECT_NAME}'"
     "-s EXPORTED_FUNCTIONS=\"['_malloc']\""
     "-s EXPORTED_RUNTIME_METHODS=\"[]\""

diff --git a/cpp/graphviz/lib/common/CMakeLists.txt b/cpp/graphviz/lib/common/CMakeLists.txt
@@ -15,7 +15,6 @@ add_library(common_obj OBJECT
   ${GRAPHVIZ_LIB_DIR}/common/intset.h
   ${GRAPHVIZ_LIB_DIR}/common/htmllex.h
   ${GRAPHVIZ_LIB_DIR}/common/htmltable.h
-  ${GRAPHVIZ_LIB_DIR}/common/logic.h
   ${GRAPHVIZ_LIB_DIR}/common/macros.h
   ${GRAPHVIZ_LIB_DIR}/common/memory.h
   ${GRAPHVIZ_LIB_DIR}/common/pointset.h

diff --git a/index.html b/index.html
@@ -27,15 +27,17 @@
 <body>
     <h3>Async DOT</h3>
     <div id="placeholder"></div>
-    <br>
+    <hr>
     <h3>Two</h3>
     <div id="placeholder2"></div>
-    <br>
+    <div id="placeholder2b"></div>
+    <hr>
     <h3>Sync DOT</h3>
     <div id="placeholder3"></div>
+    <hr>
     <h3>Cached wasmBinary</h3>
     <div id="placeholder4"></div>
-    <h3>End</h3>
+    <hr>
     <script>
         hpccWasm.expatVersion().then(v => alert(v));
         const dot = `
@@ -95,6 +97,11 @@ <h3>End</h3>
             div.innerHTML = svg;
         }).catch(err => console.error(err.message));
 
+        hpccWasm.graphviz.layout('digraph { a[image="./resources/hpcc-logo.png"]; }', "svg", "dot", { images: [{ path: "./resources/hpcc-logo.png", width: "272px", height: "92px" }] }).then(svg => {
+            const div = document.getElementById("placeholder2b");
+            div.innerHTML = svg;
+        }).catch(err => console.error(err.message));
+
         hpccWasm.graphvizSync().then(graphviz => {
             const div = document.getElementById("placeholder3");
             try {