James
With your patch it now compiles and runs, but changing “or” to “||” is still
required.
The MSVC API kindly greys out code that is ignored by #ifdef statements, e.g.
in (terrasync.cxx at about line 340:-
#if defined(HAVE_SVN_CLIENT_H) or defined(SG_SVN_CLIENT)
if (_use_svn && _use_built_in)
status = "Using built-in SVN support. ";
else
#endif
if (_use_svn)
{
status = "Using external SVN utility '";
status += _svn_command;
status += "'. ";
}
the greyout starts after “#if defined(HAVE_SVN_CLIENT_H)”, showing that the
code after and including “or” is ignored.
This is confirmed at runtime as "Using external SVN utility '" appears in the
log.
Alan
From: Alan Teeder
Sent: Tuesday, June 18, 2013 10:17 AM
To: FlightGear developers discussions
Subject: Re: [Flightgear-devel] TerraSync libSVN replacement testing
And it works too!
Once the problem that Vivian reported is sorted I will also try with a 64 bit
Windows build.
Thanks
Alan
From: Alan Teeder
Sent: Tuesday, June 18, 2013 9:55 AM
To: FlightGear developers discussions
Subject: Re: [Flightgear-devel] TerraSync libSVN replacement testing
James
I have a fix to make it compile.
In SVNRepository.hxx, change names off 1st two elements in enum ResultCode
e.g.
enum ResultCode {
ERROR_NONE = 0,
ERROR_UNFOUND,
ERROR_SOCKET,
ERROR_XML,
ERROR_TXDELTA,
ERROR_IO,
ERROR_CHECKSUM
};
Also change these names in SVNRepository.cxx, SVNReportParser.cxx,
SVNDirectory.cxx and terrasync.cxx.
Also #if defined(HAVE_SVN_CLIENT_H) or defined(SG_SVN_CLIENT) should be
corrected on each occurence in terrasync.cxx
Alan
From: Alan Teeder
Sent: Monday, June 17, 2013 11:34 PM
To: FlightGear developers discussions
Subject: Re: [Flightgear-devel] TerraSync libSVN replacement testing
James
I found this, in terrasync.cxx, line 91, but the compilation is still failing
#if (defined(HAVE_SVN_CLIENT_H) or defined(SG_SVN_CLIENT))
should be ?
#if (defined(HAVE_SVN_CLIENT_H) || defined(SG_SVN_CLIENT))
Alan
From: Alan Teeder
Sent: Monday, June 17, 2013 10:00 PM
To: FlightGear developers discussions
Subject: Re: [Flightgear-devel] TerraSync libSVN replacement testing
Sorry James, I just reported ,and then left it.
I can give it a go, but my C++ debugging is somewhat hit and miss.
Alan
From: James Turner
Sent: Monday, June 17, 2013 9:38 PM
To: FlightGear developers discussions
Subject: Re: [Flightgear-devel] TerraSync libSVN replacement testing
On 17 Jun 2013, at 21:25, Vivian Meazza <vivian.mea...@lineone.net> wrote:
Haven't managed to get it to work for Win 7 64 bit either - still seems to
want LIBSVN to build. Seems to be a cmake issue, but I'm not confident that
I know how to fix this one.
That's because I didn't yet remove the libsvn checks - that would be risky,
this close to the freeze. It's strictly a new, optional feature until after
2.12 is branched.
Alan, did you have any luck with the compiler errors? it builds on the Windows
build slaves on Jenkins I believe.
Regards,
James
--------------------------------------------------------------------------------
------------------------------------------------------------------------------
This SF.net email is sponsored by Windows:
Build for Windows Store.
http://p.sf.net/sfu/windows-dev2dev
--------------------------------------------------------------------------------
_______________________________________________
Flightgear-devel mailing list
Flightgear-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/flightgear-devel
--------------------------------------------------------------------------------
------------------------------------------------------------------------------
This SF.net email is sponsored by Windows:
Build for Windows Store.
http://p.sf.net/sfu/windows-dev2dev
--------------------------------------------------------------------------------
_______________________________________________
Flightgear-devel mailing list
Flightgear-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/flightgear-devel
--------------------------------------------------------------------------------
------------------------------------------------------------------------------
This SF.net email is sponsored by Windows:
Build for Windows Store.
http://p.sf.net/sfu/windows-dev2dev
--------------------------------------------------------------------------------
_______________________________________________
Flightgear-devel mailing list
Flightgear-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/flightgear-devel
--------------------------------------------------------------------------------
------------------------------------------------------------------------------
This SF.net email is sponsored by Windows:
Build for Windows Store.
http://p.sf.net/sfu/windows-dev2dev
--------------------------------------------------------------------------------
_______________________________________________
Flightgear-devel mailing list
Flightgear-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/flightgear-devel
--------------------------------------------------------------------------------
------------------------------------------------------------------------------
This SF.net email is sponsored by Windows:
Build for Windows Store.
http://p.sf.net/sfu/windows-dev2dev
--------------------------------------------------------------------------------
_______________________________________________
Flightgear-devel mailing list
Flightgear-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/flightgear-devel
------------------------------------------------------------------------------
This SF.net email is sponsored by Windows:
Build for Windows Store.
http://p.sf.net/sfu/windows-dev2dev
_______________________________________________
Flightgear-devel mailing list
Flightgear-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/flightgear-devel
