Skip to content

Commit 9447700

Browse files
pmp-ppmp-p
committed
3.1.74.10pre
1 parent 36c3d6f commit 9447700

File tree

3 files changed

+57
-75
lines changed

3 files changed

+57
-75
lines changed

‎.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
rustsdk: false
2727
nimsdk: false
2828
COPTS: -O2 -g3
29-
EMFLAVOUR: 3.1.61
29+
EMFLAVOUR: 3.1.74
3030

3131
steps:
3232
- uses: actions/[email protected]

‎python-wasi-sdk.sh

Lines changed: 28 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
#!/bin/bash
22
reset
3-
3+
export DOCKER=false
4+
export PREBUILT=$(pwd)/prebuilt
45
if [ $UID -ne 0 ]; then
56
echo "not UID 0, assuming no docker/proot"
67
else
@@ -11,6 +12,7 @@ else
1112
else
1213
echo "UID 0, assuming docker debian:stable"
1314
apt-get update && apt-get --yes install build-essential clang autoconf wget curl lz4 lsb-release zlib1g-dev libssl-dev git
15+
export DOCKER=true
1416
fi
1517
fi
1618

@@ -32,9 +34,9 @@ which strip || cp /bin/true /usr/bin/strip
3234
pause () {
3335
if ${CI}
3436
then
35-
echo -n
37+
echo "$0:$LINENO"
3638
else
37-
echo "<paused> press enter ..."
39+
echo "<paused as $LINENO> press enter ..."
3840
read
3941
fi
4042
}
@@ -194,7 +196,7 @@ do
194196
pause
195197
else
196198
cat /tmp/python-wasm-sdk.log
197-
exit 192
199+
exit $LINENO
198200
fi
199201

200202
. scripts/cpython-build-host-deps.sh > /dev/null
@@ -259,29 +261,10 @@ END
259261
else
260262
if ./scripts/cpython-build-${TARGET}-deps.sh
261263
then
262-
# if $CI
263-
if false
264-
then
265-
pushd /
266-
tar \
267-
--exclude=${SDKROOT}/devices/*/usr/bin/*3.1* \
268-
--exclude=${SDKROOT}/devices/*/usr/lib/python3.1? \
269-
--exclude=${SDKROOT}/devices/*/usr/include/python3.1? \
270-
--exclude=${SDKROOT}/config \
271-
--exclude=${SDKROOT}/python-was?-sdk.sh \
272-
--exclude=${SDKROOT}/python3-was? \
273-
--exclude=${SDKROOT}/scripts/* \
274-
--exclude=${SDKROOT}/sources.* \
275-
--exclude=${SDKROOT}/build \
276-
--exclude=${SDKROOT}/src \
277-
-cpR $SDKROOT > /tmp/emsdk.tar
278-
279-
date "+%d-%m-%4Y" > /tmp/sdk/emsdk.version
280-
popd
281-
fi
264+
date "+%d-%m-%4Y" > /tmp/sdk/emsdk.timestamp
282265
else
283266
echo " cpython-build-emsdk-deps failed" 1>&2
284-
exit 213
267+
exit $LINENO
285268
fi
286269
fi
287270

@@ -290,7 +273,7 @@ END
290273
then
291274

292275
echo " --------- adding some usefull pkg ${PYBUILD} ${CIVER} ---------" 1>&2
293-
./scripts/cpython-build-${TARGET}-prebuilt.sh || exit 223
276+
./scripts/cpython-build-${TARGET}-prebuilt.sh || exit $LINENO
294277

295278

296279
# experimental stuff
@@ -311,7 +294,7 @@ END
311294

312295
else
313296
echo " cpython-build-emsdk failed" 1>&2
314-
exit 239
297+
exit $LINENO
315298
fi
316299

317300
fi
@@ -325,19 +308,27 @@ END
325308
export TARGET=wasi
326309

327310
mkdir -p src build ${SDKROOT}/devices/wasisdk ${SDKROOT}/prebuilt/wasisdk
311+
if [ -d $PREBUILT ]
312+
then
313+
# unpack wasi sdk (common)
314+
tar xf $PREBUILT/wasi-sdk-25.tar.xz
315+
# unpack wasi sdk ( binary )
316+
tar xf $PREBUILT/wasi-sdk-25.0-$(arch)-linux.tar.xz
317+
else
318+
# do not source to protect env
319+
./scripts/cpython-build-wasisdk.sh
328320

329-
# do not source to protect env
330-
./scripts/cpython-build-wasisdk.sh
321+
> ${SDKROOT}/python3-${TARGET}
331322

332-
> ${SDKROOT}/python3-${TARGET}
323+
> ${SDKROOT}/wasm32-${TARGET}-shell.sh
333324

334-
> ${SDKROOT}/wasm32-${TARGET}-shell.sh
325+
CPU=wasm32
326+
CPU=$CPU TARGET=$TARGET PYDK_PYTHON_HOST_PLATFORM=${CPU}-${TARGET} \
327+
PYDK_SYSCONFIG_PLATFORM=${CPU}-${TARGET} \
328+
PREFIX=${SDKROOT}/devices/${TARGET}sdk/usr \
329+
./scripts/make-shells.sh
335330

336-
CPU=wasm32
337-
CPU=$CPU TARGET=$TARGET PYDK_PYTHON_HOST_PLATFORM=${CPU}-${TARGET} \
338-
PYDK_SYSCONFIG_PLATFORM=${CPU}-${TARGET} \
339-
PREFIX=${SDKROOT}/devices/${TARGET}sdk/usr \
340-
./scripts/make-shells.sh
331+
fi
341332

342333
cat >> $ROOT/${CPU}-${TARGET}-shell.sh <<END
343334
#!/bin/bash
@@ -373,7 +364,7 @@ END
373364

374365
else
375366
echo "cd failed" 1>&2
376-
exit 208
367+
exit $LINENO
377368
fi
378369
done
379370

‎python-wasm-sdk.sh

Lines changed: 28 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
#!/bin/bash
22
reset
3-
3+
export DOCKER=false
4+
export PREBUILT=$(pwd)/prebuilt
45
if [ $UID -ne 0 ]; then
56
echo "not UID 0, assuming no docker/proot"
67
else
@@ -11,6 +12,7 @@ else
1112
else
1213
echo "UID 0, assuming docker debian:stable"
1314
apt-get update && apt-get --yes install build-essential clang autoconf wget curl lz4 lsb-release zlib1g-dev libssl-dev git
15+
export DOCKER=true
1416
fi
1517
fi
1618

@@ -32,9 +34,9 @@ which strip || cp /bin/true /usr/bin/strip
3234
pause () {
3335
if ${CI}
3436
then
35-
echo -n
37+
echo "$0:$LINENO"
3638
else
37-
echo "<paused> press enter ..."
39+
echo "<paused as $LINENO> press enter ..."
3840
read
3941
fi
4042
}
@@ -194,7 +196,7 @@ do
194196
pause
195197
else
196198
cat /tmp/python-wasm-sdk.log
197-
exit 192
199+
exit $LINENO
198200
fi
199201

200202
. scripts/cpython-build-host-deps.sh > /dev/null
@@ -259,29 +261,10 @@ END
259261
else
260262
if ./scripts/cpython-build-${TARGET}-deps.sh
261263
then
262-
# if $CI
263-
if false
264-
then
265-
pushd /
266-
tar \
267-
--exclude=${SDKROOT}/devices/*/usr/bin/*3.1* \
268-
--exclude=${SDKROOT}/devices/*/usr/lib/python3.1? \
269-
--exclude=${SDKROOT}/devices/*/usr/include/python3.1? \
270-
--exclude=${SDKROOT}/config \
271-
--exclude=${SDKROOT}/python-was?-sdk.sh \
272-
--exclude=${SDKROOT}/python3-was? \
273-
--exclude=${SDKROOT}/scripts/* \
274-
--exclude=${SDKROOT}/sources.* \
275-
--exclude=${SDKROOT}/build \
276-
--exclude=${SDKROOT}/src \
277-
-cpR $SDKROOT > /tmp/emsdk.tar
278-
279-
date "+%d-%m-%4Y" > /tmp/sdk/emsdk.version
280-
popd
281-
fi
264+
date "+%d-%m-%4Y" > /tmp/sdk/emsdk.timestamp
282265
else
283266
echo " cpython-build-emsdk-deps failed" 1>&2
284-
exit 213
267+
exit $LINENO
285268
fi
286269
fi
287270

@@ -290,7 +273,7 @@ END
290273
then
291274

292275
echo " --------- adding some usefull pkg ${PYBUILD} ${CIVER} ---------" 1>&2
293-
./scripts/cpython-build-${TARGET}-prebuilt.sh || exit 223
276+
./scripts/cpython-build-${TARGET}-prebuilt.sh || exit $LINENO
294277

295278

296279
# experimental stuff
@@ -311,7 +294,7 @@ END
311294

312295
else
313296
echo " cpython-build-emsdk failed" 1>&2
314-
exit 239
297+
exit $LINENO
315298
fi
316299

317300
fi
@@ -325,19 +308,27 @@ END
325308
export TARGET=wasi
326309

327310
mkdir -p src build ${SDKROOT}/devices/wasisdk ${SDKROOT}/prebuilt/wasisdk
311+
if [ -d $PREBUILT ]
312+
then
313+
# unpack wasi sdk (common)
314+
tar xf $PREBUILT/wasi-sdk-25.tar.xz
315+
# unpack wasi sdk ( binary )
316+
tar xf $PREBUILT/wasi-sdk-25.0-$(arch)-linux.tar.xz
317+
else
318+
# do not source to protect env
319+
./scripts/cpython-build-wasisdk.sh
328320

329-
# do not source to protect env
330-
./scripts/cpython-build-wasisdk.sh
321+
> ${SDKROOT}/python3-${TARGET}
331322

332-
> ${SDKROOT}/python3-${TARGET}
323+
> ${SDKROOT}/wasm32-${TARGET}-shell.sh
333324

334-
> ${SDKROOT}/wasm32-${TARGET}-shell.sh
325+
CPU=wasm32
326+
CPU=$CPU TARGET=$TARGET PYDK_PYTHON_HOST_PLATFORM=${CPU}-${TARGET} \
327+
PYDK_SYSCONFIG_PLATFORM=${CPU}-${TARGET} \
328+
PREFIX=${SDKROOT}/devices/${TARGET}sdk/usr \
329+
./scripts/make-shells.sh
335330

336-
CPU=wasm32
337-
CPU=$CPU TARGET=$TARGET PYDK_PYTHON_HOST_PLATFORM=${CPU}-${TARGET} \
338-
PYDK_SYSCONFIG_PLATFORM=${CPU}-${TARGET} \
339-
PREFIX=${SDKROOT}/devices/${TARGET}sdk/usr \
340-
./scripts/make-shells.sh
331+
fi
341332

342333
cat >> $ROOT/${CPU}-${TARGET}-shell.sh <<END
343334
#!/bin/bash
@@ -373,7 +364,7 @@ END
373364

374365
else
375366
echo "cd failed" 1>&2
376-
exit 208
367+
exit $LINENO
377368
fi
378369
done
379370

0 commit comments

Comments
 (0)