Browse Source

Use git download for cxfreeze

pull/19/head
falkTX 3 years ago
parent
commit
e3711795c4
2 changed files with 5 additions and 5 deletions
  1. +2
    -2
      bootstrap-carla.sh
  2. +3
    -3
      setup/versions.sh

+ 2
- 2
bootstrap-carla.sh View File

@@ -358,9 +358,9 @@ fi
# ---------------------------------------------------------------------------------------------------------------------
# cxfreeze

download cx_Freeze "${CXFREEZE_VERSION}" "https://github.com/anthony-tuininga/cx_Freeze/archive" "" "nv"
download cx_Freeze "${CXFREEZE_VERSION}" "https://github.com/anthony-tuininga/cx_Freeze.git" "" "git"

if [ "${CXFREEZE_VERSION}" = "6.4.2" ]; then
if [ "${CXFREEZE_VERSION}" = "e1c33afea842bc61dac82145a8a0be5fbd318a92" ]; then
patch_file cx_Freeze "${CXFREEZE_VERSION}" "setup.py" 's/extra_postargs=extraArgs,/extra_postargs=extraArgs+os.getenv("LDFLAGS").split(),/'
patch_file cx_Freeze "${CXFREEZE_VERSION}" "cx_Freeze/macdist.py" 's/, use_builtin_types=False//'
fi


+ 3
- 3
setup/versions.sh View File

@@ -63,7 +63,7 @@ FILE_VERSION=5.34
LIBFFI_VERSION=3.3

if [ "${MACOS_UNIVERSAL}" -eq 1 ]; then
CXFREEZE_VERSION=6.4.2
CXFREEZE_VERSION=e1c33afea842bc61dac82145a8a0be5fbd318a92 # 6.4.2
PYTHON_VERSION=3.9.5
PYLIBLO_VERSION=0.10.0
PYQT5_VERSION=5.13.1
@@ -76,13 +76,13 @@ if [ "${MACOS_UNIVERSAL}" -eq 1 ]; then
TOML_VERSION=0.10.2
ZIPP_VERSION=3.4.0
elif [ "${WIN32}" -eq 1 ]; then
CXFREEZE_VERSION=6.1
CXFREEZE_VERSION=6c1d6f23f401d40368d4fab5cd710a784b114a12 # 6.1
PYTHON_VERSION=3.8.7
PYLIBLO_VERSION=0.9.2
PYQT5_VERSION=5.13.1
SIP_VERSION=4.19.19
else
CXFREEZE_VERSION=6.1
CXFREEZE_VERSION=6c1d6f23f401d40368d4fab5cd710a784b114a12 # 6.1
PYTHON_VERSION=3.7.4
PYLIBLO_VERSION=0.9.2
PYQT5_VERSION=5.9.2


Loading…
Cancel
Save