widelands

Merge lp://staging/~widelands-dev/widelands/windows-logging into lp://staging/widelands

windows-logging
Merge into trunk

Proposed by GunChleoc on 2018-09-06

Status:

Merged

Merged at revision:

8816

Proposed branch:

lp://staging/~widelands-dev/widelands/windows-logging

Merge into:

lp://staging/widelands

Diff against target:

334 lines (+88/-34)

10 files modified

src/CMakeLists.txt (+0/-2)
src/base/CMakeLists.txt (+1/-0)
src/base/log.cc (+39/-11)
src/base/log.h (+9/-0)
src/economy/test/CMakeLists.txt (+1/-0)
src/economy/test/test_road.cc (+6/-0)
src/main.cc (+6/-12)
src/notifications/test/CMakeLists.txt (+1/-0)
src/notifications/test/notifications_test.cc (+5/-0)
src/wlapplication.cc (+20/-9)

To merge this branch:

bzr merge lp://staging/~widelands-dev/widelands/windows-logging

Related bugs:

Bug #1398536: Logging on windows	Low	Fix Released
Bug #1630110: The Widelands installer should ask for admin privileges when installed into C:\Programs	Undecided	Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
hessenfarmer		2018-09-06	Approve on 2018-09-09
Review via email: mp+354397@code.staging.launchpad.net

Commit message

Write Windows log output to homedir instead of the program dir.

Revision history for this message

GunChleoc (gunchleoc) wrote on 2018-09-09:

I have tested the AppVeyor release build on Windows 10. The installer had to be run as administrator when installed into C:\Program Files, the game can then be run without admin privileges. stdout.txt is written to C:\Users\<username>\.widelands

Revision history for this message

bunnybot (widelandsofficial) wrote on 2018-09-09:

Continuous integration builds have changed state:

Travis build 3908. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/426088550.
Appveyor build 3706. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_windows_logging-3706.