This is the mail archive of the ecos-patches@sourceware.org mailing list for the eCos project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

Re: hosttools patch


Andreas Fritiofson wrote:

> Lars Poeschel wrote:
> > After applying the patch to cvs ecos-host, configure scripts and 
> > Makefiles have to be built by executing autoreconf in the host 
> > directory. After that, everything is ready to be configure'd and make'd 
> > in a seperate build directory as documented on the website.
> 
> I can't get it to work against a clean ecos-full checked out 20060823. After 
> a bit of manually merging the rejects (some things changed since the patch 
> was made) it patched alright. However the autoreconf step gives me errors:

Please ignore this, I was using an old version of automake. 1.9 did the trick and the patch works great!

However, hosttools won't compile with g++ 4.1. It seems it's stricter with what it accepts than previous versions. Patch is attached.

--
Andreas Fritiofson

Index: ecos/host/tools/configtool/standalone/wxwin/propertywin.h
===================================================================
RCS file: /cvs/ecos/ecos/host/tools/configtool/standalone/wxwin/propertywin.h,v
retrieving revision 1.1
diff -U5 -r1.1 propertywin.h
--- ecos/host/tools/configtool/standalone/wxwin/propertywin.h	1 Jun 2001 22:16:30 -0000	1.1
+++ ecos/host/tools/configtool/standalone/wxwin/propertywin.h	24 Aug 2006 11:44:06 -0000
@@ -91,11 +91,11 @@
     int m_nOnSizeRecursionCount;
     int m_nMaxValueWidth;
     int m_nFirstProperty;
     ecConfigItem *m_pti;
 
-    static const std::string ecPropertyListCtrl::visible_properties [];
+    static const std::string visible_properties [];
 	static const wxChar* sm_fieldTypeImage[ecMAXFIELDTYPE];
 };
 
 
 #endif
Index: ecos/host/tools/ecostest/common/eCosTest.h
===================================================================
RCS file: /cvs/ecos/ecos/host/tools/ecostest/common/eCosTest.h,v
retrieving revision 1.2
diff -U5 -r1.2 eCosTest.h
--- ecos/host/tools/ecostest/common/eCosTest.h	18 Apr 2000 21:51:58 -0000	1.2
+++ ecos/host/tools/ecostest/common/eCosTest.h	24 Aug 2006 11:44:06 -0000
@@ -197,11 +197,11 @@
 
   // Get size information (generally by running *gdb-size)
   bool GetSizes();
 
   // Connect to a test server
-  static ServerStatus CeCosTest::Connect (LPCTSTR pszHostPort, CeCosSocket *&pSock, const ExecutionParameters &e,String &strInfo,Duration dTimeout=10*1000);
+  static ServerStatus Connect (LPCTSTR pszHostPort, CeCosSocket *&pSock, const ExecutionParameters &e,String &strInfo,Duration dTimeout=10*1000);
 
   // Log some output.  The accumulated output can be retrieved using Output()
   void Log (LPCTSTR  const pszFormat,...);
   void LogString (LPCTSTR psz);
 

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]