From 58e50994c23911f0be60546b428e93c80470a561 Mon Sep 17 00:00:00 2001 From: "Anuraag (Rag) Agrawal" Date: Sat, 30 Nov 2024 19:07:54 +0900 Subject: [PATCH] Prepare for next release (#67) --- buildtools/wasm/Dockerfile | 12 ++++++------ buildtools/wasm/create_plugin_entrypoints.py | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/buildtools/wasm/Dockerfile b/buildtools/wasm/Dockerfile index a98df62..dd5992d 100644 --- a/buildtools/wasm/Dockerfile +++ b/buildtools/wasm/Dockerfile @@ -1,14 +1,14 @@ -FROM ghcr.io/webassembly/wasi-sdk:sha-7ff81cb +FROM ghcr.io/webassembly/wasi-sdk:wasi-sdk-24 -RUN apt-get update && apt-get install -y binaryen git patch +RUN apt-get update && apt-get install -y binaryen git patch python3 ADD buildtools/wasm/version.txt version.txt RUN git clone --recurse-submodules --shallow-submodules https://github.com/protocolbuffers/protobuf.git --branch $(cat version.txt | awk '{$1=$1};1') /workspace -ENV CMAKE_TOOLCHAIN_FILE /usr/share/cmake/wasi-sdk-pthread.cmake -ENV CFLAGS -D_WASI_EMULATED_MMAN -D_WASI_EMULATED_PROCESS_CLOCKS -D_WASI_EMULATED_SIGNAL -DABSL_HAVE_MMAP -ENV CXXFLAGS $CFLAGS -fno-exceptions -ENV LDFLAGS -lwasi-emulated-process-clocks -lwasi-emulated-mman -lwasi-emulated-signal -Wl,--max-memory=4294967296 -Wl,--global-base=1024 +ENV CMAKE_TOOLCHAIN_FILE=/opt/wasi-sdk/share/cmake/wasi-sdk-pthread.cmake +ENV CFLAGS="-D_WASI_EMULATED_MMAN -D_WASI_EMULATED_PROCESS_CLOCKS -D_WASI_EMULATED_SIGNAL -DABSL_HAVE_MMAP" +ENV CXXFLAGS="$CFLAGS -fno-exceptions" +ENV LDFLAGS="-lwasi-emulated-process-clocks -lwasi-emulated-mman -lwasi-emulated-signal -Wl,--max-memory=4294967296 -Wl,--global-base=1024" WORKDIR /workspace diff --git a/buildtools/wasm/create_plugin_entrypoints.py b/buildtools/wasm/create_plugin_entrypoints.py index 6dcb56f..cac20a0 100644 --- a/buildtools/wasm/create_plugin_entrypoints.py +++ b/buildtools/wasm/create_plugin_entrypoints.py @@ -16,8 +16,8 @@ }, { "name": "kotlin", - "include": "google/protobuf/compiler/java/kotlin_generator.h", - "generator": "::google::protobuf::compiler::java::KotlinGenerator", + "include": "google/protobuf/compiler/kotlin/generator.h", + "generator": "::google::protobuf::compiler::kotlin::KotlinGenerator", }, { "name": "objc",