Re: [Freeciv-Dev] (PR#39414) tolua, tolua++, toluaxx
URL: http://bugs.freeciv.org/Ticket/Display.html?id=39414 On Thu, 9 Aug 2007, Marko Lindqvist wrote: One thing at a time. It is not a trivial task to externalize it with proper configure checks and such. And we cannot externalize it *before* we take toluaxx in to use, since tolua does not work with lua-5.1 (which would be that external lua in most cases) In fact, I'm not sure if we can externalize it even (soon) after we have taken toluaxx in to use. Toluaxx might be too tightly tied to certain lua versions. So we have to provide that version instead of using what ever version is present in system. If I had the time and desire to hack on this part of the code again, I would look into using lua directly instead of going through tolua. Vasco said it saves a lot of work, but considering the mess it makes, both in the source and to our build process, I think it should at least be considered seriously. - Per Those people who think they know everything are a great annoyance to those of us who do. -- Isaac Asimov ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] (PR#39527) [Patch] Build toluaxx against included lua-5.1
URL: http://bugs.freeciv.org/Ticket/Display.html?id=39527 With these makefile changes toluaxx succesfully compiles and links against included lua-5.1 Or it would, if make would ever recurse in to lua-5.1 and toluaxx directories. That part have to go in last (when we can actually use toluaxx lua-5.1). - ML diff -Nurd -X.diff_ignore freeciv/dependencies/toluaxx/src/bin/Makefile.am freeciv/dependencies/toluaxx/src/bin/Makefile.am --- freeciv/dependencies/toluaxx/src/bin/Makefile.am 2007-08-10 17:51:12.0 +0300 +++ freeciv/dependencies/toluaxx/src/bin/Makefile.am 2007-08-10 20:24:33.0 +0300 @@ -3,16 +3,17 @@ noinst_PROGRAMS = tolua AM_CPPFLAGS = \ - -I$(top_srcdir)/dependencies/lua/src/lib \ - -I$(top_srcdir)/dependencies/lua/include \ - -I$(top_srcdir)/dependencies/toluaxx/include \ - -I. + -I$(top_srcdir)/dependencies/lua-5.1/src \ + -I$(top_srcdir)/dependencies/lua-5.1/etc \ + -I$(top_srcdir)/dependencies/toluaxx/include tolua_SOURCES = \ - $(top_srcdir)/dependencies/tolua/include/toluaxx.h \ + $(top_srcdir)/dependencies/toluaxx/include/toluaxx.h \ toluaxx.bind.cxx \ main.cxx \ main.hxx \ + help.cxx \ + help.hxx \ parsecmd.cxx \ parsecmd.hxx \ platform.hxx @@ -43,9 +44,9 @@ lua/tlx_verbatim.lua tolua_DEPENDENCIES = \ - $(top_builddir)/dependencies/lua/src/liblua.a \ + $(top_builddir)/dependencies/lua-5.1/src/liblua.a \ ../lib/libtolua.a tolua_LDADD = \ - $(top_builddir)/dependencies/lua/src/liblua.a \ + $(top_builddir)/dependencies/lua-5.1/src/liblua.a \ ../lib/libtolua.a -lm diff -Nurd -X.diff_ignore freeciv/dependencies/toluaxx/src/lib/Makefile.am freeciv/dependencies/toluaxx/src/lib/Makefile.am --- freeciv/dependencies/toluaxx/src/lib/Makefile.am 2007-08-06 05:50:56.0 +0300 +++ freeciv/dependencies/toluaxx/src/lib/Makefile.am 2007-08-10 20:24:30.0 +0300 @@ -1,11 +1,8 @@ -# SUBDIRS = none - noinst_LIBRARIES = libtolua.a AM_CPPFLAGS = \ - -I$(top_srcdir)/dependencies/lua/include \ -I$(top_srcdir)/dependencies/toluaxx/include \ - -I. + -I$(top_srcdir)/dependencies/lua-5.1/src libtolua_a_SOURCES = \ $(top_srcdir)/dependencies/tolua/include/toluaxx.h \ ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] (PR#39528) [Patch] Fix to failing sanitycheck: tile marked unavailable but seems to be available
URL: http://bugs.freeciv.org/Ticket/Display.html?id=39528
On 10/08/07, Marko Lindqvist [EMAIL PROTECTED] wrote:
$subject
S2_0 version.
Completely different version for trunk. There is no point in
refreshing workers after every clause, but only once whole treaty is
handled.
Less intrusive original version should go to S2_1, though.
- ML
diff -Nurd -X.diff_ignore freeciv/server/diplhand.c freeciv/server/diplhand.c
--- freeciv/server/diplhand.c 2007-08-04 04:27:24.0 +0300
+++ freeciv/server/diplhand.c 2007-08-10 21:01:47.0 +0300
@@ -375,12 +375,16 @@
give_map_from_player_to_player(pgiver, pdest);
notify_player(pdest, _(Game: You receive %s's worldmap.),
pgiver-name);
+
+check_city_workers(pdest); /* See CLAUSE_VISION */
gamelog(GAMELOG_TREATY, GL_MAP, pgiver, pdest);
break;
case CLAUSE_SEAMAP:
give_seamap_from_player_to_player(pgiver, pdest);
notify_player(pdest, _(Game: You receive %s's seamap.),
pgiver-name);
+
+check_city_workers(pdest); /* See CLAUSE_VISION */
gamelog(GAMELOG_TREATY, GL_SEAMAP, pgiver, pdest);
break;
case CLAUSE_CITY:
@@ -463,6 +467,10 @@
notify_player_ex(pdest, NULL, E_TREATY_SHARED_VISION,
_(Game: %s gives you shared vision.),
pgiver-name);
+
+/* Yes, shared vision may let us to _know_ tiles
+ * within radius of our own city. */
+ check_city_workers(pdest);
gamelog(GAMELOG_TREATY, GL_VISION, pgiver, pdest);
break;
case CLAUSE_LAST:
diff -Nurd -X.diff_ignore freeciv/server/diplhand.c freeciv/server/diplhand.c
--- freeciv/server/diplhand.c 2007-08-04 18:36:24.0 +0300
+++ freeciv/server/diplhand.c 2007-08-10 21:27:37.0 +0300
@@ -101,6 +101,7 @@
struct player *pother;
bool *player_accept, *other_accept;
enum dipl_reason diplcheck;
+ bool worker_refresh_required = FALSE;
if (!is_valid_player_id(counterpart) || pplayer-player_no == counterpart) {
return;
@@ -391,12 +392,16 @@
notify_player(pdest, NULL, E_DIPLOMACY,
_(You receive %s's worldmap.),
pgiver-name);
+
+worker_refresh_required = TRUE; /* See CLAUSE_VISION */
break;
case CLAUSE_SEAMAP:
give_seamap_from_player_to_player(pgiver, pdest);
notify_player(pdest, NULL, E_DIPLOMACY,
_(You receive %s's seamap.),
pgiver-name);
+
+worker_refresh_required = TRUE; /* See CLAUSE_VISION */
break;
case CLAUSE_CITY:
{
@@ -434,8 +439,8 @@
if (old_diplstate == DS_ALLIANCE) {
update_players_after_alliance_breakup(pgiver, pdest);
}
- check_city_workers(pplayer);
- check_city_workers(pother);
+
+worker_refresh_required = TRUE;
break;
case CLAUSE_PEACE:
pgiver-diplstates[player_index(pdest)].type = DS_ARMISTICE;
@@ -467,8 +472,8 @@
if (old_diplstate == DS_ALLIANCE) {
update_players_after_alliance_breakup(pgiver, pdest);
}
- check_city_workers(pplayer);
- check_city_workers(pother);
+
+worker_refresh_required = TRUE;
break;
case CLAUSE_ALLIANCE:
pgiver-diplstates[player_index(pdest)].type=DS_ALLIANCE;
@@ -484,8 +489,7 @@
_(You agree on an alliance with %s.),
pgiver-name);
- check_city_workers(pplayer);
- check_city_workers(pother);
+worker_refresh_required = TRUE;
break;
case CLAUSE_VISION:
give_shared_vision(pgiver, pdest);
@@ -495,6 +499,10 @@
notify_player(pdest, NULL, E_TREATY_SHARED_VISION,
_(%s gives you shared vision.),
pgiver-name);
+
+/* Yes, shared vision may let us to _know_ tiles
+ * within radius of our own city. */
+worker_refresh_required = TRUE;
break;
case CLAUSE_LAST:
freelog(LOG_ERROR, Received bad clause type);
@@ -502,6 +510,17 @@
}
} clause_list_iterate_end;
+
+/* In theory, we would need refresh only receiving party of
+ * CLAUSE_MAP, CLAUSE_SEAMAP and CLAUSE_VISION clauses.
+ * It's quite unlikely that there is such a clause going one
+ * way but no clauses affecting both parties or going other
+ * way. */
+if (worker_refresh_required) {
+ check_city_workers(pplayer);
+ check_city_workers(pother);
+}
+
cleanup:
treaty_list_unlink(treaties, ptreaty);
clear_treaty(ptreaty);
___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] (PR#39529) [Patch] Comments about claiming tile-worked
URL: http://bugs.freeciv.org/Ticket/Display.html?id=39529
When new city is founded and some other might need to give up working
its central tile, things get tricky. It works, but not the way one may
expect. This patch adds comments, so we know what risks there is
making any changes to that system.
- ML
diff -Nurd -X.diff_ignore freeciv/common/city.c freeciv/common/city.c
--- freeciv/common/city.c 2007-08-05 16:40:58.0 +0300
+++ freeciv/common/city.c 2007-08-10 22:28:11.0 +0300
@@ -301,6 +301,9 @@
}
pcity-city_map[city_x][city_y] = type;
if (type == C_TILE_WORKER) {
+ /* No assert to check that nobody else is working this tile.
+ * City creation relies on claiming tile to new city first,
+ * and freeing it from another city only later. */
ptile-worked = pcity;
}
} else {
diff -Nurd -X.diff_ignore freeciv/server/citytools.c freeciv/server/citytools.c
--- freeciv/server/citytools.c 2007-08-09 17:20:08.0 +0300
+++ freeciv/server/citytools.c 2007-08-10 22:25:08.0 +0300
@@ -1010,6 +1010,12 @@
/* Place a worker at the city center; this is the free-worked tile.
* This must be done before the city refresh (below) so that the city
* is in a sane state. */
+ /* Ugly detail here is that if another city is currently working
+ * this tile, we first update only ptile-worked and our own
+ * city_map. At that point city_map of both cities claim that they
+ * are working that tile. But then we refresh adjacent cities - one of
+ * which that other city certainly is. And once it notices that
+ * ptile-worked does not point to it, it will give tile up. */
server_set_tile_city(pcity, CITY_MAP_SIZE/2, CITY_MAP_SIZE/2, C_TILE_WORKER);
/* Refresh the city. First a city refresh is done (this shouldn't
___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] (PR#39515) struct req_source to struct universal
URL: http://bugs.freeciv.org/Ticket/Display.html?id=39515 Marko Lindqvist wrote: While I have not looked this particular patch, and probably have nothing against it, you should reread http://freeciv.wikia.com/wiki/Commit_rules and what it says about allowing time for comments... Note that it presumes there are managers doing code review. Since nobody was reviewing my patches, even when I gave *weeks* and sent individual messages to various folks, I've not bothered anymore. It's just list noise, sending the proposed patch and then the final patch. I've only been sending the final lately But based on your interest, take a look at today's that uses this one, and I'll wait until tomorrow to commit. ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] Developer po changes without marking translations fuzzy
I just noticed that at least several commits to S2_1 have contained po file msgid changes without marking strings fuzzy. So translators are not likely to catch what they should fix. I guess I have to go through those commits and manually mark each affected string fuzzy. This of course leads to duplicate work for translators who have already checked those changes (as they will appear as fuzzy again...) - ML ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] (PR#39524) [Patch] Fix nb.po chicken/egg and such
URL: http://bugs.freeciv.org/Ticket/Display.html?id=39524 There is several (probably minor) problems related to nb.po creation. - In certain situations msgmerge fails since nb.po is not available - nb.po is updated by copying no.po *before* no.po itself is updated Attached is my attempt to fix these issues. Considering how many different ways this makefile is used, I'm not too sure that even this is completely correct way to do it. For both trunk and S2_1. - ML diff -Nurd -X.diff_ignore freeciv/po/Makefile.in.in freeciv/po/Makefile.in.in --- freeciv/po/Makefile.in.in 2007-08-04 18:38:22.0 +0300 +++ freeciv/po/Makefile.in.in 2007-08-10 13:53:08.0 +0300 @@ -165,7 +165,7 @@ cp -p $$dir/$$file $(distdir); \ done -update-po: Makefile +update-po: Makefile nb.po $(MAKE) $(PACKAGE).pot if test $(PACKAGE) = gettext; then PATH=`pwd`/../src:$$PATH; fi; \ cd $(srcdir); \ @@ -173,9 +173,14 @@ for cat in $$catalogs; do \ cat=`basename $$cat`; \ lang=`echo $$cat | sed 's/\.gmo$$//'`; \ + if test -x $(builddir)/$$lang.po ; then \ + dir=$(builddir); \ + else \ + dir=. ; \ + fi; \ echo $$lang:; \ - if $(MSGMERGE) $$lang.po $(PACKAGE).pot -o $$lang.new.po; then \ - mv -f $$lang.new.po $$lang.po; \ + if $(MSGMERGE) $$dir/$$lang.po $(PACKAGE).pot -o $$lang.new.po; then \ + mv -f $$lang.new.po $$dir/$$lang.po; \ else \ echo msgmerge for $$cat failed!; \ rm -f $$lang.new.po; \ ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] (PR#39526) Parse metaserver phtml file.
URL: http://bugs.freeciv.org/Ticket/Display.html?id=39526 When a string contain the '\\' character (for example hello\\nworld), parsing into a section file make it as 1 character with the next character (in the example hello\nworld). If the string ended with ...\\, it will be transformed to ...\, and then, it will be impossible to find the end of the file... ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] peaceful units block my moves
How comes that a chap I'm in peace with can send diplos inside my borders and block my moves this way? Bug or feature? Christian -- Christian Knoke* * *http://cknoke.de * * * * * * * * * Ceterum censeo Microsoft esse dividendum. ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] (PR#39522) [Patch] Remove deprecated OVERFLIGHT_* definitions
URL: http://bugs.freeciv.org/Ticket/Display.html?id=39522 $subject - ML diff -Nurd -X.diff_ignore freeciv/common/game.h freeciv/common/game.h --- freeciv/common/game.h 2007-08-04 18:38:32.0 +0300 +++ freeciv/common/game.h 2007-08-10 12:12:48.0 +0300 @@ -48,9 +48,6 @@ CLIENT_GAME_OVER_STATE }; -#define OVERFLIGHT_NOTHING 1 -#define OVERFLIGHT_FRIGHTEN 2 - #define CONTAMINATION_POLLUTION 1 #define CONTAMINATION_FALLOUT 2 ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] (PR#39528) [Patch] Fix to failing sanitycheck: tile marked unavailable but seems to be available
URL: http://bugs.freeciv.org/Ticket/Display.html?id=39528
$subject
- ML
diff -Nurd -X.diff_ignore freeciv/server/diplhand.c freeciv/server/diplhand.c
--- freeciv/server/diplhand.c 2007-08-04 18:36:24.0 +0300
+++ freeciv/server/diplhand.c 2007-08-10 20:44:45.0 +0300
@@ -391,12 +391,16 @@
notify_player(pdest, NULL, E_DIPLOMACY,
_(You receive %s's worldmap.),
pgiver-name);
+
+ check_city_workers(pdest); /* See CLAUSE_VISION */
break;
case CLAUSE_SEAMAP:
give_seamap_from_player_to_player(pgiver, pdest);
notify_player(pdest, NULL, E_DIPLOMACY,
_(You receive %s's seamap.),
pgiver-name);
+
+ check_city_workers(pdest); /* See CLAUSE_VISION */
break;
case CLAUSE_CITY:
{
@@ -495,6 +499,10 @@
notify_player(pdest, NULL, E_TREATY_SHARED_VISION,
_(%s gives you shared vision.),
pgiver-name);
+
+/* Yes, shared vision may let us to _know_ tiles
+ * within radius of our own city. */
+ check_city_workers(pdest);
break;
case CLAUSE_LAST:
freelog(LOG_ERROR, Received bad clause type);
___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] (PR#39511) [Patch] Call init_available_nations()
URL: http://bugs.freeciv.org/Ticket/Display.html?id=39511
On 08/08/07, Marko Lindqvist [EMAIL PROTECTED] wrote:
There was another call of init_available_nations() at wrong time. And
sometimes it was not called when it should have been called.
- Fixed client crash
- ML
diff -Nurd -X.diff_ignore freeciv/common/player.c freeciv/common/player.c
--- freeciv/common/player.c 2007-08-04 18:38:32.0 +0300
+++ freeciv/common/player.c 2007-08-10 19:35:51.0 +0300
@@ -330,6 +330,11 @@
}
pplayer-nation = pnation;
return TRUE;
+ } else {
+/* Nation already assigned to this player.
+ * Or there was - nor will be - nation for player. */
+assert(pnation == NULL
+ || pnation-player == pplayer);
}
return FALSE;
}
diff -Nurd -X.diff_ignore freeciv/server/ruleset.c freeciv/server/ruleset.c
--- freeciv/server/ruleset.c 2007-08-09 17:20:08.0 +0300
+++ freeciv/server/ruleset.c 2007-08-10 19:26:40.0 +0300
@@ -46,6 +46,7 @@
#include aiunit.h /* update_simple_ai_types */
#include ruleset.h
+#include srv_main.h
/* RULESET_SUFFIX already used, no leading dot here */
#define RULES_SUFFIX ruleset
@@ -3494,6 +3495,10 @@
static void reset_player_nations(void)
{
players_iterate(pplayer) {
+/* We cannot use player_set_nation() here since this is
+ * called before nations are loaded. Player pointers
+ * from nations will be initialized to NULL when nations are
+ * loaded. */
pplayer-nation = NO_NATION_SELECTED;
pplayer-city_style = 0;
} players_iterate_end;
@@ -3548,6 +3553,9 @@
load_ruleset_effects(effectfile);
load_ruleset_game();
+ /* Init nations we just loaded. */
+ init_available_nations();
+
sanity_check_ruleset_data();
precalc_tech_data();
diff -Nurd -X.diff_ignore freeciv/server/srv_main.c freeciv/server/srv_main.c
--- freeciv/server/srv_main.c 2007-08-10 03:05:02.0 +0300
+++ freeciv/server/srv_main.c 2007-08-10 19:26:40.0 +0300
@@ -1347,7 +1347,29 @@
}
}
nations_iterate(nation) {
-nation-player = NULL;
+/* Even though this function is called init_available_nations(),
+ * nation-player should never have value assigned to it
+ * (since it has beeen initialized in load_rulesets() ). */
+if (nation-player != NULL) {
+
+ freelog(LOG_ERROR, Player assigned to nation before
+ init_available_nations());
+
+ /* When we enter this execution branch, assert() will always
+ * fail. This one just provides more informative message than
+ * simple assert(FAIL); */
+ assert(nation-player == NULL);
+
+ /* Try to handle error situation as well as we can */
+ if (nation-player-nation == nation) {
+/* At least assignment is consistent. Leave nation assigned,
+ * and make sure that nation is also marked available. */
+nation-is_available = TRUE;
+ } else {
+/* Not consistent. Just initialize the pointer and hope for the best */
+nation-player = NULL;
+ }
+}
} nations_iterate_end;
send_ruleset_nations(game.est_connections);
}
@@ -1791,7 +1813,6 @@
con_flush();
- server_game_init();
stdinhand_init();
diplhand_init();
@@ -1801,6 +1822,8 @@
server_open_socket();
}
+ server_game_init();
+
/* load a saved game */
if (srvarg.load_filename[0] != '\0') {
(void) load_command(NULL, srvarg.load_filename, FALSE);
@@ -1889,8 +1912,6 @@
**/
static void srv_loop(void)
{
- init_available_nations();
-
freelog(LOG_NORMAL, _(Now accepting new client connections.));
while(server_state == PRE_GAME_STATE) {
sniff_packets(); /* Accepting commands. */
___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] (PR#37537) [Patch] Base build time
URL: http://bugs.freeciv.org/Ticket/Display.html?id=37537 On 10/08/07, William Allen Simpson [EMAIL PROTECTED] wrote: Each terrain should have a different build time for each base. Feel free to implement it. But in a proper way that does not hardcode number of bases. - ML ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] (PR#37537) [Patch] Base build time
URL: http://bugs.freeciv.org/Ticket/Display.html?id=37537 Since this was originally posted before I was developing, I didn't pay attention. This is a bad idea! Each terrain should have a different build time for each base. Building an airport on a hill is (should be) harder than on plains. Likewise, a fortress in a swamp. ;-) This is/was especially needed for civ3+ as the nations with fast/slow workers are affected proportionately. Maybe there's going to be some nice multiplier/divisor system, but right now the data for everything is in the terrain files. ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] Developer po changes without marking translations fuzzy
On 10/08/07, Marko Lindqvist [EMAIL PROTECTED] wrote: I just noticed that at least several commits to S2_1 have contained po file msgid changes without marking strings fuzzy. So translators are not likely to catch what they should fix. I guess I have to go through those commits and manually mark each affected string fuzzy. This of course leads to duplicate work for translators who have already checked those changes (as they will appear as fuzzy again...) I tried that. It's not fun and it takes more time than I'd like to invest (and probably has to be done separately for trunk too...). But then there's problem with what those translations replaced by developer actually are. Even when they are fuzzy, I would feel much better if we still had old translations around instead of what is guessed to be proper new translation. I considered reverting changes made to .po files by certain revisions, then running 'make update-po' and manually correcting only syntax errors. Sadly this seems almost impossible without losing all the changes to translations during last couple of months. - ML ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] (PR#12500) Cannot end turn
URL: http://bugs.freeciv.org/Ticket/Display.html?id=12500 From: Marko Lindqvist: - Load all-AI game - aitoggle three players AI - human - set timeout 0 - attach client to two of the human players and end turn for them - aitoggle remaining human player back to AI Turn still does not end. Fix attached - ML ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] (PR#39519) [Patch] INSTALL: replace cvs with svn
URL: http://bugs.freeciv.org/Ticket/Display.html?id=39519 On 09/08/07, Marko Lindqvist [EMAIL PROTECTED] wrote: Version control was still referenced as cvs in a couple of places in INSTALL. More sensible dates to trunk and S2_1 versions. - ML diff -Nurd -X.diff_ignore freeciv/INSTALL freeciv/INSTALL --- freeciv/INSTALL 2007-08-04 18:39:15.0 +0300 +++ freeciv/INSTALL 2007-08-11 01:02:42.0 +0300 @@ -2,8 +2,9 @@ Installing Freeciv: === -This file describes how to compile and install Freeciv. This file is -last updated 18-Mar-07. +This file describes how to compile and install Freeciv. Last time we +made sure this file is up to date was 16-Jul-06. +Last minor update was 10-Aug-07. There may be a localized version of this file in the ./doc directory, named INSTALL.locale (e.g., INSTALL.de). @@ -66,7 +67,7 @@ Officially released versions of Freeciv are designed to have makefiles which work with most make programs. Development releases - and CVS snapshots contain things (like dependencies) which use + and svn snapshots contain things (like dependencies) which use gmake's enhanced features, so gmake is necessary for development, unless you give configure the --disable-cvs-deps option. See the section below for more information. @@ -278,7 +279,7 @@ 2. Generating Makefiles === -This section contains two parts, one for generating makefiles from CVS +This section contains two parts, one for generating makefiles from svn versions and one for generating makefiles from release versions. 2a. Generating the Makefile for svn versions: @@ -680,7 +681,7 @@ These things have to be put to a place where your compiler will find it. Autoconf and co: -If you build from cvs, you will have to replace ./configure with ./autogen.sh +If you build from svn, you will have to replace ./configure with ./autogen.sh in the following lines. Configuring the source: diff -Nurd -X.diff_ignore freeciv/INSTALL freeciv/INSTALL --- freeciv/INSTALL 2007-03-05 19:14:36.0 +0200 +++ freeciv/INSTALL 2007-08-11 01:01:18.0 +0300 @@ -2,8 +2,9 @@ Installing Freeciv: === -This file describes how to compile and install Freeciv. This file is -last updated 16-Jul-06. +This file describes how to compile and install Freeciv. Last time we +made sure this file is up to date was 16-Jul-06. +Last minor update was 10-Aug-07. There may be a localized version of this file in the ./doc directory, named INSTALL.locale (e.g., INSTALL.de). @@ -65,7 +66,7 @@ Officially released versions of Freeciv are designed to have makefiles which work with most make programs. Development releases - and CVS snapshots contain things (like dependencies) which use + and svn snapshots contain things (like dependencies) which use gmake's enhanced features, so gmake is necessary for development, unless you give configure the --disable-cvs-deps option. See the section below for more information. @@ -243,7 +244,7 @@ 2. Generating Makefiles === -This section contains two parts, one for generating makefiles from CVS +This section contains two parts, one for generating makefiles from svn versions and one for generating makefiles from release versions. 2a. Generating the Makefile for svn versions: @@ -645,7 +646,7 @@ These things have to be put to a place where your compiler will find it. Autoconf and co: -If you build from cvs, you will have to replace ./configure with ./autogen.sh +If you build from svn, you will have to replace ./configure with ./autogen.sh in the following lines. Configuring the source: ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
