feat: Bump GraphViz version to 6.0.2

Tweak Node v Browser build paths

Signed-off-by: Gordon Smith <[email protected]>

Author: GordonSmith

.gitignore

@@ -3,6 +3,7 @@
 /build
 /coverage
 /dist
+/dist-test
 /emsdk*
 /src-expat
 /src-graphviz

CMakeLists.txt

@@ -12,7 +12,7 @@ SET(EM_FLAGS
     "-s ALLOW_MEMORY_GROWTH=1"
     "-s WASM=1"
     "-s MODULARIZE"
-    "-s ENVIRONMENT=web,node"
+    "-s ENVIRONMENT=web"
     "-s FILESYSTEM=0"
     # "-s MINIMAL_RUNTIME=1"
     "-s MODULARIZE=1" 

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/) - v6.0.1
+* [graphviz](https://www.graphviz.org/) - v6.0.2
 * [expat](https://libexpat.github.io/) - v2.4.8
 
 Built with:
-* [emsdk](https://github.com/emscripten-core/emsdk) - v3.1.20
+* [emsdk](https://github.com/emscripten-core/emsdk) - v3.1.24
 
 ## Quick GraphViz Demos
 * https://raw.githack.com/hpcc-systems/hpcc-js-wasm/trunk/index.html

cpp/expat/expatlib/CMakeLists.txt

@@ -36,16 +36,6 @@ TARGET_LINK_LIBRARIES(expatlib
     expat::expat
 )
 
-ADD_EXECUTABLE(expatlib_node
-    main.cpp
-)
-
-SET_TARGET_PROPERTIES(expatlib_node PROPERTIES LINK_FLAGS "${LINK_FLAGS} -s ENVIRONMENT=node")
-
-TARGET_LINK_LIBRARIES(expatlib_node
-    expat::expat
-)
-
 INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/expatlib.wasm DESTINATION dist COMPONENT runtime)
 
 IF (CMAKE_BUILD_TYPE STREQUAL "Debug")

cpp/graphviz/graphvizlib/CMakeLists.txt

@@ -50,19 +50,6 @@ TARGET_LINK_LIBRARIES(graphvizlib PRIVATE
     ortho
 )
 
-ADD_EXECUTABLE(graphvizlib_node
-    ${SRCS}
-)
-
-SET_TARGET_PROPERTIES(graphvizlib_node PROPERTIES LINK_FLAGS "${LINK_FLAGS} -s ENVIRONMENT=node")
-
-TARGET_LINK_LIBRARIES(graphvizlib_node PRIVATE
-    gvplugin_core
-    gvplugin_dot_layout
-    gvplugin_neato_layout
-    ortho
-)
-
 INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/graphvizlib.wasm DESTINATION dist COMPONENT runtime)
 
 IF (CMAKE_BUILD_TYPE STREQUAL "Debug")

cpp/graphviz/graphvizlib/main.cpp

@@ -7,7 +7,6 @@
 
 #include <emscripten.h>
 
-
 extern gvplugin_library_t gvplugin_dot_layout_LTX_library;
 extern gvplugin_library_t gvplugin_neato_layout_LTX_library;
 #ifdef HAVE_LIBGD
@@ -94,7 +93,6 @@ const char *Graphviz::layout(const char *src, const char *format, const char *en
 
         src = "";
     }
-
     m_result = data;
     gvFreeRenderData(data);