Author: cazfi
Date: Thu Jan 1 23:25:16 2015
New Revision: 27475
URL: http://svn.gna.org/viewcvs/freeciv?rev=27475&view=rev
Log:
Prepared trunk for 3.0 development.
See patch #4759
Modified:
trunk/doc/BUGS
trunk/doc/README
trunk/doc/README.packaging
trunk/doc/README.ruleset_civ2civ3
trunk/doc/README.rulesets
trunk/doc/README.tilesets
trunk/fc_version
trunk/server/savecompat.c
trunk/tools/ruledit/rulesave.c
trunk/translations/Strings.txt
trunk/win32/installer/Makefile
Modified: trunk/doc/BUGS
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/doc/BUGS?rev=27475&r1=27474&r2=27475&view=diff
==============================================================================
--- trunk/doc/BUGS (original)
+++ trunk/doc/BUGS Thu Jan 1 23:25:16 2015
@@ -2,7 +2,7 @@
BUGS
====
-Freeciv 2.6 certainly contains some bugs. Please report all
+Freeciv 3.0 certainly contains some bugs. Please report all
you find to http://gna.org/bugs/?func=additem&group=freeciv.
Modified: trunk/doc/README
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/doc/README?rev=27475&r1=27474&r2=27475&view=diff
==============================================================================
--- trunk/doc/README (original)
+++ trunk/doc/README Thu Jan 1 23:25:16 2015
@@ -1,5 +1,5 @@
===================
-Freeciv Version 2.6
+Freeciv Version 3.0
===================
Welcome to Freeciv!
Modified: trunk/doc/README.packaging
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/doc/README.packaging?rev=27475&r1=27474&r2=27475&view=diff
==============================================================================
--- trunk/doc/README.packaging (original)
+++ trunk/doc/README.packaging Thu Jan 1 23:25:16 2015
@@ -7,39 +7,16 @@
create Freeciv fork.
----------------------------------------------------------------------
-Updating from 2.5 to 2.6
+Updating from 2.6 to 3.0
------------------------
-* Client uses ~/.freeciv/freeciv-client-rc-2.6 for storing its options.
+* Client uses ~/.freeciv/freeciv-client-rc-3.0 for storing its options.
Options are always saved to that file.
Loading of options first tries to get options from
- ~/.freeciv/freeciv-client-rc-2.6. If that file does not exist it tries to
+ ~/.freeciv/freeciv-client-rc-3.0. If that file does not exist it tries to
load options from old client files generated by former version of Freeciv
- (e.g. ~/.freeciv-client-rc-2.5 generated by Freeciv 2.5 or ~/.civclientrc
- generated by Freeciv version <= 2.1).
-* gtk3-client is now the default client
-* Minimum gtk3 requirement for building gtk3-client is now 3.8.
-* There's new experimental sdl2-client. It can be built with
- --enable-client=sdl2
-* Development of ruleset editor, freeciv-ruledit, has begun.
- It has same Qt5 dependencies as other Qt programs in Freeciv distribution.
-* System lua library is now used by default. Copy of lua distributed
- with freeciv is used only if system lua is not found, or it's
- explicitly requested with configure option --disable-sys-lua
-* There's new configure option --enable-sys-tolua-cmd to use tolua
- command from the build system when generating lua bindings. Plain
- --enable-sys-tolua-cmd searches tolua from the PATH, other values
- are treated as full path to executable. You have to use system
- tolua when cross-compiling.
-* Minimum libtool version is now 1.5.2
-* For translation support minimum gettext version is now 0.14. It's
- still possible to build completely without translation support
- with configure option --disable-nls
-* SDL2-mixer is now the default. To build clients to still use
- SDL1.2-mixer, configure with --enable-sdlmixer=sdl1.2. sdl-client
- cannot be built with SDL2-mixer, nor can sdl2-client be built with
- SDL1.2-mixer
-* Server now saves its readline history to file
- "~/.freeciv/freeciv-server_history" instead of "~/.freeciv-server_history"
+ (e.g. ~/.freeciv/freeciv-client-rc-2.6 generated by Freeciv 2.6,
+ ~/.freeciv-client-rc-2.5 generated by Freeciv 2.5,
+ or ~/.civclientrc generated by Freeciv version <= 2.1).
----------------------------------------------------------------------
Compatibility of modified versions
@@ -108,7 +85,7 @@
This is list of files Freeciv might generate to filesystem when running.
You may want to remove some of these when Freeciv is uninstalled.
-* Client saves its options to file "~/.freeciv/freeciv-client-rc-2.6"
+* Client saves its options to file "~/.freeciv/freeciv-client-rc-3.0"
* Server saves its readline history to file "~/.freeciv/freeciv-server_history"
* When running local single player games, challenge files with name
like "~/.freeciv/challenge_*_*" are generated
@@ -117,7 +94,7 @@
* When saving game in independently launched server, savegames go
to directory specified with "-s" command line option, defaulting
to working directory
-* freeciv-modpack saves data under "~/.freeciv/2.6/" and
+* freeciv-modpack saves data under "~/.freeciv/3.0/" and
"~/.freeciv/scenarios/"
* Server can write log to file specified with "-l" command line option
* When mapimage feature is used, it can save colortest images to
@@ -174,4 +151,4 @@
compatible servers.
Any a.b.c release is network compatible with any a.b.d release. If you
-provide 2.6.c client, it can be used to play on 2.6.d server.
+provide 3.0.c client, it can be used to play on 3.0.d server.
Modified: trunk/doc/README.ruleset_civ2civ3
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/doc/README.ruleset_civ2civ3?rev=27475&r1=27474&r2=27475&view=diff
==============================================================================
--- trunk/doc/README.ruleset_civ2civ3 (original)
+++ trunk/doc/README.ruleset_civ2civ3 Thu Jan 1 23:25:16 2015
@@ -1,6 +1,6 @@
==========================================================
-Civ2Civ3 Ruleset for Freeciv v2.6 (Updated 30-Nov-2014)
+Civ2Civ3 Ruleset for Freeciv v3.0 (Updated 30-Nov-2014)
==========================================================
Modified: trunk/doc/README.rulesets
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/doc/README.rulesets?rev=27475&r1=27474&r2=27475&view=diff
==============================================================================
--- trunk/doc/README.rulesets (original)
+++ trunk/doc/README.rulesets Thu Jan 1 23:25:16 2015
@@ -142,6 +142,8 @@
The URLs below list the differences between the freeciv versions from 2.2.x
to the current version:
+http://www.freeciv.org/wiki/How_to_update_a_ruleset_from_2.6_to_3.0
+
http://www.freeciv.org/wiki/How_to_update_a_ruleset_from_2.5_to_2.6
http://www.freeciv.org/wiki/How_to_update_a_ruleset_from_2.4_to_2.5
Modified: trunk/doc/README.tilesets
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/doc/README.tilesets?rev=27475&r1=27474&r2=27475&view=diff
==============================================================================
--- trunk/doc/README.tilesets (original)
+++ trunk/doc/README.tilesets Thu Jan 1 23:25:16 2015
@@ -17,6 +17,8 @@
The URLs below list the differences between the freeciv versions from 1.14.x
to the current version:
+http://www.freeciv.org/wiki/How_to_update_a_tileset_from_2.6_to_3.0
+
http://www.freeciv.org/wiki/How_to_update_a_tileset_from_2.5_to_2.6
http://www.freeciv.org/wiki/How_to_update_a_tileset_from_2.4_to_2.5
Modified: trunk/fc_version
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/fc_version?rev=27475&r1=27474&r2=27475&view=diff
==============================================================================
--- trunk/fc_version (original)
+++ trunk/fc_version Thu Jan 1 23:25:16 2015
@@ -5,7 +5,7 @@
# Version definition for Freeciv.
MAJOR_VERSION="2"
-MINOR_VERSION="5"
+MINOR_VERSION="90"
PATCH_VERSION="99"
VERSION_LABEL="-dev"
@@ -36,13 +36,13 @@
IS_FREEZE_VERSION=0
IS_BETA_VERSION=0
-NEXT_STABLE_VERSION="2.6.0"
+NEXT_STABLE_VERSION="3.0.0"
# 0 to disable display of release month until we can make better estimate
RELEASE_MONTH=0
DATASUBDIR=dev
-DEFAULT_FOLLOW_TAG=S2_6
+DEFAULT_FOLLOW_TAG=S3_0
# Freeciv network capstring: see documentation in common/capstr.c
#
@@ -54,7 +54,7 @@
# - Avoid adding a new mandatory capability to the development branch for
# as long as possible. We want to maintain network compatibility with
# the stable branch for as long as possible.
-NETWORK_CAPSTRING_MANDATORY="+Freeciv.Devel-2.6-2014.Dec.31b"
+NETWORK_CAPSTRING_MANDATORY="+Freeciv.Devel-3.0-2015.Jan.02"
NETWORK_CAPSTRING_OPTIONAL=""
FREECIV_DISTRIBUTOR=""
Modified: trunk/server/savecompat.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/server/savecompat.c?rev=27475&r1=27474&r2=27475&view=diff
==============================================================================
--- trunk/server/savecompat.c (original)
+++ trunk/server/savecompat.c Thu Jan 1 23:25:16 2015
@@ -62,13 +62,15 @@
| * save player color | |
| * "known" info format change | |
2.5.0 | 2.5.0 release | 201./../.. | 20
- 2.6.0 | 2.6.0 release (development) | 201./../.. | 30
+ 2.6.0 | 2.6.0 release | 201./../.. | 30
+ 3.0.0 | 3.0.0 release (development) | 201./../.. | 40
| | |
*/
static void compat_load_020400(struct loaddata *loading);
static void compat_load_020500(struct loaddata *loading);
static void compat_load_020600(struct loaddata *loading);
+static void compat_load_030000(struct loaddata *loading);
typedef void (*load_version_func_t) (struct loaddata *loading);
@@ -87,8 +89,8 @@
* add the needed code to load the old version below. Thus, old
* savegames can still be loaded while the main definition
* represents the current state of the art. */
-/* While developing freeciv 2.6.0, add the compatibility functions to
- * - compat_load_020600 to load old savegame. */
+/* While developing freeciv 3.0.0, add the compatibility functions to
+ * - compat_load_030000 to load old savegame. */
static struct compatibility compat[] = {
/* dummy; equal to the current version (last element) */
{ 0, NULL },
@@ -102,6 +104,8 @@
{ 20, compat_load_020500 },
/* version 21 to 29 are reserved for possible changes in 2.5.x */
{ 30, compat_load_020600 },
+ /* version 31 to 39 are reserved for possible changes in 2.6.x */
+ { 40, compat_load_030000 },
/* Current savefile version is listed above this line; it corresponds to
the definitions in this file. */
};
@@ -947,6 +951,17 @@
}
/****************************************************************************
+ Translate savegame secfile data from 2.6.x to 3.0.0 format.
+****************************************************************************/
+static void compat_load_030000(struct loaddata *loading)
+{
+ /* Check status and return if not OK (sg_success != TRUE). */
+ sg_check_ret();
+
+ log_debug("Upgrading data from savegame to version 3.0.0");
+}
+
+/****************************************************************************
Convert old ai level value to ai_level
****************************************************************************/
enum ai_level ai_level_convert(int old_level)
Modified: trunk/tools/ruledit/rulesave.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/tools/ruledit/rulesave.c?rev=27475&r1=27474&r2=27475&view=diff
==============================================================================
--- trunk/tools/ruledit/rulesave.c (original)
+++ trunk/tools/ruledit/rulesave.c Thu Jan 1 23:25:16 2015
@@ -36,7 +36,11 @@
#include "rulesave.h"
/* Ruleset format version */
-#define FORMAT_VERSION 1
+/*
+ * 1 - Freeciv-2.6
+ * 10 - Freeciv-3.0
+ */
+#define FORMAT_VERSION 10
/**************************************************************************
Create new ruleset section file with common header.
Modified: trunk/translations/Strings.txt
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/translations/Strings.txt?rev=27475&r1=27474&r2=27475&view=diff
==============================================================================
--- trunk/translations/Strings.txt (original)
+++ trunk/translations/Strings.txt Thu Jan 1 23:25:16 2015
@@ -11,10 +11,11 @@
/* TRANS: Version tag name received from metaserver */
_("?vertag:stable")
_("?vertag:win32")
-_("?vertag:S2_5")
_("?vertag:S2_6")
+_("?vertag:S3_0")
_("?vertag:crosser")
_("?vertag:win32-S2_6")
+_("?vertag:win32-S3_0")
Generated version header
Modified: trunk/win32/installer/Makefile
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/win32/installer/Makefile?rev=27475&r1=27474&r2=27475&view=diff
==============================================================================
--- trunk/win32/installer/Makefile (original)
+++ trunk/win32/installer/Makefile Thu Jan 1 23:25:16 2015
@@ -50,7 +50,7 @@
# create build directory
mkdir -p build-$(GUI)
# configure
- cd build-$(GUI); ../../../configure --enable-client=$(GUI)
--with-followtag="win32-S2_6" --enable-fcdb=sqlite3 --enable-fcmp=$(FCMP)
$(EXTRA_CONFIG)
+ cd build-$(GUI); ../../../configure --enable-client=$(GUI)
--with-followtag="win32-S3_0" --enable-fcdb=sqlite3 --enable-fcmp=$(FCMP)
$(EXTRA_CONFIG)
# make
make -C build-$(GUI)
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
