[Freeciv-Dev] beta version notices

[David Pfitzner <dwp@xxxxxxxxxxxxxx>]

This patch cleans up the printing of beta version notices
(which was used before the release of 1.7) so that they
are now controlled by a define IS_BETA_VERSION, in
configure.in (and also in shared.h, for non-configure builds).

-- David

diff -u -r --exclude-from exclude_auto freeciv-cvs/acconfig.h 
freeciv-mod/acconfig.h
--- freeciv-cvs/acconfig.h      Sat Nov 21 18:40:00 1998
+++ freeciv-mod/acconfig.h      Sun Feb 28 10:47:39 1999
@@ -16,6 +16,7 @@
 #undef MAJOR_VERSION
 #undef MINOR_VERSION
 #undef PATCH_VERSION
+#undef IS_BETA_VERSION
 #undef VERSION_STRING
 #undef FREECIV_DATADIR
 #undef HAVE_LIBICE
diff -u -r --exclude-from exclude_auto freeciv-cvs/client/Freeciv.h 
freeciv-mod/client/Freeciv.h
--- freeciv-cvs/client/Freeciv.h        Wed Feb 24 20:20:31 1999
+++ freeciv-mod/client/Freeciv.h        Sun Feb 28 11:02:06 1999
@@ -50,8 +50,8 @@
 "Freeciv*connectdialog.*.cquitc.fromHoriz: cmetac",
 "Freeciv*connectdialog.*.cbetaline.label: \
 THIS IS A BETA RELEASE\\n\
-Freeciv 1.7 will be released\\n\
-August 5 at http://www.freeciv.org";,
+Freeciv 1.8 will be released\\n\
+<sometime> at http://www.freeciv.org";,
 "Freeciv*connectdialog.*.cbetaline.fromVert: cconnectc",
 "Freeciv*connectdialog.*.cbetaline.justify: left",
 "Freeciv*connectdialog.*.cbetaline.background: grey",
diff -u -r --exclude-from exclude_auto freeciv-cvs/client/connectdlg.c 
freeciv-mod/client/connectdlg.c
--- freeciv-cvs/client/connectdlg.c     Mon Nov 16 21:56:55 1998
+++ freeciv-mod/client/connectdlg.c     Sun Feb 28 10:48:14 1999
@@ -80,7 +80,7 @@
   metaw=XtVaCreateManagedWidget("cmetac", commandWidgetClass, form, NULL);
   quitw=XtVaCreateManagedWidget("cquitc", commandWidgetClass, form, NULL); 
 
-  if (MINOR_VERSION < 7)
+  if (IS_BETA_VERSION)
     label2=XtVaCreateManagedWidget("cbetaline", labelWidgetClass, form, NULL);
 
   XtAddCallback(connw, XtNcallback, connect_callback, NULL);
diff -u -r --exclude-from exclude_auto freeciv-cvs/common/shared.h 
freeciv-mod/common/shared.h
--- freeciv-cvs/common/shared.h Tue Feb 16 21:50:57 1999
+++ freeciv-mod/common/shared.h Sun Feb 28 11:06:17 1999
@@ -24,10 +24,11 @@
 #define MINOR_VERSION  7
 #define PATCH_VERSION  2
 #define VERSION_STRING "1.7.2"
+#define IS_BETA_VERSION 0
 
 #endif /* HAVE_CONFIG_H */
 
-#if MINOR_VERSION < 7
+#if IS_BETA_VERSION
 #define FREECIV_NAME_VERSION "Freeciv version "##VERSION_STRING" (beta 
release)"
 #define WORD_VERSION "betatest version"
 #else
diff -u -r --exclude-from exclude_auto freeciv-cvs/configure.in 
freeciv-mod/configure.in
--- freeciv-cvs/configure.in    Sat Feb 27 12:33:57 1999
+++ freeciv-mod/configure.in    Sun Feb 28 11:06:07 1999
@@ -16,6 +16,7 @@
 MAJOR_VERSION=1
 MINOR_VERSION=7
 PATCH_VERSION=2
+IS_BETA_VERSION=0
 
 VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${PATCH_VERSION}
 
@@ -29,6 +30,7 @@
 AC_DEFINE_UNQUOTED(MINOR_VERSION, $MINOR_VERSION)
 AC_DEFINE_UNQUOTED(PATCH_VERSION, $PATCH_VERSION)
 AC_DEFINE_UNQUOTED(VERSION_STRING, 
"${MAJOR_VERSION}.${MINOR_VERSION}.${PATCH_VERSION}")
+AC_DEFINE_UNQUOTED(IS_BETA_VERSION, $IS_BETA_VERSION)
 
 dnl Initialize automake stuff
 AM_INIT_AUTOMAKE($PACKAGE, $VERSION)
diff -u -r --exclude-from exclude_auto freeciv-cvs/data/Freeciv 
freeciv-mod/data/Freeciv
--- freeciv-cvs/data/Freeciv    Wed Feb 24 20:20:31 1999
+++ freeciv-mod/data/Freeciv    Sun Feb 28 10:50:19 1999
@@ -79,8 +79,8 @@
 
 Freeciv*connectdialog.*.cbetaline.label: \
 THIS IS A BETA RELEASE\n\
-Freeciv 1.7 will be released\n\
-August 5 at http://www.freeciv.org
+Freeciv 1.8 will be released\n\
+<sometime> at http://www.freeciv.org
 Freeciv*connectdialog.*.cbetaline.fromVert: cconnectc
 Freeciv*connectdialog.*.cbetaline.justify: left
 Freeciv*connectdialog.*.cbetaline.background: grey
diff -u -r --exclude-from exclude_auto freeciv-cvs/server/civserver.c 
freeciv-mod/server/civserver.c
--- freeciv-cvs/server/civserver.c      Tue Feb 16 21:50:57 1999
+++ freeciv-mod/server/civserver.c      Sun Feb 28 10:49:22 1999
@@ -242,8 +242,8 @@
   gamelog(GAMELOG_NORMAL,"Starting new log");
   
   printf(FREECIV_NAME_VERSION " server\n");
-#if MINOR_VERSION < 7
-  printf("Freeciv 1.7 will be released on August 5 from 
http://www.freeciv.org\n";);
+#if IS_BETA_VERSION
+  printf("Freeciv 1.8 will be released <sometime> at 
http://www.freeciv.org\n";);
 #endif
   fflush(stdout);
 
diff -u -r --exclude-from exclude_auto freeciv-cvs/server/meta.h 
freeciv-mod/server/meta.h
--- freeciv-cvs/server/meta.h   Tue Dec 22 20:32:42 1998
+++ freeciv-mod/server/meta.h   Sun Feb 28 10:49:51 1999
@@ -28,7 +28,7 @@
 #define        METASERVER_PORT 12245
 #define        METASERVER_ADDR "platinum.daimi.aau.dk"
 #define METASERVER_UPDATE_INTERVAL 3*60
-#if MINOR_VERSION < 7
+#if IS_BETA_VERSION
 #  define DEFAULT_META_SERVER_INFO_STRING "unstable pre-1.8: beware"
 #else
 #  define DEFAULT_META_SERVER_INFO_STRING "(default)"