This is the mail archive of the ecos-patches@sources.redhat.com 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]

Eliminate .exe suffix processing when running tests in configtool


This patch eliminates .exe suffix processing when running tests in
the eCos configtool. Recent GNU cross toolchains do not generate
.exe suffixes on Cygwin hosts and the configtool will still work
without any special treatment of .exe suffixes.

John Dallaway
eCosCentric Limited

--cut here--

Index: ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/host/tools/configtool/ChangeLog,v
retrieving revision 1.29
diff -u -5 -r1.29 ChangeLog
--- ChangeLog	3 Feb 2003 15:42:55 -0000	1.29
+++ ChangeLog	5 Feb 2003 13:48:40 -0000
@@ -1,5 +1,15 @@
+2003-02-05  John Dallaway  <jld@ecoscentric.com>
+
+	* standalone/wxwin/configtooldoc.cpp,
+	  standalone/wxwin/platformeditordlg.cpp,
+	  standalone/wxwin/runtestsdlg.cpp:
+	Eliminate .exe suffix handling when running eCos tests. Latest
+	cross toolchains do not generate a .exe suffix.
+
+	* standalone/wxwin/symbols.h: Version number 2.11 -> 2.12
+
 2003-02-03  John Dallaway  <jld@ecoscentric.com>

 	* standalone/wxwin/filename.cpp: Eliminate (const WCHAR*) cast
 	in call to PathRelativePathTo() which is related to an error
 	in w32api/shlwapi.h.
Index: standalone/wxwin/configtooldoc.cpp
===================================================================
RCS file: /cvs/ecos/ecos/host/tools/configtool/standalone/wxwin/configtooldoc.cpp,v
retrieving revision 1.11
diff -u -5 -r1.11 configtooldoc.cpp
--- standalone/wxwin/configtooldoc.cpp	25 Jan 2003 23:07:53 -0000	1.11
+++ standalone/wxwin/configtooldoc.cpp	5 Feb 2003 13:48:51 -0000
@@ -1977,14 +1977,14 @@
             strFile += e.directory.c_str();
             strFile += wxFILE_SEP_PATH;
             strFile += ar[i];

             // Some tests accidentally specify .c
-            wxStripExtension(strFile);
+//            wxStripExtension(strFile);

 #ifdef __WXMSW__
-            strFile += wxT(".exe");
+//            strFile += wxT(".exe");
             strFile.Replace(wxT("/"),wxT("\\"));
 #endif

             if (wxFileExists(strFile))
             {
Index: standalone/wxwin/platformeditordlg.cpp
===================================================================
RCS file: /cvs/ecos/ecos/host/tools/configtool/standalone/wxwin/platformeditordlg.cpp,v
retrieving revision 1.2
diff -u -5 -r1.2 platformeditordlg.cpp
--- standalone/wxwin/platformeditordlg.cpp	6 Jul 2001 19:11:34 -0000	1.2
+++ standalone/wxwin/platformeditordlg.cpp	5 Feb 2003 13:48:53 -0000
@@ -204,11 +204,11 @@
     item3->SetFocus();
     item14->SetDefault();
 
     // Add context-sensitive help text
     parent->FindWindow( ecID_MODIFY_PLATFORM_NAME )->SetHelpText(_("Specifies the name of the platform. Platform names are arbitrary strings, but must be unique for a given user."));
-    parent->FindWindow( ecID_MODIFY_PLATFORM_PREFIX )->SetHelpText(_("Specifies the prefix to be used when invoking tools (for example, 'arm-elf' is the correct prefix if the appropriate gdb executable is arm-elf-gdb.exe)."));
+    parent->FindWindow( ecID_MODIFY_PLATFORM_PREFIX )->SetHelpText(_("Specifies the prefix to be used when invoking tools (for example, 'arm-elf' is the correct prefix if the appropriate gdb executable is arm-elf-gdb)."));
     parent->FindWindow( ecID_MODIFY_PLATFORM_ARGS )->SetHelpText(_("Specifies any additional arguments to be used when invoking gdb."));
     parent->FindWindow( ecID_MODIFY_PLATFORM_INFERIOR )->SetHelpText(_("The gdb command to run."));
     parent->FindWindow( ecID_MODIFY_PLATFORM_PROMPT )->SetHelpText(_("The gdb prompt."));
 #if USE_SS_GDB_CONTROL
     parent->FindWindow( ecID_MODIFY_PLATFORM_SS_GDB )->SetHelpText(_("TODO"));
Index: standalone/wxwin/runtestsdlg.cpp
===================================================================
RCS file: /cvs/ecos/ecos/host/tools/configtool/standalone/wxwin/runtestsdlg.cpp,v
retrieving revision 1.3
diff -u -5 -r1.3 runtestsdlg.cpp
--- standalone/wxwin/runtestsdlg.cpp	6 Jul 2001 19:11:34 -0000	1.3
+++ standalone/wxwin/runtestsdlg.cpp	5 Feb 2003 13:48:57 -0000
@@ -754,15 +754,15 @@
 {
     wxCheckListBox* checkList = (wxCheckListBox*) FindWindow(ecID_RUN_TESTS_TEST_LIST);
     if (!checkList)
         return;
 
-#ifdef __WXMSW__
-    wxString wildcard(wxT("Executables (*.exe)|*.exe"));
-#else
+//#ifdef __WXMSW__
+//    wxString wildcard(wxT("Executables (*.exe)|*.exe"));
+//#else
     wxString wildcard(wxT("Executables (*)|*"));
-#endif
+//#endif
 
     wxFileDialog dialog(this, _("Choose one or more executables to add"), wxGetCwd(), wxEmptyString,
         wildcard, wxMULTIPLE|wxOPEN);
 
     if (dialog.ShowModal() == wxID_OK)
@@ -800,15 +800,15 @@
     // In the MFC tool, a modified version of the folder dialog was used but
     // we can't do that in general in wxWindows; so instead we ask the questions
     // before we show the folder dialog.
     // We won't bother allowing the user to change the extension: on Windows it's .exe,
     // on Unix it's anything.
-#ifdef __WXMSW__
-    wxString filespec(wxT("*.exe"));
-#else
+//#ifdef __WXMSW__
+//    wxString filespec(wxT("*.exe"));
+//#else
     wxString filespec(wxT("*"));
-#endif
+//#endif
 
     wxString msg;
     msg.Printf(_("Would you like to add from subfolders, or just the folder you specify?\nChoose Yes to add from subfolders."));
     int ans = wxMessageBox(msg, wxGetApp().GetSettings().GetAppName(), wxICON_QUESTION|wxYES_NO|wxCANCEL, this);
     if (ans == wxCANCEL)
Index: standalone/wxwin/symbols.h
===================================================================
RCS file: /cvs/ecos/ecos/host/tools/configtool/standalone/wxwin/symbols.h,v
retrieving revision 1.11
diff -u -5 -r1.11 symbols.h
--- standalone/wxwin/symbols.h	20 May 2002 22:19:28 -0000	1.11
+++ standalone/wxwin/symbols.h	5 Feb 2003 13:48:58 -0000
@@ -41,10 +41,10 @@
 //
 //####DESCRIPTIONEND####
 //
 //===========================================================================
 
-#define ecCONFIGURATION_TOOL_VERSION        2.11
+#define ecCONFIGURATION_TOOL_VERSION        2.12
 
 // Use /ecos-x notation for drive specification
 #define ecUSE_ECOS_X_NOTATION               1


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