Commit Graph

268 Commits (230e06dec73eb1bac45e19327c976b9e540d6a2f)

Author SHA1 Message Date
AnyOldName3 35d920569c Tweak error message
As we have `set -e`, the error message would never be printed if we
genuinely failed to create the virtualenv, just if we succeeded and the
expected directories didn't exist.
5 years ago
AnyOldName3 657306c293 Make Qt work on my machine
Switches `eval stuff $STRIP` to `run_cmd` as it'll log errors on failure
and eval was breaking commands that ran just fine otherwise.

Don't download aqt wheel from pip and install it in two separate steps.

Upgrade aqt from 0.8 to 0.9.2 as there are bugs with 0.8 that stop Qt
5.15.0 from working for some people.

Fall back to Qt 5.14.2 for 64-bit on MSVC 2017 as the package list is
broken and that specific combination doesn't work right now.
5 years ago
Bret Curtis ae49549f03
change build type to debug for ci/cd
it should set -O0 which should prioritise fast compilation for gcc
5 years ago
Bret Curtis ad25b22db7 removed need for split compilation for static analysis, we've gone from openmw taking 30 minutes to taking 3. Merging them also makes our before_script.linux.sh less complicated; removed redundant CMAKE flag; set build type to RelWithDebInfo as None has no meaning (even if it still builds). 5 years ago
Bret Curtis 61a5c6125d #5480: Drop Qt4 support and require Qt 5.12 or later. 5 years ago
AnyOldName3 36d0a55600 Add error message when vswhere doesn't find MSVC 5 years ago
AnyOldName3 a93ea93d9d Remove MSVC 2015 specific parts of CI script.
Also add error when MSVC 2015 is requested.
5 years ago
AnyOldName3 7ef3a9d8ac Remove schoolboy error 5 years ago
psi29a 9067894335 Merge branch 'set-e-kills-ret' into 'master'
Fix Windows prebuild script error messages

Closes #5459

See merge request OpenMW/openmw!223
5 years ago
AnyOldName3 079be5d485 Remove annoying warning 5 years ago
AnyOldName3 761558f612 Remove test data
A dummy command was used to check the script would fail if a command was missing.
Not being a real command, it always made the script fail as a command was missing.
5 years ago
AnyOldName3 5bffa7453f Merge branch 'fix-msvc-buildtools' into 'master'
Fix the build script not detecting Visual Studio Build Tools installation

See merge request OpenMW/openmw!224
5 years ago
apommel 4b831f99da Allow vswhere to detect build tools installations 5 years ago
Alexei Dobrohotov 09537ed312 Merge branch 'master' into 'AnyOldName3-master-patch-15901'
# Conflicts:
#   CI/before_script.msvc.sh
5 years ago
AnyOldName3 a6493ce329 Don't exit prebuild script on nonzero exit code when we already check it
We have `set -e` enabled, so normally exit the script if a command fails.
We also had explicit exit code checks in a few places with user-friendly
error messages. These were never printed as the script exited before we
could check the exit code due to a bad exit code.
5 years ago
AnyOldName3 0d2129ca13 Add success message to Windows prebuild script 5 years ago
AnyOldName3 13c4e4b2a9 Fix ifs for ACTIVATE_MSVC 5 years ago
AnyOldName3 be22e80d33 Merge branch 'always-say-what-to-do' into 'master'
Print MSVC activation info in verbose mode, too.

See merge request OpenMW/openmw!212
5 years ago
AnyOldName3 6e267e398e Fix copy-paste snafu 5 years ago
AnyOldName3 86c1d0f4be Warn about fake stub Python 5 years ago
AnyOldName3 08e5d93c9b Print MSVC activation info in verbose mode, too. 5 years ago
elsid 2e09e96f5d
Fix msvc dir for Qt
Otherwise it fails with:
Qt 5.15.0... Exists. CI/before_script.msvc.sh: line 781: cd: MSVC2019_64_Ninja/deps/Qt/5.15.0/msvc2015_64: No such file or directory
5 years ago
Bret Curtis 9fd8470741
Merge branch 'master' into cherry-pick-e0b35232 5 years ago
Alexander "Ananace" Olofsson 7b781d8890
Windows CI dependency upgrade (#2847)
* Windows CI: Use OSG 3.4-experimental for 0.46

* Update compiled Windows CI dependencies

Only built and pushed so far, still need to try making full OpenMW
builds with them as well.

* Update missed Bullet version number

* MyGUI uses RelWithDebInfo for Release builds now

* Update Windows CI dependencies, switch Qt install

* Fix aqt retrieval and setup

* Make aqt install output slightly nicer

* Bump to Qt 5.15 for VS2019 support

* Fix FFmpeg and Qt install parts

* Fix OSG plugin DLL copying

* Add CMake flag for double-precision bullet

* Roll back 2019 to Boost 1.71 for CI

* Move aqt into unpack step, to allow manual install
5 years ago
psi29a 38daa83ff6 Merge branch 'ninja' into 'master'
Enable Windows Ninja builds

See merge request OpenMW/openmw!202

(cherry picked from commit e0b352323226ff11e230f6489e826df332fa681a)

c1e673ce Unify path conversion functions
fdf0fdbb Fix NMake with MSVC 2019
bdd4a814 Activate MSVC during CMake setup for NMake
eae41050 Support sourcing
c0d28a0e Warn that MSVC environment will need to be activated
bd16ad62 Ninja
7d57e6e2 Support MSVC 2015
3679d329 Check MSVC activated correctly
ed4b73b8 Fix post-2015 Visual Studio
4ffa116a Print message when it's necessary instead of when it isn't
c6e09461 Add instructions for using VS' non-.sln support
d9bb6e63 Activate MSVC later
9ca26358 Create batch script to activate correct MSVC
61df647d Provide scripts to activate selected MSVC in existing shell without kerfuffle
5 years ago
elsid 66da72048a
Update bullet for windows up to 2.87 5 years ago
elsid 4e0c07de0f
Build install target in CI 5 years ago
elsid 99cd99bc3b
Remove unused BUILD_MYGUI_PLUGIN option 5 years ago
elsid ca649003ed
Use googletest 1.10.0
To get support for INSTANTIATE_TEST_SUITE_P macro
5 years ago
Bret Curtis 0d10293f24
everything is implied yes 5 years ago
Bret Curtis 9698c21b36
build bsa and esm tools 5 years ago
Nikolay Kasyanov c8596f782a [macOS, CI] Use prebuilt dependencies with SDL2 2.0.12 5 years ago
Andrei Kortunov d2acac0ebe Fix Qt download link for Windows 5 years ago
Bret Curtis 444d667d22 give sdl2 2.0.12 for windows a try 5 years ago
Bret Curtis 42640b7811 no need to re-map when using system default 5 years ago
Bret Curtis 5091e2c371 bump to bionic; gcc-9 and clang-10 5 years ago
elsid c690f2d43d
Disable coverage for travis CI 5 years ago
Andrei Kortunov ed31b8c467 Attempt to fix MacOS CI 5 years ago
Andrei Kortunov 05a8702b6e Fix Boost 1.70+ detection 5 years ago
Bret Curtis 5a8bfac4df hard code Qt to version 5 years ago
Bret Curtis e7caf7a037 bump that qt 5 years ago
Bret Curtis 4c94fcd52b add msvc2019 and ditch msvc2015 5 years ago
naratzul 0220bcdef3 Add Visual Studio 2019 support 5 years ago
Nikolay Kasyanov c89876538d Fix macOS nightly preupload check
Previously, it was always ls'ing home directory.
6 years ago
Nikolay Kasyanov d305e1933a Get ccache path from Homebrew
Also, don't use legacy syntax to get Qt path.
6 years ago
Nikolay Kasyanov 95ae9c4ac8 Don't downgrade CMake 6 years ago
Nikolay Kasyanov a11c391231 Enable ccache for macOS CI 6 years ago
Bret Curtis 8c1a73ff11
Merge pull request #2220 from elsid/ccache
Use ccache for linux CI build
6 years ago
elsid 26dfa287f9
Use ccache for linux CI build 6 years ago
elsid 7d2c741d1d
Fix compare with empty value 6 years ago