diff --git a/plugins/python-build/bin/python-build b/plugins/python-build/bin/python-build index a93baa11..ae4246f8 100755 --- a/plugins/python-build/bin/python-build +++ b/plugins/python-build/bin/python-build @@ -925,7 +925,13 @@ build_package_ironpython_builder() { ( cd "Stage/Release/IronPython-"* && build_package_ironpython ) } +build_package_micropython_1_9() { + # supported version 1.9.3 and 1.9.4 + build_package_micropython "with_axtls" +} + build_package_micropython() { + # supported version 1.10 and higher if [ "${MAKEOPTS+defined}" ]; then MAKE_OPTS="$MAKEOPTS" elif [ -z "${MAKE_OPTS+defined}" ]; then @@ -934,7 +940,7 @@ build_package_micropython() { { cd mpy-cross "$MAKE" $MAKE_OPTS cd ../ports/unix - "$MAKE" $MAKE_OPTS axtls + [ "$1" = "with_axtls" ] && "$MAKE" $MAKE_OPTS axtls "$MAKE" $MAKE_OPTS CFLAGS_EXTRA="-DMICROPY_PY_SYS_PATH_DEFAULT='\".frozen:${PREFIX_PATH}/lib/micropython\"' $CFLAGS_EXTRA" "$MAKE" install $MAKE_INSTALL_OPTS PREFIX="${PREFIX_PATH}" ln -fs micropython "${PREFIX_PATH}/bin/python" diff --git a/plugins/python-build/share/python-build/micropython-1.20.0 b/plugins/python-build/share/python-build/micropython-1.20.0 new file mode 100644 index 00000000..64705710 --- /dev/null +++ b/plugins/python-build/share/python-build/micropython-1.20.0 @@ -0,0 +1,4 @@ +has_tar_xz_support \ + && { install=install_package; src="https://micropython.org/resources/source/micropython-1.20.0.tar.xz#098ef8e40abdc62551b5460d0ffe9489074240c0cb5589ca3c3a425551beb9bf"; } \ + || { install=install_zip; src="https://micropython.org/resources/source/micropython-1.20.0.zip#6a2ce86e372ee8c5b9310778fff7fca1daa580afa28ea755f1a303675a8612b7"; } +$install micropython-1.20.0 "$src" micropython diff --git a/plugins/python-build/share/python-build/micropython-1.21.0 b/plugins/python-build/share/python-build/micropython-1.21.0 new file mode 100644 index 00000000..ccd8b7d3 --- /dev/null +++ b/plugins/python-build/share/python-build/micropython-1.21.0 @@ -0,0 +1,4 @@ +has_tar_xz_support \ + && { install=install_package; src="https://micropython.org/resources/source/micropython-1.21.0.tar.xz#abd2152613559d3f44728668346e78be9d93458133a03b700baf222c322fd4d5"; } \ + || { install=install_zip; src="https://micropython.org/resources/source/micropython-1.21.0.zip#12521faacc7191353f2739267bd9fd2a5e60ea04fb47df74f8e22b6bf59ba967"; } +$install micropython-1.21.0 "$src" micropython \ No newline at end of file diff --git a/plugins/python-build/share/python-build/micropython-1.9.3 b/plugins/python-build/share/python-build/micropython-1.9.3 index bed5167a..be770437 100644 --- a/plugins/python-build/share/python-build/micropython-1.9.3 +++ b/plugins/python-build/share/python-build/micropython-1.9.3 @@ -1,4 +1,4 @@ has_tar_xz_support \ && src="https://micropython.org/resources/source/micropython-1.9.3.tar.xz#3aa37065f5ea8df372d36253d0ae6333c68572e577df8558d4b7b93e070c624d" \ || src="https://github.com/micropython/micropython/releases/download/v1.9.3/micropython-1.9.3.tar.gz#f94c0b4834edca625b86c0846c89e609ee8fbdbe98e7f719d5108d74b6b4945e" -install_package micropython-1.9.3 "$src" micropython +install_package micropython-1.9.3 "$src" micropython_1_9 diff --git a/plugins/python-build/share/python-build/micropython-1.9.4 b/plugins/python-build/share/python-build/micropython-1.9.4 index d0338c45..8d5dd562 100644 --- a/plugins/python-build/share/python-build/micropython-1.9.4 +++ b/plugins/python-build/share/python-build/micropython-1.9.4 @@ -1,4 +1,4 @@ has_tar_xz_support \ && src="https://micropython.org/resources/source/micropython-1.9.4.tar.xz#1d358d99e908a94fd6dd0d6b448ee56c5830b609cf27a42e0db3bee40cc52a9e" \ || src="https://github.com/micropython/micropython/releases/download/v1.9.4/micropython-1.9.4.tar.gz#0db042011bffcbd65362b67eb3cca87eaefa9f2a55b747fa75e922c706b8ce1a" -install_package micropython-1.9.4 "$src" micropython +install_package micropython-1.9.4 "$src" micropython_1_9 diff --git a/plugins/python-build/test/compiler.bats b/plugins/python-build/test/compiler.bats index 63da5800..61ff22be 100644 --- a/plugins/python-build/test/compiler.bats +++ b/plugins/python-build/test/compiler.bats @@ -110,7 +110,7 @@ OUT mkdir -p "$INSTALL_ROOT/bin" cd "$INSTALL_ROOT" - stub make true true '(for a in "$@"; do echo $a; done)|grep -E "^CFLAGS_EXTRA="' true + stub make true '(for a in "$@"; do echo $a; done)|grep -E "^CFLAGS_EXTRA="' true stub ln true stub mkdir true run_inline_definition <