# HG changeset patch # User jld # Date 1044453201 0 # Node ID 798c5efd7d1c2fde831e43e1712be9a902cf4c83 # Parent b012f293c30ace680381494e11c6eb04b0f02a17 * 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 diff --git a/host/tools/configtool/ChangeLog b/host/tools/configtool/ChangeLog --- a/host/tools/configtool/ChangeLog +++ b/host/tools/configtool/ChangeLog @@ -1,3 +1,13 @@ +2003-02-05 John Dallaway + + * 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 * standalone/wxwin/filename.cpp: Eliminate (const WCHAR*) cast diff --git a/host/tools/configtool/standalone/wxwin/configtooldoc.cpp b/host/tools/configtool/standalone/wxwin/configtooldoc.cpp --- a/host/tools/configtool/standalone/wxwin/configtooldoc.cpp +++ b/host/tools/configtool/standalone/wxwin/configtooldoc.cpp @@ -1979,10 +1979,10 @@ int ecConfigToolDoc::GetTestExeNames (wx 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 diff --git a/host/tools/configtool/standalone/wxwin/platformeditordlg.cpp b/host/tools/configtool/standalone/wxwin/platformeditordlg.cpp --- a/host/tools/configtool/standalone/wxwin/platformeditordlg.cpp +++ b/host/tools/configtool/standalone/wxwin/platformeditordlg.cpp @@ -206,7 +206,7 @@ void ecPlatformEditorDialog::CreateContr // 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.")); diff --git a/host/tools/configtool/standalone/wxwin/runtestsdlg.cpp b/host/tools/configtool/standalone/wxwin/runtestsdlg.cpp --- a/host/tools/configtool/standalone/wxwin/runtestsdlg.cpp +++ b/host/tools/configtool/standalone/wxwin/runtestsdlg.cpp @@ -756,11 +756,11 @@ void ecRunTestsExecutablesDialog::OnAdd( 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); @@ -802,11 +802,11 @@ void ecRunTestsExecutablesDialog::OnAddF // 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.")); diff --git a/host/tools/configtool/standalone/wxwin/symbols.h b/host/tools/configtool/standalone/wxwin/symbols.h --- a/host/tools/configtool/standalone/wxwin/symbols.h +++ b/host/tools/configtool/standalone/wxwin/symbols.h @@ -43,7 +43,7 @@ // //=========================================================================== -#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