Tidy up for a source code "snapshot" release.

diff --git a/FlightGear.dsp b/FlightGear.dsp
index a7cb147ee4825120c17a7d2b82bf1348b2497b34..dde9687a88047189512d456981308fa51241a4aa 100644 (file)
--- a/FlightGear.dsp
+++ b/FlightGear.dsp
@@ -2672,21 +2672,6 @@ SOURCE=.\src\FDM\JSBSim\models\propulsion\FGRocket.cpp
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\FDM\JSBSim\models\propulsion\FGRotor.cpp\r
-\r
-!IF  "$(CFG)" == "FlightGear - Win32 Release"\r
-\r
-# PROP Intermediate_Dir "Release\Lib_Propulsion"\r
-\r
-!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
-\r
-# PROP Intermediate_Dir "Debug\Lib_Propulsion"\r
-\r
-!ENDIF \r
-\r
-# End Source File\r
-# Begin Source File\r
-\r
 SOURCE=.\src\FDM\JSBSim\models\propulsion\FGTank.cpp\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
@@ -10548,6 +10533,36 @@ SOURCE=.\src\Navaids\navlist.cxx
 \r
 !ENDIF \r
 \r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\src\Navaids\positioned.hxx\r
+\r
+!IF  "$(CFG)" == "FlightGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_Navaids"\r
+\r
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_Navaids"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\src\Navaids\positioned.cxx\r
+\r
+!IF  "$(CFG)" == "FlightGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_Navaids"\r
+\r
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_Navaids"\r
+\r
+!ENDIF \r
+\r
 # End Source File\r
 # End Group\r
 # Begin Group "Lib_Network"\r

diff --git a/NEWS b/NEWS
index ae3db6c8561f2066d164fd4a7dd5a657e8d13598..0876a8d1d8cb5be112be1e9c40a381cce5eee48c 100644 (file)
--- 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 9add3a028683843b2ba610cc5db65d14a5a0535c..f3a612539a2e3bd9d08a5d1e4d9d5916817bf4e3 100644 (file)
--- 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 <stdio.h>
 
@@ -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 3ca94de6e2b79308b482c834cd417c53e5faa8b2..949d6d51d74e7e97e402cde60c7ee548640be64c 100644 (file)
--- 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 8d82669db988a26a1cbb3513c7a0fb66fa21ecd9..5366dfff187035e722ad53eb4e833f6910360c88 100644 (file)
--- 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 f4bad0aad07307270e9876dcb47c4b4e86f4ef5b..563d55c0c9babae5c89b7492ffd1bef5e7f0710e 100755 (executable)
--- 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 0e5327e11eed7c856450df066f20a5c8ca4edac1..26078184c6ac2f4269709d488370c53b08876847 100755 (executable)
--- 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 b38b3536a2ba51466a124a0c2e2f23d83e8176b3..691996997fceaca52841988d887337ef90881b73 100644 (file)
--- 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