michael/lean2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(build): problem with reading LEAN_PATH on cygwin

Browse source 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
This commit is contained in:
Leonardo de Moura 2013-12-30 14:50:40 -08:00
parent cc07c440e1
commit 931e196e83
2 changed files with 53 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/CMakeLists.txt
View file

@ -30,6 +30,10 @@ if((${CYGWIN} EQUAL "1") OR (${CMAKE_SYSTEM_NAME} MATCHES "Windows"))
set(LEAN_EXTRA_CXX_FLAGS "${LEAN_EXTRA_CXX_FLAGS} -D LEAN_WINDOWS -D LEAN_WIN_STACK_SIZE=${LEAN_WIN_STACK_SIZE}") set(LEAN_EXTRA_CXX_FLAGS "${LEAN_EXTRA_CXX_FLAGS} -D LEAN_WINDOWS -D LEAN_WIN_STACK_SIZE=${LEAN_WIN_STACK_SIZE}")
endif() endif()
if("${CYGWIN}" EQUAL "1")
set(LEAN_EXTRA_CXX_FLAGS "${LEAN_EXTRA_CXX_FLAGS} -D LEAN_CYGWIN")
endif()
if("${MULTI_THREAD}" MATCHES "OFF") if("${MULTI_THREAD}" MATCHES "OFF")
message(STATUS "Disabled multi-thread support, it will not be safe to run multiple threads in parallel") message(STATUS "Disabled multi-thread support, it will not be safe to run multiple threads in parallel")
else() else()

58
src/util/lean_path.cpp
View file

@ -17,9 +17,9 @@ namespace lean {
#if defined(LEAN_WINDOWS) #if defined(LEAN_WINDOWS)
// Windows version // Windows version
#include <windows.h> #include <windows.h>
static char g_path_sep = ';'; static char g_path_sep = ';';
static char g_sep = '\\'; static char g_sep = '\\';
static char g_bad_sep = '/'; static char g_bad_sep = '/';
static std::string get_exe_location() { static std::string get_exe_location() {
HMODULE hModule = GetModuleHandleW(NULL); HMODULE hModule = GetModuleHandleW(NULL);
WCHAR path[MAX_PATH]; WCHAR path[MAX_PATH];
@ -31,9 +31,9 @@ static std::string get_exe_location() {
// OSX version // OSX version
#include <mach-o/dyld.h> #include <mach-o/dyld.h>
#include <limits.h> #include <limits.h>
static char g_path_sep = ':'; static char g_path_sep = ':';
static char g_sep = '/'; static char g_sep = '/';
static char g_bad_sep = '\\'; static char g_bad_sep = '\\';
static std::string get_exe_location() { static std::string get_exe_location() {
char buf[PATH_MAX]; char buf[PATH_MAX];
uint32_t bufsize = PATH_MAX; uint32_t bufsize = PATH_MAX;
@ -49,9 +49,9 @@ static std::string get_exe_location() {
#include <sys/stat.h> #include <sys/stat.h>
#include <limits.h> // NOLINT #include <limits.h> // NOLINT
#include <stdio.h> #include <stdio.h>
static char g_path_sep = ':'; static char g_path_sep = ':';
static char g_sep = '/'; static char g_sep = '/';
static char g_bad_sep = '\\'; static char g_bad_sep = '\\';
static std::string get_exe_location() { static std::string get_exe_location() {
char path[PATH_MAX]; char path[PATH_MAX];
char dest[PATH_MAX]; char dest[PATH_MAX];
@ -66,11 +66,51 @@ static std::string get_exe_location() {
} }
#endif #endif
#if defined(LEAN_CYGWIN)
/**
\brief Cleanup path when using cygwin.
This procedure performs two fixes, if the string contains '/'.
1- It replaces '/' with '\\' and ':' with ';'
2- Then, it replaces "\cygdrive\c\" with "c:"
*/
static std::string fix_cygwin_path(std::string f) {
if (f.find('/') != std::string::npos) {
// Step 1.
for (auto & c : f) {
if (c == g_bad_sep)
c = g_sep;
else if (c == ':')
c = g_path_sep;
}
// Step 2.
size_t pos = 0;
size_t matchpos;
std::string cygdrive("\\cygdrive\\");
while ((matchpos = f.find(cygdrive, pos)) != std::string::npos) {
// erase "\cygdrive\"
f = f.replace(matchpos, cygdrive.size(), "");
// replace the next "\" with ":\"
if ((matchpos = f.find("\\", matchpos)) != std::string::npos) {
f.replace(matchpos, 1, ":\\");
}
pos = matchpos;
}
}
return f;
}
#endif
std::string normalize_path(std::string f) { std::string normalize_path(std::string f) {
#if defined(LEAN_CYGWIN)
f = fix_cygwin_path(f);
#else
for (auto & c : f) { for (auto & c : f) {
if (c == g_bad_sep) if (c == g_bad_sep)
c = g_sep; c = g_sep;
} }
#endif
return f; return f;
} }