Update of /cvsroot/mahogany/M/src/classes
In directory sc8-pr-cvs1:/tmp/cvs-serv7349/src/classes
Modified Files:
MApplication.cpp MModule.cpp PathFinder.cpp
Log Message:
cygwin PATH problem and few unicode fixes
Index: MApplication.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/classes/MApplication.cpp,v
retrieving revision 1.273
retrieving revision 1.274
diff -b -u -2 -r1.273 -r1.274
--- MApplication.cpp 16 Jul 2003 08:30:07 -0000 1.273
+++ MApplication.cpp 22 Jul 2003 12:07:38 -0000 1.274
@@ -492,8 +492,10 @@
env_parameters(SET_USERHASNOLIFE,(void *)1);
+#ifndef __CYGWIN__ // FIXME otherwise PATH becomes
+ //
D:\Mahogany/scripts:D:\Mahogany/scripts:/cygdrive/c/WINNT/system32:...
// extend path for commands, look in M's dirs first
String pathEnv;
- pathEnv << GetLocalDir() << _T("/scripts") << PATH_SEPARATOR
- << GetDataDir() << _T("/scripts");
+ pathEnv << GetLocalDir() << DIR_SEPARATOR << _T("scripts") << PATH_SEPARATOR
+ << GetDataDir() << DIR_SEPARATOR << _T("scripts");
const wxChar *path = wxGetenv(_T("PATH"));
@@ -502,4 +504,5 @@
wxSetEnv(_T("PATH"), pathEnv);
+#endif //!CYGWIN
// initialise python interpreter
Index: MModule.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/classes/MModule.cpp,v
retrieving revision 1.81
retrieving revision 1.82
diff -b -u -2 -r1.81 -r1.82
--- MModule.cpp 21 Jul 2003 00:19:58 -0000 1.81
+++ MModule.cpp 22 Jul 2003 12:07:38 -0000 1.82
@@ -842,26 +842,26 @@
wxString path0;
path0 << M_TOP_BUILDDIR
- << DIR_SEPARATOR << "src"
- << DIR_SEPARATOR << "modules" << DIR_SEPARATOR;
+ << DIR_SEPARATOR << _T("src")
+ << DIR_SEPARATOR << _T("modules") << DIR_SEPARATOR;
dirs.Add(path0);
path0.clear();
path0 << M_TOP_BUILDDIR
- << DIR_SEPARATOR << "src"
- << DIR_SEPARATOR << "adb" << DIR_SEPARATOR;
+ << DIR_SEPARATOR << _T("src")
+ << DIR_SEPARATOR << _T("adb") << DIR_SEPARATOR;
dirs.Add(path0);
path0.clear();
path0 << M_TOP_BUILDDIR
- << DIR_SEPARATOR << "src"
- << DIR_SEPARATOR << "modules"
- << DIR_SEPARATOR << "crypt" << DIR_SEPARATOR;
+ << DIR_SEPARATOR << _T("src")
+ << DIR_SEPARATOR << _T("modules")
+ << DIR_SEPARATOR << _T("crypt") << DIR_SEPARATOR;
dirs.Add(path0);
path0.clear();
path0 << M_TOP_BUILDDIR
- << DIR_SEPARATOR << "src"
- << DIR_SEPARATOR << "modules"
- << DIR_SEPARATOR << "viewflt" << DIR_SEPARATOR;
+ << DIR_SEPARATOR << _T("src")
+ << DIR_SEPARATOR << _T("modules")
+ << DIR_SEPARATOR << _T("viewflt") << DIR_SEPARATOR;
dirs.Add(path0);
#endif // Unix
@@ -875,5 +875,5 @@
<< DIR_SEPARATOR << M_CANONICAL_HOST
#endif // Unix
- << DIR_SEPARATOR << "modules" << DIR_SEPARATOR;
+ << DIR_SEPARATOR << _T("modules") << DIR_SEPARATOR;
dirs.Add(path1);
@@ -884,5 +884,5 @@
<< DIR_SEPARATOR << M_CANONICAL_HOST
#endif // Unix
- << DIR_SEPARATOR << "modules" << DIR_SEPARATOR;
+ << DIR_SEPARATOR << _T("modules") << DIR_SEPARATOR;
// under Windows, the global and local dirs might be the same
Index: PathFinder.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/classes/PathFinder.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -b -u -2 -r1.19 -r1.20
--- PathFinder.cpp 15 Jul 2003 00:47:33 -0000 1.19
+++ PathFinder.cpp 22 Jul 2003 12:07:38 -0000 1.20
@@ -54,5 +54,5 @@
char *found;
String tmp;
- String subdirList = "";
+ String subdirList = _T("");
MOcheck();
-------------------------------------------------------
This SF.net email is sponsored by: VM Ware
With VMware you can run multiple operating systems on a single machine.
WITHOUT REBOOTING! Mix Linux / Windows / Novell virtual machines at the
same time. Free trial click here: http://www.vmware.com/wl/offer/345/0
_______________________________________________
Mahogany-cvsupdates mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/mahogany-cvsupdates
