mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-02-24 18:39:59 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'qt-tidying' into 'master'

Browse Source 
Make Qt work on my machine

See merge request OpenMW/openmw!240
This commit is contained in:
psi29a 2020-06-23 15:09:47 +00:00
commit 662725069e
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
CI/before_script.msvc.sh
View File

@ -497,13 +497,6 @@ if [ -z $SKIP_DOWNLOAD ]; then
"OSG-3.6.5-msvc${MSVC_REAL_YEAR}-win${BITS}-sym.7z" "OSG-3.6.5-msvc${MSVC_REAL_YEAR}-win${BITS}-sym.7z"
fi fi
# Qt
if [ -z $APPVEYOR ]; then
download "AQt installer" \
"https://files.pythonhosted.org/packages/f3/bb/aee972f08deecca31bfc46b5aedfad1ce6c7f3aaf1288d685e4a914b53ac/aqtinstall-0.8-py2.py3-none-any.whl" \
"aqtinstall-0.8-py2.py3-none-any.whl"
fi
# SDL2 # SDL2
download "SDL 2.0.12" \ download "SDL 2.0.12" \
"https://www.libsdl.org/release/SDL2-devel-2.0.12-VC.zip" \ "https://www.libsdl.org/release/SDL2-devel-2.0.12-VC.zip" \
@ -732,9 +725,16 @@ fi
fi fi
if [ -z $APPVEYOR ]; then if [ -z $APPVEYOR ]; then
cd $DEPS_INSTALL cd $DEPS_INSTALL
QT_SDK="$(real_pwd)/Qt/5.15.0/msvc${MSVC_REAL_YEAR}${SUFFIX}"
if [ -d 'Qt/5.15.0' ]; then qt_version="5.15.0"
if [ "win${BITS}_msvc${MSVC_REAL_YEAR}${SUFFIX}" == "win64_msvc2017_64" ]; then
echo "This combination of options is known not to work. Falling back to Qt 5.14.2."
qt_version="5.14.2"
fi
QT_SDK="$(real_pwd)/Qt/${qt_version}/msvc${MSVC_REAL_YEAR}${SUFFIX}"
if [ -d "Qt/${qt_version}" ]; then
printf "Exists. " printf "Exists. "
elif [ -z $SKIP_EXTRACT ]; then elif [ -z $SKIP_EXTRACT ]; then
if [ $MISSINGPYTHON -ne 0 ]; then if [ $MISSINGPYTHON -ne 0 ]; then
@ -745,20 +745,20 @@ fi
pushd "$DEPS" > /dev/null pushd "$DEPS" > /dev/null
if ! [ -d 'aqt-venv' ]; then if ! [ -d 'aqt-venv' ]; then
echo " Creating Virtualenv for aqt..." echo " Creating Virtualenv for aqt..."
eval python -m venv aqt-venv $STRIP run_cmd python -m venv aqt-venv
fi fi
if [ -d 'aqt-venv/bin' ]; then if [ -d 'aqt-venv/bin' ]; then
VENV_BIN_DIR='bin' VENV_BIN_DIR='bin'
elif [ -d 'aqt-venv/Scripts' ]; then elif [ -d 'aqt-venv/Scripts' ]; then
VENV_BIN_DIR='Scripts' VENV_BIN_DIR='Scripts'
else else
echo "Error: Failed to create virtualenv." echo "Error: Failed to create virtualenv in expected location."
exit 1 wrappedExit 1
fi fi
if ! [ -e "aqt-venv/${VENV_BIN_DIR}/aqt" ]; then if ! [ -e "aqt-venv/${VENV_BIN_DIR}/aqt" ]; then
echo " Installing aqt wheel into virtualenv..." echo " Installing aqt wheel into virtualenv..."
eval "aqt-venv/${VENV_BIN_DIR}/pip" install aqtinstall-0.8-py2.py3-none-any.whl $STRIP run_cmd "aqt-venv/${VENV_BIN_DIR}/pip" install aqtinstall==0.9.2
fi fi
popd > /dev/null popd > /dev/null
@ -767,7 +767,7 @@ fi
mkdir Qt mkdir Qt
cd Qt cd Qt
eval "${DEPS}/aqt-venv/${VENV_BIN_DIR}/aqt" install 5.15.0 windows desktop "win${BITS}_msvc${MSVC_REAL_YEAR}${SUFFIX}" $STRIP run_cmd "${DEPS}/aqt-venv/${VENV_BIN_DIR}/aqt" install $qt_version windows desktop "win${BITS}_msvc${MSVC_REAL_YEAR}${SUFFIX}"
printf " Cleaning up extraneous data... " printf " Cleaning up extraneous data... "
rm -rf Qt/{aqtinstall.log,Tools} rm -rf Qt/{aqtinstall.log,Tools}