Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-986611-cppcheck_performance into lp:widelands
@bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/bug-986611-cppcheck_performance/+merge/301043 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-986611-cppcheck_performance. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-986611-cppcheck_performance into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/bug-986611-cppcheck_performance into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/bug-986611-cppcheck_performance/+merge/301043 -- Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-986611-cppcheck_performance. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-986611-cppcheck_performance into lp:widelands
> The weird indentation is because I can't get QTCreator tor format like we > want - since this is the only tool that I have found so far that allows me to > work efficiently, it's a small price to pay. It would probably work much easier with spaces instead of tabs - most tool work better with that. -- https://code.launchpad.net/~widelands-dev/widelands/bug-986611-cppcheck_performance/+merge/301043 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-986611-cppcheck_performance. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands-website/fix_sphinx_index_links into lp:widelands-website
Review: Approve lgtm. -- https://code.launchpad.net/~widelands-dev/widelands-website/fix_sphinx_index_links/+merge/302225 Your team Widelands Developers is subscribed to branch lp:widelands-website. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands-website/add_ops into lp:widelands-website
SirVer has proposed merging lp:~widelands-dev/widelands-website/add_ops into lp:widelands-website. Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net/~widelands-dev/widelands-website/add_ops/+merge/302269 Adds the script I regularly run on the server to update everything. -- Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands-website/add_ops into lp:widelands-website. === added directory '_ops' === added file '_ops/apt_update.sh' --- _ops/apt_update.sh 1970-01-01 00:00:00 + +++ _ops/apt_update.sh 2016-08-08 10:07:50 + @@ -0,0 +1,18 @@ +#!/bin/sh +# Updates all packages on the server, but stops the widelands website before +# doing so, in case mysql gets updated - it always results in really ugly +# errors for users otherwise. Ideally, this script would switch the website to +# a "In Maintenance" banner. +# +# This script requires root access. + +set -ex + +apt-get update +stop wlwebsite + +apt-get dist-upgrade -y + +start wlwebsite + +apt-get autoremove -y ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands-website/cleanup_ggz into lp:widelands-website
Review: Approve > Maybe we should delete every *.pyc file after stopping the website? Something > like God, I hate Python with a passion. How often did I already had trouble with this caching of compiled files :(. Yes, deleting all *.pyc files and all __pycache__ directories is exactly what we are required to do here. And ideally, we should immediately recompile them with the correct python binary: https://docs.python.org/2/library/compileall.html. Probably something for another branch though. I suggest adding a _ops directory that contains maintenance scripts around the website. I proposed another useful script in another branch for merging too. > If someone says: 'Go' Ready, steady? Go! -- https://code.launchpad.net/~widelands-dev/widelands-website/cleanup_ggz/+merge/301588 Your team Widelands Developers is subscribed to branch lp:widelands-website. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/appveyor_linking_memory into lp:widelands
Tino has proposed merging lp:~widelands-dev/widelands/appveyor_linking_memory
into lp:widelands.
Requested reviews:
Widelands Developers (widelands-dev)
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/appveyor_linking_memory/+merge/302275
With the last update https://www.appveyor.com/updates Appveyor is now using a
different virtualization with less memory.
So at the moment our 64bit-debug builds fail due to memory usage on linking.
This branch introduces the "-no-keep-memory" option in cmake for the linking
process and activates it on Appveyor.
--
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/appveyor_linking_memory into lp:widelands.
=== modified file 'CMakeLists.txt'
--- CMakeLists.txt 2016-08-05 12:32:08 +
+++ CMakeLists.txt 2016-08-08 11:00:52 +
@@ -7,6 +7,7 @@
option(OPTION_USE_GLBINDING "Use glbinding instead of GLEW" OFF)
option(OPTION_GLEW_STATIC "Use static GLEW Library" OFF)
option(OPTION_BUILD_WEBSITE_TOOLS "Build website-related tools" ON)
+option(OPTION_LINKING_REDUCE_MEMORY "Reduce memory consumption on linking" OFF)
if (CMAKE_SOURCE_DIR STREQUAL CMAKE_BINARY_DIR)
message(FATAL_ERROR "Build directory and source directory must not be the same.")
@@ -184,13 +185,17 @@
IF (WIN32)
add_definitions(-DMINGW_HAS_SECURE_API)
if (CMAKE_SIZEOF_VOID_P EQUAL 4)
-set (CMAKE_EXE_LINKER_FLAGS "-Wl,--large-address-aware" CACHE STRING "Set by widelands CMakeLists.txt" FORCE)
+set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--large-address-aware" CACHE STRING "Set by widelands CMakeLists.txt" FORCE)
message (STATUS "Enabled large address awareness on mingw32")
else (CMAKE_SIZEOF_VOID_P EQUAL 4)
message (STATUS "Detected mingw32-w64")
endif (CMAKE_SIZEOF_VOID_P EQUAL 4)
endif (WIN32)
+if (OPTION_LINKING_REDUCE_MEMORY)
+set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-no-keep-memory")
+endif()
+
# on BSD this must be explicitly linked
if (CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR CMAKE_SYSTEM_NAME MATCHES "OpenBSD")
# Not needed on Debian GNU/kFreeBSD..
=== modified file 'appveyor.yml'
--- appveyor.yml 2016-05-04 17:23:16 +
+++ appveyor.yml 2016-08-08 11:00:52 +
@@ -32,7 +32,7 @@
- cmd: md build
- cmd: cd build
- cmd: echo %APPVEYOR_BUILD_VERSION%_%CONFIGURATION%_%PLATFORM% > %APPVEYOR_BUILD_FOLDER%\WL_RELEASE
- - cmd: "cmake -G \"Ninja\" -DCMAKE_BUILD_TYPE=%CONFIGURATION% -DOPTION_USE_GLBINDING=ON %APPVEYOR_BUILD_FOLDER%"
+ - cmd: "cmake -G \"Ninja\" -DCMAKE_BUILD_TYPE=%CONFIGURATION% -DOPTION_USE_GLBINDING=ON -DOPTION_LINKING_REDUCE_MEMORY=ON %APPVEYOR_BUILD_FOLDER%"
- cmd: ninja
on_success:
___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/appveyor_linking_memory into lp:widelands
Review: Approve lgtm. Thanks for keeping an eye on the appveyor stuff! -- https://code.launchpad.net/~widelands-dev/widelands/appveyor_linking_memory/+merge/302275 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/appveyor_linking_memory. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands-website/add_ops into lp:widelands-website
I am unsure if this should be a part of the website, because it affects the whole server system. And this is Debian/Ubuntu specific. If one forgot to run this script and use the regular commands the errors will be shown again. So maybe a global alias would do the trick? Something like: alias update_server='sudo /path/to/apt_update.sh' Maybe it is possible to overwrite the 'apt-get update' command with an alias? So if one writes 'sudo apt-get update' in the console the script is executed (maybe prints an explanation whats going on). But i don't know if this is possible (didn't found an example) Why not create a cron job for this? Maintenance site: janus has changed the code in /etc/nginx/sites-available/wl.widelands.org to provide a maintenance site, but the provided solution (comment/uncomment pieces of code) isn't applicable for doing this in a script. I have searched around for this and found mostly solutions were nginx provide a maintenance site when a specific file is found. This seems to me a better solution (just move a file/create a symlink) to a specific place where nginx find it), but i am afraid to play with the nginx configuration (have also work enough with other stuff ;) ). The maintenance site is stored in /var/www/www.widelands.org/htdocs/index.html The _ops directory is good though. -- https://code.launchpad.net/~widelands-dev/widelands-website/add_ops/+merge/302269 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands-website/add_ops into lp:widelands-website. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands-website/fix_sphinx_index_links into lp:widelands-website
The proposal to merge lp:~widelands-dev/widelands-website/fix_sphinx_index_links into lp:widelands-website has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands-website/fix_sphinx_index_links/+merge/302225 -- Your team Widelands Developers is subscribed to branch lp:widelands-website. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/appveyor_linking_memory into lp:widelands
Review: Needs Fixing Not work, have to dig deeper... -- https://code.launchpad.net/~widelands-dev/widelands/appveyor_linking_memory/+merge/302275 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/appveyor_linking_memory. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands-website/fix_sphinx_index_links into lp:widelands-website
Merged and deployed. -- https://code.launchpad.net/~widelands-dev/widelands-website/fix_sphinx_index_links/+merge/302225 Your team Widelands Developers is subscribed to branch lp:widelands-website. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/appveyor_linking_memory into lp:widelands
I actually did the same (but less sophisticated) for the Raspi https://wl.widelands.org/forum/topic/2031/ but with some different flags, mmh. What can I do to test this? (other then waiting for appveyor) -- https://code.launchpad.net/~widelands-dev/widelands/appveyor_linking_memory/+merge/302275 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/appveyor_linking_memory. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands-website/cleanup_ggz into lp:widelands-website
The proposal to merge lp:~widelands-dev/widelands-website/cleanup_ggz into lp:widelands-website has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands-website/cleanup_ggz/+merge/301588 -- Your team Widelands Developers is subscribed to branch lp:widelands-website. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands-website/cleanup_ggz into lp:widelands-website
The branch is merged and tested on alpha. I had some problems because of permission on the alpha site which i solved. There was a unknown conflict (unknown because i couldn't find any description to this conflict): conflicts: Conflict adding file media/wlmaps. Moved existing file to media/wlmaps.moved. The folder media/wlmaps.moved/maps contains all maps. What i did to resolve this: - copied all files from media/wlmaps.moved/maps/* to media/wlmaps/maps - bzr resolve --all - sudo rm -R media/wlmaps.moved Hopefully i did it right on alpha and wl.widelands :-[] -- https://code.launchpad.net/~widelands-dev/widelands-website/cleanup_ggz/+merge/301588 Your team Widelands Developers is subscribed to branch lp:widelands-website. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/appveyor_linking_memory into lp:widelands
Continuous integration builds have changed state: Travis build 1258. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/150651096. Appveyor build 1100. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_appveyor_linking_memory-1100. -- https://code.launchpad.net/~widelands-dev/widelands/appveyor_linking_memory/+merge/302275 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/appveyor_linking_memory. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
