mirrors/Magpie
2
0
Fork 0
mirror of https://github.com/Blinue/Magpie.git synced 2026-06-24 02:04:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

设置文件版本号时不考虑MP_VERSION_TAG

Browse source 
同时从 public.py 中移除替换逻辑
This commit is contained in:
Howard Wu 2025-12-01 21:49:15 +08:00
commit 932adea07f
5 changed files with 27 additions and 98 deletions
Download patch file Download diff file Expand all files Collapse all files

31
scripts/publish.py
View file

@ -2,7 +2,6 @@ import sys
import os
import subprocess
import glob
import re
import argparse
try:
@ -61,36 +60,6 @@ versionNumProps = ""
if args.version_major != 0 or args.version_minor != 0 or args.version_patch != 0:
versionNumProps = f";MajorVersion={args.version_major};MinorVersion={args.version_minor};PatchVersion={args.version_patch}"
# 更新 RC 文件中的版本号
version = f"{args.version_major}.{args.version_minor}.{args.version_patch}.0"
version_comma = version.replace(".", ",")
for project in os.listdir("src"):
rcPath = f"src\\{project}\\{project}.rc"
if not os.access(rcPath, os.R_OK | os.W_OK):
continue
with open(rcPath, mode="r+", encoding="utf-8") as f:
src = f.read()
src = re.sub(
r"FILEVERSION .*?\n", "FILEVERSION " + version_comma + "\n", src
)
src = re.sub(
r"PRODUCTVERSION .*?\n", "PRODUCTVERSION " + version_comma + "\n", src
)
src = re.sub(
r'"FileVersion", *?".*?"\n', '"FileVersion", "' + version + '"\n', src
)
src = re.sub(
r'"ProductVersion", *?".*?"\n',
'"ProductVersion", "' + version + '"\n',
src,
)
f.seek(0)
f.truncate()
f.write(src)
versionTagProp = "" if args.version_tag == "" else f";VersionTag={args.version_tag}"
p = subprocess.run(

3
src/Common.Post.props
View file

@ -31,8 +31,7 @@
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions Condition="'$(CommitId)' != ''">MP_COMMIT_ID=$(CommitId);%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(MajorVersion)' != '' And '$(MinorVersion)' != '' And '$(PatchVersion)' != ''">MP_MAJOR_VERSION=$(MajorVersion);MP_MINOR_VERSION=$(MinorVersion);MP_PATCH_VERSION=$(PatchVersion);%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(VersionTag)' != ''">MP_VERSION_TAG=$(VersionTag);%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(MajorVersion)' != '' And '$(MinorVersion)' != '' And '$(PatchVersion)' != ''">MP_MAJOR_VERSION=$(MajorVersion);MP_MINOR_VERSION=$(MinorVersion);MP_PATCH_VERSION=$(PatchVersion);MP_VERSION_STRING=$(MajorVersion).$(MinorVersion).$(PatchVersion).0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ResourceCompile>
<Link>
<GenerateDebugInformation Condition="'$(DisablePDB)' == 'true'">false</GenerateDebugInformation>

29
src/Magpie/Magpie.rc
View file

@ -57,28 +57,15 @@ BEGIN
BEGIN
BLOCK "000004b0"
BEGIN
#ifdef MP_MAJOR_VERSION
VALUE "FileVersion", STRINGIFY(MP_MAJOR_VERSION) "." STRINGIFY(MP_MINOR_VERSION) "." STRINGIFY(MP_PATCH_VERSION) ".0"
#if defined(MP_VERSION_TAG) && defined(MP_COMMIT_ID)
VALUE "ProductVersion", STRINGIFY(MP_MAJOR_VERSION) "." STRINGIFY(MP_MINOR_VERSION) "." STRINGIFY(MP_PATCH_VERSION) ".0-" STRINGIFY(MP_VERSION_TAG) " (" STRINGIFY(MP_COMMIT_ID) ")"
#elif defined(MP_VERSION_TAG)
VALUE "ProductVersion", STRINGIFY(MP_MAJOR_VERSION) "." STRINGIFY(MP_MINOR_VERSION) "." STRINGIFY(MP_PATCH_VERSION) ".0-" STRINGIFY(MP_VERSION_TAG)
#elif defined(MP_COMMIT_ID)
VALUE "ProductVersion", STRINGIFY(MP_MAJOR_VERSION) "." STRINGIFY(MP_MINOR_VERSION) "." STRINGIFY(MP_PATCH_VERSION) ".0 (" STRINGIFY(MP_COMMIT_ID) ")"
#else
VALUE "ProductVersion", STRINGIFY(MP_MAJOR_VERSION) "." STRINGIFY(MP_MINOR_VERSION) "." STRINGIFY(MP_PATCH_VERSION) ".0"
#endif
#ifdef MP_VERSION_STRING
VALUE "FileVersion", STRINGIFY(MP_VERSION_STRING)
VALUE "ProductVersion", STRINGIFY(MP_VERSION_STRING)
#elif defined(MP_COMMIT_ID)
VALUE "FileVersion", "dev (" STRINGIFY(MP_COMMIT_ID) ")"
VALUE "ProductVersion", "dev (" STRINGIFY(MP_COMMIT_ID) ")"
#else
VALUE "FileVersion", "0.0.0.0"
#if defined(MP_VERSION_TAG) && defined(MP_COMMIT_ID)
VALUE "ProductVersion", "0.0.0.0-" STRINGIFY(MP_VERSION_TAG) " (" STRINGIFY(MP_COMMIT_ID) ")"
#elif defined(MP_VERSION_TAG)
VALUE "ProductVersion", "0.0.0.0-" STRINGIFY(MP_VERSION_TAG)
#elif defined(MP_COMMIT_ID)
VALUE "ProductVersion", "0.0.0.0 (" STRINGIFY(MP_COMMIT_ID) ")"
#else
VALUE "ProductVersion", "0.0.0.0"
#endif
VALUE "FileVersion", "dev"
VALUE "ProductVersion", "dev"
#endif
VALUE "InternalName", "Magpie.exe"
VALUE "LegalCopyright", "Copyright (C) 2023 Liu Xu"

33
src/TouchHelper/TouchHelper.rc
View file

@ -30,8 +30,8 @@ VS_VERSION_INFO VERSIONINFO
FILEVERSION MP_MAJOR_VERSION, MP_MINOR_VERSION, MP_PATCH_VERSION, 0
PRODUCTVERSION MP_MAJOR_VERSION, MP_MINOR_VERSION, MP_PATCH_VERSION, 0
#else
FILEVERSION 4, 0, 0, 0
PRODUCTVERSION 4, 0, 0, 0
FILEVERSION 0, 0, 0, 0
PRODUCTVERSION 0, 0, 0, 0
#endif
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
@ -47,28 +47,15 @@ BEGIN
BEGIN
BLOCK "000004b0"
BEGIN
#ifdef MP_MAJOR_VERSION
VALUE "FileVersion", STRINGIFY(MP_MAJOR_VERSION) "." STRINGIFY(MP_MINOR_VERSION) "." STRINGIFY(MP_PATCH_VERSION) ".0"
#if defined(MP_VERSION_TAG) && defined(MP_COMMIT_ID)
VALUE "ProductVersion", STRINGIFY(MP_MAJOR_VERSION) "." STRINGIFY(MP_MINOR_VERSION) "." STRINGIFY(MP_PATCH_VERSION) ".0-" STRINGIFY(MP_VERSION_TAG) " (" STRINGIFY(MP_COMMIT_ID) ")"
#elif defined(MP_VERSION_TAG)
VALUE "ProductVersion", STRINGIFY(MP_MAJOR_VERSION) "." STRINGIFY(MP_MINOR_VERSION) "." STRINGIFY(MP_PATCH_VERSION) ".0-" STRINGIFY(MP_VERSION_TAG)
#elif defined(MP_COMMIT_ID)
VALUE "ProductVersion", STRINGIFY(MP_MAJOR_VERSION) "." STRINGIFY(MP_MINOR_VERSION) "." STRINGIFY(MP_PATCH_VERSION) ".0 (" STRINGIFY(MP_COMMIT_ID) ")"
#else
VALUE "ProductVersion", STRINGIFY(MP_MAJOR_VERSION) "." STRINGIFY(MP_MINOR_VERSION) "." STRINGIFY(MP_PATCH_VERSION) ".0"
#endif
#ifdef MP_VERSION_STRING
VALUE "FileVersion", STRINGIFY(MP_VERSION_STRING)
VALUE "ProductVersion", STRINGIFY(MP_VERSION_STRING)
#elif defined(MP_COMMIT_ID)
VALUE "FileVersion", "dev (" STRINGIFY(MP_COMMIT_ID) ")"
VALUE "ProductVersion", "dev (" STRINGIFY(MP_COMMIT_ID) ")"
#else
VALUE "FileVersion", "4.0.0.0"
#if defined(MP_VERSION_TAG) && defined(MP_COMMIT_ID)
VALUE "ProductVersion", "4.0.0.0-" STRINGIFY(MP_VERSION_TAG) " (" STRINGIFY(MP_COMMIT_ID) ")"
#elif defined(MP_VERSION_TAG)
VALUE "ProductVersion", "4.0.0.0-" STRINGIFY(MP_VERSION_TAG)
#elif defined(MP_COMMIT_ID)
VALUE "ProductVersion", "4.0.0.0 (" STRINGIFY(MP_COMMIT_ID) ")"
#else
VALUE "ProductVersion", "4.0.0.0"
#endif
VALUE "FileVersion", "dev"
VALUE "ProductVersion", "dev"
#endif
VALUE "InternalName", "TouchHelper.exe"
VALUE "LegalCopyright", "Copyright (C) 2024 Liu Xu"

29
src/Updater/Updater.rc
View file

@ -57,28 +57,15 @@ BEGIN
BEGIN
BLOCK "000004b0"
BEGIN
#ifdef MP_MAJOR_VERSION
VALUE "FileVersion", STRINGIFY(MP_MAJOR_VERSION) "." STRINGIFY(MP_MINOR_VERSION) "." STRINGIFY(MP_PATCH_VERSION) ".0"
#if defined(MP_VERSION_TAG) && defined(MP_COMMIT_ID)
VALUE "ProductVersion", STRINGIFY(MP_MAJOR_VERSION) "." STRINGIFY(MP_MINOR_VERSION) "." STRINGIFY(MP_PATCH_VERSION) ".0-" STRINGIFY(MP_VERSION_TAG) " (" STRINGIFY(MP_COMMIT_ID) ")"
#elif defined(MP_VERSION_TAG)
VALUE "ProductVersion", STRINGIFY(MP_MAJOR_VERSION) "." STRINGIFY(MP_MINOR_VERSION) "." STRINGIFY(MP_PATCH_VERSION) ".0-" STRINGIFY(MP_VERSION_TAG)
#elif defined(MP_COMMIT_ID)
VALUE "ProductVersion", STRINGIFY(MP_MAJOR_VERSION) "." STRINGIFY(MP_MINOR_VERSION) "." STRINGIFY(MP_PATCH_VERSION) ".0 (" STRINGIFY(MP_COMMIT_ID) ")"
#else
VALUE "ProductVersion", STRINGIFY(MP_MAJOR_VERSION) "." STRINGIFY(MP_MINOR_VERSION) "." STRINGIFY(MP_PATCH_VERSION) ".0"
#endif
#ifdef MP_VERSION_STRING
VALUE "FileVersion", STRINGIFY(MP_VERSION_STRING)
VALUE "ProductVersion", STRINGIFY(MP_VERSION_STRING)
#elif defined(MP_COMMIT_ID)
VALUE "FileVersion", "dev (" STRINGIFY(MP_COMMIT_ID) ")"
VALUE "ProductVersion", "dev (" STRINGIFY(MP_COMMIT_ID) ")"
#else
VALUE "FileVersion", "0.0.0.0"
#if defined(MP_VERSION_TAG) && defined(MP_COMMIT_ID)
VALUE "ProductVersion", "0.0.0.0-" STRINGIFY(MP_VERSION_TAG) " (" STRINGIFY(MP_COMMIT_ID) ")"
#elif defined(MP_VERSION_TAG)
VALUE "ProductVersion", "0.0.0.0-" STRINGIFY(MP_VERSION_TAG)
#elif defined(MP_COMMIT_ID)
VALUE "ProductVersion", "0.0.0.0 (" STRINGIFY(MP_COMMIT_ID) ")"
#else
VALUE "ProductVersion", "0.0.0.0"
#endif
VALUE "FileVersion", "dev"
VALUE "ProductVersion", "dev"
#endif
VALUE "InternalName", "Updater.exe"
VALUE "LegalCopyright", "Copyright (C) 2024 Liu Xu"