ExternalVendorCode/trick
1
0
Fork 0
mirror of https://github.com/nasa/trick.git synced 2025-06-21 08:29:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Split CP up into components that can be called individually

Browse Source 
Added a new TRICK_EXT_LIB_DIRS variable that allows users to
tell Trick about external libraries, rather than trying to
use TRICK_EXCLUDE. Added back getting multiple library dependency
sections from source files.

refs #86
This commit is contained in:
Alex Lin
2015-07-22 10:54:00 -05:00
parent d72555f3cc
commit d744eba557
8 changed files with 167 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
trick_source/codegen/Interface_Code_Gen/HeaderSearchDirs.cpp
View File

@ -169,6 +169,28 @@ void HeaderSearchDirs::AddExcludeDirs () {
}
}
void HeaderSearchDirs::AddExtLibDirs () {
char * trick_ext_lib_dirs = getenv("TRICK_EXT_LIB_DIRS") ;
if( trick_ext_lib_dirs != NULL ) {
std::string s = std::string(trick_ext_lib_dirs) ;
std::stringstream ss(s);
std::string item;
while(std::getline(ss, item, ':')) {
item = trim(item) ;
if ( ! item.empty() ) {
char * resolved_path = realpath(item.c_str(), NULL) ;
if ( resolved_path ) {
ext_lib_dirs.push_back(std::string(resolved_path) + std::string("/"));
} else {
std::cout << "Cannot find TRICK_EXT_LIB_DIRS directory " << item << std::endl ;
}
}
}
}
}
void HeaderSearchDirs::AddICGNoCommentDirs () {
char * trick_icg_nocomment = getenv("TRICK_ICG_NOCOMMENT") ;
@ -214,6 +236,7 @@ void HeaderSearchDirs::addSearchDirs ( std::vector<std::string> & include_dirs )
AddCompilerBuiltInSearchDirs() ;
AddExcludeDirs() ;
AddICGExcludeDirs() ;
AddExtLibDirs() ;
AddICGNoCommentDirs() ;
ApplyHeaderSearchOptions() ;
}
@ -272,6 +295,18 @@ bool HeaderSearchDirs::isPathInICGExclude (std::string in_dir ) {
return false ;
}
bool HeaderSearchDirs::isPathInExtLib (std::string in_dir ) {
std::vector<std::string>::iterator vit ;
for ( vit = ext_lib_dirs.begin() ; vit != ext_lib_dirs.end() ; vit++ ) {
if ( ! in_dir.compare(0, (*vit).size(), (*vit))) {
return true ;
}
}
return false ;
}
bool HeaderSearchDirs::isPathInICGNoComment (std::string in_file ) {
char * resolved_path = almostRealPath(in_file.c_str() ) ;
@ -320,6 +355,18 @@ std::string HeaderSearchDirs::getPathInICGExclude (std::string in_dir ) {
return std::string() ;
}
std::string HeaderSearchDirs::getPathInExtLib (std::string in_dir ) {
std::vector<std::string>::iterator vit ;
for ( vit = ext_lib_dirs.begin() ; vit != ext_lib_dirs.end() ; vit++ ) {
if ( ! in_dir.compare(0, (*vit).size(), (*vit))) {
return (*vit) ;
}
}
return std::string() ;
}
void HeaderSearchDirs::addDefines ( std::vector<std::string> & defines ) {
// Add -D command line arguments as well as "#define TRICK_ICG" to the preprocessor