fly/flightgear
1
0
Fork 0
Code Activity

Attempt to sort out the version number mess in preparation for the v1.9.0

Browse source 
release.
This commit is contained in:
curt 2008-12-19 20:41:57 +00:00
parent 29be38ed2a
commit 231225da67
5 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
configure.ac
View file

@ -10,7 +10,7 @@ AC_PREREQ(2.52)
dnl Initialize the automake stuff dnl Initialize the automake stuff
dnl set the $host variable based on local machine/os dnl set the $host variable based on local machine/os
AC_CANONICAL_TARGET AC_CANONICAL_TARGET
AM_INIT_AUTOMAKE(FlightGear, 1.99.5-rc2) AM_INIT_AUTOMAKE(FlightGear, 1.9.0)
dnl Checks for programs. dnl Checks for programs.
AC_PROG_MAKE_SET AC_PROG_MAKE_SET
@ -395,7 +395,7 @@ if test "x$ac_cv_header_simgear_version_h" != "xyes"; then
exit exit
fi fi
AC_MSG_CHECKING([for SimGear 1.99.5 or newer]) AC_MSG_CHECKING([for SimGear 1.9.0 or newer])
AC_TRY_RUN([ AC_TRY_RUN([
#include <stdio.h> #include <stdio.h>
@ -405,8 +405,8 @@ AC_TRY_RUN([
#define XSTRINGIFY(X) #X #define XSTRINGIFY(X) #X
#define MIN_MAJOR 1 #define MIN_MAJOR 1
#define MIN_MINOR 99 #define MIN_MINOR 9
#define MIN_MICRO 5 #define MIN_MICRO 0
int main() { int main() {
int major, minor, micro; int major, minor, micro;

4
src/Include/config.h-msvc6
View file

@ -46,7 +46,7 @@
#define PACKAGE "FlightGear" #define PACKAGE "FlightGear"
/* Define to package version - use in main.cxx */ /* Define to package version - use in main.cxx */
#define FLIGHTGEAR_VERSION "MSVC6-WIN32-1.99.5" #define FLIGHTGEAR_VERSION "MSVC6-WIN32-1.9.0"
/* Define as the return type of signal handlers (int or void). */ /* Define as the return type of signal handlers (int or void). */
#define RETSIGTYPE void #define RETSIGTYPE void
@ -64,7 +64,7 @@
#define TM_IN_SYS_TIME 1 #define TM_IN_SYS_TIME 1
/* Define to version number */ /* Define to version number */
#define VERSION "1.99.5" #define VERSION "1.9.0"
/* Define if compiling on a Winbloze (95, NT, etc.) platform */ /* Define if compiling on a Winbloze (95, NT, etc.) platform */
#define WIN32 1 #define WIN32 1

4
src/Include/config.h-msvc71
View file

@ -19,7 +19,7 @@
#define PACKAGE "FlightGear" #define PACKAGE "FlightGear"
/* Define to package version - use in main.cxx */ /* Define to package version - use in main.cxx */
#define FLIGHTGEAR_VERSION "MSVC7.1-WIN32-1.99.5" #define FLIGHTGEAR_VERSION "MSVC7.1-WIN32-1.9.0"
/* Define as the return type of signal handlers (int or void). */ /* Define as the return type of signal handlers (int or void). */
#define RETSIGTYPE void #define RETSIGTYPE void
@ -37,7 +37,7 @@
#define TM_IN_SYS_TIME 1 #define TM_IN_SYS_TIME 1
/* Define to version number */ /* Define to version number */
#define VERSION "1.99.5" #define VERSION "1.9.0"
#ifndef FG_VERSION /* allow override */ #ifndef FG_VERSION /* allow override */
#define FG_VERSION 7 #define FG_VERSION 7
#endif /* FG_VERSION */ #endif /* FG_VERSION */

4
src/Include/config.h-msvc8
View file

@ -50,7 +50,7 @@
#define PACKAGE "FlightGear" #define PACKAGE "FlightGear"
/* Define to package version - use in main.cxx */ /* Define to package version - use in main.cxx */
#define FLIGHTGEAR_VERSION "MSVC8-WIN32-1.99.5" #define FLIGHTGEAR_VERSION "MSVC8-WIN32-1.9.0"
/* Define as the return type of signal handlers (int or void). */ /* Define as the return type of signal handlers (int or void). */
#define RETSIGTYPE void #define RETSIGTYPE void
@ -68,7 +68,7 @@
#define TM_IN_SYS_TIME 1 #define TM_IN_SYS_TIME 1
/* Define to version number */ /* Define to version number */
#define VERSION "1.99.5" #define VERSION "1.9.0"
/* Define if compiling on a Winbloze (95, NT, etc.) platform */ /* Define if compiling on a Winbloze (95, NT, etc.) platform */
#define WIN32 1 #define WIN32 1

2
src/Main/main.cxx
View file

@ -1016,7 +1016,7 @@ bool fgMainInit( int argc, char **argv ) {
fgInitFGRoot(argc, argv); fgInitFGRoot(argc, argv);
// Check for the correct base package version // Check for the correct base package version
static char required_version[] = "1.99.5"; static char required_version[] = "1.9.0";
string base_version = fgBasePackageVersion(); string base_version = fgBasePackageVersion();
if ( !(base_version == required_version) ) { if ( !(base_version == required_version) ) {
// tell the operator how to use this application // tell the operator how to use this application