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

Fix build and run runnin the executable when build failed (SpartanJ/ecode#278).

Browse Source
This commit is contained in:
Martín Lucas Golini
2024-05-14 11:43:49 -03:00
parent 04540a3ebe
commit 8e9d97f6ac
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,5 +1,5 @@
#include "ecode.hpp"
#include "projectbuild.hpp"
#include "ecode.hpp"
#include "statusbuildoutputcontroller.hpp"
#include "uibuildsettings.hpp"
#include <eepp/core/string.hpp>
@@ -707,8 +707,9 @@ void ProjectBuildManager::cleanCurrentConfig( StatusBuildOutputController* sboc
void ProjectBuildManager::runCurrentConfig( StatusAppOutputController* saoc, bool build,
StatusBuildOutputController* sboc ) {
if ( build ) {
buildCurrentConfig( sboc, [this, saoc]( int ) {
mApp->getUISceneNode()->runOnMainThread( [saoc, this] { runConfig( saoc ); } );
buildCurrentConfig( sboc, [this, saoc]( int exitStatus ) {
if ( EXIT_SUCCESS == exitStatus )
mApp->getUISceneNode()->runOnMainThread( [saoc, this] { runConfig( saoc ); } );
} );
} else {
runConfig( saoc );
@@ -751,7 +752,7 @@ void ProjectBuildManager::runConfig( StatusAppOutputController* saoc ) {
ProjectBuildCommand finalBuild( build->replaceVars( *run ) );
replaceDynamicVars( finalBuild );
String::trimInPlace( finalBuild.cmd );
if ( finalBuild.cmd.find_first_of("\\/") == std::string::npos &&
if ( finalBuild.cmd.find_first_of( "\\/" ) == std::string::npos &&
Sys::which( finalBuild.cmd ).empty() ) {
FileSystem::dirAddSlashAtEnd( finalBuild.workingDir );
finalBuild.cmd = finalBuild.workingDir + finalBuild.cmd;