diff --git a/appveyor.yml b/appveyor.yml index 23ea769ce1..ce9d4b3ca1 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,4 +1,4 @@ -version: '4.24.x.{build}' +version: '24.x.{build}' image: - Visual Studio 2017 diff --git a/build/BuildAll.py b/build/BuildAll.py index 2eb1a13989..2063ec6023 100644 --- a/build/BuildAll.py +++ b/build/BuildAll.py @@ -101,14 +101,7 @@ def zip_folder_inner(folder, output): print('make zip fail:', retcode, os.path.basename(output)) def get_app_version(): - major, minor, build, reversion = ['']*4 - path = os.path.join(buildFolder, '../src/Version.h') - with open(path, encoding='utf-8') as fd: - for line in fd.read().splitlines(): - if line.startswith('#define VERSION_MAJOR'): - major = line.split()[2] - break - + minor, build, reversion = ['']*3 path = os.path.join(buildFolder, '../src/VersionRev.h') with open(path, encoding='utf-8') as fd: for line in fd.read().splitlines(): @@ -122,7 +115,7 @@ def get_app_version(): build = value elif key == 'VERSION_REV': reversion = value - return f'v{major}.{minor}.{build}r{reversion}' + return f'v{minor}.{build}r{reversion}' def prepare_build_environment(): app_version = get_app_version() diff --git a/build/make_zip.bat b/build/make_zip.bat index 89512b39ba..73569feda3 100644 --- a/build/make_zip.bat +++ b/build/make_zip.bat @@ -241,8 +241,6 @@ EXIT /B :SubGetVersion rem Get the version -FOR /F "tokens=3,4" %%K IN ( - 'FINDSTR /I /L /C:"define VERSION_MAJOR" "..\src\Version.h"') DO (SET "VerMajor=%%K") FOR /F "tokens=3,4" %%K IN ( 'FINDSTR /I /L /C:"define VERSION_MINOR" "..\src\VersionRev.h"') DO (SET "VerMinor=%%K") FOR /F "tokens=3,4" %%K IN ( @@ -250,7 +248,7 @@ FOR /F "tokens=3,4" %%K IN ( FOR /F "tokens=3,4" %%K IN ( 'FINDSTR /I /L /C:"define VERSION_REV " "..\src\VersionRev.h"') DO (SET "VerRev=%%K") -SET NP2_VER=v%VerMajor%.%VerMinor%.%VerBuild%r%VerRev% +SET NP2_VER=v%VerMinor%.%VerBuild%r%VerRev% EXIT /B diff --git a/doc/release.md b/doc/release.md index 74a7c04515..6f76486f6c 100644 --- a/doc/release.md +++ b/doc/release.md @@ -16,6 +16,6 @@ | zh-Hans | 中文 (简体) | Win32 | 🟠legacy Windows XP, Server 2003 | | zh-Hant | 中文 (繁體) | | i18n | all above languages include French | winget | `winget install -e "Notepad4"` | -| 한국어 | https://teus.me/category/IT/Notepad2 | winget | `winget install zufuliu.notepad4` | +| 한국어 | https://teus.me/Notepad4 | winget | `winget install zufuliu.notepad4` | Latest development builds (artifacts in Release configuration for each compiler and platform) are available at https://github.com/zufuliu/notepad4/actions and https://ci.appveyor.com/project/zufuliu/notepad4. diff --git a/matepath/res/matepath.exe.manifest b/matepath/res/matepath.exe.manifest index 0d5310c7c4..f3c75824f6 100644 --- a/matepath/res/matepath.exe.manifest +++ b/matepath/res/matepath.exe.manifest @@ -1,6 +1,6 @@ - + matepath File Browser diff --git a/matepath/src/VersionRev.h b/matepath/src/VersionRev.h index 2fe50c0e0e..fb7f0b2c45 100644 --- a/matepath/src/VersionRev.h +++ b/matepath/src/VersionRev.h @@ -1,6 +1,6 @@ #define VERSION_MINOR 24 #define VERSION_BUILD_NUM 5 #define VERSION_BUILD 05 -#define VERSION_HASH TEXT("8a997c12") -#define VERSION_REV 5242 -#define VERSION_REV_FULL TEXT("r5242 (8a997c12)") +#define VERSION_HASH TEXT("7f055869") +#define VERSION_REV 5252 +#define VERSION_REV_FULL TEXT("r5252 (7f055869)") diff --git a/matepath/src/version.h b/matepath/src/version.h index 243b49566b..4db4bd3611 100644 --- a/matepath/src/version.h +++ b/matepath/src/version.h @@ -24,12 +24,10 @@ #define DO_STRINGIFY(x) TEXT(#x) #define STRINGIFY(x) DO_STRINGIFY(x) -#define VERSION_MAJOR 4 - #define MY_APPNAME L"matepath" #define MY_APPNAME_DESCRIPTION L"matepath File Browser" -#define VERSION_FILEVERSION_NUM VERSION_MAJOR,VERSION_MINOR,VERSION_BUILD_NUM,VERSION_REV -#define VERSION_FILEVERSION STRINGIFY(VERSION_MAJOR) "." STRINGIFY(VERSION_MINOR) "." \ +#define VERSION_FILEVERSION_NUM VERSION_MINOR,VERSION_BUILD_NUM,0,VERSION_REV +#define VERSION_FILEVERSION STRINGIFY(VERSION_MINOR) "." \ STRINGIFY(VERSION_BUILD) "." STRINGIFY(VERSION_REV) #define VERSION_LEGALCOPYRIGHT L"\xA9 2011-2024 Zufu Liu and all contributors" #define VERSION_COMPANYNAME L"Zufu Liu et al." @@ -91,6 +89,6 @@ #define VERSION_FILEVERSION_ARCH L" (32-bit) " #endif #endif -#define VERSION_FILEVERSION_LONG MY_APPNAME VERSION_FILEVERSION_ARCH STRINGIFY(VERSION_MAJOR) L"." \ +#define VERSION_FILEVERSION_LONG MY_APPNAME VERSION_FILEVERSION_ARCH \ STRINGIFY(VERSION_MINOR) L"." STRINGIFY(VERSION_BUILD) \ L" " VERSION_REV_FULL diff --git a/readme.md b/readme.md index 52acd805fe..73760083b4 100644 --- a/readme.md +++ b/readme.md @@ -200,5 +200,5 @@ Latest development builds (artifacts in Release configuration for each compiler * [中文 (繁體)](https://github.com/zufuliu/notepad4/tree/main/locale/zh-Hant) * [中文 (简体)](https://github.com/zufuliu/notepad4/tree/main/locale/zh-Hans) * [한국어](https://github.com/zufuliu/notepad4/tree/main/locale/ko) by [@VenusGirl](https://github.com/VenusGirl) - * [한국어](https://teus.me/category/IT/Notepad2) by [@bluenlive](https://github.com/bluenlive) + * [한국어](https://teus.me/Notepad4) by [@bluenlive](https://github.com/bluenlive) * [Notepad4 Wiki](https://github.com/zufuliu/notepad4/wiki) diff --git a/res/Notepad4.exe.manifest b/res/Notepad4.exe.manifest index f73a59b585..30ac84d7da 100644 --- a/res/Notepad4.exe.manifest +++ b/res/Notepad4.exe.manifest @@ -1,6 +1,6 @@ - + Notepad4 Text Editor diff --git a/src/Version.h b/src/Version.h index 8528733687..3bac621d47 100644 --- a/src/Version.h +++ b/src/Version.h @@ -18,12 +18,10 @@ #define DO_STRINGIFY(x) TEXT(#x) #define STRINGIFY(x) DO_STRINGIFY(x) -#define VERSION_MAJOR 4 - #define MY_APPNAME L"Notepad4" #define MY_APPNAME_DESCRIPTION L"Notepad4 Text Editor" -#define VERSION_FILEVERSION_NUM VERSION_MAJOR,VERSION_MINOR,VERSION_BUILD_NUM,VERSION_REV -#define VERSION_FILEVERSION STRINGIFY(VERSION_MAJOR) "." STRINGIFY(VERSION_MINOR) "." \ +#define VERSION_FILEVERSION_NUM VERSION_MINOR,VERSION_BUILD_NUM,0,VERSION_REV +#define VERSION_FILEVERSION STRINGIFY(VERSION_MINOR) "." \ STRINGIFY(VERSION_BUILD) "." STRINGIFY(VERSION_REV) #define VERSION_LEGALCOPYRIGHT L"\xA9 2011-2024 Zufu Liu and all contributors" #define VERSION_COMPANYNAME L"Zufu Liu et al." @@ -94,6 +92,6 @@ #define VERSION_FILEVERSION_ARCH L" (32-bit) " #endif #endif -#define VERSION_FILEVERSION_LONG MY_APPNAME VERSION_FILEVERSION_ARCH STRINGIFY(VERSION_MAJOR) L"." \ +#define VERSION_FILEVERSION_LONG MY_APPNAME VERSION_FILEVERSION_ARCH \ STRINGIFY(VERSION_MINOR) L"." STRINGIFY(VERSION_BUILD) \ L" " VERSION_REV_FULL diff --git a/src/VersionRev.h b/src/VersionRev.h index 2fe50c0e0e..fb7f0b2c45 100644 --- a/src/VersionRev.h +++ b/src/VersionRev.h @@ -1,6 +1,6 @@ #define VERSION_MINOR 24 #define VERSION_BUILD_NUM 5 #define VERSION_BUILD 05 -#define VERSION_HASH TEXT("8a997c12") -#define VERSION_REV 5242 -#define VERSION_REV_FULL TEXT("r5242 (8a997c12)") +#define VERSION_HASH TEXT("7f055869") +#define VERSION_REV 5252 +#define VERSION_REV_FULL TEXT("r5252 (7f055869)") diff --git a/version.sh b/version.sh index 87bb216b75..49051add4f 100644 --- a/version.sh +++ b/version.sh @@ -88,8 +88,8 @@ if [[ ! -f "$versionfile" ]] || [[ "$version_info" != "$(<"$versionfile")" ]]; t fi # Update manifest file if version information was changed. -base_ver="4" -new_ver="`date +%y.%m`.${ver}" +base_ver="[0-9][0-9]" +new_ver="`date +%m`.0.${ver}" newmanifest="$(sed -Ee "0,/(${base_ver}\.)([0-9.]+)/s//\1${new_ver}/g" "$manifestfile")" if [[ "$newmanifest" != "$(<"$manifestfile")" ]]; then # Update the revision number in the manifest file @@ -104,7 +104,6 @@ if [[ $# -ne 0 ]]; then echo "$version_info" > "$versionfile" fi - base_ver="4" newmanifest="$(sed -Ee "0,/(${base_ver}\.)([0-9.]+)/s//\1${new_ver}/g" "$manifestfile")" if [[ "$newmanifest" != "$(<"$manifestfile")" ]]; then echo "$newmanifest" > "$manifestfile"