On 12/14/2009 11:08 AM, Csaba Halász wrote:
> It is used in the *flightgear* configure.ac script. FG can't find
> simgear anymore because it can't parse the version. Easy to fix there
> but maybe other projects (such as terragear or fgrun) also depend on
> it.
A fully-compatible fix is attached below.
In the interests of consistency, would it make sense
to define FLIGHTGEAR_VERSION_STRING with quotes,
and change FLIGHTGEAR_VERSION to have no quotes?
Now is the time to change it if we're going to
change it.
>> It's not really a "version number" since it
>> is not a number.
>
> It's a NaN! Sorry :)
Ewwwww.
=========================
commit 9ea41430a4e12767c67fdd2e2799b47670c1cba0
Author: John Denker <j...@av8n.com>
Date: Mon Dec 14 11:26:05 2009 -0700
Add SIMGEAR_VERSION_STRING (emphasis on STRING).
diff --git a/simgear/version.h.in b/simgear/version.h.in
index 368a4a9..dcbcf5d 100644
--- a/simgear/version.h.in
+++ b/simgear/version.h.in
@@ -27,6 +27,7 @@
#define SIMGEAR_VERSION @VERSION@
+#define SIMGEAR_VERSION_STRING "@VERSION@"
#endif // _SIMGEAR_VERSION_H
commit 4423a4c867e6d87a3c5a2edff45a00788468ebd3
Author: John Denker <j...@av8n.com>
Date: Mon Dec 14 11:27:37 2009 -0700
Use SIMGEAR_VERSION_STRING (emphasis on STRING)
diff --git a/src/Main/options.cxx b/src/Main/options.cxx
index c04053b..985b36a 100644
--- a/src/Main/options.cxx
+++ b/src/Main/options.cxx
@@ -1212,7 +1212,7 @@ fgOptVersion( const char *arg )
cerr << *it;
}
cerr << endl;
- cerr << "SimGear version: " << SIMGEAR_VERSION << endl;
+ cerr << "SimGear version: " << SIMGEAR_VERSION_STRING << endl;
cerr << "PLIB version: " << PLIB_VERSION << endl;
cerr << "OSG version: " << FG_OSG_VERSION << endl;
return FG_OPTIONS_EXIT;
------------------------------------------------------------------------------
Return on Information:
Google Enterprise Search pays you back
Get the facts.
http://p.sf.net/sfu/google-dev2dev
_______________________________________________
Flightgear-devel mailing list
Flightgear-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/flightgear-devel
