From e8ff28f9f8ed16098738aa1aa6a7b6a067d56542 Mon Sep 17 00:00:00 2001 From: curt Date: Thu, 30 Oct 2008 18:35:44 +0000 Subject: [PATCH] Tidy up for a source code "snapshot" release. --- FlightGear.dsp | 45 ++++++++++++++++++--------- NEWS | 4 +++ configure.ac | 14 ++++----- src/FDM/ExternalPipe/ExternalPipe.cxx | 1 + src/Include/config.h-msvc6 | 4 +-- src/Include/config.h-msvc71 | 4 +-- src/Include/config.h-msvc8 | 4 +-- src/Main/main.cxx | 2 +- 8 files changed, 49 insertions(+), 29 deletions(-) diff --git a/FlightGear.dsp b/FlightGear.dsp index a7cb147ee..dde9687a8 100644 --- a/FlightGear.dsp +++ b/FlightGear.dsp @@ -2672,21 +2672,6 @@ SOURCE=.\src\FDM\JSBSim\models\propulsion\FGRocket.cpp # End Source File # Begin Source File -SOURCE=.\src\FDM\JSBSim\models\propulsion\FGRotor.cpp - -!IF "$(CFG)" == "FlightGear - Win32 Release" - -# PROP Intermediate_Dir "Release\Lib_Propulsion" - -!ELSEIF "$(CFG)" == "FlightGear - Win32 Debug" - -# PROP Intermediate_Dir "Debug\Lib_Propulsion" - -!ENDIF - -# End Source File -# Begin Source File - SOURCE=.\src\FDM\JSBSim\models\propulsion\FGTank.cpp !IF "$(CFG)" == "FlightGear - Win32 Release" @@ -10548,6 +10533,36 @@ SOURCE=.\src\Navaids\navlist.cxx !ENDIF +# End Source File +# Begin Source File + +SOURCE=.\src\Navaids\positioned.hxx + +!IF "$(CFG)" == "FlightGear - Win32 Release" + +# PROP Intermediate_Dir "Release\Lib_Navaids" + +!ELSEIF "$(CFG)" == "FlightGear - Win32 Debug" + +# PROP Intermediate_Dir "Debug\Lib_Navaids" + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=.\src\Navaids\positioned.cxx + +!IF "$(CFG)" == "FlightGear - Win32 Release" + +# PROP Intermediate_Dir "Release\Lib_Navaids" + +!ELSEIF "$(CFG)" == "FlightGear - Win32 Debug" + +# PROP Intermediate_Dir "Debug\Lib_Navaids" + +!ENDIF + # End Source File # End Group # Begin Group "Lib_Network" diff --git a/NEWS b/NEWS index ae3db6c85..0876a8d1d 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,7 @@ +Version 1.99.5 +* October 30, 2008 (source code snapshot release) + + New in 0.9.10 * April 5, 2006 diff --git a/configure.ac b/configure.ac index 9add3a028..f3a612539 100644 --- a/configure.ac +++ b/configure.ac @@ -10,7 +10,7 @@ AC_PREREQ(2.52) dnl Initialize the automake stuff dnl set the $host variable based on local machine/os AC_CANONICAL_TARGET -AM_INIT_AUTOMAKE(FlightGear, 1.99.4) +AM_INIT_AUTOMAKE(FlightGear, 1.99.5) dnl Checks for programs. AC_PROG_MAKE_SET @@ -22,7 +22,7 @@ AC_PROG_INSTALL AC_PROG_LN_S # specify the simgear location -AC_ARG_WITH(simgear, [ --with-simgear=PREFIX Specify the prefix path to simgear]) +AC_ARG_WITH(simgear, [ --with-simgear=PREFIX Specify the prefix path to SimGear]) if test "x$with_simgear" != "x" ; then echo "SimGear prefix path is $with_simgear" @@ -390,7 +390,7 @@ if test "x$ac_cv_header_simgear_version_h" != "xyes"; then exit fi -AC_MSG_CHECKING([for simgear 0.3.10 or newer]) +AC_MSG_CHECKING([for SimGear 1.99.5 or newer]) AC_TRY_RUN([ #include @@ -399,9 +399,9 @@ AC_TRY_RUN([ #define STRINGIFY(X) XSTRINGIFY(X) #define XSTRINGIFY(X) #X -#define MIN_MAJOR 0 -#define MIN_MINOR 3 -#define MIN_MICRO 10 +#define MIN_MAJOR 1 +#define MIN_MINOR 99 +#define MIN_MICRO 5 int main() { int major, minor, micro; @@ -423,7 +423,7 @@ int main() { ], AC_MSG_RESULT(yes), [AC_MSG_RESULT(wrong version); - AC_MSG_ERROR([Install latest simgear first...])], + AC_MSG_ERROR([Install latest SimGear first...])], AC_MSG_RESULT(yes) ) diff --git a/src/FDM/ExternalPipe/ExternalPipe.cxx b/src/FDM/ExternalPipe/ExternalPipe.cxx index 3ca94de6e..949d6d51d 100644 --- a/src/FDM/ExternalPipe/ExternalPipe.cxx +++ b/src/FDM/ExternalPipe/ExternalPipe.cxx @@ -525,6 +525,7 @@ void FGExternalPipe::update_property( double dt ) { cout << "Error reading data" << endl; } else { // cout << " read " << strlen(cmd) << " bytes" << endl; + // cout << cmd << endl; } // chop trailing newline diff --git a/src/Include/config.h-msvc6 b/src/Include/config.h-msvc6 index 8d82669db..5366dfff1 100644 --- a/src/Include/config.h-msvc6 +++ b/src/Include/config.h-msvc6 @@ -46,7 +46,7 @@ #define PACKAGE "FlightGear" /* Define to package version - use in main.cxx */ -#define FLIGHTGEAR_VERSION "MSVC6-WIN32-1.99.4" +#define FLIGHTGEAR_VERSION "MSVC6-WIN32-1.99.5" /* Define as the return type of signal handlers (int or void). */ #define RETSIGTYPE void @@ -64,7 +64,7 @@ #define TM_IN_SYS_TIME 1 /* Define to version number */ -#define VERSION "1.99.4" +#define VERSION "1.99.5" /* Define if compiling on a Winbloze (95, NT, etc.) platform */ #define WIN32 1 diff --git a/src/Include/config.h-msvc71 b/src/Include/config.h-msvc71 index f4bad0aad..563d55c0c 100755 --- a/src/Include/config.h-msvc71 +++ b/src/Include/config.h-msvc71 @@ -19,7 +19,7 @@ #define PACKAGE "FlightGear" /* Define to package version - use in main.cxx */ -#define FLIGHTGEAR_VERSION "MSVC7.1-WIN32-1.99.4" +#define FLIGHTGEAR_VERSION "MSVC7.1-WIN32-1.99.5" /* Define as the return type of signal handlers (int or void). */ #define RETSIGTYPE void @@ -37,7 +37,7 @@ #define TM_IN_SYS_TIME 1 /* Define to version number */ -#define VERSION "1.99.4" +#define VERSION "1.99.5" #ifndef FG_VERSION /* allow override */ #define FG_VERSION 7 #endif /* FG_VERSION */ diff --git a/src/Include/config.h-msvc8 b/src/Include/config.h-msvc8 index 0e5327e11..26078184c 100755 --- a/src/Include/config.h-msvc8 +++ b/src/Include/config.h-msvc8 @@ -50,7 +50,7 @@ #define PACKAGE "FlightGear" /* Define to package version - use in main.cxx */ -#define FLIGHTGEAR_VERSION "MSVC8-WIN32-1.99.4" +#define FLIGHTGEAR_VERSION "MSVC8-WIN32-1.99.5" /* Define as the return type of signal handlers (int or void). */ #define RETSIGTYPE void @@ -68,7 +68,7 @@ #define TM_IN_SYS_TIME 1 /* Define to version number */ -#define VERSION "1.99.4" +#define VERSION "1.99.5" /* Define if compiling on a Winbloze (95, NT, etc.) platform */ #define WIN32 1 diff --git a/src/Main/main.cxx b/src/Main/main.cxx index b38b3536a..691996997 100644 --- a/src/Main/main.cxx +++ b/src/Main/main.cxx @@ -997,7 +997,7 @@ bool fgMainInit( int argc, char **argv ) { fgInitFGRoot(argc, argv); // Check for the correct base package version - static char required_version[] = "1.0.0"; + static char required_version[] = "1.99.5"; string base_version = fgBasePackageVersion(); if ( !(base_version == required_version) ) { // tell the operator how to use this application -- 2.39.2