From aee8cbe47967aa5cc95cda7762fa65a7cc029705 Mon Sep 17 00:00:00 2001
From: Andrej730 <azhilenkov@gmail.com>
Date: Mon, 20 Oct 2025 11:40:45 +0500
Subject: [PATCH] build_pyodide.yaml - move build_pyodide to a separate script

---
 .github/workflows/build_pyodide.yml | 12 +-----------
 pyodide/build_pyodide.sh            | 12 ++++++++++++
 win/build-all-win.py                |  1 +
 3 files changed, 14 insertions(+), 11 deletions(-)
 create mode 100755 pyodide/build_pyodide.sh

diff --git a/.github/workflows/build_pyodide.yml b/.github/workflows/build_pyodide.yml
index 64fe96c32c..11d41b0777 100644
--- a/.github/workflows/build_pyodide.yml
+++ b/.github/workflows/build_pyodide.yml
@@ -28,18 +28,8 @@ jobs:
           VERSION=`cat IfcOpenShell/VERSION`
           sed -i s/0.8.0/$VERSION/g IfcOpenShell/pyodide/meta.yaml
           sed -i s/0.8.0/$VERSION/g IfcOpenShell/pyodide/setup.py
-          echo '#!/usr/bin/bash' > script.sh
-          echo 'cd pyodide' >> script.sh
-          echo 'make' >> script.sh
-          echo 'cd ..' >> script.sh
-          echo 'mkdir -p packages/ifcopenshell' >> script.sh
-          echo 'cp IfcOpenShell/pyodide/meta.yaml packages/ifcopenshell' >> script.sh
-          echo 'PYODIDE_ROOT=/src/pyodide \' >> script.sh
-          echo 'PATH=/src/pyodide/emsdk/emsdk:/src/pyodide/emsdk/emsdk/node/22.16.0_64bit/bin:/src/pyodide/emsdk/emsdk/upstream/emscripten:$PATH \' >> script.sh
-          echo 'pyodide build-recipes ifcopenshell --install' >> script.sh
-          chmod +x script.sh
           sed -i s/--tty// pyodide/run_docker
-          pyodide/run_docker ./script.sh
+          pyodide/run_docker IfcOpenShell/pyodide/build_pyodide.sh
           FILE=`echo dist/ifcopenshell-*.whl`
           NEW_FILE=`echo $FILE | sed "s/$VERSION/$VERSION+${GITHUB_SHA:0:7}/"`
           mv $FILE $NEW_FILE
diff --git a/pyodide/build_pyodide.sh b/pyodide/build_pyodide.sh
new file mode 100755
index 0000000000..1b6ba711d4
--- /dev/null
+++ b/pyodide/build_pyodide.sh
@@ -0,0 +1,12 @@
+#!/usr/bin/bash
+set -e
+cd pyodide
+make
+cd ..
+mkdir -p packages/ifcopenshell
+cp IfcOpenShell/pyodide/meta.yaml packages/ifcopenshell
+# Required, otherwise pyodide will create new temp pyodide environment.
+export PYODIDE_ROOT=/src/pyodide
+# Ensure emsdk tools are in PATH.
+export PATH=$PYODIDE_ROOT/emsdk/emsdk:$PYODIDE_ROOT/emsdk/emsdk/node/22.16.0_64bit/bin:$PYODIDE_ROOT/emsdk/emsdk/upstream/emscripten:$PATH
+pyodide build-recipes ifcopenshell --install
diff --git a/win/build-all-win.py b/win/build-all-win.py
index 5c2c6ababa..165d1508e0 100644
--- a/win/build-all-win.py
+++ b/win/build-all-win.py
@@ -48,6 +48,7 @@ def build() -> None:
                 "-DGLTF_SUPPORT=ON",
                 "-DADD_COMMIT_SHA=ON",
                 "-DVERSION_OVERRIDE=ON",
+                "-DSCHEMA_VERSIONS=4",
             ]
         )
         run([str(REPO_WIN / "install-ifcopenshell.bat"), "vs2022-x64", "Release"])