haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Standardize eeschema header with pcbnew 

Removes the host tag with build data and replaces with the "generator"
tag
This commit is contained in:
Seth Hillbrand 2020-08-27 12:22:51 -07:00
parent e665ad811d
commit 46cb760641
3 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
eeschema/sch_file_versions.h
View File

@ -35,7 +35,9 @@
//#define SEXPR_SYMBOL_LIB_FILE_VERSION 20200126 // Initial version. Add alternate pin //#define SEXPR_SYMBOL_LIB_FILE_VERSION 20200126 // Initial version. Add alternate pin
// definitions. // definitions.
#define SEXPR_SYMBOL_LIB_FILE_VERSION 20200820 //#define SEXPR_SYMBOL_LIB_FILE_VERSION 20200820
#define SEXPR_SYMBOL_LIB_FILE_VERSION 20200827 // Remove host tag
/** /**
* Symbol library file version. * Symbol library file version.
@ -56,4 +58,6 @@
//#define SEXPR_SCHEMATIC_FILE_VERSION 20200714 // Add alternate pin definitions. //#define SEXPR_SCHEMATIC_FILE_VERSION 20200714 // Add alternate pin definitions.
#define SEXPR_SCHEMATIC_FILE_VERSION 20200820 //#define SEXPR_SCHEMATIC_FILE_VERSION 20200820
#define SEXPR_SCHEMATIC_FILE_VERSION 20200827 // Remove host tag

5
eeschema/sch_sexpr_parser.cpp
View File

@ -647,7 +647,10 @@ void SCH_SEXPR_PARSER::parseHeader( TSCHEMATIC_T::T aHeaderType, int aFileVersio
NeedLEFT(); NeedLEFT();
NeedSYMBOL(); NeedSYMBOL();
NeedSYMBOL(); NeedSYMBOL();
NeedSYMBOL();
if( m_requiredVersion < 20200827 )
NeedSYMBOL();
NeedRIGHT(); NeedRIGHT();
} }
else else

10
eeschema/sch_sexpr_plugin.cpp
View File

@ -593,9 +593,8 @@ void SCH_SEXPR_PLUGIN::Format( SCH_SHEET* aSheet )
wxCHECK( screen, /* void */ ); wxCHECK( screen, /* void */ );
m_out->Print( 0, "(kicad_sch (version %d) (host eeschema %s)\n\n", m_out->Print( 0, "(kicad_sch (version %d) (generator eeschema)\n\n",
SEXPR_SCHEMATIC_FILE_VERSION, SEXPR_SCHEMATIC_FILE_VERSION );
m_out->Quotew( GetBuildVersion() ).c_str() );
// Root sheet must have a permanent UUID. // Root sheet must have a permanent UUID.
// if( aSheet->IsRootSheet() && aSheet->m_Uuid.IsLegacyTimestamp() ) // if( aSheet->IsRootSheet() && aSheet->m_Uuid.IsLegacyTimestamp() )
@ -1437,9 +1436,8 @@ void SCH_SEXPR_PLUGIN_CACHE::Save()
std::unique_ptr< FILE_OUTPUTFORMATTER > formatter( new FILE_OUTPUTFORMATTER( fn.GetFullPath() ) ); std::unique_ptr< FILE_OUTPUTFORMATTER > formatter( new FILE_OUTPUTFORMATTER( fn.GetFullPath() ) );
formatter->Print( 0, "(kicad_symbol_lib (version %d) (host kicad_symbol_editor %s)\n", formatter->Print( 0, "(kicad_symbol_lib (version %d) (generator kicad_symbol_editor)\n",
SEXPR_SYMBOL_LIB_FILE_VERSION, SEXPR_SYMBOL_LIB_FILE_VERSION );
formatter->Quotew( GetBuildVersion() ).c_str() );
for( auto parent : m_symbols ) for( auto parent : m_symbols )
{ {