diff --git a/Build/make_zip.bat b/Build/make_zip.bat index e3837a8af..43e8a1c82 100644 --- a/Build/make_zip.bat +++ b/Build/make_zip.bat @@ -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!" diff --git a/Build/notepad3_setup.iss b/Build/notepad3_setup.iss index 009c3e059..4604bd894 100644 --- a/Build/notepad3_setup.iss +++ b/Build/notepad3_setup.iss @@ -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() diff --git a/Build/notepad3_x86_setup.iss b/Build/notepad3_x86_setup.iss index 033597254..f649454da 100644 --- a/Build/notepad3_x86_setup.iss +++ b/Build/notepad3_x86_setup.iss @@ -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 diff --git a/Versions/build.txt b/Versions/build.txt index d00491fd7..0cfbf0888 100644 --- a/Versions/build.txt +++ b/Versions/build.txt @@ -1 +1 @@ -1 +2 diff --git a/res/Notepad3.exe.manifest.conf b/res/Notepad3.exe.manifest.conf index 724c9b305..d39c6e9f5 100644 --- a/res/Notepad3.exe.manifest.conf +++ b/res/Notepad3.exe.manifest.conf @@ -3,7 +3,7 @@ Notepad3 BETA diff --git a/src/VersionEx.h b/src/VersionEx.h index 69dcd2516..f2b5ab422 100644 --- a/src/VersionEx.h +++ b/src/VersionEx.h @@ -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