Mercurial > ecos-v2_0-branch
changeset 817:f3f125e938f4
* standalone/wxwin/appsettings.cpp: Don't use "." in the PATH to look for
build tools and user tools.
| author | jld |
|---|---|
| date | Fri, 02 May 2003 14:00:12 +0000 |
| parents | 9496963b504c |
| children | 5dbff99e9fa3 |
| files | host/tools/configtool/ChangeLog host/tools/configtool/standalone/wxwin/appsettings.cpp host/tools/configtool/standalone/wxwin/symbols.h |
| diffstat | 3 files changed, 36 insertions(+), 25 deletions(-) [+] |
line wrap: on
line diff
--- a/host/tools/configtool/ChangeLog +++ b/host/tools/configtool/ChangeLog @@ -1,3 +1,8 @@ +2003-05-02 John Dallaway <jld@ecoscentric.com> + + * standalone/wxwin/appsettings.cpp: Don't use "." in the PATH to + look for build tools and user tools. + 2003-05-01 John Dallaway <jld@ecoscentric.com> * standalone/common/cdl_exec.cxx: Generate Cygwin text-mode mounts
--- a/host/tools/configtool/standalone/wxwin/appsettings.cpp +++ b/host/tools/configtool/standalone/wxwin/appsettings.cpp @@ -413,22 +413,25 @@ bool ecSettings::LoadConfig() wxArrayString arstrPath; ecUtils::Chop(strPath, arstrPath, wxT(':')); - + for (int i = arstrPath.GetCount()-1;i >= 0; --i) { // Reverse order is important to treat path correctly - wxLogNull log; - wxDir finder(arstrPath[i]); - wxString filename; - - if (finder.IsOpened()) + if (wxT(".") != arstrPath[i] && !arstrPath[i].IsEmpty()) { - bool bMore = finder.GetFirst(& filename, gccExe); - while (bMore) + wxLogNull log; + wxDir finder(arstrPath[i]); + wxString filename; + + if (finder.IsOpened()) { - wxString targetName = filename.Left(filename.Find(wxT("-gcc"))); - m_arstrBinDirs.Set(targetName, arstrPath[i]); - - bMore = finder.GetNext(& filename); + bool bMore = finder.GetFirst(& filename, gccExe); + while (bMore) + { + wxString targetName = filename.Left(filename.Find(wxT("-gcc"))); + m_arstrBinDirs.Set(targetName, arstrPath[i]); + + bMore = finder.GetNext(& filename); + } } } } @@ -458,7 +461,7 @@ bool ecSettings::LoadConfig() // Read toolchain paths (local machine again) #ifdef __WXMSW__ wxArrayString arstrToolChainPaths; - + // Use eCos just as a test. //GetRepositoryRegistryClues(arstrToolChainPaths,_T("eCos")); GetRepositoryRegistryClues(arstrToolChainPaths,_T("GNUPro eCos")); @@ -547,20 +550,23 @@ bool ecSettings::LoadConfig() for (int i = arstrPath.GetCount()-1;i >= 0; --i) { // Reverse order is important to treat path correctly - + const ecFileName &strFolder = arstrPath[i]; - ecFileName strFile(strFolder); - strFile += wxT("ls.exe"); - if ( strFile.Exists() ) + if (wxT(".") != strFolder && !strFolder.IsEmpty()) { - if (!wxArrayStringIsMember(m_userToolPaths, strFolder)) + ecFileName strFile(strFolder); + strFile += wxT("ls.exe"); + if ( strFile.Exists() ) { - m_userToolPaths.Add(strFolder); - } - - if ( m_userToolsDir.IsEmpty() ) - { - m_userToolsDir = strFolder; + if (!wxArrayStringIsMember(m_userToolPaths, strFolder)) + { + m_userToolPaths.Add(strFolder); + } + + if ( m_userToolsDir.IsEmpty() ) + { + m_userToolsDir = strFolder; + } } } }
--- a/host/tools/configtool/standalone/wxwin/symbols.h +++ b/host/tools/configtool/standalone/wxwin/symbols.h @@ -44,7 +44,7 @@ // //=========================================================================== -#define ecCONFIGURATION_TOOL_VERSION "2.13.net" +#define ecCONFIGURATION_TOOL_VERSION "2.0" // Use /ecos-x notation for drive specification #define ecUSE_ECOS_X_NOTATION 1