diff --git a/bootstrap-carla.sh b/bootstrap-carla.sh index 65f9804..001cf41 100755 --- a/bootstrap-carla.sh +++ b/bootstrap-carla.sh @@ -168,6 +168,14 @@ fi download PyQt5${PYQT5_SUFFIX} "${PYQT5_VERSION}" "${PYQT5_DOWNLOAD_URL}" build_pyqt PyQt5${PYQT5_SUFFIX} "${PYQT5_VERSION}" "--concatenate --confirm-license -c" +# --------------------------------------------------------------------------------------------------------------------- +# cython (optional) + +if [ -n "${CYTHON_VERSION}" ]; then + download Cython "${CYTHON_VERSION}" "https://files.pythonhosted.org/packages/6c/9f/f501ba9d178aeb1f5bf7da1ad5619b207c90ac235d9859961c11829d0160" + build_python Cython "${CYTHON_VERSION}" +fi + # --------------------------------------------------------------------------------------------------------------------- # pyliblo diff --git a/patches/pyliblo/01_python3.7+-support.patch b/patches/pyliblo/common/01_python3.7+-support.patch similarity index 100% rename from patches/pyliblo/01_python3.7+-support.patch rename to patches/pyliblo/common/01_python3.7+-support.patch diff --git a/patches/pyliblo/linux b/patches/pyliblo/linux new file mode 120000 index 0000000..d66298e --- /dev/null +++ b/patches/pyliblo/linux @@ -0,0 +1 @@ +common \ No newline at end of file diff --git a/patches/pyliblo/macos b/patches/pyliblo/macos new file mode 120000 index 0000000..d66298e --- /dev/null +++ b/patches/pyliblo/macos @@ -0,0 +1 @@ +common \ No newline at end of file diff --git a/patches/pyliblo/win32 b/patches/pyliblo/win32 new file mode 120000 index 0000000..d66298e --- /dev/null +++ b/patches/pyliblo/win32 @@ -0,0 +1 @@ +common \ No newline at end of file diff --git a/patches/pyliblo/win64 b/patches/pyliblo/win64 new file mode 120000 index 0000000..d66298e --- /dev/null +++ b/patches/pyliblo/win64 @@ -0,0 +1 @@ +common \ No newline at end of file diff --git a/setup/versions.sh b/setup/versions.sh index b8040b9..3b0dac2 100644 --- a/setup/versions.sh +++ b/setup/versions.sh @@ -55,14 +55,16 @@ fi # carla FILE_VERSION=5.34 -PYLIBLO_VERSION=0.9.2 if [ "${MACOS_UNIVERSAL}" -eq 1 ]; then CXFREEZE_VERSION=6.4.2 PYTHON_VERSION=3.9.1 + PYLIBLO_VERSION=0.10.0 PYQT5_VERSION=5.13.1 SIP_VERSION=4.19.19 - # extra, needed only for cxfreeze + # extra, needed for pyliblo + CYTHON_VERSION=0.29.21 + # extra, needed for cxfreeze IMPORTLIB_METADATA_VERSION=3.1.1 SETUPTOOLS_SCM_VERSION=5.0.0 TOML_VERSION=0.10.2 @@ -70,6 +72,7 @@ if [ "${MACOS_UNIVERSAL}" -eq 1 ]; then else CXFREEZE_VERSION=6.1 PYTHON_VERSION=3.7.4 + PYLIBLO_VERSION=0.9.2 PYQT5_VERSION=5.9.2 SIP_VERSION=4.19.13 fi