tyler.durden
/
notepad-plus-plus
mirror of https://github.com/notepad-plus-plus/notepad-plus-plus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix xml writing issue in gcc build 

Fix #10185, fix #9163, close #10503
This commit is contained in:
Ivan Ustûžanin 2021-09-04 12:54:35 +03:00 committed by Don Ho
parent cddcbb5d61
commit 241238df5a
3 changed files with 17 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
.gitignore vendored
View File

@ -100,11 +100,8 @@ PowerEditor/src/tools/NppShell/build_x64
# scintilla - generated files # scintilla - generated files
scintilla/bin/SciLexer.* scintilla/bin/SciLexer.*
scintilla/bin/Scintilla.* scintilla/bin/Scintilla.*
scintilla/bin/libscilexer.a
scintilla/bin/libscintilla.a
scintilla/bin/libscintilla.lib scintilla/bin/libscintilla.lib
scintilla/win32/*.lib scintilla/win32/*.lib
scintilla/win32/Lexers.a
scintilla/win32/ScintRes.res scintilla/win32/ScintRes.res
scintilla/win32/ARM64 scintilla/win32/ARM64
scintilla/win32/Unicode Release/ scintilla/win32/Unicode Release/
@ -155,11 +152,10 @@ PowerEditor/bin/SourceCodePro-Regular.ttf
# GNU GCC MinGW # GNU GCC MinGW
#-- Generated during makefile build #-- Generated during makefile build
*.d PowerEditor/gcc/*.build/
*.o PowerEditor/bin/NotepadPP*.exe
/PowerEditor/gcc/resources.res scintilla/win32/*.o
/PowerEditor/bin/NotepadPP.exe scintilla/bin/libscilexer.a
/PowerEditor/bin/NotepadPP.exe_dynamic
#-- Generated manually to make Notepad++ execute properly on Linux using Wine #-- Generated manually to make Notepad++ execute properly on Linux using Wine
/PowerEditor/bin/libgcc_s_sjlj-1.dll /PowerEditor/bin/libgcc_s_sjlj-1.dll

2
PowerEditor/gcc/makefile
View File

@ -48,7 +48,7 @@ CXXFLAGS += -g -Wall -Wpedantic -Wconversion-null
BUILD_TYPE := $(CROSS_COMPILE)debug BUILD_TYPE := $(CROSS_COMPILE)debug
endif endif
BUILD_DIR := $(GCC_DIR)/$(BUILD_TYPE) BUILD_DIR := $(BUILD_TYPE).build
TARGET_BINARY := $(TARGET_DIR)/$(TARGET_BASE)-$(BUILD_TYPE)$(TARGET_SUFFIX) TARGET_BINARY := $(TARGET_DIR)/$(TARGET_BASE)-$(BUILD_TYPE)$(TARGET_SUFFIX)
# Preparations: # Preparations:

24
PowerEditor/src/TinyXml/tinyxml.cpp
View File

@ -559,7 +559,7 @@ void TiXmlElement::Print( FILE* cfile, int depth ) const
generic_fprintf( cfile, TEXT(" ") ); generic_fprintf( cfile, TEXT(" ") );
} }
generic_fprintf( cfile, TEXT("<%s"), value.c_str() ); generic_fprintf( cfile, TEXT("<%ls"), value.c_str() );
TiXmlAttribute* attrib; TiXmlAttribute* attrib;
for ( attrib = attributeSet.First(); attrib; attrib = attrib->Next() ) for ( attrib = attributeSet.First(); attrib; attrib = attrib->Next() )
@ -581,7 +581,7 @@ void TiXmlElement::Print( FILE* cfile, int depth ) const
{ {
generic_fprintf( cfile, TEXT(">") ); generic_fprintf( cfile, TEXT(">") );
firstChild->Print( cfile, depth + 1 ); firstChild->Print( cfile, depth + 1 );
generic_fprintf( cfile, TEXT("</%s>"), value.c_str() ); generic_fprintf( cfile, TEXT("</%ls>"), value.c_str() );
} }
else else
{ {
@ -598,7 +598,7 @@ void TiXmlElement::Print( FILE* cfile, int depth ) const
generic_fprintf( cfile, TEXT("\n") ); generic_fprintf( cfile, TEXT("\n") );
for( i=0; i<depth; ++i ) for( i=0; i<depth; ++i )
generic_fprintf( cfile, TEXT(" ") ); generic_fprintf( cfile, TEXT(" ") );
generic_fprintf( cfile, TEXT("</%s>"), value.c_str() ); generic_fprintf( cfile, TEXT("</%ls>"), value.c_str() );
} }
} }
@ -840,9 +840,9 @@ void TiXmlAttribute::Print( FILE* cfile, int /*depth*/ ) const
PutString( Value(), &v ); PutString( Value(), &v );
if (value.find ('\"') == TIXML_STRING::npos) if (value.find ('\"') == TIXML_STRING::npos)
generic_fprintf (cfile, TEXT("%s=\"%s\""), n.c_str(), v.c_str() ); generic_fprintf (cfile, TEXT("%ls=\"%ls\""), n.c_str(), v.c_str() );
else else
generic_fprintf (cfile, TEXT("%s='%s'"), n.c_str(), v.c_str() ); generic_fprintf (cfile, TEXT("%ls='%ls'"), n.c_str(), v.c_str() );
} }
@ -906,9 +906,9 @@ void TiXmlComment::Print( FILE* cfile, int depth ) const
{ {
for ( int i=0; i<depth; i++ ) for ( int i=0; i<depth; i++ )
{ {
fputs( " ", cfile ); generic_fprintf( cfile, TEXT(" ") );
} }
generic_fprintf( cfile, TEXT("<!--%s-->"), value.c_str() ); generic_fprintf( cfile, TEXT("<!--%ls-->"), value.c_str() );
} }
void TiXmlComment::StreamOut( TIXML_OSTREAM * stream ) const void TiXmlComment::StreamOut( TIXML_OSTREAM * stream ) const
@ -934,7 +934,7 @@ void TiXmlText::Print( FILE* cfile, int /*depth*/ ) const
{ {
TIXML_STRING buffer; TIXML_STRING buffer;
PutString( value, &buffer ); PutString( value, &buffer );
generic_fprintf( cfile, TEXT("%s"), buffer.c_str() ); generic_fprintf( cfile, TEXT("%ls"), buffer.c_str() );
} }
@ -973,11 +973,11 @@ void TiXmlDeclaration::Print( FILE* cfile, int /*depth*/ ) const
generic_fprintf (cfile, TEXT("<?xml ")); generic_fprintf (cfile, TEXT("<?xml "));
if ( !version.empty() ) if ( !version.empty() )
generic_fprintf (cfile, TEXT("version=\"%s\" "), version.c_str ()); generic_fprintf (cfile, TEXT("version=\"%ls\" "), version.c_str ());
if ( !encoding.empty() ) if ( !encoding.empty() )
generic_fprintf (cfile, TEXT("encoding=\"%s\" "), encoding.c_str ()); generic_fprintf (cfile, TEXT("encoding=\"%ls\" "), encoding.c_str ());
if ( !standalone.empty() ) if ( !standalone.empty() )
generic_fprintf (cfile, TEXT("standalone=\"%s\" "), standalone.c_str ()); generic_fprintf (cfile, TEXT("standalone=\"%ls\" "), standalone.c_str ());
generic_fprintf (cfile, TEXT("?>")); generic_fprintf (cfile, TEXT("?>"));
} }
@ -1025,7 +1025,7 @@ void TiXmlUnknown::Print( FILE* cfile, int depth ) const
{ {
for ( int i=0; i<depth; i++ ) for ( int i=0; i<depth; i++ )
generic_fprintf( cfile, TEXT(" ") ); generic_fprintf( cfile, TEXT(" ") );
generic_fprintf( cfile, TEXT("%s"), value.c_str() ); generic_fprintf( cfile, TEXT("%ls"), value.c_str() );
} }
void TiXmlUnknown::StreamOut( TIXML_OSTREAM * stream ) const void TiXmlUnknown::StreamOut( TIXML_OSTREAM * stream ) const