Mercurial > ecos
diff host/tools/configtool/standalone/wxwin/appsettings.cpp @ 931:d7c9117adc25
* standalone/wxwin/ecutils.cpp, standalone/wxwin/ecutils.h: Create
wxString wrappers for cygwin_conv_to_*_path().
* standalone/wxwin/appsettings.cpp: Accommodate POSIX-style values of
the ECOS_REPOSITORY environment variable.
| author | jld |
|---|---|
| date | Fri, 11 Apr 2003 10:22:36 +0000 |
| parents | e890ffec4503 |
| children | 3021b4922c80 |
line wrap: on
line diff
--- a/host/tools/configtool/standalone/wxwin/appsettings.cpp +++ b/host/tools/configtool/standalone/wxwin/appsettings.cpp @@ -598,6 +598,7 @@ bool ecSettings::LoadConfig() // Note that ECOS_REPOSITORY has the packages (or ecc) folder in the name. // In order to be in the form that is compatible with configtool operation, // it needs to have that stripped off. + envVarValue = ecUtils::PosixToNativePath(envVarValue); // accommodate posix-style ECOS_REPOSITORY value under Cygwin wxString packagesName = wxFileNameFromPath(envVarValue); if (packagesName == wxT("ecc") || packagesName == wxT("packages")) envVarValue = wxPathOnly(envVarValue); @@ -608,7 +609,7 @@ bool ecSettings::LoadConfig() #ifdef __WXMSW__ if (m_userToolsDir.IsEmpty()) - m_userToolsDir = GetCygwinInstallPath() + wxT("\\bin"); + m_userToolsDir = GetCygwinInstallPath() + wxT("\\bin"); #else if (m_userToolsDir.IsEmpty()) m_userToolsDir = wxT("/bin");
