mirror of
https://gitlab.com/kicad/code/kicad.git
synced 2025-04-21 00:21:25 +00:00
Fix erc/drc output paths in cli
Fixes https://gitlab.com/kicad/code/kicad/-/issues/19474
This commit is contained in:
parent
2ee3ee341a
commit
afd2406adc
common/jobs
eeschema
kicad/cli
pcbnew
@ -31,7 +31,6 @@ public:
|
||||
JOB_RC( const std::string& aType );
|
||||
|
||||
wxString m_filename;
|
||||
wxString m_outputFile;
|
||||
|
||||
enum class UNITS
|
||||
{
|
||||
|
@ -1073,7 +1073,7 @@ int EESCHEMA_JOBS_HANDLER::JobSchErc( JOB* aJob )
|
||||
|
||||
sch->Prj().ApplyTextVars( aJob->GetVarOverrides() );
|
||||
|
||||
if( ercJob->m_outputFile.IsEmpty() )
|
||||
if( ercJob->GetOutputPath().IsEmpty() )
|
||||
{
|
||||
wxFileName fn = sch->GetFileName();
|
||||
fn.SetName( fn.GetName() + wxS( "-erc" ) );
|
||||
|
@ -95,7 +95,7 @@ int CLI::PCB_DRC_COMMAND::doPerform( KIWAY& aKiway )
|
||||
{
|
||||
std::unique_ptr<JOB_PCB_DRC> drcJob( new JOB_PCB_DRC() );
|
||||
|
||||
drcJob->m_outputFile = m_argOutput;
|
||||
drcJob->SetOutputPath( m_argOutput );
|
||||
drcJob->m_filename = m_argInput;
|
||||
drcJob->SetVarOverrides( m_argDefineVars );
|
||||
drcJob->m_reportAllTrackErrors = m_argParser.get<bool>( ARG_ALL_TRACK_ERRORS );
|
||||
|
@ -85,7 +85,7 @@ int CLI::SCH_ERC_COMMAND::doPerform( KIWAY& aKiway )
|
||||
{
|
||||
std::unique_ptr<JOB_SCH_ERC> ercJob( new JOB_SCH_ERC() );
|
||||
|
||||
ercJob->m_outputFile = m_argOutput;
|
||||
ercJob->SetOutputPath( m_argOutput );
|
||||
ercJob->m_filename = m_argInput;
|
||||
ercJob->m_exitCodeViolations = m_argParser.get<bool>( ARG_EXIT_CODE_VIOLATIONS );
|
||||
ercJob->SetVarOverrides( m_argDefineVars );
|
||||
|
@ -1660,7 +1660,7 @@ int PCBNEW_JOBS_HANDLER::JobExportDrc( JOB* aJob )
|
||||
brd->GetProject()->ApplyTextVars( aJob->GetVarOverrides() );
|
||||
brd->SynchronizeProperties();
|
||||
|
||||
if( drcJob->m_outputFile.IsEmpty() )
|
||||
if( drcJob->GetOutputPath().IsEmpty() )
|
||||
{
|
||||
wxFileName fn = brd->GetFileName();
|
||||
fn.SetName( fn.GetName() + wxS( "-drc" ) );
|
||||
|
Loading…
Reference in New Issue
Block a user