StarMirror/qTox
1
0
Fork 0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00
Code Issues Projects Releases Wiki Activity

Merge pull request #6180

Browse Source 
Maxim Biro (2):
      fix(build): cache debug deps during 2nd stage
      refactor(build): remove specific string tests
This commit is contained in:
sudden6 2020-06-23 19:06:41 +02:00
commit def038a897
No known key found for this signature in database
GPG Key ID: 279509B499E032B9
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
windows/cross-compile/build.sh
View File

@ -297,7 +297,7 @@ then
# which happens when building Qt # which happens when building Qt
CONFIGURE_EXTRA="" CONFIGURE_EXTRA=""
set +u set +u
if [[ "$TRAVIS_CI_STAGE" == "stage1" ]] if [[ -n "$TRAVIS_CI_STAGE" ]]
then then
CONFIGURE_EXTRA="-silent" CONFIGURE_EXTRA="-silent"
fi fi
@ -974,8 +974,10 @@ else
fi fi
if [[ "$BUILD_TYPE" == "debug" ]] set +u
if [[ -n "$TRAVIS_CI_STAGE" ]] || [[ "$BUILD_TYPE" == "debug" ]]
then then
set -u
# mingw-w64-debug-scripts # mingw-w64-debug-scripts
@ -1071,7 +1073,9 @@ then
echo "Using cached build of GDB `cat $GDB_PREFIX_DIR/done`" echo "Using cached build of GDB `cat $GDB_PREFIX_DIR/done`"
fi fi
set +u
fi fi
set -u
# NSIS ShellExecAsUser plugin # NSIS ShellExecAsUser plugin
@ -1182,8 +1186,9 @@ echo "
SET(CMAKE_FIND_ROOT_PATH /usr/$ARCH-w64-mingw32 $CMAKE_FIND_ROOT_PATH) SET(CMAKE_FIND_ROOT_PATH /usr/$ARCH-w64-mingw32 $CMAKE_FIND_ROOT_PATH)
" > toolchain.cmake " > toolchain.cmake
# Run tests using Wine
set +u set +u
if [[ "$TRAVIS_CI_STAGE" == "stage3" ]] if [[ -n "$TRAVIS_CI_STAGE" ]]
then then
echo "SET(TEST_CROSSCOMPILING_EMULATOR /usr/bin/wine)" >> toolchain.cmake echo "SET(TEST_CROSSCOMPILING_EMULATOR /usr/bin/wine)" >> toolchain.cmake
fi fi
@ -1279,9 +1284,9 @@ do
done < /tmp/$ARCH-qtox-dll-find done < /tmp/$ARCH-qtox-dll-find
# Run tests # Run tests (only on Travis)
set +u set +u
if [[ "$TRAVIS_CI_STAGE" == "stage3" ]] if [[ -n "$TRAVIS_CI_STAGE" ]]
then then
# Add libgcc_s_*.dll, libwinpthread-1.dll, QtTest.dll, etc. into PATH env var of wine # Add libgcc_s_*.dll, libwinpthread-1.dll, QtTest.dll, etc. into PATH env var of wine
export WINEPATH=`cd $QTOX_PREFIX_DIR ; winepath -w $(pwd)`\;`winepath -w $QT_PREFIX_DIR/bin/` export WINEPATH=`cd $QTOX_PREFIX_DIR ; winepath -w $(pwd)`\;`winepath -w $QT_PREFIX_DIR/bin/`