mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-02-28 22:09:40 +00:00
Code Issues Releases Wiki Activity

Update before_script.msvc.sh

Browse source 
taking nits into account :)
This commit is contained in:
Bret Curtis 2018-06-29 15:14:23 +02:00 committed by GitHub
parent a532aef935
commit 8811c7141a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
CI/before_script.msvc.sh
View file

@ -1,5 +1,5 @@
#!/bin/bash #!/bin/bash
set -x # set -x # turn-on for debugging
MISSINGTOOLS=0 MISSINGTOOLS=0
@ -417,13 +417,14 @@ fi
# We work around this by installing to root of the current working drive and then move it to our deps # We work around this by installing to root of the current working drive and then move it to our deps
BOOST_SDK="$(real_pwd)/Boost" BOOST_SDK="$(real_pwd)/Boost"
CWD_DRIVE_ROOT=`powershell -command '(get-location).Drive.Root'` # get the current working drive's root CWD_DRIVE_ROOT=$(powershell -command '(get-location).Drive.Root') # get the current working drive's root
if [ -d Boost ] && grep "BOOST_VERSION 106700" Boost/boost/version.hpp > /dev/null; then if [ -d Boost ] && grep "BOOST_VERSION 106700" Boost/boost/version.hpp > /dev/null; then
printf "Exists. " printf "Exists. "
elif [ -z $SKIP_EXTRACT ]; then elif [ -z $SKIP_EXTRACT ]; then
rm -rf Boost rm -rf Boost
"${DEPS}/boost-1.67.0-msvc${MSVC_YEAR}-win${BITS}.exe" //DIR="${CWD_DRIVE_ROOT}Boost_temp" //VERYSILENT //NORESTART //SUPPRESSMSGBOXES //LOG="boost_install.log" [ -n "$CI" ] CI_EXTRA_INNO_OPTIONS="//SUPPRESSMSGBOXES //LOG="boost_install.log"
"${DEPS}/boost-1.67.0-msvc${MSVC_YEAR}-win${BITS}.exe" //DIR="${CWD_DRIVE_ROOT}Boost_temp" //VERYSILENT //NORESTART ${CI_EXTRA_INNO_OPTIONS}
mv "${CWD_DRIVE_ROOT}Boost_temp" "${BOOST_SDK}" mv "${CWD_DRIVE_ROOT}Boost_temp" "${BOOST_SDK}"
fi fi