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

[xml][force compile] Add toolbarIcons.xml to the build process 

Ref: https://github.com/notepad-plus-plus/notepad-plus-plus/pull/12682#issuecomment-1365151173

Close #12712
This commit is contained in:
ArkadiuszMichalski 2022-12-27 13:49:35 +01:00 committed by Don Ho
parent dc3fd93f5a
commit 1d6fe3ff42
4 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
PowerEditor/gcc/makefile
View File

@ -26,7 +26,7 @@ BIN_DIRECTORY := ../bin
INSTALLER_DIRECTORY := ../installer
TARGET_BINARY := notepad++.exe
SRC_DATA := contextMenu.xml langs.model.xml shortcuts.xml stylers.model.xml tabContextMenu_example.xml
SRC_DATA := contextMenu.xml langs.model.xml shortcuts.xml stylers.model.xml tabContextMenu_example.xml toolbarIcons.xml
BIN_DATA := change.log doLocalConf.xml nppLogNulContentCorruptionIssue.xml readme.txt userDefineLangs/
INSTALLER_DATA := autoCompletion/ functionList/ localization/ themes/

3
PowerEditor/installer/nsisInclude/mainSectionFuncs.nsh
View File

@ -75,7 +75,8 @@ Function copyCommonFiles
SetOutPath "$UPDATE_PATH\"
File "..\bin\contextMenu.xml"
File "..\src\tabContextMenu_example.xml"
File "..\src\toolbarIcons.xml"
SetOverwrite on
SetOutPath "$INSTDIR\"
File "..\bin\langs.model.xml"

2
PowerEditor/installer/nsisInclude/uninstall.nsh
View File

@ -230,6 +230,7 @@ Section Uninstall
Delete "$INSTDIR\nativeLang.xml"
Delete "$INSTDIR\userDefineLang.xml"
Delete "$INSTDIR\nppLogNulContentCorruptionIssue.xml"
Delete "$INSTDIR\toolbarIcons.xml"
${endIf}
Delete "$INSTDIR\config.model.xml"
@ -269,6 +270,7 @@ Section Uninstall
Delete "$APPDATA\${APPNAME}\userDefineLang.xml"
Delete "$APPDATA\${APPNAME}\insertExt.ini"
Delete "$APPDATA\${APPNAME}\nppLogNulContentCorruptionIssue.log"
Delete "$APPDATA\${APPNAME}\toolbarIcons.xml"
Delete "$APPDATA\${APPNAME}\userDefineLangs\userDefinedLang-markdown.default.modern.xml"
Delete "$APPDATA\${APPNAME}\userDefineLangs\markdown._preinstalled.udl.xml"
Delete "$APPDATA\${APPNAME}\userDefineLangs\markdown._preinstalled_DM.udl.xml"

13
PowerEditor/installer/packageAll.bat
View File

@ -113,6 +113,8 @@ copy /Y ..\bin\"notepad++.exe" .\minimalist\
If ErrorLevel 1 goto End
copy /Y ".\themes\DarkModeDefault.xml" .\minimalist\themes\
If ErrorLevel 1 goto End
copy /Y ..\src\toolbarIcons.xml .\minimalist\
If ErrorLevel 1 goto End
rmdir /S /Q .\minimalist64
@ -146,6 +148,8 @@ copy /Y ..\bin64\"notepad++.exe" .\minimalist64\
If ErrorLevel 1 goto End
copy /Y ".\themes\DarkModeDefault.xml" .\minimalist64\themes\
If ErrorLevel 1 goto End
copy /Y ..\src\toolbarIcons.xml .\minimalist64\
If ErrorLevel 1 goto End
rmdir /S /Q .\minimalistArm64
@ -179,6 +183,8 @@ copy /Y ..\binarm64\"notepad++.exe" .\minimalistArm64\
If ErrorLevel 1 goto End
copy /Y ".\themes\DarkModeDefault.xml" .\minimalistArm64\themes\
If ErrorLevel 1 goto End
copy /Y ..\src\toolbarIcons.xml .\minimalistArm64\
If ErrorLevel 1 goto End
rem Remove old built Notepad++ 32-bit package
@ -261,6 +267,9 @@ copy /Y ..\bin\nppLogNulContentCorruptionIssue.xml .\zipped.package.release\
If ErrorLevel 1 goto End
copy /Y ..\bin\"notepad++.exe" .\zipped.package.release\
If ErrorLevel 1 goto End
copy /Y ..\src\toolbarIcons.xml .\zipped.package.release\
If ErrorLevel 1 goto End
rem Basic Copy needed files into Notepad++ 64-bit package folders
@ -286,6 +295,8 @@ copy /Y ..\bin\nppLogNulContentCorruptionIssue.xml .\zipped.package.release64\
If ErrorLevel 1 goto End
copy /Y ..\bin64\"notepad++.exe" .\zipped.package.release64\
If ErrorLevel 1 goto End
copy /Y ..\src\toolbarIcons.xml .\zipped.package.release64\
If ErrorLevel 1 goto End
rem Basic Copy needed files into Notepad++ ARM64 package folders
@ -311,6 +322,8 @@ copy /Y ..\bin\nppLogNulContentCorruptionIssue.xml .\zipped.package.releaseArm64
If ErrorLevel 1 goto End
copy /Y ..\binarm64\"notepad++.exe" .\zipped.package.releaseArm64\
If ErrorLevel 1 goto End
copy /Y ..\src\toolbarIcons.xml .\zipped.package.releaseArm64\
If ErrorLevel 1 goto End
rem Plugins: Copy needed files into Notepad++ 32-bit package folders