Import Geant4 10.4.0 source tree
This commit is contained in:
@@ -31,14 +31,14 @@ inline bool find_with_dirs(std::ostream& a_out,
|
||||
|
||||
if(a_verbose) {
|
||||
a_out << "find_with_dirs :"
|
||||
<< " look for " << tools::sout(a_path) << " ..."
|
||||
<< " look for " << sout(a_path) << " ..."
|
||||
<< std::endl;
|
||||
}
|
||||
|
||||
if(tools::file::exists(a_path)) {
|
||||
if(file::exists(a_path)) {
|
||||
if(a_verbose) {
|
||||
a_out << "find_with_dirs :"
|
||||
<< " found " << tools::sout(a_path) << "."
|
||||
<< " found " << sout(a_path) << "."
|
||||
<< std::endl;
|
||||
}
|
||||
return true;
|
||||
@@ -48,7 +48,7 @@ inline bool find_with_dirs(std::ostream& a_out,
|
||||
|
||||
if(a_verbose) {
|
||||
a_out << "find_with_dirs :"
|
||||
<< " " << tools::sout(a_file) << " not found."
|
||||
<< " " << sout(a_file) << " not found."
|
||||
<< std::endl;
|
||||
}
|
||||
|
||||
@@ -67,10 +67,10 @@ inline bool find_with_env(std::ostream& a_out,
|
||||
std::string& a_path,
|
||||
bool a_verbose = false ) {
|
||||
std::string PATH;
|
||||
if(!tools::getenv(a_env,PATH)) {
|
||||
if(!get_env(a_env,PATH)) {
|
||||
//look for a a_file in current directory.
|
||||
a_path = a_file;
|
||||
if(tools::file::exists(a_path)) return true;
|
||||
if(file::exists(a_path)) return true;
|
||||
a_out << "tools::find_with_path :"
|
||||
<< " env variable " << sout(a_env) << " not defined."
|
||||
<< std::endl;
|
||||
@@ -79,12 +79,12 @@ inline bool find_with_env(std::ostream& a_out,
|
||||
}
|
||||
if(a_verbose) {
|
||||
a_out << "find_with_path :"
|
||||
<< " PATH is " << tools::sout(PATH)
|
||||
<< " PATH is " << sout(PATH)
|
||||
<< std::endl;
|
||||
}
|
||||
|
||||
std::vector<std::string> dirs;
|
||||
tools::words(PATH,psep(),false,dirs); //or true ?
|
||||
words(PATH,psep(),false,dirs); //or true ?
|
||||
|
||||
return find_with_dirs(a_out,dirs,a_file,a_path,a_verbose);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user