Re: [Freeciv-Dev] freeciv.net merge: metaserver
On 9 June 2011 18:31, Andreas Røsdal andre...@pvv.ntnu.no wrote: On Thu, 9 Jun 2011, Marko Lindqvist wrote: settings.php has just defaults that are used if user provided configuration file local.php does not provide particular value. I didn't know about local.php. How should documentation be improved? Or have you just not read it? First sentence in metaserver INSTALL is: Local configuration is in file php_code/local.php - ML ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] freeciv.net merge: metaserver
On Fri, 10 Jun 2011, Marko Lindqvist wrote: On 9 June 2011 18:31, Andreas Røsdal andre...@pvv.ntnu.no wrote: On Thu, 9 Jun 2011, Marko Lindqvist wrote: settings.php has just defaults that are used if user provided configuration file local.php does not provide particular value. I didn't know about local.php. How should documentation be improved? I now understand the intended usage of local.php. To improve the documentation, I guess it could be a little more verbose. Or have you just not read it? I don't remember, this was a long time ago. First sentence in metaserver INSTALL is: Local configuration is in file php_code/local.php Yes, will do next time. - Andreas___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] freeciv.net merge: metaserver
I had a moment to browse freeciv.net sources again to plan how to proceed in our gradual merge (currently just unifying codebase; minimizing diff between the two systems) I noticed that your tree has copy of metaserver also. I've been doing commit or two per year to metaserver code. I hope you are aware of what has been happening there also. The slight problem I noticed is in how you deploy metaserver. You have renamed settings.php as settings.php.dist and your main README installation instructions say that one should modify that file directly and then rename it back to settings.php. I don't think you have any good reason to do it that way instead of doing it correctly. settings.php has just defaults that are used if user provided configuration file local.php does not provide particular value. So your installation instructions ask to change these *defaults* and not to actually configure the metaserver. Well, as long as you provide no custom configuration for metaserver, (modified) defaults are used, but that's definitely not supported way to do it. Have you done any changes to metaserver so that metaservers of these two projects would also need merging? - ML ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] freeciv.net merge: metaserver
- As instructed in README, I run ./build.sh in freeciv-web directory. It fails when it tries to cp file to ~/freeciv-build/resin-4.0.18/webapps/ as I don't have any ~/freeciv-build directory. I don't see from the instructions when such a directory is supposed to be created. Does this mean that document assumes that I have installed requirements (such as resin) to such an predefined (but undocumented) location? - Freeciv comfiguration failed due to missing glib-2.29 dependency. That's obviously something to be resolved before any merge can take place. Main freeciv is supposed to be supported in quite old systems compared to release dates. So everything depending on something that is only development version, not even released, is definitely no no. Note that it's ok for *additional functionality* (such as freeciv.net) to depend on newer versions of glib as long as the usual freeciv functionality is available with older glib. We may have other similar freeciv.net requirements are unacceptable to main freeciv -problems. What this glib-2.29 is needed for? - ML ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
