pimhwang
/
CppSharp
mirror of https://github.com/mono/CppSharp.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Refactor the VS-specific lookup logic to its own file.

pull/1/head
triton 13 years ago
parent
7bd0d28ecd
commit
9fcac6dbe3
2 changed files with 117 additions and 107 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 114
      src/Parser/Parser.cpp
  2. 110
      src/Parser/VSLookup.cpp

114
src/Parser/Parser.cpp
Unescape View File

@ -60,111 +60,12 @@ static std::string GetClangBuiltinIncludeDir() @@ -60,111 +60,12 @@ static std::string GetClangBuiltinIncludeDir()
}
//-----------------------------------//
#ifdef _WIN32
#include <string>
#include <vector>
#include <stdio.h>
static std::string exec(const char* cmd)
{
FILE* pipe = _popen(cmd, "r");
if (!pipe) return "ERROR";
char buffer[128];
std::string result = "";
while(!feof(pipe)) {
if(fgets(buffer, 128, pipe) != NULL)
result += buffer;
}
_pclose(pipe);
return result;
}
#pragma comment(lib, "shlwapi.lib") //_popen, _pclose
#include <shlwapi.h>
//
// Returns true if got settings, false if not.
//
bool GetVisualStudioEnv(
const char* envVar, // [in] "INCLUDE" / "LIBPATH"
std::vector<std::string>& vecPathes,
int iProbeFrom = 0, int iProbeTo = 0 // 2005 - 8, 2008 - 9, 2010 - 10
)
{
std::string s;
if( iProbeFrom == 0 && iProbeTo == 0 )
{
// Environment variable specifies which VS to use.
if( getenv("VSENV") != NULL )
{
int iVer = atoi( getenv("VSENV") );
if( iVer == 0 )
return false;
return GetVisualStudioEnv(envVar, vecPathes, iVer, iVer );
}
iProbeFrom = 20;
iProbeTo = 9;
} //if
for( int iProbeVer = iProbeFrom; iProbeVer >= iProbeTo; iProbeVer-- )
{
char envvar[64];
sprintf(envvar, "VS%d0COMNTOOLS", iProbeVer);
// Not defined
if( getenv(envvar) == NULL )
continue;
std::string cmd = getenv(envvar);
cmd += "\\..\\..\\vc\\vcvarsall.bat";
if( !PathFileExistsA( cmd.c_str() ) )
continue;
//printf("Located: %s", envvar);
cmd = "cmd /C \"" + cmd + "\" ^>nul ^& set";
s = exec(cmd.c_str());
break;
}
if( s.length() == 0 )
return false;
char* envline;
vecPathes.clear();
for (envline = strtok( &s[0], "\n" ); envline; envline = strtok( NULL, "\n" ))
{
char* varend = strchr( envline, '=');
if( !varend )
continue;
*varend = 0;
if( strcmp(envline,envVar) == 0 )
{
char* val;
for (val = strtok( varend + 1, ";" ); val; val = strtok( NULL, ";" ))
{
vecPathes.push_back(val);
}
}
*varend = '=';
} //for
return true;
} //GetVisualStudioEnv
#endif //_WIN32
#ifdef _MSC_VER
bool GetVisualStudioEnv(const char* env,
std::vector<std::string>& pathes,
int probeFrom = 0, int probeTo = 0);
#endif
void Parser::Setup(ParserOptions^ Opts)
{
@ -232,9 +133,8 @@ void Parser::Setup(ParserOptions^ Opts) @@ -232,9 +133,8 @@ void Parser::Setup(ParserOptions^ Opts)
}
#endif
#ifdef _WIN32
#ifdef _MSC_VER
std::vector<std::string> SystemDirs;
if( GetVisualStudioEnv("INCLUDE", SystemDirs, Opts->toolSetToUse, Opts->toolSetToUse ) )
{
clang::HeaderSearchOptions& HSOpts = C->getHeaderSearchOpts();
@ -243,7 +143,7 @@ void Parser::Setup(ParserOptions^ Opts) @@ -243,7 +143,7 @@ void Parser::Setup(ParserOptions^ Opts)
{
HSOpts.AddPath(SystemDirs[i], frontend::System, false, false, true);
}
} //if
}
#endif
C->createPreprocessor();

110
src/Parser/VSLookup.cpp
Unescape View File

@ -0,0 +1,110 @@ @@ -0,0 +1,110 @@
/************************************************************************
*
* Cxxi
* Licensed under the simplified BSD license. All rights reserved.
*
************************************************************************/
#ifdef _MSC_VER
#include <string>
#include <vector>
#include <cstdio>
static std::string exec(const char* cmd)
{
FILE* pipe = _popen(cmd, "r");
if (!pipe) return "ERROR";
char buffer[128];
std::string result = "";
while(!feof(pipe)) {
if(fgets(buffer, 128, pipe) != NULL)
result += buffer;
}
_pclose(pipe);
return result;
}
#pragma comment(lib, "shlwapi.lib") //_popen, _pclose
#include <shlwapi.h>
//
// Returns true if got settings, false if not.
//
bool GetVisualStudioEnv(
const char* envVar, // [in] "INCLUDE" / "LIBPATH"
std::vector<std::string>& vecPathes,
int iProbeFrom = 0, int iProbeTo = 0 // 2005 - 8, 2008 - 9, 2010 - 10
)
{
std::string s;
if( iProbeFrom == 0 && iProbeTo == 0 )
{
// Environment variable specifies which VS to use.
if( getenv("VSENV") != NULL )
{
int iVer = atoi( getenv("VSENV") );
if( iVer == 0 )
return false;
return GetVisualStudioEnv(envVar, vecPathes, iVer, iVer );
}
iProbeFrom = 20;
iProbeTo = 9;
}
for( int iProbeVer = iProbeFrom; iProbeVer >= iProbeTo; iProbeVer-- )
{
char envvar[64];
sprintf(envvar, "VS%d0COMNTOOLS", iProbeVer);
// Not defined
if( getenv(envvar) == NULL )
continue;
std::string cmd = getenv(envvar);
cmd += "\\..\\..\\vc\\vcvarsall.bat";
if( !PathFileExistsA( cmd.c_str() ) )
continue;
//printf("Located: %s", envvar);
cmd = "cmd /C \"" + cmd + "\" ^>nul ^& set";
s = exec(cmd.c_str());
break;
}
if( s.length() == 0 )
return false;
char* envline;
vecPathes.clear();
for (envline = strtok( &s[0], "\n" ); envline; envline = strtok( NULL, "\n" ))
{
char* varend = strchr( envline, '=');
if( !varend )
continue;
*varend = 0;
if( strcmp(envline,envVar) == 0 )
{
char* val;
for (val = strtok( varend + 1, ";" ); val; val = strtok( NULL, ";" ))
{
vecPathes.push_back(val);
}
}
*varend = '=';
}
return true;
}
#endif
Write Preview
Loading…
Cancel
Save