CodeCow/Notepad3
1
0
Fork 0
mirror of https://github.com/rizonesoft/Notepad3.git synced 2026-06-14 21:09:05 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #2268 from hpwamr/mui

Browse Source 
+ chg: Update Notepad3 installers x86 and x64 and make.zip NP3Portetable
This commit is contained in:
Pairi Daiza 2020-04-27 19:42:11 +02:00 committed by GitHub
commit 3f01ccc19f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 36 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Build/make_zip.bat
View File

@ -29,10 +29,12 @@ SET INPUTDIRx86=bin\Release_x86_v142
SET INPUTDIRx64=bin\Release_x64_v142
SET "TEMP_NAME=temp_zip"
IF NOT EXIST "..\%INPUTDIRx86%\Notepad3.exe" CALL :SUBMSG "ERROR" "Compile Notepad3 x86 first!"
IF NOT EXIST "..\%INPUTDIRx86%\minipath.exe" CALL :SUBMSG "ERROR" "Compile MiniPath x86 first!"
IF NOT EXIST "..\%INPUTDIRx64%\Notepad3.exe" CALL :SUBMSG "ERROR" "Compile Notepad3 x64 first!"
IF NOT EXIST "..\%INPUTDIRx64%\minipath.exe" CALL :SUBMSG "ERROR" "Compile MiniPath x64 first!"
IF NOT EXIST "..\%INPUTDIRx86%\Notepad3.exe" CALL :SUBMSG "ERROR" "Compile Notepad3 x86 first!"
IF NOT EXIST "..\%INPUTDIRx86%\minipath.exe" CALL :SUBMSG "ERROR" "Compile MiniPath x86 first!"
IF NOT EXIST "..\%INPUTDIRx86%\grepWinNP3.exe" CALL :SUBMSG "ERROR" "Compile MiniPath x86 first!"
IF NOT EXIST "..\%INPUTDIRx64%\Notepad3.exe" CALL :SUBMSG "ERROR" "Compile Notepad3 x64 first!"
IF NOT EXIST "..\%INPUTDIRx64%\minipath.exe" CALL :SUBMSG "ERROR" "Compile MiniPath x64 first!"
IF NOT EXIST "..\%INPUTDIRx64%\grepWinNP3.exe" CALL :SUBMSG "ERROR" "Compile MiniPath x64 first!"
CALL :SubGetVersion
CALL :SubDetectSevenzipPath
@ -80,21 +82,23 @@ EXIT /B
SET "ZIP_NAME=Notepad3_%NP2_VER%_%2%SUFFIX%"
TITLE Creating %ZIP_NAME%.zip...
CALL :SUBMSG "INFO" "Creating %ZIP_NAME%.zip..."
echo off
IF EXIST "%TEMP_NAME%" RD /S /Q "%TEMP_NAME%"
IF NOT EXIST "%TEMP_NAME%" MD "%TEMP_NAME%"
IF NOT EXIST "Packages" MD "Packages"
FOR %%A IN ("Changes.txt" "License.txt" "Readme.txt" "Notepad3.ini" "minipath.ini"^
"..\%1\Notepad3.exe" "..\%1\minipath.exe") DO COPY /Y /V "%%A" "%TEMP_NAME%\"
FOR %%A IN ("Changes.txt" "License.txt" "Readme.txt" "..\grepWinNP3\GPL_v3.0_LICENSE.txt" "Notepad3.ini" "minipath.ini"^
"..\%1\Notepad3.exe" "..\%1\minipath.exe" "..\%1\grepWinNP3.exe" "..\grepWinNP3") DO COPY /Y /V "%%A" "%TEMP_NAME%\"
SET "LNG=%TEMP_NAME%\lng"
SET "GRP=%TEMP_NAME%\lng\gwLng\"
SET "THEMES=%TEMP_NAME%\themes"
SET "DOCS=%TEMP_NAME%\Docs"
IF NOT EXIST %LNG% MD %LNG%
IF NOT EXIST %THEMES% MD %THEMES%
IF NOT EXIST %DOCS% MD %DOCS%
XCOPY /E /Y /V "..\%1\lng" "%LNG%" /EXCLUDE:Ignore.txt
XCOPY /E /Y /V "..\grepWinNP3\translations" "%GRP%"
XCOPY /E /Y /V "themes" "%THEMES%"
XCOPY /E /Y /V "Docs" "%DOCS%"
@ -103,8 +107,8 @@ IF NOT EXIST "%FAVORITES%" MD "%FAVORITES%"
PUSHD "%TEMP_NAME%"
"%SEVENZIP%" a -tzip -mx=9^
"%ZIP_NAME%.zip" "License.txt" "Notepad3.exe" "Notepad3.ini" "Changes.txt"^
"Readme.txt" "Favorites" "minipath.exe" "minipath.ini" "lng" "themes" "Docs">NUL
"%ZIP_NAME%.zip" "License.txt" "Notepad3.exe" "Notepad3.ini" "GPL_v3.0_LICENSE.txt" "Changes.txt"^
"Readme.txt" "Favorites" "minipath.exe" "minipath.ini" "grepWinNP3.exe" "lng" "themes" "Docs">NUL
IF %ERRORLEVEL% NEQ 0 CALL :SUBMSG "ERROR" "Compilation failed!"
CALL :SUBMSG "INFO" "%ZIP_NAME%.zip created successfully!"

13
Build/notepad3_setup.iss
View File

@ -122,6 +122,11 @@ Source: License.txt; DestDir: {ap
Source: Readme.txt; DestDir: {app}; Flags: ignoreversion
Source: {#bindir}\Release_x64_v142\minipath.exe; DestDir: {app}; Flags: ignoreversion; Check: Is64BitInstallMode()
Source: {#bindir}\Release_x86_v142\minipath.exe; DestDir: {app}; Flags: ignoreversion; Check: not Is64BitInstallMode()
Source: "..\grepWinNP3\GPL_v3.0_LICENSE.txt"; DestDir: {app}; Flags: ignoreversion;
Source: "..\grepWinNP3\translations\*.lang"; DestDir: {app}\lng\gwLng; Flags: ignoreversion; Check: Is64BitInstallMode()
Source: "..\grepWinNP3\translations\*.lang"; DestDir: {app}\lng\gwLng; Flags: ignoreversion; Check: not Is64BitInstallMode()
Source: {#bindir}\Release_x64_v142\grepWinNP3.exe; DestDir: {app}; Flags: ignoreversion; Check: Is64BitInstallMode()
Source: {#bindir}\Release_x86_v142\grepWinNP3.exe; DestDir: {app}; Flags: ignoreversion; Check: not Is64BitInstallMode()
Source: Notepad3.ini; DestDir: {userappdata}\Rizonesoft\Notepad3; Flags: onlyifdoesntexist uninsneveruninstall
Source: minipath.ini; DestDir: {userappdata}\Rizonesoft\Notepad3; Flags: onlyifdoesntexist uninsneveruninstall
Source: themes\Dark.ini; DestDir: {userappdata}\Rizonesoft\Notepad3\themes; Flags: onlyifdoesntexist uninsneveruninstall
@ -186,10 +191,18 @@ Source: {#bindir}\Release_x64_v142\lng\ru-RU\mplng.dll.mui; DestDir: {ap
Source: {#bindir}\Release_x86_v142\lng\ru-RU\mplng.dll.mui; DestDir: {app}\lng\ru-RU; Flags: ignoreversion; Check: not Is64BitInstallMode()
Source: {#bindir}\Release_x64_v142\lng\ru-RU\np3lng.dll.mui; DestDir: {app}\lng\ru-RU; Flags: ignoreversion; Check: Is64BitInstallMode()
Source: {#bindir}\Release_x86_v142\lng\ru-RU\np3lng.dll.mui; DestDir: {app}\lng\ru-RU; Flags: ignoreversion; Check: not Is64BitInstallMode()
Source: {#bindir}\Release_x64_v142\lng\sk-SK\mplng.dll.mui; DestDir: {app}\lng\sk-SK; Flags: ignoreversion; Check: Is64BitInstallMode()
Source: {#bindir}\Release_x86_v142\lng\sk-SK\mplng.dll.mui; DestDir: {app}\lng\sk-SK; Flags: ignoreversion; Check: not Is64BitInstallMode()
Source: {#bindir}\Release_x64_v142\lng\sk-SK\np3lng.dll.mui; DestDir: {app}\lng\sk-SK; Flags: ignoreversion; Check: Is64BitInstallMode()
Source: {#bindir}\Release_x86_v142\lng\sk-SK\np3lng.dll.mui; DestDir: {app}\lng\sk-SK; Flags: ignoreversion; Check: not Is64BitInstallMode()
Source: {#bindir}\Release_x64_v142\lng\sv-SE\mplng.dll.mui; DestDir: {app}\lng\sv-SE; Flags: ignoreversion; Check: Is64BitInstallMode()
Source: {#bindir}\Release_x86_v142\lng\sv-SE\mplng.dll.mui; DestDir: {app}\lng\sv-SE; Flags: ignoreversion; Check: not Is64BitInstallMode()
Source: {#bindir}\Release_x64_v142\lng\sv-SE\np3lng.dll.mui; DestDir: {app}\lng\sv-SE; Flags: ignoreversion; Check: Is64BitInstallMode()
Source: {#bindir}\Release_x86_v142\lng\sv-SE\np3lng.dll.mui; DestDir: {app}\lng\sv-SE; Flags: ignoreversion; Check: not Is64BitInstallMode()
Source: {#bindir}\Release_x64_v142\lng\tr-TR\mplng.dll.mui; DestDir: {app}\lng\tr-TR; Flags: ignoreversion; Check: Is64BitInstallMode()
Source: {#bindir}\Release_x86_v142\lng\tr-TR\mplng.dll.mui; DestDir: {app}\lng\tr-TR; Flags: ignoreversion; Check: not Is64BitInstallMode()
Source: {#bindir}\Release_x64_v142\lng\tr-TR\np3lng.dll.mui; DestDir: {app}\lng\tr-TR; Flags: ignoreversion; Check: Is64BitInstallMode()
Source: {#bindir}\Release_x86_v142\lng\tr-TR\np3lng.dll.mui; DestDir: {app}\lng\tr-TR; Flags: ignoreversion; Check: not Is64BitInstallMode()
Source: {#bindir}\Release_x64_v142\lng\zh-CN\mplng.dll.mui; DestDir: {app}\lng\zh-CN; Flags: ignoreversion; Check: Is64BitInstallMode()
Source: {#bindir}\Release_x86_v142\lng\zh-CN\mplng.dll.mui; DestDir: {app}\lng\zh-CN; Flags: ignoreversion; Check: not Is64BitInstallMode()
Source: {#bindir}\Release_x64_v142\lng\zh-CN\np3lng.dll.mui; DestDir: {app}\lng\zh-CN; Flags: ignoreversion; Check: Is64BitInstallMode()

7
Build/notepad3_x86_setup.iss
View File

@ -112,6 +112,9 @@ Source: {#bindir}\Release_x86_v142\Notepad3.exe; DestDir: {ap
Source: License.txt; DestDir: {app}; Flags: ignoreversion
Source: Readme.txt; DestDir: {app}; Flags: ignoreversion
Source: {#bindir}\Release_x86_v142\minipath.exe; DestDir: {app}; Flags: ignoreversion;
Source: "..\grepWinNP3\GPL_v3.0_LICENSE.txt"; DestDir: {app}; Flags: ignoreversion;
Source: "..\grepWinNP3\translations\*.lang"; DestDir: {app}\lng\gwLng; Flags: ignoreversion;
Source: {#bindir}\Release_x86_v142\grepWinNP3.exe; DestDir: {app}; Flags: ignoreversion;
Source: Notepad3.ini; DestDir: {userappdata}\Rizonesoft\Notepad3; Flags: onlyifdoesntexist uninsneveruninstall
Source: minipath.ini; DestDir: {userappdata}\Rizonesoft\Notepad3; Flags: onlyifdoesntexist uninsneveruninstall
Source: themes\Dark.ini; DestDir: {userappdata}\Rizonesoft\Notepad3\themes; Flags: onlyifdoesntexist uninsneveruninstall
@ -146,8 +149,12 @@ Source: {#bindir}\Release_x86_v142\lng\pt-BR\mplng.dll.mui; DestDir: {ap
Source: {#bindir}\Release_x86_v142\lng\pt-BR\np3lng.dll.mui; DestDir: {app}\lng\pt-BR; Flags: ignoreversion
Source: {#bindir}\Release_x86_v142\lng\ru-RU\mplng.dll.mui; DestDir: {app}\lng\ru-RU; Flags: ignoreversion
Source: {#bindir}\Release_x86_v142\lng\ru-RU\np3lng.dll.mui; DestDir: {app}\lng\ru-RU; Flags: ignoreversion
Source: {#bindir}\Release_x86_v142\lng\sk-SK\mplng.dll.mui; DestDir: {app}\lng\sk-SK; Flags: ignoreversion
Source: {#bindir}\Release_x86_v142\lng\sk-SK\np3lng.dll.mui; DestDir: {app}\lng\sk-SK; Flags: ignoreversion
Source: {#bindir}\Release_x86_v142\lng\sv-SE\mplng.dll.mui; DestDir: {app}\lng\sv-SE; Flags: ignoreversion
Source: {#bindir}\Release_x86_v142\lng\sv-SE\np3lng.dll.mui; DestDir: {app}\lng\sv-SE; Flags: ignoreversion
Source: {#bindir}\Release_x86_v142\lng\tr-TR\mplng.dll.mui; DestDir: {app}\lng\tr-TR; Flags: ignoreversion
Source: {#bindir}\Release_x86_v142\lng\tr-TR\np3lng.dll.mui; DestDir: {app}\lng\tr-TR; Flags: ignoreversion
Source: {#bindir}\Release_x86_v142\lng\zh-CN\mplng.dll.mui; DestDir: {app}\lng\zh-CN; Flags: ignoreversion
Source: {#bindir}\Release_x86_v142\lng\zh-CN\np3lng.dll.mui; DestDir: {app}\lng\zh-CN; Flags: ignoreversion
Source: Docs\KeyboardShortcuts.txt; DestDir: {app}\Docs; Flags: ignoreversion

2
Versions/build.txt
View File

@ -1 +1 @@
1
2

2
res/Notepad3.exe.manifest.conf
View File

@ -3,7 +3,7 @@
<assemblyIdentity
name="Notepad3"
processorArchitecture="*"
version="5.20.427.1"
version="5.20.427.2"
type="win32"
/>
<description>Notepad3 BETA</description>

2
src/VersionEx.h
View File

@ -9,7 +9,7 @@
#define VERSION_MAJOR 5
#define VERSION_MINOR 20
#define VERSION_REV 427
#define VERSION_BUILD 1
#define VERSION_BUILD 2
#define SCINTILLA_VER 432
#define ONIGURUMA_REGEX_VER 6.9.5
#define UCHARDET_VER 2018.09.27