Skip to content

Commit b6d58be

Browse files
committed
3.1.27pre
1 parent 2ce5355 commit b6d58be

File tree

4 files changed

+1794
-18
lines changed

4 files changed

+1794
-18
lines changed

python-wasm-sdk.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ do
2929

3030
if [ -f ${SDKROOT}/dev ]
3131
then
32-
rm ${SDKROOT}/embuild.done
32+
rm ${SDKROOT}/emsdk/.completed
3333
else
3434
rm -rf ${SDKROOT}/*
3535
fi

scripts/emsdk-fetch.sh

Lines changed: 29 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ then
1313
" 1>&2
1414
else
1515
# emsdk could have been deleted for full rebuild
16-
rm embuild.done
16+
rm emsdk/.completed
1717

1818
if git clone --no-tags --depth 1 --single-branch --branch main https://github.com/emscripten-core/emsdk.git
1919
then
@@ -48,7 +48,7 @@ then
4848

4949
export EMSDK_PYTHON=$SYS_PYTHON
5050

51-
if [ -f embuild.done ]
51+
if [ -f emsdk/.completed ]
5252
then
5353
echo "
5454
* emsdk prereq ok
@@ -84,8 +84,10 @@ then
8484
cat > emsdk/upstream/emscripten/emcc <<END
8585
#!/bin/bash
8686
87-
if [ -z "\$_EMCC_CCACHE" ]
88-
then
87+
unset _EMCC_CCACHE
88+
89+
#if [ -z "\$_EMCC_CCACHE" ]
90+
#then
8991
9092
unset _PYTHON_SYSCONFIGDATA_NAME
9193
unset PYTHONHOME
@@ -103,13 +105,13 @@ for arg do
103105
104106
if [ "\$arg" = "-v" ]
105107
then
106-
\$EMSDK_PYTHON -E \$0.py -v
108+
$EMSDK_PYTHON -E \$0.py -v
107109
exit 0
108110
fi
109111
110112
if [ "\$arg" = "--version" ]
111113
then
112-
\$EMSDK_PYTHON -E \$0.py --version
114+
$EMSDK_PYTHON -E \$0.py --version
113115
exit 0
114116
fi
115117
@@ -128,23 +130,33 @@ for arg do
128130
if echo "\$arg"|grep -q wasm32-emscripten.so\$
129131
then
130132
PY_MODULE=true
131-
fi
132-
133-
if echo "\$arg"|grep -q abi3.so\$
134-
then
135-
PY_MODULE=true
133+
SHARED_TARGET=\$arg
134+
else
135+
if echo "\$arg"|grep -q abi3.so\$
136+
then
137+
PY_MODULE=true
138+
SHARED_TARGET=\$arg
139+
fi
136140
fi
137141
138142
if \$PY_MODULE
139143
then
140-
SHARED_TARGET=\$arg
141144
if \$IS_SHARED
142145
then
143146
true
144147
else
145148
IS_SHARED=true
146149
SHARED="\$SHARED -shared -sSIDE_MODULE"
147150
fi
151+
else
152+
if \$IS_SHARED
153+
then
154+
if echo "$arg"|grep -q -F .so\$
155+
then
156+
PY_MODULE=true
157+
SHARED_TARGET=$arg
158+
fi
159+
fi
148160
fi
149161
150162
set -- "\$@" "\$arg"
@@ -161,10 +173,10 @@ then
161173
else
162174
$EMSDK_PYTHON -E \$0.py \$COPTS \$CPPFLAGS -DBUILD_STATIC "\$@" \$COMMON
163175
fi
164-
else
165-
unset _EMCC_CCACHE
166-
exec ccache "\$0" "\$@"
167-
fi
176+
#else
177+
# unset _EMCC_CCACHE
178+
# exec ccache "\$0" "\$@"
179+
#fi
168180
169181
END
170182

@@ -188,7 +200,7 @@ $EMSDK_PYTHON -E \$0.py "\$@"
188200
END
189201

190202
chmod +x emsdk/upstream/emscripten/em*
191-
touch embuild.done
203+
touch emsdk/.completed
192204
sync
193205
fi
194206

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
"""The asyncio package, tracking PEP 3156."""
2+
3+
# flake8: noqa
4+
5+
import sys
6+
7+
# This relies on each of the submodules having an __all__ variable.
8+
from .base_events import *
9+
from .coroutines import *
10+
from .events import *
11+
from .exceptions import *
12+
from .futures import *
13+
from .locks import *
14+
from .protocols import *
15+
from .runners import *
16+
from .queues import *
17+
from .streams import *
18+
from .subprocess import *
19+
from .tasks import *
20+
from .taskgroups import *
21+
from .timeouts import *
22+
from .threads import *
23+
from .transports import *
24+
25+
__all__ = (base_events.__all__ +
26+
coroutines.__all__ +
27+
events.__all__ +
28+
exceptions.__all__ +
29+
futures.__all__ +
30+
locks.__all__ +
31+
protocols.__all__ +
32+
runners.__all__ +
33+
queues.__all__ +
34+
streams.__all__ +
35+
subprocess.__all__ +
36+
tasks.__all__ +
37+
threads.__all__ +
38+
timeouts.__all__ +
39+
transports.__all__)
40+
41+
if sys.platform == 'win32': # pragma: no cover
42+
from .windows_events import *
43+
__all__ += windows_events.__all__
44+
elif sys.platform in ['emscripten','wasi']:
45+
from .wasm_events import *
46+
__all__ += wasm_events.__all__
47+
else:
48+
from .unix_events import * # pragma: no cover
49+
__all__ += unix_events.__all__

0 commit comments

Comments
 (0)