Update Graphviz v11, Use Dev Container.

.devcontainer/devcontainer.json

@@ -0,0 +1,26 @@
+{
+  "$schema": "https://raw.githubusercontent.com/devcontainers/spec/main/schemas/devContainer.base.schema.json",
+  "name": "wasinodot",
+  "image": "mcr.microsoft.com/devcontainers/base:bookworm",
+  "remoteEnv": {
+	  "PATH": "${containerEnv:PATH}:/usr/local/lib/wasi-sdk-22.0/bin",
+    "WASI_SDK_PATH": "/usr/local/lib/wasi-sdk-22.0"
+  },
+  "features": {
+    "devwasm.azurecr.io/dev-wasm/dev-wasm-feature/wasmtime-wasi:0.0.15": {
+      "version": "22",
+      "wasmtime_version": "v22.0.0",
+      "wit_version": "0.26.0",
+      "wasm_tools_version": "1.0.60"
+    },
+    "ghcr.io/devcontainers/features/rust:1": {},
+	  "devwasm.azurecr.io/dev-wasm/dev-wasm-feature/rust-wasi:0.0.2": {}
+  },
+  "onCreateCommand": {
+    "install-cargo-wasi": [
+      "cargo",
+      "install",
+      "cargo-wasi"
+    ]
+  }
+}

.github/workflows/ci.yml

@@ -1,3 +1,5 @@
+# TODO use Dev Container
+
 name: Ci
 
 on:
@@ -9,13 +11,13 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
 
     - name: Install dependencies
       run: |
         sudo apt update
         sudo apt install -y --no-install-recommends curl ca-certificates patch make
-        wasi_sdk_url='https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-14/wasi-sdk-14.0-linux.tar.gz'
+        wasi_sdk_url='https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-22/wasi-sdk-22.0-linux.tar.gz'
         sudo curl -L $wasi_sdk_url|tar zxf - -C /opt
         sudo mv /opt/wasi-sdk-14.0 /opt/wasi-sdk
         echo "/opt/wasi-sdk/bin" >> $GITHUB_PATH
@@ -28,7 +30,7 @@ jobs:
         profile: minimal
 
     - name: Cargo cache
-      uses: actions/cache@v2
+      uses: actions/cache@v4
       with:
         path: |
           ~/.cargo/registry
@@ -51,7 +53,7 @@ jobs:
 
     - name: Upload config.log
       if: failure()
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       with:
         name: config.log
         path: |
@@ -61,7 +63,7 @@ jobs:
         ls target/wasm32-wasi/release/wasinodot.wasm
 
     - name: Upload builds
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       with:
         name: build
         path: |
@@ -73,7 +75,7 @@ jobs:
     - build
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/download-artifact@v2
+    - uses: actions/download-artifact@v4
       with:
         name: build
 

.gitignore

@@ -1,4 +1,4 @@
 /target
 Cargo.lock
-graphviz-2.49.0/
+graphviz-*/
 graphviz-build/

build.rs

@@ -6,15 +6,15 @@ use std::process::{Command, Stdio};
 
 fn get_graphviz_dir() -> PathBuf {
     let dir = env::var("CARGO_MANIFEST_DIR").unwrap();
-    let graphviz_dir = Path::new(&dir).join("graphviz-2.49.0");
+    let graphviz_dir = Path::new(&dir).join("graphviz-11.0.0");
     if fs::metadata(&graphviz_dir)
         .map(|m| m.is_dir())
         .unwrap_or_default()
     {
         return graphviz_dir;
     }
 
-    let graphviz_url = "https://gitlab.com/api/v4/projects/4207231/packages/generic/graphviz-releases/2.49.0/graphviz-2.49.0.tar.xz";
+    let graphviz_url = "https://gitlab.com/api/v4/projects/4207231/packages/generic/graphviz-releases/11.0.0/graphviz-11.0.0.tar.xz";
 
     let mut curl = Command::new("curl")
         .args(["-LsSf", graphviz_url])
@@ -35,10 +35,11 @@ fn get_graphviz_dir() -> PathBuf {
         panic!("failed to run tar.");
     }
 
-    let ok = Command::new("patch")
-        .arg("-u")
+    // missing for read...(???)
+    let ok = Command::new("sed")
+        .arg("-i")
+        .arg("s;^;#include <unistd.h>\\n;")
         .arg(graphviz_dir.join("plugin/core/gvloadimage_core.c"))
-        .arg(Path::new(&dir).join("patch/gvloadimage_core.patch"))
         .status()
         .expect("unable to run patch.");
     if !ok.success() {
@@ -77,16 +78,13 @@ fn configure(graphviz_dir: &Path) -> PathBuf {
             "--without-pangocairo",
             "--without-webp",
         ])
-        .arg(format!(
-            "--with-extraincludedir={}",
-            Path::new(&dir).join("graphviz-stub").to_string_lossy()
-        ))
         .env("CC", format!("{}/bin/clang", wasi_sdk_path))
         .env("LD", format!("{}/bin/wasm-ld", wasi_sdk_path))
         .env("CXX", format!("{}/bin/clang++", wasi_sdk_path))
         .env("NM", format!("{}/bin/llvm-nm", wasi_sdk_path))
         .env("AR", format!("{}/bin/llvm-ar", wasi_sdk_path))
         .env("RANLIB", format!("{}/bin/llvm-ranlib", wasi_sdk_path))
+        .env("CFLAGS", "-mllvm -wasm-enable-sjlj")
         .env(
             "CPPFLAGS",
             "-D_WASI_EMULATED_SIGNAL -D_WASI_EMULATED_PROCESS_CLOCKS",