Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1619402-port-work-area-on-expedition into lp:widelands
Review: Needs Fixing I will try to merge trunk, which contains a workaroud for #1784200. Until then I wont be able to debug this any further :\ -- https://code.launchpad.net/~widelands-dev/widelands/bug-1619402-port-work-area-on-expedition/+merge/349594 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1619402-port-work-area-on-expedition. ___ 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-1619402-port-work-area-on-expedition into lp:widelands
Now Internetgaming fails me with InternetGaming: logout(Something went wrong: Syntax error at 1:385: expected an allowed tag, got '/p'. String continues with: ' Welcome on the Widelands Metase') libc++abi.dylib: terminating with uncaught exception of type RT::SyntaxErrorImpl: Syntax error at 1:385: expected an allowed tag, got '/p'. String continues with: ' Uuuh, this smells like its related to ripping out the old fonr renderer? Must check this in trunk. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1619402-port-work-area-on-expedition/+merge/349594 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1619402-port-work-area-on-expedition. ___ 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-1619402-port-work-area-on-expedition into lp:widelands
Some notes: * logs show: [] Section [global], key 'workareapreview' not used (did you spell the name correctly?) This is actually expected. But will only affect existing games. * I am actually used to see the workarea when opening the building window, the extra click now kind of annoys me. e.g. I often wanto to check if a woodcutter can actually reach the area covered by a forester. * OTOH This removes some overhead and I am always a fan of optimizing things -- https://code.launchpad.net/~widelands-dev/widelands/bug-1619402-port-work-area-on-expedition/+merge/349594 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1619402-port-work-area-on-expedition. ___ 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/no-hardcoded-resources into lp:widelands
Continuous integration builds have changed state: Travis build 3733. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/409359058. Appveyor build 3533. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_no_hardcoded_resources-3533. -- https://code.launchpad.net/~widelands-dev/widelands/no-hardcoded-resources/+merge/350750 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/no-hardcoded-resources. ___ 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-1784113-desktop-file-utils into lp:widelands
Continuous integration builds have changed state: Travis build 3732. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/409261257. Appveyor build 3532. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1784113_desktop_file_utils-3532. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1784113-desktop-file-utils/+merge/351614 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1784113-desktop-file-utils 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/no-hardcoded-resources into lp:widelands
Continuous integration builds have changed state: Travis build 3731. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/409248477. Appveyor build 3531. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_no_hardcoded_resources-3531. -- https://code.launchpad.net/~widelands-dev/widelands/no-hardcoded-resources/+merge/350750 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/no-hardcoded-resources. ___ 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-1619402-port-work-area-on-expedition into lp:widelands
Automatic builds are OK, I do not expect problems with local builds, will do some testplay (OS-X only) to check for unexpected optical effects or worse. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1619402-port-work-area-on-expedition/+merge/349594 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1619402-port-work-area-on-expedition. ___ 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-1619402-port-work-area-on-expedition into lp:widelands
Continuous integration builds have changed state: Travis build 3729. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/409227011. Appveyor build 3529. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1619402_port_work_area_on_expedition-3529. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1619402-port-work-area-on-expedition/+merge/349594 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1619402-port-work-area-on-expedition. ___ 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-1784113-desktop-file-utils into lp:widelands
GunChleoc has proposed merging
lp:~widelands-dev/widelands/bug-1784113-desktop-file-utils into lp:widelands.
Commit message:
Validate .desktop file on translation updates. Removed deprecated category from
.desktop file.
Requested reviews:
Widelands Developers (widelands-dev)
Related bugs:
Bug #1784113 in widelands: "Automatically validate the .desktop file"
https://bugs.launchpad.net/widelands/+bug/1784113
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/bug-1784113-desktop-file-utils/+merge/351614
--
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/bug-1784113-desktop-file-utils into lp:widelands.
=== modified file 'debian/org.widelands.widelands.desktop'
--- debian/org.widelands.widelands.desktop 2018-07-06 14:23:53 +
+++ debian/org.widelands.widelands.desktop 2018-07-28 11:16:58 +
@@ -74,4 +74,4 @@
Icon=/usr/share/games/widelands/data/images/logos/wl-ico-64.png
TryExec=widelands
Exec=widelands
-Categories=Application;Game;StrategyGame;
+Categories=Game;StrategyGame;
=== modified file 'debian/org.widelands.widelands.desktop.stub'
--- debian/org.widelands.widelands.desktop.stub 2017-03-10 12:39:34 +
+++ debian/org.widelands.widelands.desktop.stub 2018-07-28 11:16:58 +
@@ -6,4 +6,4 @@
Icon=/usr/share/games/widelands/data/images/logos/wl-ico-64.png
TryExec=widelands
Exec=widelands
-Categories=Application;Game;StrategyGame;
+Categories=Game;StrategyGame;
=== modified file 'utils/update_appdata.py'
--- utils/update_appdata.py 2017-03-10 12:39:34 +
+++ utils/update_appdata.py 2018-07-28 11:16:58 +
@@ -118,8 +118,8 @@
input_file.close()
-dest_filepath = base_path + '/debian/widelands.appdata.xml'
-dest_file = codecs.open(dest_filepath, encoding='utf-8', mode='w')
+appdata_filepath = base_path + '/debian/widelands.appdata.xml'
+dest_file = codecs.open(appdata_filepath, encoding='utf-8', mode='w')
dest_file.write(appdata)
dest_file.close()
@@ -135,12 +135,22 @@
input_file.close()
-dest_filepath = base_path + '/debian/org.widelands.widelands.desktop'
-dest_file = codecs.open(dest_filepath, encoding='utf-8', mode='w')
+desktop_filepath = base_path + '/debian/org.widelands.widelands.desktop'
+dest_file = codecs.open(desktop_filepath, encoding='utf-8', mode='w')
dest_file.write(desktop)
dest_file.close()
print('Done!')
-from subprocess import call
-call(['appstreamcli', 'validate', base_path + '/debian/widelands.appdata.xml'])
+from subprocess import call, CalledProcessError, Popen, PIPE
+
+# Validata Appdata
+call(['appstreamcli', 'validate', appdata_filepath])
+
+# Validate desktop file. We don't get return codes, so we have to parse it
+process = Popen(['desktop-file-validate', desktop_filepath], stderr=PIPE, stdout=PIPE, stdin=PIPE)
+desktop_result = process.communicate()
+if desktop_result[0] != "":
+ print(desktop_result[0])
+ sys.exit(1)
+
___
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/no-hardcoded-resources into lp:widelands
Review: Approve The last AppVeyor build is fine, so once my final nit has been fixed, this can go in. -- https://code.launchpad.net/~widelands-dev/widelands/no-hardcoded-resources/+merge/350750 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/no-hardcoded-resources. ___ 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/mines-worldsavior into lp:widelands
> We should document the new philosophy of the mines preferably in the RST > section: > - now one ressource on the map delivers exactly one ware > - the probability is now calculated over the complete work cycle and > implemented in the first mine command > - all working animations are put at the beginning of the command cycle. Good idea - make sure that it gets phrased as a string recommendation rather than a guarantee, since there is no implementation enforcing it. also a little howto on how to calculate the probability? -- https://code.launchpad.net/~widelands-dev/widelands/mines-worldsavior/+merge/350716 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/mines-worldsavior. ___ 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-1619402-port-work-area-on-expedition into lp:widelands
Thanks for the review :) I hope it will compile again now - if it doesn't, I'd be happy if you could fix it for me. I'm still on the VM right now. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1619402-port-work-area-on-expedition/+merge/349594 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1619402-port-work-area-on-expedition. ___ 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/no-hardcoded-resources into lp:widelands
Thanks for implementing the comments. I just noticed another one: we prefer std::string over const char*. Parameters and return types then are const std::string&. Diff comments: > > === modified file 'src/logic/message.h' > --- src/logic/message.h 2018-04-07 16:59:00 + > +++ src/logic/message.h 2018-07-26 11:25:26 + > @@ -72,8 +69,10 @@ > const std::string& init_body, > const Widelands::Coords& c = Coords::null(), > Widelands::Serial ser = 0, > + const char* subt = nullptr, Make this a const std::string. Checks can then be for sub_type_.empty() > Status s = Status::kNew) > : type_(msgtype), > + sub_type_(subt), >title_(init_title), >icon_filename_(init_icon_filename), >icon_(g_gr->images().get(init_icon_filename)), -- https://code.launchpad.net/~widelands-dev/widelands/no-hardcoded-resources/+merge/350750 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/no-hardcoded-resources 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/bug-1736901-shift-market into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/bug-1736901-shift-market into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/bug-1736901-shift-market/+merge/349630 -- Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1736901-shift-market. ___ 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/rip_out_old_fontrenderer into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/rip_out_old_fontrenderer into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/rip_out_old_fontrenderer/+merge/350442 -- Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/rip_out_old_fontrenderer. ___ 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/rip_out_old_fontrenderer into lp:widelands
Thanks! @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/rip_out_old_fontrenderer/+merge/350442 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/rip_out_old_fontrenderer. ___ 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-1736901-shift-market into lp:widelands
Thanks! @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/bug-1736901-shift-market/+merge/349630 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1736901-shift-market. ___ 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
