From 6bde77c9c094ddf749d97ba3196da56271bef22d Mon Sep 17 00:00:00 2001
From: pmp-p <mail.peny@free.fr>
Date: Tue, 27 Aug 2024 13:44:51 +0200
Subject: [PATCH] increamental file

---
 .github/workflows/CI.yml |  7 +++----
 build.sh                 | 29 +++++------------------------
 pack.sh                  | 40 ++++++++++++++++++++++++++++++++++++++++
 3 files changed, 48 insertions(+), 28 deletions(-)
 mode change 100755 => 100644 build.sh
 create mode 100755 pack.sh

diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index e2edfe5..134594e 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -35,14 +35,13 @@ jobs:
 
 
       - name: Build emsdk extra
-        working-directory: /opt/python-wasm-sdk
         run: |
-          bash ./scripts/emsdk-extra.sh
+          bash ./build.sh
 
 
-      - name: Build WASM extra index and packages
+      - name: Package extra
         run: |
-          bash ./build.sh
+          bash ./pack.sh
 
 
       - name: publish web index
diff --git a/build.sh b/build.sh
old mode 100755
new mode 100644
index 3f12dc7..f7e0066
--- a/build.sh
+++ b/build.sh
@@ -1,28 +1,9 @@
 #!/bin/bash
 
-. /etc/lsb-release
-export DISTRIB="${DISTRIB_ID}-${DISTRIB_RELEASE}"
-export SDKROOT=${SDKROOT:-/opt/python-wasm-sdk}
-export CIVER=${CIVER:-$DISTRIB}
+if cd /opt/python-wasm-sdk
+then
+    find . -type f > sdk.base
+    . scripts/emsdk-extra.sh
+fi
 
-TAG=emsdk
 
-echo "making sdk-extra $TAG tarball" 1>&2
-
-pushd /
-mkdir -p /tmp/sdk
-tar -cpPR \
-    ${SDKROOT}/config \
-    ${SDKROOT}/python3-was? \
-    ${SDKROOT}/wasm32-*-shell.sh \
-    ${SDKROOT}/*sdk \
-    ${SDKROOT}/scripts/*sdk-fetch.sh \
-    ${SDKROOT}/devices/* \
-    ${SDKROOT}/prebuilt/* \
-     > /tmp/sdk/python${PYBUILD}-${TAG}-sdk-extra-${CIVER}.tar
-
-    lz4 -c --favor-decSpeed --best /tmp/sdk/python${PYBUILD}-${TAG}-sdk-extra-${CIVER}.tar \
-     > /tmp/sdk/python${PYBUILD}-${TAG}-sdk-extra-${CIVER}.tar.lz4
-
-echo "done"  1>&2
-popd
diff --git a/pack.sh b/pack.sh
new file mode 100755
index 0000000..3f6139a
--- /dev/null
+++ b/pack.sh
@@ -0,0 +1,40 @@
+#!/bin/bash
+
+. /etc/lsb-release
+export DISTRIB="${DISTRIB_ID}-${DISTRIB_RELEASE}"
+export SDKROOT=${SDKROOT:-/opt/python-wasm-sdk}
+export CIVER=${CIVER:-$DISTRIB}
+
+TAG=emsdk
+
+pushd /opt/python-wasm-sdk
+    echo "Removing $(wc -l sdk.base) files belonging to SDK"
+    for sdkfile in $(cat sdk.base)
+    do
+        rm $f
+    done
+popd
+
+echo "Making sdk-extra $TAG tarball" 1>&2
+
+
+pushd /
+mkdir -p /tmp/sdk
+tar -cpPR \
+    ${SDKROOT}/config \
+    ${SDKROOT}/python3-was? \
+    ${SDKROOT}/wasm32-*-shell.sh \
+    ${SDKROOT}/*sdk \
+    ${SDKROOT}/scripts/*sdk-fetch.sh \
+    ${SDKROOT}/devices/* \
+    ${SDKROOT}/prebuilt/* \
+     > /tmp/sdk/python${PYBUILD}-${TAG}-sdk-extra-${CIVER}.tar
+
+    lz4 -c --favor-decSpeed --best /tmp/sdk/python${PYBUILD}-${TAG}-sdk-extra-${CIVER}.tar \
+     > /tmp/sdk/python${PYBUILD}-${TAG}-sdk-extra-${CIVER}.tar.lz4
+
+    du -hs /tmp/sdk/*
+
+    rm /tmp/sdk/python${PYBUILD}-${TAG}-sdk-extra-${CIVER}.tar
+echo "done"  1>&2
+popd