1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-15 15:49:56 +00:00
Commit graph

321 commits

Author SHA1 Message Date
Bret Curtis
3eeee4bc94 drop need to upgrade qt, 5.15 is by default installed; add CXX_FLAGS; retarget SYSROOT to 10.15 2020-07-01 17:52:34 +02:00
AnyOldName3
0d7b9c51fd Log misparsed stuff as it caused an unexpected CI failure 2020-06-28 03:51:41 +01:00
Evil Eye
fcc761c13c Update Windows CI script to download a version of Google Test that can actually compile the tests 2020-06-27 15:30:28 +02:00
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.
2020-06-23 15:26:24 +01:00
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.
2020-06-23 15:22:59 +01:00
Bret Curtis
ae49549f03
change build type to debug for ci/cd
it should set -O0 which should prioritise fast compilation for gcc
2020-06-23 12:19:38 +02:00
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). 2020-06-23 07:59:05 +02:00
Bret Curtis
61a5c6125d #5480: Drop Qt4 support and require Qt 5.12 or later. 2020-06-22 12:17:06 +02:00
AnyOldName3
36d0a55600 Add error message when vswhere doesn't find MSVC 2020-06-18 14:50:07 +01:00
AnyOldName3
a93ea93d9d Remove MSVC 2015 specific parts of CI script.
Also add error when MSVC 2015 is requested.
2020-06-18 14:46:08 +01:00
AnyOldName3
7ef3a9d8ac Remove schoolboy error 2020-06-16 13:51:25 +00:00
psi29a
9067894335 Merge branch 'set-e-kills-ret' into 'master'
Fix Windows prebuild script error messages

Closes #5459

See merge request OpenMW/openmw!223
2020-06-16 08:37:16 +00:00
AnyOldName3
079be5d485 Remove annoying warning 2020-06-15 16:37:47 +01:00
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.
2020-06-15 16:36:30 +01:00
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
2020-06-15 14:23:52 +00:00
apommel
4b831f99da Allow vswhere to detect build tools installations 2020-06-15 10:13:22 +09:00
Alexei Dobrohotov
09537ed312 Merge branch 'master' into 'AnyOldName3-master-patch-15901'
# Conflicts:
#   CI/before_script.msvc.sh
2020-06-14 19:47:01 +00:00
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.
2020-06-13 01:51:27 +01:00
AnyOldName3
0d2129ca13 Add success message to Windows prebuild script 2020-06-12 22:50:06 +00:00
AnyOldName3
13c4e4b2a9 Fix ifs for ACTIVATE_MSVC 2020-06-12 22:35:38 +00:00
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
2020-06-08 21:42:28 +00:00
AnyOldName3
6e267e398e Fix copy-paste snafu 2020-06-03 22:38:08 +00:00
AnyOldName3
86c1d0f4be Warn about fake stub Python 2020-06-03 22:36:55 +00:00
AnyOldName3
08e5d93c9b Print MSVC activation info in verbose mode, too. 2020-05-18 17:36:07 +01:00
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
2020-05-17 15:21:12 +02:00
Bret Curtis
9fd8470741
Merge branch 'master' into cherry-pick-e0b35232 2020-05-17 02:23:18 +02:00
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
2020-05-17 01:12:04 +02:00
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
2020-05-16 22:23:37 +00:00
elsid
66da72048a
Update bullet for windows up to 2.87 2020-05-13 19:24:29 +02:00
elsid
4e0c07de0f
Build install target in CI 2020-05-10 19:39:32 +02:00
elsid
99cd99bc3b
Remove unused BUILD_MYGUI_PLUGIN option 2020-05-09 19:42:36 +02:00
elsid
ca649003ed
Use googletest 1.10.0
To get support for INSTANTIATE_TEST_SUITE_P macro
2020-05-02 17:56:32 +02:00
Bret Curtis
0d10293f24
everything is implied yes 2020-04-17 15:10:05 +02:00
Bret Curtis
9698c21b36
build bsa and esm tools 2020-04-17 13:50:54 +02:00
Nikolay Kasyanov
c8596f782a [macOS, CI] Use prebuilt dependencies with SDL2 2.0.12 2020-04-01 19:57:04 +04:00
Andrei Kortunov
d2acac0ebe Fix Qt download link for Windows 2020-03-23 17:40:30 +04:00
Bret Curtis
444d667d22 give sdl2 2.0.12 for windows a try 2020-03-22 23:07:07 +01:00
Bret Curtis
42640b7811 no need to re-map when using system default 2020-03-22 21:34:46 +01:00
Bret Curtis
5091e2c371 bump to bionic; gcc-9 and clang-10 2020-03-22 20:56:48 +01:00
elsid
c690f2d43d
Disable coverage for travis CI 2020-01-26 22:09:48 +01:00
Andrei Kortunov
ed31b8c467 Attempt to fix MacOS CI 2019-12-21 12:27:56 +04:00
Andrei Kortunov
05a8702b6e Fix Boost 1.70+ detection 2019-11-28 16:46:18 +04:00
Bret Curtis
5a8bfac4df hard code Qt to version 2019-10-21 15:40:38 +02:00
Bret Curtis
e7caf7a037 bump that qt 2019-10-21 15:38:10 +02:00
Bret Curtis
4c94fcd52b add msvc2019 and ditch msvc2015 2019-10-21 14:28:12 +02:00
naratzul
0220bcdef3 Add Visual Studio 2019 support 2019-10-12 11:08:43 +05:00
Nikolay Kasyanov
c89876538d Fix macOS nightly preupload check
Previously, it was always ls'ing home directory.
2019-04-06 18:21:33 +02:00
Nikolay Kasyanov
d305e1933a Get ccache path from Homebrew
Also, don't use legacy syntax to get Qt path.
2019-03-31 17:41:16 +02:00
Nikolay Kasyanov
95ae9c4ac8 Don't downgrade CMake 2019-03-31 17:16:14 +02:00
Nikolay Kasyanov
a11c391231 Enable ccache for macOS CI 2019-03-31 17:16:14 +02:00
Bret Curtis
8c1a73ff11
Merge pull request #2220 from elsid/ccache
Use ccache for linux CI build
2019-03-07 12:21:05 +01:00
elsid
26dfa287f9
Use ccache for linux CI build 2019-03-07 11:17:51 +03:00
elsid
7d2c741d1d
Fix compare with empty value 2019-03-07 00:33:26 +03:00
elsid
e99f783c65
Remove white spaces and trailing spaces 2019-03-07 00:33:26 +03:00
Alexander Olofsson
f8118272f4
Package FreeType plugin for OSG in Windows
Fixes #4872
2019-02-22 18:37:49 +01:00
Chris Djali
cb5a57e41b
Merge pull request #1547 from AnyOldName3/osgshadow-test-vdsm
Shadows
2019-02-20 15:35:49 +00:00
Nikolay Kasyanov
cdbd3a9c09
Fix macOS CI
It looks like Homebrew has deprecated some syntax making CMake formula invalid, now a for of the formula is used.
2019-02-04 21:32:54 +01:00
AnyOldName3
8482236a82 Merge remote-tracking branch 'upstream/master' into osgshadow-test-vdsm 2019-01-24 23:09:23 +00:00
Azdul
6d8215ecb6 Google Test / Google Mock / OpenMW unit tests on Windows 2019-01-23 14:21:03 +01:00
Nikolay Kasyanov
4a266b3277
[macOS, CI] Update dependencies
They now include boost iostreams for TES 4/5 BSA support.
See https://gitlab.com/OpenMW/openmw/merge_requests/56.
2019-01-20 11:03:37 +01:00
Nikolay Kasyanov
9cce6ecfe3 [macOS] Update deploy script to use ssh/scp 2019-01-16 23:04:26 +01:00
Nikolay Kasyanov
956934911a [macOS, CI] Use CMake 3.12.4
See https://gitlab.com/OpenMW/openmw/issues/4767 for details.
2018-12-26 10:17:32 +01:00
Bret Curtis
8e113a32b2
Merge pull request #2081 from nikolaykasyanov/unneed-macos-files
Remove unnecessary Recastnavigation headers & static libs from macOS package
2018-12-21 17:47:15 +01:00
Nikolay Kasyanov
e0161bb2bf Update macOS dependencies, use Xcode 10.1 2018-12-20 22:36:06 +01:00
Nikolay Kasyanov
f98a454ec1 Add a script to verify macOS package contents 2018-12-20 21:18:41 +01:00
AnyOldName3
e2515f6db7 Merge branch 'master' into osgshadow-test-vdsm 2018-12-18 19:51:27 +00:00
AnyOldName3
2a2d9f0006 Fix if statements 2018-12-07 15:03:36 +00:00
AnyOldName3
14fcb9158f Add NMake support to the Windows prebuild script. 2018-12-07 14:46:32 +00:00
AnyOldName3
642002b302 Merge remote-tracking branch 'upstream/master' into osgshadow-test-vdsm 2018-11-29 01:19:01 +00:00
Bret Curtis
fc15fa0a89 we now have gcc-5 _and_ gcc-8, along with QT5 and use system tinyxml 2018-11-14 21:14:14 +01:00
Alexander Olofsson
f8f66b83b6 Update OpenAL-soft to 1.19.1 2018-11-13 22:17:04 +01:00
Bret Curtis
461ba74d6d
Merge pull request #2017 from sthalik/pr/allow-build-under-cygwin-msys2-etc
fix build with CI dependencies on all Cygwin derivatives
2018-11-09 10:07:36 +01:00
Bret Curtis
9ae077c033
use c++11 std::align from <memory> (#2026)
* use c++11 std::align from <memory>

* for Ubuntu, use gcc5 instead of 4.8

* use travis to set gcc to 5

eval

and sudo

* use eval in .travis.yml

* use gcc-8

* replace precise with trusty llvm toolchain, because we have been using trusty for awhile now

* push things to matrix, so we can support multiple releases if we want

* we should not be allowing for failures, we are ready to start trusting clang and its analyzer

* scan-build was pushed to another package

* use gcc-8 still but wrap in scan-build

* travis.yml cleanup, have output of scripts go to stdout, make search for substring a regex

use double []

fix missing ,

use bash to use regex

black spaces matter

* set human readable names for our various builds, split out our static analysis between openmw and openmw-cs

* test if not set, then set otherwise ignore

* use quotes

* do not eval it, set it in travis env

* no more &&

* what does clang7 have to say?

* use sourceline for now

* use clang-7 instead of clang-7.0

* yes, llvm-toolchain-trusty-7 not llvm-toolchain-trusty-7.0

* for static analysis, openmw is compiled and checked on its own while openmw-cs is build with all the rest. this might change in the future.

and actually do it the other way around
2018-11-08 17:38:09 +01:00
Stanislaw Halik
b099981c91 fix CI msvc build outside git bash
It was only by accident that git bash worked for CI basing on the
"real_pwd()" expression. Replace the dubious replacement pattern with
"cygpath", which is present on git bash, Cygwin, and msys2 alike. In
particular git bash uses msys2 internally.

I was able to confirm a working build under msys2 with a wrapper for
MSVC invocation via the Ninja generator.
2018-11-03 20:19:44 +01:00
Andrei Kortunov
f88d5e808c Rewrite media decoder to use FFMpeg 3.2+ API (task #4686) 2018-11-03 22:34:25 +04:00
AnyOldName3
d0c254bc7e Merge remote-tracking branch 'upstream/master' into osgshadow-test-vdsm 2018-11-01 16:48:21 +00:00
elsid
792a0585c0 Add recastnavigation as subdirectory 2018-11-01 17:01:22 +01:00
AnyOldName3
afd700dab9 Ensure different Boost versions get different names 2018-10-31 23:38:10 +00:00
AnyOldName3
3785ba6aa0 Merge upstream/master 2018-10-30 22:38:09 +00:00
elsid
49d81241db Merge branch 'master' into pathfinder_detour 2018-10-28 17:08:09 +03:00
Nikolay Kasyanov
f62ca24356 [macOS, CI] Use dependencies with downgraded MyGUI, fixing #4665 2018-10-26 19:33:04 +02:00
elsid
3d97e96f55
Add dependency to recastnavigation 2018-10-13 22:16:25 +03:00
AnyOldName3
0124be5713 Merge upstream/master 2018-10-10 21:23:19 +01:00
Capostrophic
e627f49df4 Fix AppVeyor build 2018-10-07 20:22:52 +03:00
elsid
2073218fc6
Use specific googletest version 2018-09-28 22:39:27 +03:00
AnyOldName3
80082308f0 Merge upstream (shadermanager log system revamp) 2018-08-17 18:22:13 +01:00
elsid
ef631a0961
Add dependency for GMock 2018-08-11 16:52:53 +03:00
AnyOldName3
cc23a968d1 Merge upstream/master 2018-08-01 14:13:45 +01:00
Bret Curtis
84b80ae405 no spaces in assignment 2018-07-22 23:12:37 +00:00
Bret Curtis
b910106713 Catch an unbound variable before it happens. 2018-07-22 07:17:34 +00:00
Bret Curtis
739c49d59b Merge branch 'master' into 'win10_ci'
# Conflicts:
#   CI/before_script.msvc.sh
2018-07-04 15:21:45 +00:00
Bret Curtis
57e2573593
Update before_script.msvc.sh
check if temp directory exists, error out and warn user about it.
2018-07-03 15:59:51 +02:00
Bret Curtis
70e9d5c0a0 ; it? 2018-07-03 13:53:13 +00:00
Bret Curtis
11030e56c4 detect existing dir 2018-07-03 13:41:06 +00:00
Bret Curtis
4f07ca28a6 Try passing the _real_ windows dir to innoinstaller, then using the linux-like directory for mv. 2018-07-03 13:00:19 +00:00
Bret Curtis
d4c9586bd0 try just converting the \ to a / 2018-07-03 12:53:30 +00:00
Bret Curtis
af75c1e909
Update before_script.msvc.sh
reverting back to what works
2018-06-30 08:40:21 +02:00
Bret Curtis
4d60fe5a76 reverting back 2018-06-30 06:10:26 +00:00
Bret Curtis
b8b07b52f0 try this... 2018-06-29 22:42:12 +00:00
Bret Curtis
4177fd04eb
Update before_script.msvc.sh
Does it blend?
2018-06-29 21:08:42 +02:00