Mirrors/eepp
1
0
Fork 0
mirror of https://github.com/SpartanJ/eepp.git synced 2026-06-05 21:16:28 +03:00
Code Issues Packages Projects Releases Wiki Activity

eepp: Added Sys::getEnvironmentVariables. Improved Process class.

Browse Source 
ecode: Fixed a bug in StatusBuildOuputController. Improvements when code completion and signature help are present at the same time.
This commit is contained in:
Martín Lucas Golini
2023-12-16 00:21:20 -03:00
parent 9e0ff076f2
commit b41cbfe1ce
7 changed files with 96 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/tools/ecode/projectbuild.cpp
View File

@@ -17,33 +17,6 @@ using json = nlohmann::json;
using namespace EE::Scene;
/** @return The process environment variables */
static ecode::ProjectBuildKeyVal getEnvironmentVariables() {
ecode::ProjectBuildKeyVal ret;
char** env;
#if defined( WIN ) && ( _MSC_VER >= 1900 )
env = *__p__environ();
#else
extern char** environ;
env = environ;
#endif
for ( ; *env; ++env ) {
auto var = String::split( *env, "=" );
if ( var.size() == 2 ) {
ret.push_back( std::make_pair( var[0], var[1] ) );
} else if ( var.size() > 2 ) {
auto val( var[1] );
for ( size_t i = 2; i < var.size(); ++i )
val += var[i];
ret.push_back( std::make_pair( var[0], val ) );
}
}
return ret;
}
namespace ecode {
static const char* VAR_PROJECT_ROOT = "${project_root}";
@@ -764,17 +737,8 @@ void ProjectBuildManager::runBuild( const std::string& buildName, const std::str
int progress = c > 0 ? c / (Float)totSteps : 0;
mProcess = std::make_unique<Process>();
auto options = Process::SearchUserPath | Process::NoWindow | Process::CombinedStdoutStderr;
ProjectBuildKeyVal env;
if ( !cmd.config.clearSysEnv ) {
if ( !res.envs.empty() ) {
env = getEnvironmentVariables();
env.insert( env.begin(), res.envs.begin(), res.envs.end() );
} else {
options |= Process::InheritEnvironment;
}
} else {
env = res.envs;
}
if ( !cmd.config.clearSysEnv )
options |= Process::InheritEnvironment;
if ( !cmd.enabled ) {
c++;
@@ -797,7 +761,7 @@ void ProjectBuildManager::runBuild( const std::string& buildName, const std::str
nullptr );
}
if ( mProcess->create( cmd.cmd, cmd.args, options, toUnorderedMap( env ),
if ( mProcess->create( cmd.cmd, cmd.args, options, toUnorderedMap( res.envs ),
cmd.workingDir ) ) {
std::string buffer( 1024, '\0' );
unsigned bytesRead = 0;