Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/gcc9 into lp:widelands
I've pushed the appveyor changes to a github branch: https://github.com/widelands/widelands/commit/1af305097f174a9a38e2710f3f96ed26d4f39e55 Sorry, I am not able to use bzr/launchpad on my new laptop anymore. -- https://code.launchpad.net/~widelands-dev/widelands/gcc9/+merge/370692 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/gcc9 into lp:widelands. ___ 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] Current state of launchpad->github migration
Hey everyone, just want to ask, if there are any current plans to finish the migration to github? With a new laptop i just noticed that it is increasingly difficult to get the bzr tools running, because the windows binaries are very old and everything still depends on python2. Breezy is not available for windows, and compiling/installing it via PIP does require a visual studio compiler on your system. I would really like to work with git only, because it is just so convenient. Is there anything i can do to help with the migration? -- This message was sent from Launchpad by Tino (https://launchpad.net/~tino79) to each member of the Widelands Developers team using the "Contact this team" link on the Widelands Developers team page (https://launchpad.net/~widelands-dev). For more information see https://help.launchpad.net/YourAccount/ContactingPeople ___ 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-fix into lp:widelands
If you are using GLEW instead of GLBindings you'll have to set OPTION_GLEW_STATIC=1 and/or adapt the innosetup script to include the glew dll (and you can omit the libglbinding.dll) -- https://code.launchpad.net/~widelands-dev/widelands/appveyor-fix/+merge/363152 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/appveyor-fix into lp:widelands. ___ 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_reenable_glbinding into lp:widelands
Tino has proposed merging
lp:~widelands-dev/widelands/appveyor_reenable_glbinding into lp:widelands.
Commit message:
Use glbinding on Appveyor again, pre-built package was updated:
https://github.com/Alexpux/MINGW-packages/issues/4671
Requested reviews:
Widelands Developers (widelands-dev)
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/appveyor_reenable_glbinding/+merge/360052
--
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/appveyor_reenable_glbinding into lp:widelands.
=== modified file 'appveyor.yml'
--- appveyor.yml 2018-11-14 09:19:46 +
+++ appveyor.yml 2018-12-04 12:51:24 +
@@ -18,10 +18,10 @@
# Update mirrors
- cmd: "bash --login -c \"pacman --noconfirm --sync pacman pacman-mirrors\""
# Update msys2 system (twice, first run does system packages)
- - cmd: "bash --login -c \"pacman -Su --noconfirm\""
- - cmd: "bash --login -c \"pacman -Su --noconfirm\""
+ - cmd: "bash --login -c \"pacman -Suuyy --noconfirm\""
+ - cmd: "bash --login -c \"pacman -Suuyy --noconfirm\""
# Installed required libs
- - cmd: "bash --login -c \"pacman --noconfirm -S mingw-w64-%MINGWSUFFIX%-ninja mingw-w64-%MINGWSUFFIX%-boost mingw-w64-%MINGWSUFFIX%-SDL2_ttf mingw-w64-%MINGWSUFFIX%-SDL2_mixer mingw-w64-%MINGWSUFFIX%-SDL2_image mingw-w64-%MINGWSUFFIX%-glew\""
+ - cmd: "bash --login -c \"pacman --noconfirm -S mingw-w64-%MINGWSUFFIX%-ninja mingw-w64-%MINGWSUFFIX%-boost mingw-w64-%MINGWSUFFIX%-SDL2_ttf mingw-w64-%MINGWSUFFIX%-SDL2_mixer mingw-w64-%MINGWSUFFIX%-SDL2_image mingw-w64-%MINGWSUFFIX%-glbinding\""
shallow_clone: true
@@ -34,7 +34,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=OFF -DOPTION_BUILD_WEBSITE_TOOLS=OFF -DOPTION_ASAN=OFF -DCMAKE_JOB_POOLS=\"linking=1\" -DCMAKE_JOB_POOL_LINK=linking %APPVEYOR_BUILD_FOLDER%"
+ - cmd: "cmake -G \"Ninja\" -DCMAKE_BUILD_TYPE=%CONFIGURATION% -DOPTION_USE_GLBINDING=ON -DOPTION_BUILD_WEBSITE_TOOLS=OFF -DOPTION_ASAN=OFF -DCMAKE_JOB_POOLS=\"linking=1\" -DCMAKE_JOB_POOL_LINK=linking %APPVEYOR_BUILD_FOLDER%"
- cmd: "cmake --build ."
on_success:
- cmd: strip -sv %APPVEYOR_BUILD_FOLDER%\build\src\widelands.exe
=== modified file 'utils/win32/innosetup/Widelands.iss'
--- utils/win32/innosetup/Widelands.iss 2018-11-14 10:55:20 +
+++ utils/win32/innosetup/Widelands.iss 2018-12-04 12:51:24 +
@@ -101,7 +101,7 @@
Source: {#BuildFolder}\data\scripting\*; DestDir: {app}\data\scripting\; Flags: recursesubdirs ignoreversion; Tasks: ; Languages: ; Attribs: hidden; Components: "Widelands"
Source: {#BuildFolder}\data\shaders\*; DestDir: {app}\data\shaders\; Flags: recursesubdirs ignoreversion; Tasks: ; Languages: ; Attribs: hidden; Components: "Widelands"
Source: {#BuildFolder}\data\ai\*; DestDir: {app}\data\ai\; Flags: recursesubdirs ignoreversion; Tasks: ; Languages: ; Attribs: hidden; Components: "Widelands"
-Source: {#DLLFolder}\glew32.dll;DestDir: {app};Flags: ignoreversion;Components: "Widelands"
+Source: {#DLLFolder}\libglbinding.dll;DestDir: {app};Flags: ignoreversion;Components: "Widelands"
Source: {#DLLFolder}\libopusfile-0.dll; DestDir: {app};Flags: ignoreversion;Components: "Widelands"
Source: {#DLLFolder}\libopus-0.dll; DestDir: {app};Flags: ignoreversion;Components: "Widelands"
Source: {#DLLFolder}\libtermcap-0.dll; DestDir: {app};Flags: ignoreversion;Components: "Widelands"
@@ -145,6 +145,7 @@
Source: {#DLLFolder}\libiconv-2.dll;DestDir: {app};Flags: ignoreversion; Components: "Widelands"
Source: {#DLLFolder}\libgraphite2.dll; DestDir: {app};Flags: ignoreversion; Components: "Widelands"
Source: {#DLLFolder}\libpcre-1.dll; DestDir: {app};Flags: ignoreversion;
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/update_appveyor into lp:widelands
Review: Approve Ok, i'll merge this to trunk to get win builds up again. I'll check the issue with glbinding the next days in a different branch... @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/update_appveyor/+merge/358712 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/update_appveyor. ___ 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/update_appveyor into lp:widelands
Yes, but this still would require to identify dlls in the first place. Just tested, and now we need some more dlls. (e.g. the famous libreadline7.dll ;) ). Static linking would be the way to go. But nearly all cmake package scripts default to the dynamic libs... -- https://code.launchpad.net/~widelands-dev/widelands/update_appveyor/+merge/358712 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/update_appveyor into lp:widelands. ___ 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/update_appveyor into lp:widelands
Tino has proposed merging lp:~widelands-dev/widelands/update_appveyor into
lp:widelands.
Commit message:
changes appveyor platform update nov'18
Requested reviews:
Widelands Developers (widelands-dev)
Related bugs:
Bug #1803107 in widelands: "AppVeyor platform update 11/09/18"
https://bugs.launchpad.net/widelands/+bug/1803107
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/update_appveyor/+merge/358712
--
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/update_appveyor into lp:widelands.
=== modified file 'CMakeLists.txt'
--- CMakeLists.txt 2018-10-19 16:42:42 +
+++ CMakeLists.txt 2018-11-13 15:23:40 +
@@ -71,7 +71,7 @@
if (WIN32)
set (Boost_USE_STATIC_LIBS ON)
- link_libraries(wsock32 ws2_32)
+ link_libraries(wsock32 ws2_32 bcrypt)
else()
set (Boost_USE_STATIC_LIBS OFF)
endif()
=== modified file 'appveyor.yml'
--- appveyor.yml 2018-09-19 12:04:36 +
+++ appveyor.yml 2018-11-13 15:23:40 +
@@ -21,7 +21,7 @@
- cmd: "bash --login -c \"pacman -Su --noconfirm\""
- cmd: "bash --login -c \"pacman -Su --noconfirm\""
# Installed required libs
- - cmd: "bash --login -c \"pacman --noconfirm -S mingw-w64-%MINGWSUFFIX%-ninja mingw-w64-%MINGWSUFFIX%-boost mingw-w64-%MINGWSUFFIX%-SDL2_ttf mingw-w64-%MINGWSUFFIX%-SDL2_mixer mingw-w64-%MINGWSUFFIX%-SDL2_image mingw-w64-%MINGWSUFFIX%-glbinding\""
+ - cmd: "bash --login -c \"pacman --noconfirm -S mingw-w64-%MINGWSUFFIX%-ninja mingw-w64-%MINGWSUFFIX%-boost mingw-w64-%MINGWSUFFIX%-SDL2_ttf mingw-w64-%MINGWSUFFIX%-SDL2_mixer mingw-w64-%MINGWSUFFIX%-SDL2_image mingw-w64-%MINGWSUFFIX%-glew\""
shallow_clone: true
@@ -34,7 +34,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 -DOPTION_BUILD_WEBSITE_TOOLS=OFF -DOPTION_ASAN=OFF -DCMAKE_JOB_POOLS=\"linking=1\" -DCMAKE_JOB_POOL_LINK=linking %APPVEYOR_BUILD_FOLDER%"
+ - cmd: "cmake -G \"Ninja\" -DCMAKE_BUILD_TYPE=%CONFIGURATION% -DOPTION_USE_GLBINDING=OFF -DOPTION_BUILD_WEBSITE_TOOLS=OFF -DOPTION_ASAN=OFF -DCMAKE_JOB_POOLS=\"linking=1\" -DCMAKE_JOB_POOL_LINK=linking %APPVEYOR_BUILD_FOLDER%"
- cmd: "cmake --build ."
on_success:
- cmd: strip -sv %APPVEYOR_BUILD_FOLDER%\build\src\widelands.exe
=== modified file 'utils/win32/innosetup/Widelands.iss'
--- utils/win32/innosetup/Widelands.iss 2018-09-18 13:52:22 +
+++ utils/win32/innosetup/Widelands.iss 2018-11-13 15:23:40 +
@@ -129,7 +129,7 @@
Source: {#DLLFolder}\SDL2_ttf.dll; DestDir: {app};Flags: ignoreversion; Components: "Widelands"
Source: {#DLLFolder}\zlib1.dll;DestDir: {app};Flags: ignoreversion; Components: "Widelands"
Source: {#DLLFolder}\libFLAC-8.dll;DestDir: {app};Flags: ignoreversion; Components: "Widelands"
-Source: {#DLLFolder}\libfluidsynth-1.dll; DestDir: {app};Flags: ignoreversion; Components: "Widelands"
+Source: {#DLLFolder}\libfluidsynth-2.dll; DestDir: {app};Flags: ignoreversion; Components: "Widelands"
Source: {#DLLFolder}\libportaudio-2.dll; DestDir: {app};Flags: ignoreversion; Components: "Widelands"
Source: {#DLLFolder}\libsndfile-1.dll; DestDir: {app};Flags: ignoreversion; Components: "Widelands"
Source: {#DLLFolder}\libspeex-1.dll; DestDir: {app};Flags: ignoreversion; Components: "Widelands"
___
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/detect_revision_update into lp:widelands
Review: Approve Ok, currently at least on travis (MacOS and Linux) and on Travis (Windows) CMake + DetectRevision.py can determine the git version. On my local machine (windows) both git and bzr work. So this can go in from my side. -- https://code.launchpad.net/~widelands-dev/widelands/detect_revision_update/+merge/355590 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/detect_revision_update. ___ 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/detect_revision_update into lp:widelands
No, the cmake warning is not causing the failure. I've updated the whole function, should work on every os... -- https://code.launchpad.net/~widelands-dev/widelands/detect_revision_update/+merge/355590 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/detect_revision_update. ___ 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/cmake_errors_WL_VERSION into lp:widelands
I am not a big fan of silencing warnings and do not see this warning on both Appveyor and Travis or my system (cmake 3.11.1). -- https://code.launchpad.net/~widelands-dev/widelands/cmake_errors_WL_VERSION/+merge/355728 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/cmake_errors_WL_VERSION into lp:widelands. ___ 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/remove_duplicate_code into lp:widelands
OK, the merge was a bit premature: Revision detection is not broken, but does not happen any longer... -- https://code.launchpad.net/~widelands-dev/widelands/remove_duplicate_code/+merge/355586 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/remove_duplicate_code. ___ 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/detect_revision_update into lp:widelands
Tino has proposed merging lp:~widelands-dev/widelands/detect_revision_update
into lp:widelands.
Commit message:
use git rev-parse instead of show with head
remove use of deprecated os.open
avoid leaking of stderr into cmake output on windows
Requested reviews:
Widelands Developers (widelands-dev)
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/detect_revision_update/+merge/355590
--
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/detect_revision_update into lp:widelands.
=== modified file 'utils/detect_revision.py'
--- utils/detect_revision.py 2016-12-04 07:02:25 +
+++ utils/detect_revision.py 2018-09-25 08:31:49 +
@@ -44,17 +44,19 @@
def detect_git_revision():
if not sys.platform.startswith('linux') and \
not sys.platform.startswith('darwin'):
-git_revnum = os.popen(
-'git show --pretty=format:%h | head -n 1').read().rstrip()
-if git_revnum:
-return 'unofficial-git-%s' % (git_revnum,)
-else:
-return None
+try:
+git_revnum = subprocess.Popen(
+'git rev-parse --short HEAD',stdout=subprocess.PIPE).stdout.read().rstrip()
+if git_revnum:
+return 'unofficial-git-%s' % (git_revnum,)
+except:
+pass
+return None
-is_git_workdir = os.system('git show >/dev/null 2>&1') == 0
+is_git_workdir = subprocess.Popen('git show >/dev/null 2>&1',stdout=subprocess.PIPE).returncode == 0
if is_git_workdir:
-git_revnum = os.popen(
-'git show --pretty=format:%h | head -n 1').read().rstrip()
+git_revnum = subprocess.Popen(
+'git rev-parse --short HEAD',stdout=subprocess.PIPE).stdout.read().rstrip()
return 'unofficial-git-%s' % (git_revnum,)
___
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/remove_duplicate_code into lp:widelands
Tino has proposed merging lp:~widelands-dev/widelands/remove_duplicate_code
into lp:widelands.
Commit message:
Remove duplicate code for revision detection task (code already in
BzrRevision.cmake)
Requested reviews:
Widelands Developers (widelands-dev)
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/remove_duplicate_code/+merge/355586
--
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/remove_duplicate_code into lp:widelands.
=== modified file 'CMakeLists.txt'
--- CMakeLists.txt 2018-08-21 08:14:38 +
+++ CMakeLists.txt 2018-09-25 07:48:30 +
@@ -246,17 +246,6 @@
BzrRevision ALL
COMMAND ${CMAKE_COMMAND} -DWL_INSTALL_BASEDIR=${WL_INSTALL_BASEDIR} -DWL_INSTALL_DATADIR=${WL_INSTALL_DATADIR} -DPYTHON_EXECUTABLE=${PYTHON_EXECUTABLE} -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DSOURCE_DIR=${CMAKE_CURRENT_SOURCE_DIR} -DBINARY_DIR=${CMAKE_CURRENT_BINARY_DIR} -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/BzrRevision.cmake
)
-
- # Detect version now
- execute_process (
-COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/utils/detect_revision.py
-OUTPUT_VARIABLE WL_VERSION
-WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-OUTPUT_STRIP_TRAILING_WHITESPACE
- )
- file (WRITE ${CMAKE_CURRENT_BINARY_DIR}/VERSION "${WL_VERSION}")
- configure_file (${CMAKE_CURRENT_SOURCE_DIR}/src/build_info.cc.cmake ${CMAKE_CURRENT_BINARY_DIR}/src/build_info.cc)
- message (STATUS "Version of Widelands Build is ${WL_VERSION}(${CMAKE_BUILD_TYPE})")
else (NOT DEFINED WL_VERSION)
add_custom_target (
InputRevision ALL
___
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/bug1629013_obsoletewinfiles into lp:widelands
Tino has proposed merging
lp:~widelands-dev/widelands/bug1629013_obsoletewinfiles into lp:widelands.
Commit message:
Remove obsolete mingw files.
Only "widelands.rc.cmake" is needed, which cmake needs to generate the
ressource file widelands.rc
Requested reviews:
Widelands Developers (widelands-dev)
Related bugs:
Bug #1629013 in widelands: "Remove unused supplementary win32 files"
https://bugs.launchpad.net/widelands/+bug/1629013
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/bug1629013_obsoletewinfiles/+merge/355178
--
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/bug1629013_obsoletewinfiles into lp:widelands.
=== removed directory 'utils/win32/mingw'
=== removed file 'utils/win32/mingw/WL.exe.Manifest'
--- utils/win32/mingw/WL.exe.Manifest 2008-03-13 21:29:56 +
+++ utils/win32/mingw/WL.exe.Manifest 1970-01-01 00:00:00 +
@@ -1,23 +0,0 @@
-
-
-
-Widelands
-
-
-
-
-
-
=== removed file 'utils/win32/mingw/Widelands_win.h'
--- utils/win32/mingw/Widelands_win.h 2016-09-29 16:47:19 +
+++ utils/win32/mingw/Widelands_win.h 1970-01-01 00:00:00 +
@@ -1,42 +0,0 @@
-/*
- * Copyright (C) 2006-2015 by the Widelands Development Team
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-
-#ifndef WIDELANDS_WIN_H
-#define WIDELANDS_WIN_H
-
-#include "wlversion.h"
-
-/* VERSION DEFINITIONS */
-#define VER_STRING "0.0.0.19"
-#define VER_MAJOR 0
-#define VER_MINOR 0
-#define VER_RELEASE 0
-#define VER_BUILD 19
-#define COMPANY_NAME "The Widelands Development Team"
-#define FILE_VERSION BUILD_ID
-#define FILE_DESCRIPTION "Widelands - realtime strategy game"
-#define INTERNAL_NAME "WL"
-#define LEGAL_COPYRIGHT "GPL v2"
-#define WWW "http:\/\/wl.widelands.org"
-#define License "Gnu GPL v2"
-#define ORIGINAL_FILENAME "widelands"
-#define PRODUCT_NAME "Widelands"
-#define PRODUCT_VERSION BUILD_ID
-
-#endif /*WIDELANDS_WIN_H*/
=== removed file 'utils/win32/mingw/Widelands_win.rc'
--- utils/win32/mingw/Widelands_win.rc 2016-09-29 16:47:19 +
+++ utils/win32/mingw/Widelands_win.rc 1970-01-01 00:00:00 +
@@ -1,60 +0,0 @@
-/*
- * Copyright (C) 2006-2016 by the Widelands Development Team
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-
-#include "wlversion.h"
-
-#include // included for version info constants
-
-A ICON MOVEABLE PURE LOADONCALL DISCARDABLE "../WL.ico"
-
-// SUPPORT FOR WINDOWS XP THEMES:
-// THIS WILL MAKE THE PROGRAM USE THE COMMON CONTROLS
-// LIBRARY VERSION 6.0 (IF IT IS AVAILABLE)
-1 24 "WL.exe.Manifest"
-
-//
-// TO CHANGE VERSION INFORMATION, EDIT OPTIONS BELOW...
-//
-1 VERSIONINFO
-FILEVERSION 0,0,0,19
-PRODUCTVERSION 0,0,0,19
-FILETYPE VFT_APP
-{
- BLOCK "StringFileInfo"
- {
- BLOCK "080904E4"
- {
- VALUE "CompanyName", "The Widelands Development Team"
- VALUE "FileVersion", BUILD_ID
- VALUE "FileDescription", "Widelands - realtime strategy game"
- VALUE "InternalName", "WL"
- VALUE "LegalCopyright", "GPL v2"
- VALUE "WWW", "http://www.widelands.org;
- VALUE "License", "Gnu GPL v2"
- VALUE "OriginalFilename", "widelands"
- VALUE "ProductName", "Widelands - an Open-Source realtime strategy game"
- VALUE "ProductVersion", BUILD_ID
- }
- }
- BLOCK "VarFileInfo&
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1733064-program-redesign into lp:widelands
It is very stable, but hardware constraint: - 2 cores, 4GB RAM, 2 hours runtime for each job For x64-debug builds i had to disable parallel build/linking because widelands takes ~8GB RAM on linking the x64 debug builds. Now the build scratches at the 2 hour mark and fails if it hits this limit for x64 debug. I am pretty sure, that there are still some dependencies quirks in widelands cmake files and module partitions which could help to lower memory usage and runtime on build/link, but that is a complex task. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1733064-program-redesign/+merge/349100 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1733064-program-redesign. ___ 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/update_appveyor into lp:widelands
@bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/update_appveyor/+merge/341910 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/update_appveyor into lp:widelands. ___ 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/update_appveyor into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/update_appveyor into lp:widelands has been updated. Commit Message changed to: Appveyor build environment updates For more details, see: https://code.launchpad.net/~widelands-dev/widelands/update_appveyor/+merge/341910 -- Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/update_appveyor into lp:widelands. ___ 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/update_appveyor into lp:widelands
Tino has proposed merging lp:~widelands-dev/widelands/update_appveyor into
lp:widelands.
Requested reviews:
Widelands Developers (widelands-dev)
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/update_appveyor/+merge/341910
Seems appveyor has updated the build environment.
Merge request to trigger a build...
--
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/update_appveyor into lp:widelands.
=== modified file 'utils/win32/innosetup/Widelands.iss'
--- utils/win32/innosetup/Widelands.iss 2017-11-02 14:35:20 +
+++ utils/win32/innosetup/Widelands.iss 2018-03-22 14:41:36 +
@@ -131,7 +131,7 @@
Source: {#DLLFolder}\libwinpthread-1.dll; DestDir: {app};Flags: ignoreversion; Components: "Widelands"
Source: {#DLLFolder}\SDL2.dll; DestDir: {app};Flags: ignoreversion; Components: "Widelands"
Source: {#DLLFolder}\SDL2_image.dll; DestDir: {app};Flags: ignoreversion; Components: "Widelands"
-Source: {#DLLFolder}\libSDL2_mixer-2-0-0.dll; DestDir: {app};Flags: ignoreversion; Components: "Widelands"
+Source: {#DLLFolder}\SDL2_mixer.dll; DestDir: {app};Flags: ignoreversion; Components: "Widelands"
Source: {#DLLFolder}\SDL2_ttf.dll; DestDir: {app};Flags: ignoreversion; Components: "Widelands"
Source: {#DLLFolder}\zlib1.dll;DestDir: {app};Flags: ignoreversion; Components: "Widelands"
Source: {#DLLFolder}\libFLAC-8.dll;DestDir: {app};Flags: ignoreversion; Components: "Widelands"
___
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-1639514_fix_yellow_player into lp:widelands
Has anyone an idea, why this was not merged to trunk by now? Interestingly it is already merged on github to master: https://github.com/widelands/widelands/commit/4b2baddcdcd635b4c4b07490ea43efcbb20e2df9 -- https://code.launchpad.net/~widelands-dev/widelands/bug-1639514_fix_yellow_player/+merge/337507 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/fix_infrastructure_return_values. ___ 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/findpath_modification into lp:widelands
Appveyor is not able to parallel build x64 Debug due to memory constraints on Appveyor (see build times for every job: x86 release/debug + x64 release builds are taking ~30 minutes, x64 debug takes ~90 minutes.) But now in this branch we also hit the time limit of 120 minutes with the x64 debug build, so the job was cancelled. The logfiles show that compiling was fine, appveyor cancelled at the point when the installer was build. I've manually triggered a re-build of this branch, so perhaps it is now a few minutes faster and will finish... -- https://code.launchpad.net/~widelands-dev/widelands/findpath_modification/+merge/337103 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/findpath_modification. ___ 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/gcc_optimize into lp:widelands
Tino has proposed merging lp:~widelands-dev/widelands/gcc_optimize into
lp:widelands.
Requested reviews:
Widelands Developers (widelands-dev)
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/gcc_optimize/+merge/331049
On my system gcc 7.2 (Win10 x64, GCC 7.2 MinGW) still produces corrupt binaries
with -O3.
The economy test fails and crashes.
Can anyone reproduce this on another OS?
--
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/gcc_optimize into lp:widelands.
=== modified file 'CMakeLists.txt'
--- CMakeLists.txt 2017-08-05 14:31:23 +
+++ CMakeLists.txt 2017-09-20 11:42:04 +
@@ -94,16 +94,16 @@
if(CMAKE_BUILD_TYPE STREQUAL "Debug")
set(WL_DEBUG_FLAGS "-g -DDEBUG")
elseif(CMAKE_BUILD_TYPE STREQUAL "Release")
- if(("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") AND (CMAKE_CXX_COMPILER_VERSION VERSION_EQUAL 6.3))
-message(STATUS "GCC 6.3.0 breaks -03, setting -02")
+ if(("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") AND (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 6.2))
+message(STATUS "GCC >6.2.0 breaks -03, setting -02")
set(WL_OPTIMIZE_FLAGS "-O2")
else()
set(WL_OPTIMIZE_FLAGS "-O3")
endif ()
set(WL_DEBUG_FLAGS "-DNDEBUG -DNOPARACHUTE")
elseif(CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo")
- if(("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") AND (CMAKE_CXX_COMPILER_VERSION VERSION_EQUAL 6.3))
-message(STATUS "GCC 6.3.0 breaks -03, setting -02")
+ if(("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") AND (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 6.2))
+message(STATUS "GCC >6.2.0 breaks -03, setting -02")
set(WL_OPTIMIZE_FLAGS "-O2")
else()
set(WL_OPTIMIZE_FLAGS "-O3")
___
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/ai_cmakelist into lp:widelands
Yes, new files/directories have to be added to the Innosetup file. Give me a few minutes... -- https://code.launchpad.net/~widelands-dev/widelands/ai_cmakelist/+merge/328630 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/ai_cmakelist. ___ 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/compiler_warnings_062017_windows into lp:widelands
Review: Approve Ok, all warnings on win are gone, but i am not sure if I've introduced new ones on Linux with clang/gcc? For me it looks those are in external (eris) code or not related to printf? -- https://code.launchpad.net/~widelands-dev/widelands/compiler_warnings_062017_windows/+merge/326232 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/compiler_warnings_062017_windows. ___ 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/compiler_warnings_062017_windows into lp:widelands
Ok, now all warnings are gone on mingw64. Let's check Travis/Appveyor if we do break other systems or mingw32. -- https://code.launchpad.net/~widelands-dev/widelands/compiler_warnings_062017_windows/+merge/326232 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/compiler_warnings_062017_windows. ___ 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/net-boost-asio into lp:widelands
It seems the Bazaar->Github-Bridge is broken. Both Appveyor und Travis do only build on new commits to the Github repo. -- https://code.launchpad.net/~widelands-dev/widelands/net-boost-asio/+merge/324364 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/net-boost-asio. ___ 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/net-boost-asio into lp:widelands
Review: Resubmit Windows.h includes winsock.h, which clashes with winsock2 and boost asio. The additional define WIN32_LEAN_AND_MEAN avoids including winsock.h and some other headers. -- https://code.launchpad.net/~widelands-dev/widelands/net-boost-asio/+merge/324364 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/net-boost-asio. ___ 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/update_copyright_script into lp:widelands
Another small change: Force Unix-style line endings on writing. When run on windows it does not create huge changes this way. -- https://code.launchpad.net/~widelands-dev/widelands/update_copyright_script/+merge/315352 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/update_copyright_script. ___ 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/update_copyright_script into lp:widelands
Review: Approve I've pushed a small change to use "with" for opening files, so python should take care of closing them. Tested with Python 2.7 and 3.5 on my system with the update_copyright.py script. -- https://code.launchpad.net/~widelands-dev/widelands/update_copyright_script/+merge/315352 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/update_copyright_script. ___ 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/fsmenu_fullscreen_2_about into lp:widelands
Review: Approve @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/fsmenu_fullscreen_2_about/+merge/309754 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/fsmenu_fullscreen_2_about. ___ 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/animation_scaling into lp:widelands
This looks very promising! -- https://code.launchpad.net/~widelands-dev/widelands/animation_scaling/+merge/310718 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/animation_scaling into lp:widelands. ___ 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/b19-appid into lp:widelands/build19
@bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/b19-appid/+merge/310135 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/b19-appid into lp:widelands/build19. ___ 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/b19-appid into lp:widelands/build19
The proposal to merge lp:~widelands-dev/widelands/b19-appid into lp:widelands/build19 has been updated. Commit Message changed to: Give the build19 builds from Appveyor also a unique AppID. For more details, see: https://code.launchpad.net/~widelands-dev/widelands/b19-appid/+merge/310135 -- Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/b19-appid into lp:widelands/build19. ___ 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/b19-appid into lp:widelands/build19
Tino has proposed merging lp:~widelands-dev/widelands/b19-appid into
lp:widelands/build19.
Requested reviews:
Widelands Developers (widelands-dev)
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/b19-appid/+merge/310135
Backport unique AppID from trunk to build19 branch for appveyor.
--
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/b19-appid into lp:widelands/build19.
=== modified file 'utils/win32/innosetup/Widelands.iss'
--- utils/win32/innosetup/Widelands.iss 2016-10-04 15:29:55 +
+++ utils/win32/innosetup/Widelands.iss 2016-11-06 13:12:39 +
@@ -40,6 +40,7 @@
;Appveyor environment
#define BuildFolder GetEnv("APPVEYOR_BUILD_FOLDER")
#define DLLFolder GetEnv("MINGWPATH")
+#define Version GetEnv("APPVEYOR_BUILD_VERSION") + GetEnv("CONFIGURATION") + GetEnv("PLATFORM")
[Setup]
AppName={#Name}
@@ -68,7 +69,7 @@
UninstallDisplayName={#VerName}
VersionInfoCopyright={#Publisher}
InternalCompressLevel=max
-AppID={{WIDELANDS-WIN32-IS}
+AppID={#Version}
AppCopyright={#Copyright}
ChangesAssociations=yes
PrivilegesRequired=lowest
___
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/prevent_ai_deadlocks into lp:widelands/build19
Review: Disapprove I also strongly oppose merging this to b19. I've added a bug report here: https://bugs.launchpad.net/widelands/+bug/1638260 Adding some more logs to the warehouse for fortified villages would be my way to go. -- https://code.launchpad.net/~widelands-dev/widelands/prevent_ai_deadlocks/+merge/309727 Your team Widelands Developers is subscribed to branch lp:widelands/build19. ___ 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/fs-tile-background into lp:widelands
Review: Approve Oh, placeholder? Thats looks definitely better than just "placeholder" ;). I really like this change! -- https://code.launchpad.net/~widelands-dev/widelands/fs-tile-background/+merge/309673 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/fs-tile-background. ___ 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/fsmenu_fullscreen_1_main_menus into lp:widelands
Review: Approve -- https://code.launchpad.net/~widelands-dev/widelands/fsmenu_fullscreen_1_main_menus/+merge/309655 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/fsmenu_fullscreen_1_main_menus. ___ 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/scrollbar_beautification into lp:widelands
Review: Approve Everything's ok on my end. -- https://code.launchpad.net/~widelands-dev/widelands/scrollbar_beautification/+merge/309635 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/scrollbar_beautification. ___ 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/fsmenu_fullscreen_0_flicker into lp:widelands
Review: Approve Compiles and works on win. -- https://code.launchpad.net/~widelands-dev/widelands/fsmenu_fullscreen_0_flicker/+merge/309277 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/fsmenu_fullscreen_0_flicker. ___ 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/gettext-compile-errors into lp:widelands
Ok, let's wait for feedback on MacOS and Appveyor. -- https://code.launchpad.net/~widelands-dev/widelands/gettext-compile-errors/+merge/309638 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/gettext-compile-errors. ___ 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/gettext-compile-errors into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/gettext-compile-errors into lp:widelands has been updated. Description changed to: Silence warnings about variable length arrays in gettext.h For more details, see: https://code.launchpad.net/~widelands-dev/widelands/gettext-compile-errors/+merge/309638 -- Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/gettext-compile-errors into lp:widelands. ___ 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/gettext-compile-errors into lp:widelands
Tino has proposed merging lp:~widelands-dev/widelands/gettext-compile-errors into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net/~widelands-dev/widelands/gettext-compile-errors/+merge/309638 Merge request for appveyor building. -- Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/gettext-compile-errors into lp:widelands. === modified file 'src/third_party/gettext/gettext.h' --- src/third_party/gettext/gettext.h 2016-08-04 15:49:05 + +++ src/third_party/gettext/gettext.h 2016-10-30 12:39:29 + @@ -158,12 +158,11 @@ #include -#if (((__GNUC__ >= 3 || __GNUG__ >= 2) && \ - !defined __STRICT_ANSI__) /* || __STDC_VERSION__ >= 199901L */) -#define GETTEXT_LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS 1 -#else -#define GETTEXT_LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS 0 -#endif + /* http://bug-gnulib.gnu.narkive.com/1Hoiy7Iw/c-support + GCC supports variable-size arrays in C and C++ mode. + ISO C++ supports variable-size arrays, but some older PGI and Sun compilers + don't. */ +#define GETTEXT_LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS !(__GNUC__ >= 3 || (defined __cplusplus && !(defined __PGI || defined __SUNPRO_CC))) #if !GETTEXT_LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS #include ___ 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/fix_name_collision into lp:widelands
Review: Resubmit Sorry, this is the best i can come up with. Tried declaring the Widelands namespace in draw_text.h, but then always the enum was invalid (duplicate declaration). Tried using "enum class DrawText"... -- https://code.launchpad.net/~widelands-dev/widelands/fix_name_collision/+merge/309320 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/fix_name_collision. ___ 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/fix_name_collision into lp:widelands
Tino has proposed merging lp:~widelands-dev/widelands/fix_name_collision into
lp:widelands.
Requested reviews:
Widelands Developers (widelands-dev)
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/fix_name_collision/+merge/309320
It was not possible to compile current trunk on windows, because of a name
collision with a MSDN function DrawText :
https://msdn.microsoft.com/en-us/library/windows/desktop/dd162498(v=vs.85).aspx
I've renamed the function to WLDrawText, but perhaps there is also a better fix
by using namespaces?
--
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/fix_name_collision into lp:widelands.
=== modified file 'src/economy/flag.h'
--- src/economy/flag.h 2016-10-22 11:20:33 +
+++ src/economy/flag.h 2016-10-26 08:26:48 +
@@ -146,7 +146,7 @@
void cleanup(EditorGameBase&) override;
void draw(uint32_t gametime,
- DrawText draw_text,
+ WLDrawText draw_text,
const Vector2f& point_on_dst,
float scale,
RenderTarget* dst) override;
=== modified file 'src/economy/portdock.cc'
--- src/economy/portdock.cc 2016-10-24 14:04:00 +
+++ src/economy/portdock.cc 2016-10-26 08:26:48 +
@@ -141,7 +141,7 @@
expedition_bootstrap_->set_economy(e);
}
-void PortDock::draw(uint32_t, const DrawText, const Vector2f&, float, RenderTarget*) {
+void PortDock::draw(uint32_t, const WLDrawText, const Vector2f&, float, RenderTarget*) {
// do nothing
}
=== modified file 'src/economy/portdock.h'
--- src/economy/portdock.h 2016-10-22 11:20:33 +
+++ src/economy/portdock.h 2016-10-26 08:26:48 +
@@ -97,7 +97,7 @@
Flag& base_flag() override;
PositionList get_positions(const EditorGameBase&) const override;
void draw(uint32_t gametime,
- DrawText draw_text,
+ WLDrawText draw_text,
const Vector2f& point_on_dst,
float scale,
RenderTarget* dst) override;
=== modified file 'src/economy/road.h'
--- src/economy/road.h 2016-10-22 11:20:33 +
+++ src/economy/road.h 2016-10-26 08:26:48 +
@@ -119,7 +119,7 @@
void cleanup(EditorGameBase&) override;
void draw(uint32_t gametime,
- DrawText draw_text,
+ WLDrawText draw_text,
const Vector2f& point_on_dst,
float scale,
RenderTarget* dst) override;
=== modified file 'src/graphic/game_renderer.cc'
--- src/graphic/game_renderer.cc 2016-10-24 20:07:22 +
+++ src/graphic/game_renderer.cc 2016-10-26 08:26:48 +
@@ -100,29 +100,29 @@
void draw_objects_for_visible_field(const EditorGameBase& egbase,
const FieldsToDraw::Field& field,
const float zoom,
-const DrawText draw_text,
+const WLDrawText draw_text,
const Player* player,
RenderTarget* dst) {
BaseImmovable* const imm = field.fcoords.field->get_immovable();
if (imm != nullptr && imm->get_positions(egbase).front() == field.fcoords) {
- DrawText draw_text_for_this_immovable = draw_text;
+ WLDrawText draw_text_for_this_immovable = draw_text;
const Player* owner = imm->get_owner();
if (player != nullptr && owner != nullptr && !player->see_all() &&
player->is_hostile(*owner)) {
draw_text_for_this_immovable =
- static_cast(draw_text_for_this_immovable & ~DrawText::kStatistics);
+ static_cast(draw_text_for_this_immovable & ~WLDrawText::kStatistics);
}
imm->draw(
egbase.get_gametime(), draw_text_for_this_immovable, field.rendertarget_pixel, zoom, dst);
}
for (Bob* bob = field.fcoords.field->get_first_bob(); bob; bob = bob->get_next_bob()) {
- DrawText draw_text_for_this_bob = draw_text;
+ WLDrawText draw_text_for_this_bob = draw_text;
const Player* owner = bob->get_owner();
if (player != nullptr && owner != nullptr && !player->see_all() &&
player->is_hostile(*owner)) {
draw_text_for_this_bob =
- static_cast(draw_text_for_this_bob & ~DrawText::kStatistics);
+ static_cast(draw_text_for_this_bob & ~WLDrawText::kStatistics);
}
bob->draw(egbase, draw_text_for_this_bob, field.rendertarget_pixel, zoom, dst);
}
@@ -215,7 +215,7 @@
const float zoom,
const FieldsToDraw& fields_to_draw,
const Player* player,
- const DrawText draw_text,
+ const WLDrawText draw_text,
RenderTarget* dst) {
std::vector overlay_info;
for (size_t current_index = 0; current_index < fields_to_draw.size(); ++current_index) {
@@ -319,7 +319,7 @@
const Vector2f& viewpoint,
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/fix-widelands-icon into lp:widelands
Review: Approve It seems i am blind: Where is the README.lua displayed/viewable? Ingame? -- https://code.launchpad.net/~widelands-dev/widelands/fix-widelands-icon/+merge/306426 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/fix-widelands-icon. ___ 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/sdl2_logging into lp:widelands
Just did some more testing. Build18: - Installer always requires elevated privileges - Installation to C:\Program Files (x86)\Widelands -- Run widelands as user: Widelands does not write any stdout.txt or stderr.txt - Installation to C:\bin\Widelands -- Run widelands as user: Widelands does write stdout.txt and stderr.txt to c:\bin\Widelands Build19 (with this branch): - Installer does not require elevated privileges - Installation to C:\Program Files (x86)\Widelands not possible with UAC - Installation to C:\bin\Widelands -- Run widelands as user: Widelands does write stdout.txt to c:\bin\Widelands -- If i do write protect stdout.txt => Crash on start -- https://code.launchpad.net/~widelands-dev/widelands/sdl2_logging/+merge/302866 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/sdl2_logging into lp:widelands. ___ 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/sdl2_logging into lp:widelands
Review: Needs Fixing I've committed some small changes to get it to compile, please review. It does work, but stdout.txt gets created in the same directory as the widelands binary (at least on windows). I think ~/.widelands/stdout.txt would be better, because we should not pollute the installation directory and due to security settings (Windows UAC) we perhaps are not even allowed to write in this directory. -- https://code.launchpad.net/~widelands-dev/widelands/sdl2_logging/+merge/302866 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/sdl2_logging into lp:widelands. ___ 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
[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/bug-1588063 into lp:widelands
Review: Approve Nice, thanks Gun. I can compile fine and do not find those bugs active any longer. @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/bug-1588063/+merge/301636 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1588063. ___ 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-1588063 into lp:widelands
Review: Needs Fixing Found another bug in the current state of implementation: https://bugs.launchpad.net/widelands/+bug/1608558 -- https://code.launchpad.net/~widelands-dev/widelands/bug-1588063/+merge/301636 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1588063. ___ 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-1588063 into lp:widelands
Tino has proposed merging lp:~widelands-dev/widelands/bug-1588063 into
lp:widelands.
Requested reviews:
Widelands Developers (widelands-dev)
Related bugs:
Bug #1588063 in widelands: "Map folder gets not created"
https://bugs.launchpad.net/widelands/+bug/1588063
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/bug-1588063/+merge/301636
Use system dependant file seperator for the My_Maps subdirectory.
Now ensure_directory_exists() does work also on win32.
I don't like the #ifdef __win32 solution, but i was not able to
FileSystem::file_separator() because i lack c++ knowledge to concatenate
char/char*/char[].
Suggestions welcome.
--
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/bug-1588063 into lp:widelands.
=== modified file 'src/editor/ui_menus/main_menu_save_map.cc'
--- src/editor/ui_menus/main_menu_save_map.cc 2016-05-17 07:53:03 +
+++ src/editor/ui_menus/main_menu_save_map.cc 2016-08-01 11:14:29 +
@@ -49,8 +49,11 @@
// TODO(GunChleoc): Arabic: Make directory dialog: buttons need more height for Arabic.
MainMenuSaveMap::MainMenuSaveMap(EditorInteractive& parent)
+ #ifdef _WIN32
+ : MainMenuLoadOrSaveMap(parent, 3, "save_map_menu", _("Save Map"), "maps\\My_Maps"),
+ #elif
: MainMenuLoadOrSaveMap(parent, 3, "save_map_menu", _("Save Map"), "maps/My_Maps"),
-
+ #endif
make_directory_(this,
"make_directory",
right_column_x_,
=== modified file 'src/wui/mapdata.cc'
--- src/wui/mapdata.cc 2016-07-24 11:50:34 +
+++ src/wui/mapdata.cc 2016-08-01 11:14:29 +
@@ -162,7 +162,11 @@
if (boost::equals(directory, "maps/MP_Scenarios")) {
/** TRANSLATORS: Directory name for MP Scenarios in map selection */
localized_name = _("Multiplayer Scenarios");
+ #ifdef _WIN32
+ } else if (boost::equals(directory, "maps\\My_Maps")) {
+ #else
} else if (boost::equals(directory, "maps/My_Maps")) {
+ #endif
/** TRANSLATORS: Directory name for user maps in map selection */
localized_name = _("My Maps");
} else {
___
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-1548932-editor-save-zip-2 into lp:widelands
Ok, trunk shows the same behavior (zipping of files disabled): - Load scenario - Save it under the same name => error - Save it again under the same same => works, but empty scripting dir -- https://code.launchpad.net/~widelands-dev/widelands/bug-1548932-editor-save-zip-2/+merge/294067 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1548932-editor-save-zip-2. ___ 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-1548932-editor-save-zip-2 into lp:widelands
Review: Needs Fixing I get an empty scripting subdir: 1.) Copy one tutorial scenario into ~/.widelands/maps 2.) Rename it test1234 3.) Open it with the editor 4.) Save it again as test1234 With no-zipping enabled at this point i get an error, that the map cannot be saved because the map dir itself cannot removed. 5.) Save as test5678 works 6.) Save again as test1234 works But now in both map dirs test5678.wmf and test1234.wmf the scripting directory is empty. Widelands shows this maps as normal ones and not as scenarios. Not sure if this behavior is caused by this patch. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1548932-editor-save-zip-2/+merge/294067 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1548932-editor-save-zip-2. ___ 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-1548932-editor-save-zip-2 into lp:widelands
Review: Approve Great fix, does work fine here. Let's wait for one response from Linux or MacOS that this does not break anything. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1548932-editor-save-zip-2/+merge/294067 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1548932-editor-save-zip-2. ___ 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/gcc531 into lp:widelands
GCC 5.3.1 ? It is not listed on https://gcc.gnu.org/ ... -- https://code.launchpad.net/~widelands-dev/widelands/gcc531/+merge/293478 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/gcc531. ___ 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-1572879-broken_bidi into lp:widelands
Review: Approve Looking good on my windows machine! Let's skip appveyor ;) @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/bug-1572879-broken_bidi/+merge/293491 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1572879-broken_bidi. ___ 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_1571009_work_area_radius into lp:widelands
Yes, inderectly: We have rolling builds on Appveyor. This means the moment you commit a new revision, the current build of the branch is cancelled. -- https://code.launchpad.net/~widelands-dev/widelands/bug_1571009_work_area_radius/+merge/292066 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug_1571009_work_area_radius. ___ 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/python3 into lp:widelands
Review: Resubmit Ok, please have another look on linux. -- https://code.launchpad.net/~widelands-dev/widelands/python3/+merge/291236 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/python3. ___ 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/python3 into lp:widelands
Review: Needs Fixing Hm, I did run the test with both Python 2/3 without these errors, but perhaps I aborted them too early. Or the test do not currently run on windows? I'll check this later today... -- https://code.launchpad.net/~widelands-dev/widelands/python3/+merge/291236 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/python3. ___ 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/python3 into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/python3 into lp:widelands has been updated. Commit Message changed to: Add a compatibility layer to regression_test.py to allow running with python 2 and 3 For more details, see: https://code.launchpad.net/~widelands-dev/widelands/python3/+merge/291236 -- Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/python3 into lp:widelands. ___ 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-1395278-scripting into lp:widelands
Seems some pre installation scripts failed (downloading InnoSetup) on Appveyor. I've triggered a re-build of this commit: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1395278_scripting-686 -- https://code.launchpad.net/~widelands-dev/widelands/bug-1395278-scripting/+merge/288975 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1395278-scripting. ___ 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-1509172-map-saving-paths into lp:widelands
I would really like to avoid using different code pathes for windows and linux. The current version does work for directory saves on windows. But if fails on the second save for a zip save: If you start the editor and save the map "abc" and "abc" already exists it gets overwritten correctly. But you can't save again "abc" without restarting the editor (or save once under another name). So the editor itself does put also a lock on the save file after the first save. Why does creating a MapSaver object with new not work on linux? -- https://code.launchpad.net/~widelands-dev/widelands/bug-1509172-map-saving-paths/+merge/286067 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1509172-map-saving-paths. ___ 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-1509172-map-saving-paths into lp:widelands
Review: Resubmit Ok, it does work again on windows. But i've really no clue what i've done with the last commit. No the file lock on the tmp save is gone and it can be renamed correctly. If this does not break anything on linux i would remove the NOCOMs and merge. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1509172-map-saving-paths/+merge/286067 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1509172-map-saving-paths. ___ 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-1509172-map-saving-paths into lp:widelands
Probably i was still uploading...
I've done some debugging, but did not find a solution as of now:
- Click ok in save dialog
- The first string which arrives in ensure_dir_exists is
"C:\data\wl_x64\src\maps" (my binary dir + maps)
- Then the drive letter "C:" get extracted
- Canonalize_name() makes "C:\\Users\\mit\\.widelands\\C:" from this.
- This seems to be done because is_path_absolute("C:") gives false
- This is because path_size < root_size => "C:" <
"C:\\Users\\mit\\.widelands\\"
But why is a path relative just because it is shorter than your widelands home
directory?
--
https://code.launchpad.net/~widelands-dev/widelands/bug-1509172-map-saving-paths/+merge/286067
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/bug-1509172-map-saving-paths.
___
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-1509172-map-saving-paths into lp:widelands
Review: Needs Fixing => https://widelands.8-schuss.de/Widelands-bzr7830%5bbug-1509172-map-saving-paths%5d-nomusic-win64.exe It does not work: Now ensure_dir_exists() throws an error. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1509172-map-saving-paths/+merge/286067 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1509172-map-saving-paths. ___ 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/syncstream_on_option into lp:widelands
Review: Approve Does compile and the wss file is written on windows. -- https://code.launchpad.net/~widelands-dev/widelands/syncstream_on_option/+merge/286004 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/syncstream_on_option. ___ 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/dedicated_out_of_main into lp:widelands
Review: Approve Compiles, does work fine. No regressionson windows found. @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/dedicated_out_of_main/+merge/285268 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/dedicated_out_of_main. ___ 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/clang-codecheck into lp:widelands
@bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/clang-codecheck/+merge/284586 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/clang-codecheck. ___ 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/ignore_dev_branch into lp:widelands
Tino has proposed merging lp:~widelands-dev/widelands/ignore_dev_branch into lp:widelands. Commit message: For Travis builds ignore github branch _widelands_dev_widelands_trunk. Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net/~widelands-dev/widelands/ignore_dev_branch/+merge/284711 Currently bunnybot mirrors trunk to both github branches master and _widelands_dev_widelands_trunk. Let Travis only build master. -- Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/ignore_dev_branch into lp:widelands. === modified file '.travis.yml' --- .travis.yml 2016-01-16 17:52:56 + +++ .travis.yml 2016-02-02 10:42:23 + @@ -8,6 +8,11 @@ - "sh -e /etc/init.d/xvfb start" - sleep 3 # give xvfb some time to start +# ignore this branch because it is only a mirror of master +branches: + except: +- _widelands_dev_widelands_trunk + matrix: include: - compiler: clang ___ 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/ignore_dev_branch into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/ignore_dev_branch into lp:widelands has been updated. Commit Message changed to: For Travis builds ignore github branch _widelands_dev_widelands_trunk. For more details, see: https://code.launchpad.net/~widelands-dev/widelands/ignore_dev_branch/+merge/284711 -- Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/ignore_dev_branch into lp:widelands. ___ 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/beautiful_correct_lines into lp:widelands
The lines look very good! I do not get any crashes, but can confirm kaputtniks discovery in the wares production window. -- https://code.launchpad.net/~widelands-dev/widelands/beautiful_correct_lines/+merge/284517 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/beautiful_correct_lines into lp:widelands. ___ 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-1397500 into lp:widelands
Review: Approve test local build & appveyor Does work now. @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/bug-1397500/+merge/243860 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1397500. ___ 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-1397500 into lp:widelands
Review: Needs Fixing
Sorry, it does not work: If started without --datadir Widelands assumes
{execdir}\data correctly, but does not build the path correctly:
$ ./widelands
Set home directory: C:\Users\mit\.widelands
Widelands executable directory: C:\bin\Widelands
Adding directory: C:\bin\Widelands./data/
Caught exception (of type '17FileNotFoundError') in outermost handler!
The exception said: FileSystem::create: could not find file or directory:
C:\bin\Widelands./data/
This should not happen. Please file a bug report on version
bzr7353[bug-1397500](Release).
and remember to specify your operating system.
With --datadir it is fine:
$ ./widelands --datadir=./data
Set home directory: C:\Users\mit\.widelands
Adding directory: C:\bin\Widelands\./data
selected language: (system language)
Graphics: Try to set Videomode 800x600
Graphics: OpenGL: Version "4.3.0 - Build 10.18.14.4139"
Graphics: SDL_GL_RED_SIZE is 8
Graphics: SDL_GL_GREEN_SIZE is 8
Graphics: SDL_GL_BLUE_SIZE is 8
[...]
--
https://code.launchpad.net/~widelands-dev/widelands/bug-1397500/+merge/243860
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/bug-1397500.
___
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/opengl_debug into lp:widelands
Review: Needs Fixing Ok, i've changed both appveyor and travis scripts to use glbindings: - Appveyor does fail because it seems at some point GLEW is still included - Travis fails because no glbindings debian package is installed I would really like to get both CI systems to build with GLBindings before merging. -- https://code.launchpad.net/~widelands-dev/widelands/opengl_debug/+merge/283738 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/opengl_debug. ___ 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/opengl_debug into lp:widelands
I did not succeed in compiling the glbindings library for now. It does seem to depend on posix threads and does not detect the correct version on my system with mingw-w64. But i'll continue to try... I've created a github branch for this branch with a changed appveyor.yml wich enables glbinding: https://ci.appveyor.com/project/widelands-dev/widelands/build/opengl_binding-290 Let's wait if appveyor does manage to build it at some point without a timeout... -- https://code.launchpad.net/~widelands-dev/widelands/opengl_debug/+merge/283738 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/opengl_debug into lp:widelands. ___ 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/stricter_travis into lp:widelands
Review: Approve Travis and Appveyor build ok, should we merge? -- https://code.launchpad.net/~widelands-dev/widelands/stricter_travis/+merge/282852 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/stricter_travis. ___ 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-1537157 into lp:widelands
Review: Approve LGTM. Compiled and tested, no untranslated strings any longer! -- https://code.launchpad.net/~widelands-dev/widelands/bug-1537157/+merge/283724 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1537157. ___ 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/memory_leak into lp:widelands
Review: Approve I do not experience any more memory leaking on windows. And no overlapping icons in the message menu. -- https://code.launchpad.net/~widelands-dev/widelands/memory_leak/+merge/283690 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/memory_leak. ___ 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/png_alternative_method into lp:widelands
Both optipng and pngcrush were not able to "fix" (remove the unknown profile) all images. AdvaneCOMP was able to: http://www.advancemame.it/doc-advdef.html Now with this branch I get no warning messages from libPNG any longer. -- https://code.launchpad.net/~widelands-dev/widelands/png_alternative_method/+merge/282856 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/png_alternative_method. ___ 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/png_fix_only_relevant into lp:widelands
Review: Approve No more incorrect profile warnings on windows, nice! -- https://code.launchpad.net/~widelands-dev/widelands/png_fix_only_relevant/+merge/283005 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/png_fix_only_relevant. ___ 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/png_alternative_method into lp:widelands
Review: Approve No, sorry. As a test, I've run "pngcrush -ow -rem allb -reduce" (compiled with gcc 5.3.0 and libpng 1.6.20) once more over all files does not change anything. BZR then only shows changes on the three files kaputtnik comitted last, but there is no visual difference. Still 1-4 occurences of the "libpng warning: iCCP: known incorrect sRGB profile" when i quit widelands. Perhaps some windows only issue, i think we can ignore safely. -- https://code.launchpad.net/~widelands-dev/widelands/png_alternative_method/+merge/282856 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/png_alternative_method. ___ 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/png_alternative_method into lp:widelands
I cannot detect any visual regressions. Still getting one "libpng warning: iCCP: known incorrect sRGB profile" on exit. Any hint how to find the corresponding image? -- https://code.launchpad.net/~widelands-dev/widelands/png_alternative_method/+merge/282856 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/png_alternative_method into lp:widelands. ___ 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/use_image_cache into lp:widelands
Review: Approve Compiles and runs fine on windows. I would really like to see this land in trunk as soon as possible. -- https://code.launchpad.net/~widelands-dev/widelands/use_image_cache/+merge/282106 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/full_texture_atlas. ___ 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/fix_windows_delete_dir into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/fix_windows_delete_dir into lp:widelands has been updated. Commit Message changed to: Check return value of RemoveDirectory() and throw error if delete fails For more details, see: https://code.launchpad.net/~widelands-dev/widelands/fix_windows_delete_dir/+merge/282114 -- Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/fix_windows_delete_dir. ___ 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/fix_windows_delete_dir into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/fix_windows_delete_dir into lp:widelands has been updated. Commit Message changed to: - Check return value of RemoveDirectory() and throw error if delete fails - Use CreateDirectory() on windows instead of mkdir For more details, see: https://code.launchpad.net/~widelands-dev/widelands/fix_windows_delete_dir/+merge/282114 -- Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/fix_windows_delete_dir. ___ 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/fix_windows_delete_dir into lp:widelands
Tino has proposed merging lp:~widelands-dev/widelands/fix_windows_delete_dir
into lp:widelands.
Requested reviews:
Widelands Developers (widelands-dev)
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/fix_windows_delete_dir/+merge/282114
Testing the use_texture_cache branch revealed that deleting directories on
windows does not always succeeds:
If the cache dir was deleted due to recalculating it was removed but not
recreated.
Checking the return value seems to solve the problem.
Includes a small codecheck and python 3 fix.
--
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/fix_windows_delete_dir into lp:widelands.
=== modified file 'src/io/filesystem/disk_filesystem.cc'
--- src/io/filesystem/disk_filesystem.cc 2015-01-22 18:14:06 +
+++ src/io/filesystem/disk_filesystem.cc 2016-01-10 12:27:11 +
@@ -278,7 +278,10 @@
#ifndef _WIN32
rmdir(fspath.c_str());
#else
- RemoveDirectory(fspath.c_str());
+ if (!RemoveDirectory(fspath.c_str())) {
+ throw wexception
+("%s could not be deleted.",
+fspath.c_str());
#endif
}
=== modified file 'src/logic/map_objects/map_object.h'
--- src/logic/map_objects/map_object.h 2016-01-09 17:18:20 +
+++ src/logic/map_objects/map_object.h 2016-01-10 12:27:11 +
@@ -250,8 +250,8 @@
/**
* Is called right before the object will be removed from
* the game. No conncetion is handled in this class.
- *
- * param serial : the object serial (cannot use param comment as this is a callback)
+ *
+ * param serial : the object serial (cannot use param comment as this is a callback)
*/
boost::signals2::signal<void(uint32_t serial)> removed;
=== modified file 'utils/build_deps.py'
--- utils/build_deps.py 2014-11-03 06:55:18 +
+++ utils/build_deps.py 2016-01-10 12:27:11 +
@@ -52,7 +52,7 @@
message = '%s%s%s%s' % (
ANSI_COLORS["yellow"], ANSI_COLORS["bold"],
message, ANSI_COLORS["reset"])
-print "%s:%s: %s" % (filename, line_index, message)
+print("%s:%s: %s" % (filename, line_index, message))
__INCLUDE = re.compile(r'#include "([^"]+)"')
def extract_includes(srcdir, source):
@@ -201,7 +201,7 @@
for lib in targets.values():
for src in lib.srcs:
if src in owners_of_src:
-print "%s:1 is owned by more than one target." % src
+print("%s:1 is owned by more than one target." % src)
owners_of_src[src] = lib
___
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/fix_windows_delete_dir into lp:widelands
Review: Resubmit Ok, one more change. I'll wait for the travis bot to make sure i did not break anything on *nix and will merge then. -- https://code.launchpad.net/~widelands-dev/widelands/fix_windows_delete_dir/+merge/282114 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/fix_windows_delete_dir. ___ 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/use_image_cache into lp:widelands
Review: Needs Fixing Currently the images in campaigns are not cached. Starting any campaign mission fails. -- https://code.launchpad.net/~widelands-dev/widelands/use_image_cache/+merge/282106 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/full_texture_atlas. ___ 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/fix_windows_delete_dir into lp:widelands
@bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/fix_windows_delete_dir/+merge/282114 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/fix_windows_delete_dir. ___ 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 into lp:widelands
Review: Approve Ok, it works now including building a windows setup. I am going to merge because there are no changes to other than windows related things. @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/appveyor/+merge/281599 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/appveyor. ___ 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 into lp:widelands
Tino has proposed merging lp:~widelands-dev/widelands/appveyor into
lp:widelands.
Requested reviews:
Widelands Developers (widelands-dev)
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/appveyor/+merge/281599
Provide a build script for appveyor, the "travis ci" for windows.
Currently a release build is done and a complete inno setup created.
Includes 2 fixes for windows:
- enable static linking glew32 with cmake option on windows
- allow git revision detection in windows (does work on my machine, but atm not
an appveyor)
--
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/appveyor into lp:widelands.
=== modified file 'CMakeLists.txt'
--- CMakeLists.txt 2016-01-04 20:58:32 +
+++ CMakeLists.txt 2016-01-05 10:27:43 +
@@ -1,296 +1,300 @@
-project (widelands)
-
-cmake_minimum_required (VERSION 2.8.7)
-
-include("${CMAKE_SOURCE_DIR}/cmake/WlFunctions.cmake")
-
-option(OPTION_USE_GLBINDING "Use glbinding instead of GLEW" OFF)
-option(OPTION_GLEW_STATIC "Use static GLEW Library" OFF)
-
-if (CMAKE_SOURCE_DIR STREQUAL CMAKE_BINARY_DIR)
- message(FATAL_ERROR "Build directory and source directory must not be the same.")
-endif (CMAKE_SOURCE_DIR STREQUAL CMAKE_BINARY_DIR)
-
-# Define the directory structure for installation - will be hardcoded in WL bin
-# (through config.h). If not specified, we are going to use the directory where
-# the executable is in. Also on Linux.
-# Packagers (or people using make install) have to set this variable to an absolute path.
-wl_set_if_unset(WL_INSTALL_DATADIR ".")
-
-if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
- if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.7)
-message(FATAL_ERROR "Widelands needs GCC >= 4.7 to compile.")
- endif()
-elseif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
- if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 3.2)
-message(FATAL_ERROR "Clang version must be at least 3.2!")
- endif()
-else()
- message(WARNING "You are using an unsupported compiler! Supported are Clang and GCC.")
-endif()
-
-SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules)
-
-set (Boost_USE_STATIC_LIBS OFF)
-set (Boost_USE_MULTITHREADED ON)
-set (Boost_DETAILED_FAILURE_MSG ON)
-find_package(Boost 1.48
- COMPONENTS
-unit_test_framework
-regex
- REQUIRED)
-
-find_package (PythonInterp REQUIRED)
-
-find_package(Gettext REQUIRED)
-find_package(OpenGL REQUIRED)
-find_package(PNG REQUIRED)
-find_package(SDL2 REQUIRED)
-find_package(SDL2_image REQUIRED)
-find_package(SDL2_mixer REQUIRED)
-find_package(SDL2_net REQUIRED)
-find_package(SDL2_ttf REQUIRED)
-find_package(ZLIB REQUIRED)
-find_package(ICU REQUIRED)
-if(OPTION_USE_GLBINDING)
- find_package(glbinding REQUIRED)
-else()
- find_package(GLEW REQUIRED)
-endif()
-
-if (APPLE OR WIN32 OR CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
- if (NOT CMAKE_SYSTEM_NAME MATCHES "kFreeBSD")
-find_package(intl REQUIRED)
- endif()
-endif()
-
-# TODO(sirver): One day, this should be enabled. Then we have no more cycles in our dependencies
-# set_property(GLOBAL PROPERTY GLOBAL_DEPENDS_NO_CYCLES ON)
-
-if (NOT CMAKE_BUILD_TYPE OR CMAKE_BUILD_TYPE STREQUAL "")
- find_path(FILE_WL_RELEASE "WL_RELEASE" ${CMAKE_CURRENT_SOURCE_DIR})
- if(${FILE_WL_RELEASE} STREQUAL "FILE_WL_RELEASE-NOTFOUND")
-set(CMAKE_BUILD_TYPE Debug)
- else()
-set(CMAKE_BUILD_TYPE Release)
- endif()
-endif (NOT CMAKE_BUILD_TYPE OR CMAKE_BUILD_TYPE STREQUAL "")
-
-if(CMAKE_BUILD_TYPE STREQUAL "Debug")
- set(WL_DEBUG_FLAGS "-g -DDEBUG")
-elseif(CMAKE_BUILD_TYPE STREQUAL "Release")
- set(WL_OPTIMIZE_FLAGS "-O3")
- set(WL_DEBUG_FLAGS "-DNDEBUG -DNOPARACHUTE")
-elseif(CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo")
- set(WL_OPTIMIZE_FLAGS "-O3")
- set(WL_DEBUG_FLAGS "-g -DNDEBUG -DNOPARACHUTE")
-else()
- message(FATAL_ERROR "Unknown CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}")
-endif()
-
-wl_add_flag(WL_GENERIC_CXX_FLAGS "-std=c++11")
-
-if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
- wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Weverything")
-
- # Disabled warnings that are overly verbose right now or just do not make sense.
- wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Wno-c++98-compat")
- wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Wno-c++98-compat-pedantic")
- wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Wno-conversion")
- wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Wno-exit-time-destructors")
- wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Wno-global-constructors")
- wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Wno-padded")
- wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Wno-sign-conversi
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/appveyor into lp:widelands
Ok, no static linking at all for now. Locally i am able to do a complete static widelands.exe, will have to figure this out for appveyor later. -- https://code.launchpad.net/~widelands-dev/widelands/appveyor/+merge/281599 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/appveyor into lp:widelands. ___ 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/render_queue into lp:widelands
Review: Approve Some minor issues with axis, ticks and graphs in the statistics window: https://imgur.com/nkf8VCn -- https://code.launchpad.net/~widelands-dev/widelands/render_queue/+merge/250524 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/render_queue. ___ 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/request_supply_opt into lp:widelands
Review: Approve LGTM. I cannot really quantify the performance gain, but i did not find any regression. -- https://code.launchpad.net/~widelands-dev/widelands/request_supply_opt/+merge/280193 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/request_supply_opt. ___ 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/editor-remove-invalid-resources_fix into lp:~janosch-peters/widelands/editor-remove-invalid-resources
Tino has proposed merging
lp:~widelands-dev/widelands/editor-remove-invalid-resources_fix into
lp:~janosch-peters/widelands/editor-remove-invalid-resources.
Requested reviews:
Janosch Peters (janosch-peters)
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/editor-remove-invalid-resources_fix/+merge/281467
avoid crash when setting resource amount to 0 on empty field
--
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/editor-remove-invalid-resources_fix.
=== modified file 'src/editor/tools/editor_set_resources_tool.cc'
--- src/editor/tools/editor_set_resources_tool.cc 2016-01-01 17:35:01 +
+++ src/editor/tools/editor_set_resources_tool.cc 2016-01-02 14:34:02 +
@@ -57,10 +57,11 @@
if (editor_change_resource_tool_callback(mr.location(), map, world, args.cur_res)) {
// Ok, we're doing something. First remove the current overlays.
- const Image* pic = g_gr->images().get
-(world.get_resource(res)->get_editor_pic (mr.location().field->get_resources_amount()));
- overlay_manager.remove_overlay(mr.location(), pic);
-
+ if (res != Widelands::kNoResource) {
+const Image* pic = g_gr->images().get
+ (world.get_resource(res)->get_editor_pic (mr.location().field->get_resources_amount()));
+overlay_manager.remove_overlay(mr.location(), pic);
+ }
if (!amount) {
mr.location().field->set_resources(Widelands::kNoResource, 0);
mr.location().field->set_initial_res_amount(0);
@@ -68,7 +69,7 @@
mr.location().field->set_resources(args.cur_res, amount);
mr.location().field->set_initial_res_amount(amount);
// set new overlay
-pic =
+const Image* pic =
g_gr->images().get(world.get_resource(args.cur_res)->get_editor_pic(amount));
overlay_manager.register_overlay(mr.location(), pic, 4);
map.recalc_for_field_area(world, Widelands::Area(mr.location(), 0));
___
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/options_window into lp:widelands
Review: Approve Looks good to me and bunnybot ;). @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/options_window/+merge/280355 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/options_window. ___ 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 into lp:widelands
Tino has proposed merging lp:~widelands-dev/widelands/appveyor into
lp:widelands.
Requested reviews:
Widelands Developers (widelands-dev)
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/appveyor/+merge/281473
Please do not merge as for now.
I want only bunnybot to clone the branch to github.
--
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/appveyor into lp:widelands.
=== added file 'appveyor.yml'
--- appveyor.yml 1970-01-01 00:00:00 +
+++ appveyor.yml 2016-01-02 19:30:04 +
@@ -0,0 +1,15 @@
+platform:
+- x64
+
+environment:
+ matrix:
+# VS 2013
+ - BUILD_TYPE: cmake
+VS_VERSION: Visual Studio 12
+
+version: '{branch}-{build}'
+branches:
+ only:
+ - appveyor
+build:
+ verbosity: detailed
\ No newline at end of file
___
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-1459529 into lp:widelands
Review: Approve Works fine here! -- https://code.launchpad.net/~widelands-dev/widelands/bug-1459529/+merge/260632 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1459529. ___ 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/seafaring-ai into lp:widelands
I am not sure if this is related: https://github.com/boostorg/signals2/pull/8/files When i was updating my build environment a few days ago i had to apply this patch to boost 1.5.7 to make it work with widelands. -- https://code.launchpad.net/~widelands-dev/widelands/seafaring-ai/+merge/242271 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/seafaring-ai. ___ 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/rolling_autosave into lp:widelands
Review: Resubmit Ok, hopefully addressed all comments and suggestions. -- https://code.launchpad.net/~widelands-dev/widelands/rolling_autosave/+merge/246061 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/rolling_autosave. ___ 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
