feat: Bump GraphViz to 7.0.5

Bump EMSDK to 3.1.28 Add settings.json to commit Signed-off-by: Gordon Smith <[email protected]>
hpcc-systems · Dec 24, 2022 · cf656ad · cf656ad
1 parent 175325d
commit cf656ad
Show file tree

Hide file tree

Showing 18 changed files with 403 additions and 326 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,7 +1,6 @@
 /.nyc_output
 /.vscode/c_cpp_properties.json
 /.vscode/ipch
-/.vscode/settings.json
 /bin
 /build
 /coverage

diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -0,0 +1,3 @@
+{
+    "cmake.cmakePath": "${workspaceFolder}/scripts/cmake.sh"
+}
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -6,7 +6,6 @@ set(CMAKE_TOOLCHAIN_FILE ${REPO_DIR}/vcpkg/scripts/buildsystems/vcpkg.cmake)
 set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE ${REPO_DIR}/emsdk/upstream/emscripten/cmake/Modules/Platform/Emscripten.cmake)
 set(VCPKG_ROOT ${REPO_DIR}/vcpkg)
 set(VCPKG_OVERLAY_PORTS ${CMAKE_CURRENT_SOURCE_DIR}/vcpkg-overlays)
-set(VCPKG_VERBOSE OFF)
 set(VCPKG_TARGET_TRIPLET "wasm32-emscripten")
 file(REMOVE ${REPO_DIR}/vcpkg/vcpkg)
 

diff --git a/README.md b/README.md
@@ -8,12 +8,12 @@
 This repository contains a collection of useful c++ libraries compiled to WASM for (re)use in Node JS, Web Browsers and JavaScript Libraries:
 - [base91](https://base91.sourceforge.net/) - v0.6.0
 - [expat](https://libexpat.github.io/) - v2.5.0
-- [graphviz](https://www.graphviz.org/) - v7.0.4
+- [graphviz](https://www.graphviz.org/) - v7.0.5
 - [zstd](https://github.com/facebook/zstd) - v1.5.2
 - ...more to follow...
 
 Built with:
-- [emsdk](https://github.com/emscripten-core/emsdk) - v3.1.27
+- [emsdk](https://github.com/emscripten-core/emsdk) - v3.1.28
 
 ## Homepage and Documents
 

diff --git a/cpp/base91/CMakeLists.txt b/cpp/base91/CMakeLists.txt
@@ -7,9 +7,9 @@ string(REPLACE ";" " " CPP_FLAGS "${EM_CPP_FLAGS}")
 
 set(EM_LINK_FLAGS 
     ${EM_LINK_FLAGS}
-    "-s EXPORT_NAME='${CMAKE_PROJECT_NAME}'"
-    "-s EXPORTED_FUNCTIONS=\"[]\""
-    "-s EXPORTED_RUNTIME_METHODS=\"[]\""
+    "-sEXPORT_NAME='${CMAKE_PROJECT_NAME}'"
+    "-sEXPORTED_FUNCTIONS=\"[]\""
+    "-sEXPORTED_RUNTIME_METHODS=\"[]\""
     "--post-js ${CMAKE_CURRENT_BINARY_DIR}/main_glue.js"
 )
 string(REPLACE ";" " " LINK_FLAGS "${EM_LINK_FLAGS}")

diff --git a/cpp/expat/expatlib/CMakeLists.txt b/cpp/expat/expatlib/CMakeLists.txt
@@ -7,9 +7,9 @@ string(REPLACE ";" " " CPP_FLAGS "${EM_CPP_FLAGS}")
 
 set(EM_LINK_FLAGS 
     ${EM_LINK_FLAGS}
-    "-s EXPORT_NAME='${CMAKE_PROJECT_NAME}'"
-    "-s EXPORTED_FUNCTIONS=\"['_malloc']\""
-    "-s EXPORTED_RUNTIME_METHODS=\"[]\""
+    "-sEXPORT_NAME='${CMAKE_PROJECT_NAME}'"
+    "-sEXPORTED_FUNCTIONS=\"['_malloc']\""
+    "-sEXPORTED_RUNTIME_METHODS=\"[]\""
     "--post-js ${CMAKE_CURRENT_BINARY_DIR}/main_glue.js"
 )
 string(REPLACE ";" " " LINK_FLAGS "${EM_LINK_FLAGS}")

diff --git a/cpp/graphviz/graphvizlib/CMakeLists.txt b/cpp/graphviz/graphvizlib/CMakeLists.txt
@@ -5,10 +5,10 @@ string(REPLACE ";" " " CPP_FLAGS "${EM_CPP_FLAGS}")
 
 set(EM_LINK_FLAGS 
     ${EM_LINK_FLAGS}
-    "-s FILESYSTEM=1"
-    "-s EXPORT_NAME='${CMAKE_PROJECT_NAME}'"
-    "-s EXPORTED_FUNCTIONS=\"[_free]\""
-    "-s EXPORTED_RUNTIME_METHODS=\"[]\""
+    "-sFILESYSTEM=1"
+    "-sEXPORT_NAME='${CMAKE_PROJECT_NAME}'"
+    "-sEXPORTED_FUNCTIONS=\"['_free', '_malloc']\""
+    "-sEXPORTED_RUNTIME_METHODS=\"[]\""
     "--post-js ${CMAKE_CURRENT_BINARY_DIR}/main_glue.js"
 )
 string(REPLACE ";" " " LINK_FLAGS "${EM_LINK_FLAGS}")

diff --git a/cpp/graphviz/lib/cgraph/CMakeLists.txt b/cpp/graphviz/lib/cgraph/CMakeLists.txt
@@ -10,6 +10,7 @@ add_library(cgraph STATIC
   ${GRAPHVIZ_LIB_DIR}/cgraph/exit.h
   ${GRAPHVIZ_LIB_DIR}/cgraph/itos.h
   ${GRAPHVIZ_LIB_DIR}/cgraph/likely.h
+  ${GRAPHVIZ_LIB_DIR}/cgraph/list.h
   ${GRAPHVIZ_LIB_DIR}/cgraph/prisize_t.h
   ${GRAPHVIZ_LIB_DIR}/cgraph/stack.h
   ${GRAPHVIZ_LIB_DIR}/cgraph/startswith.h

diff --git a/cpp/graphviz/lib/sparse/CMakeLists.txt b/cpp/graphviz/lib/sparse/CMakeLists.txt
@@ -6,7 +6,6 @@ add_library(sparse STATIC
   ${GRAPHVIZ_LIB_DIR}/sparse/colorutil.h
   ${GRAPHVIZ_LIB_DIR}/sparse/DotIO.h
   ${GRAPHVIZ_LIB_DIR}/sparse/general.h
-  ${GRAPHVIZ_LIB_DIR}/sparse/IntStack.h
   ${GRAPHVIZ_LIB_DIR}/sparse/LinkedList.h
   ${GRAPHVIZ_LIB_DIR}/sparse/mq.h
   ${GRAPHVIZ_LIB_DIR}/sparse/QuadTree.h
@@ -19,7 +18,6 @@ add_library(sparse STATIC
   ${GRAPHVIZ_LIB_DIR}/sparse/colorutil.c
   ${GRAPHVIZ_LIB_DIR}/sparse/DotIO.c
   ${GRAPHVIZ_LIB_DIR}/sparse/general.c
-  ${GRAPHVIZ_LIB_DIR}/sparse/IntStack.c
   ${GRAPHVIZ_LIB_DIR}/sparse/LinkedList.c
   ${GRAPHVIZ_LIB_DIR}/sparse/mq.c
   ${GRAPHVIZ_LIB_DIR}/sparse/QuadTree.c

diff --git a/cpp/zstd/CMakeLists.txt b/cpp/zstd/CMakeLists.txt
@@ -7,9 +7,9 @@ string(REPLACE ";" " " CPP_FLAGS "${EM_CPP_FLAGS}")
 
 set(EM_LINK_FLAGS 
     ${EM_LINK_FLAGS}
-    "-s EXPORT_NAME='${CMAKE_PROJECT_NAME}'"
-    "-s EXPORTED_FUNCTIONS=\"[]\""
-    "-s EXPORTED_RUNTIME_METHODS=\"[]\""
+    "-sEXPORT_NAME='${CMAKE_PROJECT_NAME}'"
+    "-sEXPORTED_FUNCTIONS=\"[]\""
+    "-sEXPORTED_RUNTIME_METHODS=\"[]\""
     "--post-js ${CMAKE_CURRENT_BINARY_DIR}/main_glue.js"
 )
 string(REPLACE ";" " " LINK_FLAGS "${EM_LINK_FLAGS}")