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

Add dynamic vars to Run command.

Browse Source
This commit is contained in:
Martín Lucas Golini
2024-04-25 14:25:30 -03:00
parent 3ae10dab6c
commit e55535cc7c
2 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -313,6 +313,20 @@ ProjectBuildManager::~ProjectBuildManager() {
Sys::sleep( Milliseconds( 0.1f ) );
}
void ProjectBuildManager::replaceDynamicVars( ProjectBuildCommand& cmd ) {
std::string currentOS = String::toLower( Sys::getPlatform() );
std::string nproc = String::format( "%d", Sys::getCPUCount() );
std::string curDoc = getCurrentDocument();
std::string curDocName =
FileSystem::fileRemoveExtension( FileSystem::fileNameFromPath( curDoc ) );
replaceVar( cmd, VAR_OS, currentOS );
replaceVar( cmd, VAR_NPROC, nproc );
replaceVar( cmd, VAR_CURRENT_DOC, curDoc );
replaceVar( cmd, VAR_CURRENT_DOC_NAME, curDocName );
if ( cmd.workingDir.empty() )
cmd.workingDir = mProjectRoot;
}
ProjectBuildCommandsRes ProjectBuildManager::generateBuildCommands( const std::string& buildName,
const ProjectBuildi18nFn& i18n,
const std::string& buildType,
@@ -333,22 +347,12 @@ ProjectBuildCommandsRes ProjectBuildManager::generateBuildCommands( const std::s
return {
i18n( "build_os_not_supported", "Operating System not supported for this build!" ) };
std::string nproc = String::format( "%d", Sys::getCPUCount() );
std::string curDoc = getCurrentDocument();
std::string curDocName =
FileSystem::fileRemoveExtension( FileSystem::fileNameFromPath( curDoc ) );
ProjectBuildCommandsRes res;
auto finalBuild( build.replaceVars( isClean ? build.mClean : build.mBuild ) );
ProjectBuildCommandsRes res;
for ( const auto& step : finalBuild ) {
ProjectBuildCommand buildCmd( step );
replaceVar( buildCmd, VAR_OS, currentOS );
replaceVar( buildCmd, VAR_NPROC, nproc );
replaceVar( buildCmd, VAR_CURRENT_DOC, curDoc );
replaceVar( buildCmd, VAR_CURRENT_DOC_NAME, curDocName );
if ( buildCmd.workingDir.empty() )
buildCmd.workingDir = mProjectRoot;
replaceDynamicVars( buildCmd );
if ( !buildType.empty() )
replaceVar( buildCmd, VAR_BUILD_TYPE, buildType );
buildCmd.config = build.mConfig;
@@ -728,6 +732,7 @@ void ProjectBuildManager::runConfig( StatusAppOutputController* saoc ) {
return;
ProjectBuildCommand finalBuild( build->replaceVars( *run ) );
replaceDynamicVars( finalBuild );
auto cmd = finalBuild.cmd + " " + finalBuild.args;
if ( finalBuild.runInTerminal ) {
UITerminal* term = mApp->getTerminalManager()->createTerminalInSplitter(