Author: cazfi
Date: Sun Jan 1 23:16:43 2017
New Revision: 34757
URL: http://svn.gna.org/viewcvs/freeciv?rev=34757&view=rev
Log:
Prepared trunk for 3.1 development.
See patch #7760
Modified:
trunk/data/civ2civ3/README.civ2civ3
trunk/doc/BUGS
trunk/doc/README
trunk/doc/README.packaging
trunk/doc/README.rulesets
trunk/doc/README.tilesets
trunk/fc_version
trunk/server/rscompat.h
trunk/server/savecompat.c
trunk/translations/Strings.txt
trunk/windows/installer_legacy/Makefile
trunk/windows/installer_msys2/Makefile
Modified: trunk/data/civ2civ3/README.civ2civ3
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/civ2civ3/README.civ2civ3?rev=34757&r1=34756&r2=34757&view=diff
==============================================================================
--- trunk/data/civ2civ3/README.civ2civ3 (original)
+++ trunk/data/civ2civ3/README.civ2civ3 Sun Jan 1 23:16:43 2017
@@ -1,5 +1,5 @@
=======================================================
-Civ2Civ3 Ruleset for Freeciv v3.0 (Updated 16-Mar-2015)
+Civ2Civ3 Ruleset for Freeciv v3.1 (Updated 16-Mar-2015)
=======================================================
Modified: trunk/doc/BUGS
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/doc/BUGS?rev=34757&r1=34756&r2=34757&view=diff
==============================================================================
--- trunk/doc/BUGS (original)
+++ trunk/doc/BUGS Sun Jan 1 23:16:43 2017
@@ -2,7 +2,7 @@
BUGS
====
-Freeciv 3.0 certainly contains some bugs. Please report all
+Freeciv 3.1 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=34757&r1=34756&r2=34757&view=diff
==============================================================================
--- trunk/doc/README (original)
+++ trunk/doc/README Sun Jan 1 23:16:43 2017
@@ -1,5 +1,5 @@
===================
-Freeciv Version 3.0
+Freeciv Version 3.1
===================
Welcome to Freeciv!
Modified: trunk/doc/README.packaging
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/doc/README.packaging?rev=34757&r1=34756&r2=34757&view=diff
==============================================================================
--- trunk/doc/README.packaging (original)
+++ trunk/doc/README.packaging Sun Jan 1 23:16:43 2017
@@ -7,39 +7,16 @@
create Freeciv fork.
----------------------------------------------------------------------
-Updating from 2.6 to 3.0
+Updating from 3.0 to 3.1
------------------------
-* Client uses ~/.freeciv/freeciv-client-rc-3.0 for storing its options.
+* Client uses ~/.freeciv/freeciv-client-rc-3.1 for storing its options.
Options are always saved to that file.
Loading of options first tries to get options from
- ~/.freeciv/freeciv-client-rc-3.0. If that file does not exist it tries to
+ ~/.freeciv/freeciv-client-rc-3.1. If that file does not exist it tries to
load options from old client files generated by former version of Freeciv
- (e.g. ~/.freeciv/freeciv-client-rc-2.6 generated by Freeciv 2.6,
- ~/.freeciv-client-rc-2.5 generated by Freeciv 2.5,
+ (e.g. ~/.freeciv/freeciv-client-rc-3.0 generated by Freeciv 3.0,
+ ~/.freeciv-client-rc-2.6 generated by Freeciv 2.6,
or ~/.civclientrc generated by Freeciv version <= 2.1).
-* Minimum autoconf version is now 2.65, automake 1.11.2
-* Tinycthreads can be used as threading implementation. Copy of tinycthreads
- can be compiled in to freeciv by configuring with --with-tinycthread.
-* libicu is a new hard requirement
-* Minimum gettext version is now 0.15
-* Support for project definition file added for freeciv forks to define for
- themselves. This has obsoleted old --with-modlist configure option.
- See chapter "Project definition file" below.
-* gtk3.22-client is now the default
-* Xaw-client has been dropped completely
-* Sdl-client has been dropped completely
-* Minimum libcurl version is now 7.15.4
-* Minimum libtool version is now 2.2
-* Minimum gtk3 requirement for building gtk3-client is now 3.10
-* Added gtk3x-client. The difference between gtk3-client and gtk3x-client is
- that latter is adjusted for, and depends on, as new gtk3 version as
- possible. Once gtk4 gets released, this client is turned to gtk4-client.
-* Gtk2-client is no longer considered maintained client
-* --enable-ipv6 now defaults to strict 'yes' (it used to just 'test')
- One has to explicitly allow IPv4-only builds with --enable-ipv6=test or
- --disable-ipv6.
-* Threaded AI module gets statically linked in by default, if threading
- implementation supports it.
----------------------------------------------------------------------
Compatibility of modified versions
@@ -128,7 +105,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-3.0"
+* Client saves its options to file "~/.freeciv/freeciv-client-rc-3.1"
* 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
@@ -137,7 +114,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/3.0/" and
+* freeciv-modpack saves data under "~/.freeciv/3.1/" 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
@@ -196,4 +173,4 @@
compatible servers.
Any a.b.c release is network compatible with any a.b.d release. If you
-provide 3.0.c client, it can be used to play on 3.0.d server.
+provide 3.1.c client, it can be used to play on 3.1.d server.
Modified: trunk/doc/README.rulesets
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/doc/README.rulesets?rev=34757&r1=34756&r2=34757&view=diff
==============================================================================
--- trunk/doc/README.rulesets (original)
+++ trunk/doc/README.rulesets Sun Jan 1 23:16:43 2017
@@ -145,6 +145,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_3.0_to_3.1
+
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
Modified: trunk/doc/README.tilesets
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/doc/README.tilesets?rev=34757&r1=34756&r2=34757&view=diff
==============================================================================
--- trunk/doc/README.tilesets (original)
+++ trunk/doc/README.tilesets Sun Jan 1 23:16:43 2017
@@ -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_3.0_to_3.1
+
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
Modified: trunk/fc_version
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/fc_version?rev=34757&r1=34756&r2=34757&view=diff
==============================================================================
--- trunk/fc_version (original)
+++ trunk/fc_version Sun Jan 1 23:16:43 2017
@@ -5,9 +5,9 @@
# Version definition for Freeciv.
-MAJOR_VERSION="2"
-MINOR_VERSION="92"
-PATCH_VERSION="99"
+MAJOR_VERSION="3"
+MINOR_VERSION="0"
+PATCH_VERSION="90"
EMERGENCY_VERSION=""
VERSION_LABEL="-dev"
@@ -38,13 +38,13 @@
IS_FREEZE_VERSION=0
IS_BETA_VERSION=0
-NEXT_STABLE_VERSION="3.0.0"
+NEXT_STABLE_VERSION="3.1.0"
# 0 to disable display of release month until we can make better estimate
RELEASE_MONTH=0
DATASUBDIR=dev
-DEFAULT_FOLLOW_TAG=S3_0
+DEFAULT_FOLLOW_TAG=S3_1
# Freeciv network capstring: see documentation in common/capstr.c
#
@@ -56,7 +56,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-3.0-2016.Nov.13"
+NETWORK_CAPSTRING_MANDATORY="+Freeciv.Devel-3.1-2017.Jan.02"
NETWORK_CAPSTRING_OPTIONAL=""
FREECIV_DISTRIBUTOR=""
Modified: trunk/server/rscompat.h
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/server/rscompat.h?rev=34757&r1=34756&r2=34757&view=diff
==============================================================================
--- trunk/server/rscompat.h (original)
+++ trunk/server/rscompat.h Sun Jan 1 23:16:43 2017
@@ -20,7 +20,7 @@
/* utility */
#include "support.h"
-#define RULESET_COMPAT_CAP "+Freeciv-2.6-ruleset"
+#define RULESET_COMPAT_CAP "+Freeciv-ruleset-Devel-2015.January.14"
struct rscompat_info
{
Modified: trunk/server/savecompat.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/server/savecompat.c?rev=34757&r1=34756&r2=34757&view=diff
==============================================================================
--- trunk/server/savecompat.c (original)
+++ trunk/server/savecompat.c Sun Jan 1 23:16:43 2017
@@ -63,7 +63,8 @@
| * "known" info format change | |
2.5.0 | 2.5.0 release | 201./../.. | 20
2.6.0 | 2.6.0 release | 201./../.. | 30
- 3.0.0 | 3.0.0 release (development) | 201./../.. | 40
+ 3.0.0 | 3.0.0 release | 201./../.. | 40
+ 3.1.0 | 3.0.0 release (development) | 201./../.. | 50
| | |
*/
@@ -71,6 +72,7 @@
static void compat_load_020500(struct loaddata *loading);
static void compat_load_020600(struct loaddata *loading);
static void compat_load_030000(struct loaddata *loading);
+static void compat_load_030100(struct loaddata *loading);
#ifdef FREECIV_DEV_SAVE_COMPAT
static void compat_load_dev(struct loaddata *loading);
@@ -93,8 +95,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 3.0.0, add the compatibility functions to
- * - compat_load_030000 to load old savegame. */
+/* While developing freeciv 3.1.0, add the compatibility functions to
+ * - compat_load_030100 to load old savegame. */
static struct compatibility compat[] = {
/* dummy; equal to the current version (last element) */
{ 0, NULL },
@@ -110,6 +112,8 @@
{ 30, compat_load_020600 },
/* version 31 to 39 are reserved for possible changes in 2.6.x */
{ 40, compat_load_030000 },
+ /* version 41 to 49 are reserved for possible changes in 3.0.x */
+ { 50, compat_load_030100 },
/* Current savefile version is listed above this line; it corresponds to
the definitions in this file. */
};
@@ -163,7 +167,6 @@
compat_load_dev(loading);
}
#endif /* FREECIV_DEV_SAVE_COMPAT */
-
}
/****************************************************************************
@@ -1309,6 +1312,20 @@
secfile_replace_int(loading->file, num_settings, "settings.set_count");
}
+/****************************************************************************
+ Translate savegame secfile data from 3.0.x to 3.1.0 format.
+ Note that even after 2.6 savegame has gone through all the compatibility
+ functions, it's still 2.6 savegame in the sense that savegame2.c, and not
+ savegame3.c, handles it.
+****************************************************************************/
+static void compat_load_030100(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.1.0");
+}
+
#ifdef FREECIV_DEV_SAVE_COMPAT_3_0
static const char num_chars[] =
"0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ_-+";
Modified: trunk/translations/Strings.txt
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/translations/Strings.txt?rev=34757&r1=34756&r2=34757&view=diff
==============================================================================
--- trunk/translations/Strings.txt (original)
+++ trunk/translations/Strings.txt Sun Jan 1 23:16:43 2017
@@ -12,11 +12,11 @@
_("?vertag:stable")
_("?vertag:windows")
_("?vertag:win32")
-_("?vertag:S2_6")
_("?vertag:S3_0")
+_("?vertag:S3_1")
_("?vertag:crosser")
-_("?vertag:win32-S2_6")
_("?vertag:windows-S3_0")
+_("?vertag:windows-S3_1")
Generated version header
Modified: trunk/windows/installer_legacy/Makefile
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/windows/installer_legacy/Makefile?rev=34757&r1=34756&r2=34757&view=diff
==============================================================================
--- trunk/windows/installer_legacy/Makefile (original)
+++ trunk/windows/installer_legacy/Makefile Sun Jan 1 23:16:43 2017
@@ -61,7 +61,7 @@
# create build directory
mkdir -p build-$(GUI)
# configure
- cd build-$(GUI); ../../../configure
CPPFLAGS="-D_WIN32_WINNT=$(MIN_WIN_VER)" --enable-client=$(GUI)
--with-followtag="windows-S3_0" --enable-fcdb=sqlite3 --enable-fcmp=$(FCMP)
$(EXTRA_CONFIG)
+ cd build-$(GUI); ../../../configure
CPPFLAGS="-D_WIN32_WINNT=$(MIN_WIN_VER)" --enable-client=$(GUI)
--with-followtag="windows-S3_1" --enable-fcdb=sqlite3 --enable-fcmp=$(FCMP)
$(EXTRA_CONFIG)
# make
make -C build-$(GUI)
make -C build-$(GUI)/translations/core update-po
Modified: trunk/windows/installer_msys2/Makefile
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/windows/installer_msys2/Makefile?rev=34757&r1=34756&r2=34757&view=diff
==============================================================================
--- trunk/windows/installer_msys2/Makefile (original)
+++ trunk/windows/installer_msys2/Makefile Sun Jan 1 23:16:43 2017
@@ -78,7 +78,7 @@
# create build directory
mkdir -p build-$(WINARCH)-$(GUI)
# configure
- cd build-$(WINARCH)-$(GUI); ../../../configure
FREECIV_LABEL_FORCE="<base>-msys2" CPPFLAGS="-D_WIN32_WINNT=$(MIN_WIN_VER)"
--with-project-definition=../../../bootstrap/snapshot.project
--enable-client=$(GUI) --with-followtag="windows-S3_0" --with-tinycthread
--without-readline --enable-fcdb=sqlite3 --with-sqlite3-prefix=/$(ARCHDIR)
--enable-fcmp=$(FCMP) $(EXTRA_CONFIG)
+ cd build-$(WINARCH)-$(GUI); ../../../configure
FREECIV_LABEL_FORCE="<base>-msys2" CPPFLAGS="-D_WIN32_WINNT=$(MIN_WIN_VER)"
--with-project-definition=../../../bootstrap/snapshot.project
--enable-client=$(GUI) --with-followtag="windows-S3_1" --with-tinycthread
--without-readline --enable-fcdb=sqlite3 --with-sqlite3-prefix=/$(ARCHDIR)
--enable-fcmp=$(FCMP) $(EXTRA_CONFIG)
# make
make -C build-$(WINARCH)-$(GUI)
make -C build-$(WINARCH)-$(GUI)/translations/core update-po
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
