The proposal to merge lp:~widelands-dev/widelands/bug-1397500 into lp:widelands
has been updated.
Status: Needs review => Merged
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/bug-1397500/+merge/284574
--
Your team Widelands Developers is subscribed to branch
lp
Yes, that looks much better :)
@bunnybot merge
--
https://code.launchpad.net/~widelands-dev/widelands/bug-1397500/+merge/284574
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/bug-1397500.
___
Mailing list: https://l
Review: Approve
Looks great. I fixed a couple of small nits while testing - see last commit. If
you are happy, feel free to merge.
--
https://code.launchpad.net/~widelands-dev/widelands/bug-1397500/+merge/284574
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/wideland
Sorry, answered myself... the files are needed after compiling and when
starting widelands.
--
https://code.launchpad.net/~widelands-dev/widelands/bug-1397500/+merge/284574
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/bug-1397500 into lp
Maybe a silly question: With this change we have some piece of C++ code living
in directory data/. As i understand this folder would be regularly installed in
a whole (from an installer or when installing over a ppa). So they get
installed without usage?
--
https://code.launchpad.net/~widelands
Continuous integration builds have changed state:
Travis build 536. State: passed. Details:
https://travis-ci.org/widelands/widelands/builds/106465450.
Appveyor build 384. State: success. Details:
https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1397500-
Continuous integration builds have changed state:
Travis build 503. State: errored. Details:
https://travis-ci.org/widelands/widelands/builds/106279199.
Appveyor build 384. State: success. Details:
https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1397500
Continuous integration builds have changed state:
Travis build 485. State: failed. Details:
https://travis-ci.org/widelands/widelands/builds/106181759.
Appveyor build 370. State: success. Details:
https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1397500-
Hi, I am bunnybot (https://github.com/widelands/bunnybot).
I am keeping the source branch lp:~widelands-dev/widelands/bug-1397500 mirrored
to
https://github.com/widelands/widelands/tree/_widelands_dev_widelands_bug_1397500
You can give me commands by starting a line with @bunnybot . I
understa
Continuous integration builds have changed state:
Travis build 472. State: errored. Details:
https://travis-ci.org/widelands/widelands/builds/106067227.
Appveyor build 365. State: success. Details:
https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1397500
GunChleoc has proposed merging lp:~widelands-dev/widelands/bug-1397500 into
lp:widelands.
Commit message:
Moved GL shaders into external files. Fragment shaders now live in
"data/shaders/.fp" and vertex shaders in
"data/shaders/.vp".
Requested reviews:
Widelands Developers (widelands-dev)
Re
The proposal to merge lp:~widelands-dev/widelands/bug-1397500 into lp:widelands
has been updated.
Status: Needs review => Merged
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/bug-1397500/+merge/243860
--
Your team Widelands Developers is subscribed to branch
lp
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.
__
I just tried the latest Appveyor build and datadir is still broken for Windows.
I have pushed a change that will hopefully fix it.
--
https://code.launchpad.net/~widelands-dev/widelands/bug-1397500/+merge/243860
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/b
Review: Approve
I just tested this on Mac OS X and made a slight adaptation to the build script
we use. This is ready to go IMHO.
--
https://code.launchpad.net/~widelands-dev/widelands/bug-1397500/+merge/243860
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/b
+1 for finetuning the file structure later. I have added SirVer's idea to the
bug.
--
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.
___
Review: Approve functionality
Yes, finetuning of folders could be done in a separate branch. This could also
be targeted to build 20 i think.
I have tested now also different datadirs and all works fine. Also did a test
merge to trunk ... all fine. No compiler errors here.
So the only thing to
how about:
ui_sfmenu -> widelands/ui/menus
wui -> widelands/ui/game/
editor/*all_ui_stuff/ -> widelands/ui/editor/
This would move us (further) towards separating non-widelands dependant stuff
and widelands dependant stuff?
I wonder if that should done in a separate PR though, because this is
> Yes, the naming is based on the source code, fs = fullscreen in this case. If
> we rename anything here, it should be done both in the source code and the
> images - naming should be identical.
I could only say for the folder images and for graphical development. And i
believe it isn't possib
Thanks for testing!
Yes, the naming is based on the source code, fs = fullscreen in this case. If
we rename anything here, it should be done both in the source code and the
images - naming should be identical.
how about:
ui_sfmenu -> ui_menu
wui -> ui_game?
--
https://code.launchpad.net/~wide
Sorry, the first statement was too short :-S
What should we do with the folder data/unused/ and his content? I would suggest
to move this into widelands-media repo. Thanks for collecting these unused pics
:-)
The structure (naming) of the folders is a bit uncommon. F.e.
"data/images/ui_fsmenu
Now I get what you mean - fixed :)
@Tino: does this help with Windows?
--
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.
___
No, an absolute path begins with a slash (/) (afaik) and "data/" does not.
But i am not really sure though... But you could investigate the path for your
self. Here on arch-linux the datadir path with the current setting is:
"/some/directory/widelands/./data/"
And that is wrong, instead it is r
The . has to stay for Linux. Otherwise, Widelands would assume an absolute path
and would look for /data/ instead of /data/.
--
https://code.launchpad.net/~widelands-dev/widelands/bug-1397500/+merge/243860
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/bug-139
Continuous integration builds have changed state:
Travis build 443. State: passed. Details:
https://travis-ci.org/widelands/widelands/builds/105628289.
Appveyor build 340. State: success. Details:
https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1397500-
The wrong building of the path appears also on linux. See diff comment.
With this change all works fine, imho. Haven't tested all use cases yet.
Diff comments:
>
> === modified file 'CMakeLists.txt'
> --- CMakeLists.txt2016-01-23 12:42:00 +
> +++ CMakeLists.txt2016-01-28 17:26:34 +0
Continuous integration builds have changed state:
Travis build 434. State: passed. Details:
https://travis-ci.org/widelands/widelands/builds/105474727.
Appveyor build 332. State: failed. Details:
https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1397500-3
Continuous integration builds have changed state:
Travis build 434. State: failed. Details:
https://travis-ci.org/widelands/widelands/builds/105474727.
Appveyor build 332. State: failed. Details:
https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1397500-3
I had a look at
http://bazaar.launchpad.net/~widelands-dev/widelands/bug-1397500/view/head:/utils/win32/mingw/config.h
and I don't know if the . in the datadir needs removing or something. SInce I
can't test on Windows, it's hard for me to play with stuff.
The variable that needs setting is dat
Continuous integration builds have changed state:
Travis build 426. State: failed. Details:
https://travis-ci.org/widelands/widelands/builds/105358644.
Appveyor build 326. State: success. Details:
https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1397500-
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\Widela
Review: Approve
I've removed the breaking comment in the iss file and my local build is working
(but this uses a different iss file).
Let's wait for appveyor and travis...
--
https://code.launchpad.net/~widelands-dev/widelands/bug-1397500/+merge/243860
Your team Widelands Developers is subscribe
Continuous integration builds have changed state:
Travis build 420. State: failed. Details:
https://travis-ci.org/widelands/widelands/builds/105347928.
Appveyor build 321. State: failed. Details:
https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1397500-3
The proposal to merge lp:~widelands-dev/widelands/bug-1397500 into lp:widelands
has been updated.
Commit Message changed to:
Moved all data-related directories into a new "data" directory.
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/bug-1397500/+merge/243860
--
Y
Review: Resubmit
This is ready for testing and review now.
I tried clicking on everything that has an image in it, but I might have missed
something.
The packaging also needs to be tested for all OSses.
--
https://code.launchpad.net/~widelands-dev/widelands/bug-1397500/+merge/243860
Your team
Thanks - will have a look.
--
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/~widelan
I made the regression tests work in this branch. Could you take it from here?
--
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.
_
Bunnybot encountered an error while working on this merge proposal:
--
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.
___
M
Bunnybot encountered an error while working on this merge proposal:
--
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.
___
M
Bunnybot encountered an error while working on this merge proposal:
--
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.
___
M
Before I consitune working on this, we need to fix the issues with the
regression suite. I have been unable to crack this, and it's the reason this
branc is still sitting here. Would you like to take this on for me?
Here's what I wrote about the problem:
I have changed the global datadir to "./
Review: Needs Fixing
Let's get this branch in before it starts to smell from sitting around too long
:)
I think it is a good improvement, making data/ the only directory that we need
to install. However there are a couple of things that need fixing:
- this fails to compile on gcc 4.7 (see trav
Yes, I would like to have this. I don't know how to fix the Python stuff for
the test suite, which is why this branch is still waiting.
I think other things are highter priority though - I'd be happy to target this
for Build 20.
--
https://code.launchpad.net/~widelands-dev/widelands/bug-1397500
Is this still current? I mean, do you still want to do this?
--
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 li
OK, I understand this is out of scope, but generaly locale recognition should
be more verbose - to allow common user to understand why the game does not run
localized. Though advanced users would not care if localized or no...
I dont understant exactly what you mean but the line in regression_t
Widelands doesn't have a locale sk_SK@UTF-8 like Linux does, for example, but
we use simply sk. So, we move from back to front until we find a matching
locale. So, this is just some console output that you can ignore - It is
sometimes important for me when I am working on i18n stuff, so I'd rath
oh, I found that Widelands checks LANG variable and LC_ALL
Never mind, now I can make widelands run in my langugage, but what I dont
understand is this in output:
No corresponding locale found - trying to set it via LANGUAGE=sk, LANG=sk
WTF, why it complains if localization works? :)
--
ht
one comment added
Diff comments:
> === modified file 'src/wui/buildingwindow.cc'
> --- src/wui/building_statistics_menu.cc 2014-11-30 18:49:38 +
> +++ src/wui/building_statistics_menu.cc 2015-06-06 14:58:59 +
> @@ -149,8 +149,8 @@
> new UI::Button
I think that m
further comments, I compiled with
-DCMAKE_INSTALL_PREFIX=/var/widelands/installed-bug-1397500/ \
-DWL_INSTALL_DATADIR=share/widelands
It works with but see on part of console output:
Adding directory: /var/widelands/installed-bug-1397500/share/widelands <= my
datadir - OK
Realpath: /var/widela
when I manually moved test to data, regression test went fine... hm?
--
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.
___
Ma
could introducing something like m_testsdir be solution? And pushing it to
m_filesystems.
--
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.
@GunChleoc,
this is maybe out of scope of this change, but what defines the language of
widelands (when running the game). It seems it is insensitive to environmental
variables, LC_ALL=slovak, LC_ALL=Sk_sk are ignored.
--
https://code.launchpad.net/~widelands-dev/widelands/bug-1397500/+merge/24
Review: Resubmit
Next round. ImageCatalog is gone, sound handler is reverted to old design.
I have changed the global datadir to "./data", and it is working fine, except
for the tests which are broken, because the map loader won't find the maps now.
I tried moving the tests to data as well, but
Sub filesystems aren't a solution - sometimes, world or tribe images will be
used as GUI strings, e,g, in the Terrain Tool.
I will go back to using full paths, based on the "data" directory.
--
https://code.launchpad.net/~widelands-dev/widelands/bug-1397500/+merge/243860
Your team Widelands Deve
> So, I would like the calls to look like load("buttons/button01.png") rather
> than load("images/buttons/button01.png")
If you desire this to be more concise, I think a better approach is to create a
sub-filesystem that tracks the images directory. So instead of pulling out the
constants into
Sgrìobh SirVer na leanas 24/02/2015 aig 06:18:
>> For GUI images, we would then still need to prefix "data" to the image
>> files, which sort of means that we are redefining the same information all
>> the time all over the code base.
>
> Why? They load their graphics through load_image, which u
> For GUI images, we would then still need to prefix "data" to the image files,
> which sort of means that we are redefining the same information all the time
> all over the code base.
Why? They load their graphics through load_image, which uses g_fs too. If we
only register data/ into g_fs, it
Yes, we could do that. For GUI images, we would then still need to prefix
"data" to the image files, which sort of means that we are redefining the same
information all the time all over the code base. This is why I came up with the
image catalog for GUI images, but we could also use other means
How about making data/ the search path for luas include, i.e. not add "." as a
filesystem, but add "data/" as the filesystem? same goes for the image loader.
--
https://code.launchpad.net/~widelands-dev/widelands/bug-1397500/+merge/243860
Your team Widelands Developers is requested to review the
> I have very little time this weekend, but wanted to give you quick feedback
> right away.
>
> [moving of dirs and splitting graphic into sub directories]
> great change.
>
> > So, I decided to do some overhaul:
>
> Would have been better to do that in trunk, so that the data move is
> independ
I have very little time this weekend, but wanted to give you quick feedback
right away.
[moving of dirs and splitting graphic into sub directories]
great change.
> So, I decided to do some overhaul:
Would have been better to do that in trunk, so that the data move is
independent. Do you think
The proposal to merge lp:~widelands-dev/widelands/bug-1397500 into lp:widelands
has been updated.
Description changed to:
Welcome to the scope creep of the week. Basically, this moves some directories
into a new "data" directory:
campaigns: data -> campaigns
global:data -> global
fonts:
62 matches
Mail list logo
