AnyOldName3
f4db29a717
Kill BUILD_CONFIG
...
It was basically just CONFIGURATION but less confusing. CONFIGURATION
could just be less confusing.
4 years ago
David Cernat
80af0ce6a7
Add OpenMW commits up to 29 Aug 2020
...
# Conflicts:
# CMakeLists.txt
# apps/openmw/mwmechanics/character.cpp
4 years ago
AnyOldName3
70384d8a83
Restore previous bash settings on exit
4 years ago
AnyOldName3
b71f13965a
Don't set pipefail
4 years ago
David Cernat
baa9446cd1
Add OpenMW commits up to 4 Aug 2020
4 years ago
descawed
58e0b34adc
Verify certificates when downloading dependencies
4 years ago
David Cernat
ff10aa816b
Add OpenMW commits up to 25 Jul 2020
...
# Conflicts:
# .travis.yml
5 years ago
Nikolay Kasyanov
3be1cdef33
[macOS, CI] Use Xcode 11.6 ( #2970 )
...
* [macOS, CI] Use Xcode 11.6
* [macOS, CI] Enable OpenCs build and see how it goes
* [macOS, CI] Re-enable package build and check
5 years ago
David Cernat
39e429c9eb
Add OpenMW commits up to 11 Jul 2020
...
# Conflicts:
# .travis.yml
# apps/openmw/mwmechanics/actors.cpp
5 years ago
AnyOldName3
38f1eae575
Merge remote-tracking branch 'upstream/master' into yet-another-windows-shared-runner-attempt
5 years ago
Bret Curtis
4a17bf27a3
Set BULLET_ROOT via add_cmake_opts like we do the rest
5 years ago
Bret Curtis
14d5b3eeaf
try release again and turning on bit by bit for ccache to be used
5 years ago
David Cernat
e85f506569
[CI] Assign execution permission to before_script_linux.sh
5 years ago
David Cernat
5eb7eb8d88
Add OpenMW commits up to 4 Jul 2020
...
# Conflicts:
# .travis.yml
# CI/before_script.linux.sh
# apps/openmw/engine.cpp
# apps/openmw/mwbase/windowmanager.hpp
# apps/openmw/mwgui/charactercreation.cpp
# apps/openmw/mwgui/windowmanagerimp.hpp
# apps/openmw/mwmechanics/character.cpp
5 years ago
Bret Curtis
db75398fba
only build openmw for now
5 years ago
Bret Curtis
3ea576efdc
do not build a few things; temporary disable checking package; get things compiling and cached first
5 years ago
Bret Curtis
1e23d007dd
Use Debug instead of Release to increase build time (passing -O0)
5 years ago
Bret Curtis
a62e3a7b35
What happens when I remove the sysroot line?
5 years ago
Bret Curtis
3eeee4bc94
drop need to upgrade qt, 5.15 is by default installed; add CXX_FLAGS; retarget SYSROOT to 10.15
5 years ago
AnyOldName3
0d7b9c51fd
Log misparsed stuff as it caused an unexpected CI failure
5 years ago
Evil Eye
fcc761c13c
Update Windows CI script to download a version of Google Test that can actually compile the tests
5 years ago
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
David Cernat
b42c1498f9
[CI] Temporarily disable building of CS
5 years ago
David Cernat
3b2eb6f62c
Add OpenMW commits up to 22 Jun 2020
...
# Conflicts:
# .travis.yml
# CMakeLists.txt
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
David Cernat
e5b1843089
Add OpenMW commits up to 11 Jun 2020
...
# Conflicts:
# apps/openmw/mwbase/world.hpp
# apps/openmw/mwgui/jailscreen.cpp
# apps/openmw/mwmechanics/activespells.cpp
# apps/openmw/mwmechanics/aiactivate.cpp
# apps/openmw/mwmechanics/aiactivate.hpp
# apps/openmw/mwmechanics/creaturestats.cpp
# apps/openmw/mwscript/aiextensions.cpp
# apps/openmw/mwscript/statsextensions.cpp
# apps/openmw/mwworld/worldimp.cpp
# apps/openmw/mwworld/worldimp.hpp
5 years ago
David Cernat
36a2308acd
Add OpenMW commits up to 30 May 2020
...
# Conflicts:
# CMakeLists.txt
# apps/openmw/mwbase/windowmanager.hpp
# apps/openmw/mwgui/windowmanagerimp.hpp
# apps/openmw/mwmechanics/actors.cpp
# apps/openmw/mwmechanics/actors.hpp
# apps/openmw/mwscript/interpretercontext.cpp
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
David Cernat
62df188fd4
Add OpenMW commits up to 16 May 2020
...
# Conflicts:
# CI/before_script.linux.sh
# apps/openmw/mwbase/world.hpp
# apps/openmw/mwinput/inputmanagerimp.cpp
# apps/openmw/mwscript/globalscripts.cpp
# apps/openmw/mwscript/interpretercontext.cpp
# apps/openmw/mwworld/cellstore.cpp
# apps/openmw/mwworld/cellstore.hpp
# apps/openmw/mwworld/worldimp.cpp
# apps/openmw/mwworld/worldimp.hpp
# components/interpreter/context.hpp
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
David Cernat
053a5a6258
Add OpenMW commits up to 9 May 2020
...
# Conflicts:
# apps/openmw/mwmechanics/spellcasting.cpp
# apps/openmw/mwscript/aiextensions.cpp
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
David Cernat
25a632c650
Add OpenMW commits up to 13 Apr 2020
...
# Conflicts:
# CMakeLists.txt
# README.md
# apps/openmw/engine.cpp
# apps/openmw/mwclass/creaturelevlist.cpp
# apps/openmw/mwgui/quickkeysmenu.cpp
5 years ago
David Cernat
7bc3298ed4
Add OpenMW commits up to 1 Apr 2020
...
# Conflicts:
# .travis.yml
# CI/before_install.linux.sh
# apps/openmw/mwphysics/physicssystem.cpp
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
David Cernat
dae76b91ee
[CI] Assign execution permission to Linux .sh file again
5 years ago
David Cernat
f0f76516d8
Add OpenMW commits up to 4 Feb 2020
...
# Conflicts:
# .travis.yml
# CI/before_script.linux.sh
5 years ago
elsid
c690f2d43d
Disable coverage for travis CI
5 years ago
David Cernat
a58f09fd6c
Add OpenMW commits up to 2 Jan 2020
...
# Conflicts:
# apps/openmw/mwmechanics/enchanting.cpp
# apps/openmw/mwworld/scene.cpp
5 years ago
Andrei Kortunov
ed31b8c467
Attempt to fix MacOS CI
5 years ago
David Cernat
9d6f3fdd09
Add OpenMW commits up to 1 Dec 2019
...
# Conflicts:
# CMakeLists.txt
# apps/openmw/mwscript/aiextensions.cpp
# apps/openmw/mwscript/statsextensions.cpp
5 years ago
Andrei Kortunov
05a8702b6e
Fix Boost 1.70+ detection
5 years ago
David Cernat
54301f5f89
Add OpenMW commits up to 29 Oct 2019
...
# Conflicts:
# apps/openmw/mwmechanics/combat.cpp
# apps/openmw/mwworld/inventorystore.cpp
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
David Cernat
5181c601c0
Add OpenMW commits up to 2 May 2019
...
# Conflicts:
# CMakeLists.txt
# apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
# apps/openmw/mwscript/statsextensions.cpp
5 years ago
David Cernat
f671c0bddc
Add OpenMW commits up to 1 Apr 2019
...
# Conflicts:
# .travis.yml
# CMakeLists.txt
# apps/openmw/engine.cpp
# apps/openmw/mwdialogue/dialoguemanagerimp.cpp
# apps/openmw/mwgui/jailscreen.cpp
# apps/openmw/mwgui/trainingwindow.cpp
# apps/openmw/mwgui/travelwindow.cpp
# apps/openmw/mwgui/waitdialog.cpp
5 years ago
David Cernat
de16b8118c
[CI] Fix execution permission for before_script_linux.sh
5 years ago
David Cernat
8729c3c5e3
Add OpenMW commits up to 9 Mar 2019
...
# Conflicts:
# .travis.yml
# CI/before_script.linux.sh
# README.md
# apps/openmw/mwgui/jailscreen.cpp
# apps/openmw/mwscript/animationextensions.cpp
# apps/openmw/mwscript/guiextensions.cpp
# apps/openmw/mwscript/miscextensions.cpp
# apps/openmw/mwscript/soundextensions.cpp
5 years ago
David Cernat
95a5607509
Add OpenMW commits up to 22 Feb 2019
...
# Conflicts:
# CMakeLists.txt
# apps/openmw/mwmechanics/spellcasting.cpp
# apps/openmw/mwscript/containerextensions.cpp
5 years ago
David Cernat
6205ff6b04
Add OpenMW commits up to 30 Jan 2019
...
# Conflicts:
# apps/openmw/mwworld/worldimp.cpp
5 years ago
David Cernat
d439edce70
[CI] Fix oversight in before_script_linux.sh
5 years ago
David Cernat
6fdef4fd0a
Add OpenMW commits up to 1 Jan 2019
...
# Conflicts:
# .travis.yml
# CMakeLists.txt
# apps/openmw/mwbase/world.hpp
# apps/openmw/mwphysics/physicssystem.hpp
# apps/openmw/mwworld/worldimp.cpp
# apps/openmw/mwworld/worldimp.hpp
5 years ago
David Cernat
68886e7539
Add OpenMW commits up to 2 Dec 2018
...
# Conflicts:
# .travis.yml
# README.md
5 years ago
David Cernat
1b9842c175
[CI] Fix oversights in .travis.yml and before_script_linux.sh
5 years ago
David Cernat
cbba81df03
Add OpenMW commits up to 14 Nov 2018
...
# Conflicts:
# .travis.yml
# CI/before_install.linux.sh
# CI/before_script.linux.sh
# CMakeLists.txt
# apps/openmw/CMakeLists.txt
# apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
# apps/openmw/mwworld/containerstore.cpp
# apps/openmw/mwworld/inventorystore.cpp
5 years ago
David Cernat
3efffe92e3
Add OpenMW commits up to 5 Nov 2018
...
# Conflicts:
# CI/before_install.linux.sh
# CMakeLists.txt
# apps/openmw/mwmechanics/aifollow.cpp
# apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
# apps/openmw/mwphysics/physicssystem.hpp
# apps/openmw/mwworld/scene.cpp
# apps/openmw/mwworld/worldimp.cpp
# components/CMakeLists.txt
5 years ago
David Cernat
7de1a3d016
[CI] Assign execution permissions to Linux .sh files
5 years ago
David Cernat
7edfca06cf
[CI] Fix issues in before_install.linux.sh
5 years ago
David Cernat
fba07194cf
Add OpenMW commits up to 29 Oct 2018
...
# Conflicts:
# apps/openmw/mwbase/world.hpp
# apps/openmw/mwinput/inputmanagerimp.cpp
# apps/openmw/mwmechanics/actors.cpp
# apps/openmw/mwmechanics/aicombat.cpp
# apps/openmw/mwmechanics/character.cpp
# apps/openmw/mwworld/worldimp.cpp
# apps/openmw/mwworld/worldimp.hpp
5 years ago
David Cernat
84cab59057
Add OpenMW commits up to 19 Aug 2018
...
# Conflicts:
# .travis.yml
# CI/before_install.linux.sh
# CI/before_script.linux.sh
# apps/openmw/engine.cpp
# apps/openmw/main.cpp
# apps/openmw/mwgui/windowmanagerimp.cpp
# apps/openmw/mwmechanics/actors.hpp
# apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
# apps/openmw/mwscript/aiextensions.cpp
# apps/openmw/mwscript/containerextensions.cpp
# apps/openmw/mwscript/dialogueextensions.cpp
# apps/openmw/mwworld/cellstore.cpp
# apps/openmw/mwworld/containerstore.cpp
# apps/openmw/mwworld/scene.cpp
# apps/openmw/mwworld/worldimp.cpp
# components/misc/debugging.hpp
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