From 9666b769a14a0caf8bd2052702002edf1dd8ac2a Mon Sep 17 00:00:00 2001 From: Mikachu2333 Date: Fri, 10 Oct 2025 23:32:52 +0800 Subject: [PATCH 01/17] =?UTF-8?q?build(.gitignore):=20=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=20.res=20=E6=96=87=E4=BB=B6=E5=88=B0=E5=BF=BD=E7=95=A5?= =?UTF-8?q?=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 66c4a28..8586f5b 100644 --- a/.gitignore +++ b/.gitignore @@ -22,7 +22,7 @@ *.dll *.out *.exe - +*.res ############################## From a5e358fc4a47dbd40da78aa97395517e2a84b6f5 Mon Sep 17 00:00:00 2001 From: Mikachu2333 Date: Fri, 10 Oct 2025 23:33:44 +0800 Subject: [PATCH 02/17] =?UTF-8?q?feat(logo):=20=E6=B7=BB=E5=8A=A0=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E5=9B=BE=E6=A0=87=E6=96=87=E4=BB=B6=20svg=E4=B8=BA?= =?UTF-8?q?=E7=9F=A2=E9=87=8F=E5=9B=BE=EF=BC=8C=E5=9B=A0=E6=97=A0=E6=8D=9F?= =?UTF-8?q?=E6=89=80=E4=BB=A5=E5=8F=AF=E4=BD=9C=E4=B8=BA=E5=A4=87=E4=BB=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- doc/image/chsrc.svg | 9 +++++++++ lib/logo.ico | Bin 0 -> 61764 bytes 2 files changed, 9 insertions(+) create mode 100644 doc/image/chsrc.svg create mode 100644 lib/logo.ico diff --git a/doc/image/chsrc.svg b/doc/image/chsrc.svg new file mode 100644 index 0000000..fc00ba6 --- /dev/null +++ b/doc/image/chsrc.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/lib/logo.ico b/lib/logo.ico new file mode 100644 index 0000000000000000000000000000000000000000..44c0dc670419536054cc0b96094c673459dc5462 GIT binary patch literal 61764 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 literal 0 HcmV?d00001 From de75aaa62b8ff18c03eb894cb89df706540dc426 Mon Sep 17 00:00:00 2001 From: Mikachu2333 Date: Fri, 10 Oct 2025 23:34:30 +0800 Subject: [PATCH 03/17] =?UTF-8?q?docs(chsrc):=20=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E6=96=87=E6=A1=A3=E8=B4=A1=E7=8C=AE=E8=80=85=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- doc/01-开发与构建.md | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/doc/01-开发与构建.md b/doc/01-开发与构建.md index 27a1422..0112f44 100644 --- a/doc/01-开发与构建.md +++ b/doc/01-开发与构建.md @@ -3,11 +3,11 @@ ! ------------------------------------------------------------- ! Doc Type : Markdown ! Doc Name : 01-开发与构建.md - ! Doc Authors : 曾奥然 - ! Contributors : Nul None + ! Doc Authors : 曾奥然 + ! Contributors : Mikachu2333 ! | ! Created On : <2024-12-27> - ! Last Modified : <2025-08-22> + ! Last Modified : <2025-10-10> ! ---------------------------------------------------------- --> # 开发 chsrc @@ -46,6 +46,8 @@ git clone https://gitee.com/RubyMetric/chsrc.git -b dev ## 编译运行 +**⚠️警告：Windows 上使用 `make` 将无法正确编译版本号与附加信息，仅 `just` 可完整编译** + 共有四种构建模式： 1. **`DEV mode`** From b84f2f9eddd0bb89b3a42b9966be162761d036d0 Mon Sep 17 00:00:00 2001 From: Mikachu2333 Date: Fri, 10 Oct 2025 23:34:18 +0800 Subject: [PATCH 04/17] =?UTF-8?q?feat(build):=20=E6=94=AF=E6=8C=81?= =?UTF-8?q?=E7=BC=96=E8=AF=91=E8=B5=84=E6=BA=90=E6=96=87=E4=BB=B6=20?= =?UTF-8?q?=E4=BF=AE=E5=A4=8Djust=20=E4=BF=AE=E5=A4=8Dmakefile?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Makefile | 81 ++++++++++++++++++++++++++++++++--------- include/chsrc_version.h | 24 ++++++++++++ justfile | 17 +++++---- lib/win_res.rc | 44 ++++++++++++++++++++++ src/chsrc-main.c | 4 +- 5 files changed, 143 insertions(+), 27 deletions(-) create mode 100644 include/chsrc_version.h create mode 100644 lib/win_res.rc diff --git a/Makefile b/Makefile index 5f8ab71..3a1184b 100755 --- a/Makefile +++ b/Makefile @@ -3,12 +3,13 @@ # SPDX-License-Identifier: GPL-3.0-or-later # -------------------------------------------------------------- # Build File : Makefile -# File Authors : Aoran Zeng -# Contributors : Yangmoooo -# | sanchuanhehe -# | +# File Authors : Aoran Zeng +# Contributors : Yangmoooo +# | sanchuanhehe +# | Mikachu2333 +# | # Created On : <2023-08-28> -# Last Modified : <2025-07-22> +# Last Modified : <2025-10-11> # # 请阅读 ./doc/01-开发与构建.md 来使用 # -------------------------------------------------------------- @@ -18,17 +19,24 @@ On-Linux = 0 On-Windows = 0 On-macOS = 0 -ifeq ($(shell uname), Linux) - On-Linux = 1 -endif - -ifeq ($(shell uname), Darwin) - On-macOS = 1 -endif - -# 只有Windows会定义$(OS)变量 -ifeq ($(OS), Windows_NT) +# Windows 会定义 OS 或 ComSpec 环境变量 +ifdef ComSpec On-Windows = 1 +else ifdef OS + ifeq ($(OS), Windows_NT) + On-Windows = 1 + endif +endif + +# 只在非 Windows 环境下调用 uname +ifneq ($(On-Windows), 1) + UNAME_S := $(shell uname 2>/dev/null || echo unknown) + ifeq ($(UNAME_S), Linux) + On-Linux = 1 + endif + ifeq ($(UNAME_S), Darwin) + On-macOS = 1 + endif endif #===================================== @@ -36,8 +44,8 @@ endif #======== Default Tooling ============ ifeq ($(On-Windows), 1) - # MSYS2 环境 - CC = cc + # Windows 环境 - 使用 gcc + CC = gcc else ifeq ($(On-macOS), 1) CC = clang else @@ -142,13 +150,25 @@ build-in-debug-mode: build-in-release-mode: CFLAGS += $(CFLAGS_optimization) build-in-release-mode: @echo Starting: Build in RELEASE mode: \'$(CC)\' $(CFLAGS) -o $(ReleaseMode-Target-Name) +ifeq ($(On-Windows), 1) + @if exist lib\chsrc.res del /Q lib\chsrc.res 2>nul + @windres lib\win_res.rc -O coff -o lib\chsrc.res -Iinclude -Ilib + @$(CC) src/chsrc-main.c lib/chsrc.res $(CFLAGS) $(_C_Warning_Flags) -o $(ReleaseMode-Target-Name) + @del /Q lib\chsrc.res 2>nul +else @$(CC) src/chsrc-main.c $(CFLAGS) $(_C_Warning_Flags) -o $(ReleaseMode-Target-Name) +endif @echo Finished: Build in RELEASE mode # CI release mode 的配置在该文件上方 build-in-ci-release-mode: @echo Starting: Build in CI-RELEASE mode: \'$(CC)\' $(CFLAGS) -o $(CIReleaseMode-Target-Name) +ifeq ($(On-Windows), 1) + @windres lib\win_res.rc -O coff -o lib\chsrc.res -Iinclude -Ilib + @$(CC) src/chsrc-main.c lib/chsrc.res $(CFLAGS) $(_C_Warning_Flags) -o $(CIReleaseMode-Target-Name) +else @$(CC) src/chsrc-main.c $(CFLAGS) $(_C_Warning_Flags) -o $(CIReleaseMode-Target-Name) +endif @echo Finished: Build in CI-RELEASE mode # 永远重新编译 @@ -163,6 +183,10 @@ test-make-env: @echo "On-macOS: $(On-macOS)" @echo "CC: $(CC)" @echo "CFLAGS: $(CFLAGS)" +ifeq ($(On-Windows), 1) + @echo "USER: $(USERNAME)" + @echo "PWD: $(CURDIR)" +else @echo "USER: $$(whoami)" @echo "PWD: $(shell pwd)" @echo "UID: $$(id -u)" @@ -173,17 +197,28 @@ test-make-env: else \ echo "HOME: $(HOME)"; \ fi +endif # 这两个测试文件都用 DEBUG mode test-xy: CFLAGS += $(CFLAGS_debug) test-xy: +ifeq ($(On-Windows), 1) + @$(CC) test/xy.c $(CFLAGS) -o xy.exe + @xy.exe +else @$(CC) test/xy.c $(CFLAGS) -o xy @./xy +endif test-fw: CFLAGS += $(CFLAGS_debug) test-fw: +ifeq ($(On-Windows), 1) + @$(CC) test/fw.c $(CFLAGS) -o fw.exe + @fw.exe +else @$(CC) test/fw.c $(CFLAGS) -o fw @./fw +endif check: test @@ -195,15 +230,25 @@ test-cli: $(DevMode-Target-Name) @perl ./test/cli.pl clean: +ifeq ($(On-Windows), 1) + -@if exist *.exe del /Q *.exe 2>nul + -@if exist xy.exe del /Q xy.exe 2>nul + -@if exist fw.exe del /Q fw.exe 2>nul + -@if exist README.md.bak* del /Q README.md.bak* 2>nul + -@if exist chsrc.exe del /Q chsrc.exe 2>nul + -@if exist chsrc-debug.exe del /Q chsrc-debug.exe 2>nul + -@if exist chsrc-release.exe del /Q chsrc-release.exe 2>nul + -@if exist chsrc-ci-release.exe del /Q chsrc-ci-release.exe 2>nul +else -@rm *.exe 2>/dev/null -@rm xy 2>/dev/null -@rm fw 2>/dev/null -@rm README.md.bak* 2>/dev/null - -@rm chsrc 2>/dev/null -@rm chsrc-debug 2>/dev/null -@rm chsrc-release 2>/dev/null -@rm chsrc-ci-release 2>/dev/null +endif # -include pkg/deb/Makefile # 不这么做，因为 pkg/deb/Makefile 需要在 pkg/deb 目录下执行 # 保持动词在前的任务名风格 diff --git a/include/chsrc_version.h b/include/chsrc_version.h new file mode 100644 index 0000000..778e4fa --- /dev/null +++ b/include/chsrc_version.h @@ -0,0 +1,24 @@ +/** ------------------------------------------------------------ + * Copyright © 2023-2025 曾奥然, 郭恒 + * SPDX-License-Identifier: MIT + * ------------------------------------------------------------- + * Lib Authors : 曾奥然 + * Contributors : Mikachu2333 + * | + * Created On : <2025-10-10> + * Last Modified : <2025-10-10> + + * ！！！警告！！！ + * 发布前请修改此处的内容 + * ------------------------------------------------------------*/ + +#define Chsrc_Version "0.2.3" +#define Chsrc_Release_Date "2025/10/06" + +// 以下宏仅用于 Windows +#if defined(_WIN32) || defined(_WIN64) || defined(__CYGWIN__) + #define CHSRC_VERSION_MAJOR 0 + #define CHSRC_VERSION_MINOR 2 + #define CHSRC_VERSION_PATCH 3 + #define CHSRC_VERSION_STRING "0.2.3" +#endif diff --git a/justfile b/justfile index 2bacf86..081b4ef 100644 --- a/justfile +++ b/justfile @@ -3,11 +3,11 @@ # SPDX-License-Identifier: GPL-3.0-or-later # -------------------------------------------------------------- # Build File : justfile -# File Authors : Aoran Zeng -# Contributors : Nul None +# File Authors : Aoran Zeng +# Contributors : Mikachu2333 # | # Created On : <2025-06-18> -# Last Modified : <2025-07-21> +# Last Modified : <2025-10-11> # # 该文件主要用于在原生Windows上执行项目的基本任务，而不借助于 # GNU make 以及相应的 MSYS2、Cygwin 环境 @@ -104,9 +104,9 @@ alias c := clean default: build-in-dev-mode build-in-dev-mode: - @echo Starting: Build in DEV mode: '{{CC}}' {{CFLAGS_dev_mode_prompt}} -o {{DevMode-Target-Name}} - @{{CC}} src/chsrc-main.c {{CFLAGS_dev_mode}} -o {{DevMode-Target-Name}} - @echo Finished: Build in DEV mode + @echo Starting: Build in DEV mode: '{{CC}}' {{CFLAGS_dev_mode_prompt}} -o {{DevMode-Target-Name}} + @{{CC}} src/chsrc-main.c {{CFLAGS_dev_mode}} -o {{DevMode-Target-Name}} + @echo Finished: Build in DEV mode build-in-debug-mode: @echo Starting: Build in DEBUG mode: '{{CC}}' {{CFLAGS_debug_mode_prompt}} -o {{DebugMode-Target-Name}} @@ -115,7 +115,10 @@ build-in-debug-mode: build-in-release-mode: @echo Starting: Build in RELEASE mode: '{{CC}}' {{CFLAGS_release_mode_prompt}} -o {{ReleaseMode-Target-Name}} - @{{CC}} src/chsrc-main.c {{CFLAGS_release_mode}} -o {{ReleaseMode-Target-Name}} + {{ if os() == 'windows' { '@if exist lib\\chsrc.res del lib\\chsrc.res' } else { '' } }} + {{ if os() == 'windows' { '@windres lib\\win_res.rc -O coff -o lib\\chsrc.res -Iinclude -Ilib' } else { '' } }} + {{ if os() == 'windows' { '@{{CC}} src/chsrc-main.c lib/chsrc.res {{CFLAGS_release_mode}} -o {{ReleaseMode-Target-Name}}' } else { '@{{CC}} src/chsrc-main.c {{CFLAGS_release_mode}} -o {{ReleaseMode-Target-Name}}' } }} + {{ if os() == 'windows' { '@del lib\\chsrc.res' } else { '' } }} @echo Finished: Build in RELEASE mode debug: build-in-debug-mode diff --git a/lib/win_res.rc b/lib/win_res.rc new file mode 100644 index 0000000..d45e568 --- /dev/null +++ b/lib/win_res.rc @@ -0,0 +1,44 @@ +// chsrc.rc - Windows Resource Script +// SPDX-License-Identifier: GPL-3.0-or-later + +#include +#include "chsrc_version.h" + +// 图标资源 +IDI_ICON1 ICON DISCARDABLE "logo.ico" + +// 版本信息 +VS_VERSION_INFO VERSIONINFO + FILEVERSION CHSRC_VERSION_MAJOR,CHSRC_VERSION_MINOR,CHSRC_VERSION_PATCH,0 + PRODUCTVERSION CHSRC_VERSION_MAJOR,CHSRC_VERSION_MINOR,CHSRC_VERSION_PATCH,0 + FILEFLAGSMASK VS_FFI_FILEFLAGSMASK +#ifdef _DEBUG + FILEFLAGS VS_FF_DEBUG +#else + FILEFLAGS 0x0L +#endif + FILEOS VOS_NT_WINDOWS32 + FILETYPE VFT_APP + FILESUBTYPE VFT2_UNKNOWN +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904b0" + BEGIN + VALUE "CompanyName", "Github RubyMetric" + VALUE "FileDescription", "Change Source everywhere for every software" + VALUE "FileVersion", Chsrc_Version + VALUE "InternalName", "chsrc" + VALUE "LegalCopyright", "Copyright (c) 2023-2025 RubyMetric" + VALUE "OriginalFilename", "chsrc.exe" + VALUE "ProductName", "chsrc" + VALUE "ProductVersion", Chsrc_Release_Date + VALUE "Comments", "MIT License" + VALUE "LegalTrademarks", "" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x0804, 1200, 0x0409, 1200 // 简体中文和英语 + END +END diff --git a/src/chsrc-main.c b/src/chsrc-main.c index 98318a7..94f4031 100644 --- a/src/chsrc-main.c +++ b/src/chsrc-main.c @@ -30,8 +30,8 @@ * 然的加入，逐渐成长为互相支持的伙伴。 * ------------------------------------------------------------*/ -#define Chsrc_Version "0.2.3" -#define Chsrc_Release_Date "2025/10/06" +#include "chsrc_version.h" + #define Chsrc_Maintain_URL "https://github.com/RubyMetric/chsrc" #define Chsrc_Maintain_URL2 "https://gitee.com/RubyMetric/chsrc" From 1829f6e622dc92fe235214f7d65e53397a4cc046 Mon Sep 17 00:00:00 2001 From: Mikachu2333 Date: Sun, 12 Oct 2025 00:19:20 +0800 Subject: [PATCH 05/17] =?UTF-8?q?feat(chsrc):=20=E7=A7=BB=E9=99=A4?= =?UTF-8?q?=E4=B8=80=E5=A4=84=E6=97=A0=E7=94=A8=E7=9A=84=E5=AE=8F=E5=AE=9A?= =?UTF-8?q?=E4=B9=89=EF=BC=8C=E5=88=A0=E9=99=A4=E6=96=87=E6=A1=A3=E8=BF=87?= =?UTF-8?q?=E6=97=B6=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- doc/01-开发与构建.md | 4 +--- include/chsrc_version.h | 1 - 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/doc/01-开发与构建.md b/doc/01-开发与构建.md index 0112f44..a2d3b1e 100644 --- a/doc/01-开发与构建.md +++ b/doc/01-开发与构建.md @@ -7,7 +7,7 @@ ! Contributors : Mikachu2333 ! | ! Created On : <2024-12-27> - ! Last Modified : <2025-10-10> + ! Last Modified : <2025-10-11> ! ---------------------------------------------------------- --> # 开发 chsrc @@ -46,8 +46,6 @@ git clone https://gitee.com/RubyMetric/chsrc.git -b dev ## 编译运行 -**⚠️警告：Windows 上使用 `make` 将无法正确编译版本号与附加信息，仅 `just` 可完整编译** - 共有四种构建模式： 1. **`DEV mode`** diff --git a/include/chsrc_version.h b/include/chsrc_version.h index 778e4fa..4e5181c 100644 --- a/include/chsrc_version.h +++ b/include/chsrc_version.h @@ -20,5 +20,4 @@ #define CHSRC_VERSION_MAJOR 0 #define CHSRC_VERSION_MINOR 2 #define CHSRC_VERSION_PATCH 3 - #define CHSRC_VERSION_STRING "0.2.3" #endif From 6aac016c02acc3a5630877a745ea8e072af7998c Mon Sep 17 00:00:00 2001 From: Mikachu2333 Date: Sun, 12 Oct 2025 20:53:21 +0800 Subject: [PATCH 06/17] =?UTF-8?q?refactor(include):=20=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E5=A4=B4=E6=96=87=E4=BB=B6=E5=BC=95=E7=94=A8=E8=B7=AF=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/chsrc-main.c | 2 +- include/chsrc_version.h => src/framework/version.h | 0 {lib => src/res}/logo.ico | Bin {lib => src/res}/win_res.rc | 2 +- 4 files changed, 2 insertions(+), 2 deletions(-) rename include/chsrc_version.h => src/framework/version.h (100%) rename {lib => src/res}/logo.ico (100%) rename {lib => src/res}/win_res.rc (98%) diff --git a/src/chsrc-main.c b/src/chsrc-main.c index 94f4031..0325b75 100644 --- a/src/chsrc-main.c +++ b/src/chsrc-main.c @@ -30,7 +30,7 @@ * 然的加入，逐渐成长为互相支持的伙伴。 * ------------------------------------------------------------*/ -#include "chsrc_version.h" +#include "version.h" #define Chsrc_Maintain_URL "https://github.com/RubyMetric/chsrc" #define Chsrc_Maintain_URL2 "https://gitee.com/RubyMetric/chsrc" diff --git a/include/chsrc_version.h b/src/framework/version.h similarity index 100% rename from include/chsrc_version.h rename to src/framework/version.h diff --git a/lib/logo.ico b/src/res/logo.ico similarity index 100% rename from lib/logo.ico rename to src/res/logo.ico diff --git a/lib/win_res.rc b/src/res/win_res.rc similarity index 98% rename from lib/win_res.rc rename to src/res/win_res.rc index d45e568..b2f0414 100644 --- a/lib/win_res.rc +++ b/src/res/win_res.rc @@ -2,7 +2,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later #include -#include "chsrc_version.h" +#include "version.h" // 图标资源 IDI_ICON1 ICON DISCARDABLE "logo.ico" From 91692d62151baa8c3d72b1da43aee7bd719ed137 Mon Sep 17 00:00:00 2001 From: Mikachu2333 Date: Sun, 12 Oct 2025 21:07:15 +0800 Subject: [PATCH 07/17] =?UTF-8?q?build(Makefile):=20=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E7=BC=96=E8=AF=91=E9=85=8D=E7=BD=AE=E4=BB=A5=E5=8C=85=E5=90=AB?= =?UTF-8?q?=E6=96=B0=E7=9A=84=E5=A4=B4=E6=96=87=E4=BB=B6=E8=B7=AF=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Makefile | 14 +++++++------- justfile | 10 +++++----- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Makefile b/Makefile index 3a1184b..01640a4 100755 --- a/Makefile +++ b/Makefile @@ -62,7 +62,7 @@ endif #======== Compilation Config ========== -CFLAGS += -Iinclude -Ilib +CFLAGS += -Iinclude -Ilib -Isrc/framework -Isrc/res ifeq ($(On-Windows), 1) CLANG_FLAGS = -target x86_64-pc-windows-gnu @@ -151,10 +151,10 @@ build-in-release-mode: CFLAGS += $(CFLAGS_optimization) build-in-release-mode: @echo Starting: Build in RELEASE mode: \'$(CC)\' $(CFLAGS) -o $(ReleaseMode-Target-Name) ifeq ($(On-Windows), 1) - @if exist lib\chsrc.res del /Q lib\chsrc.res 2>nul - @windres lib\win_res.rc -O coff -o lib\chsrc.res -Iinclude -Ilib - @$(CC) src/chsrc-main.c lib/chsrc.res $(CFLAGS) $(_C_Warning_Flags) -o $(ReleaseMode-Target-Name) - @del /Q lib\chsrc.res 2>nul + @if exist src\\res\\chsrc.res del src\\res\\chsrc.res + @windres src\\res\\win_res.rc -O coff -o src\\res\\chsrc.res -Iinclude -Ilib -Isrc\\framework -Isrc\\res + @$(CC) src\\chsrc-main.c src\\res\\chsrc.res $(CFLAGS) $(_C_Warning_Flags) -o $(ReleaseMode-Target-Name) + @del src\\res\\chsrc.res else @$(CC) src/chsrc-main.c $(CFLAGS) $(_C_Warning_Flags) -o $(ReleaseMode-Target-Name) endif @@ -164,8 +164,8 @@ endif build-in-ci-release-mode: @echo Starting: Build in CI-RELEASE mode: \'$(CC)\' $(CFLAGS) -o $(CIReleaseMode-Target-Name) ifeq ($(On-Windows), 1) - @windres lib\win_res.rc -O coff -o lib\chsrc.res -Iinclude -Ilib - @$(CC) src/chsrc-main.c lib/chsrc.res $(CFLAGS) $(_C_Warning_Flags) -o $(CIReleaseMode-Target-Name) + @windres src\\res\\win_res.rc -O coff -o src\\res\\chsrc.res -Iinclude -Ilib -Isrc\\framework -Isrc\\res + @$(CC) src\\chsrc-main.c src\\res\\chsrc.res $(CFLAGS) $(_C_Warning_Flags) -o $(CIReleaseMode-Target-Name) else @$(CC) src/chsrc-main.c $(CFLAGS) $(_C_Warning_Flags) -o $(CIReleaseMode-Target-Name) endif diff --git a/justfile b/justfile index 081b4ef..3902916 100644 --- a/justfile +++ b/justfile @@ -53,7 +53,7 @@ CFLAGS_chk_Clang := if os() == 'windows' { } else {''} -CFLAGS_base := '-Iinclude -Ilib ' + CFLAGS_chk_Clang +CFLAGS_base := '-Iinclude -Ilib -Isrc/framework ' + CFLAGS_chk_Clang WARN := '-Wall -Wextra -Wno-unused-variable -Wno-unused-function -Wno-missing-braces -Wno-misleading-indentation' + ' ' + \ '-Wno-missing-field-initializers -Wno-unused-parameter -Wno-sign-compare' @@ -115,10 +115,10 @@ build-in-debug-mode: build-in-release-mode: @echo Starting: Build in RELEASE mode: '{{CC}}' {{CFLAGS_release_mode_prompt}} -o {{ReleaseMode-Target-Name}} - {{ if os() == 'windows' { '@if exist lib\\chsrc.res del lib\\chsrc.res' } else { '' } }} - {{ if os() == 'windows' { '@windres lib\\win_res.rc -O coff -o lib\\chsrc.res -Iinclude -Ilib' } else { '' } }} - {{ if os() == 'windows' { '@{{CC}} src/chsrc-main.c lib/chsrc.res {{CFLAGS_release_mode}} -o {{ReleaseMode-Target-Name}}' } else { '@{{CC}} src/chsrc-main.c {{CFLAGS_release_mode}} -o {{ReleaseMode-Target-Name}}' } }} - {{ if os() == 'windows' { '@del lib\\chsrc.res' } else { '' } }} + {{ if os() == 'windows' { '@if exist src\\res\\chsrc.res del src\\res\\chsrc.res' } else { '' } }} + {{ if os() == 'windows' { '@windres src\\res\\win_res.rc -O coff -o src\\res\\chsrc.res -Iinclude -Ilib -Isrc\\framework -Isrc\\res' } else { '' } }} + {{ if os() == 'windows' { '@' + CC + ' src/chsrc-main.c src/res/chsrc.res ' + CFLAGS_release_mode + ' -o ' + ReleaseMode-Target-Name } else { '@' + CC + ' src/chsrc-main.c ' + CFLAGS_release_mode + ' -o ' + ReleaseMode-Target-Name } }} + {{ if os() == 'windows' { '@del src\\res\\chsrc.res' } else { '' } }} @echo Finished: Build in RELEASE mode debug: build-in-debug-mode From 717b0f96b872a695fcdf360e4ebb289d43c2b918 Mon Sep 17 00:00:00 2001 From: Mikachu2333 Date: Tue, 14 Oct 2025 01:48:46 +0800 Subject: [PATCH 08/17] =?UTF-8?q?feat(build):=20=E5=A2=9E=E5=BC=BAWindows?= =?UTF-8?q?=E6=94=AF=E6=8C=81=EF=BC=8C=E5=8A=A8=E6=80=81=E6=A3=80=E6=B5=8B?= =?UTF-8?q?=E7=9B=AE=E6=A0=87=E6=9C=BA=E5=99=A8=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Makefile | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 01640a4..39f290a 100755 --- a/Makefile +++ b/Makefile @@ -64,8 +64,18 @@ endif #======== Compilation Config ========== CFLAGS += -Iinclude -Ilib -Isrc/framework -Isrc/res +Target-Is-Windows = 0 +Use-Windows-Resource = 0 + ifeq ($(On-Windows), 1) CLANG_FLAGS = -target x86_64-pc-windows-gnu + Target-Machine := $(shell $(CC) -dumpmachine 2>nul || echo unknown) + ifneq ($(findstring mingw,$(Target-Machine)),) + Target-Is-Windows = 1 + else ifneq ($(findstring windows,$(Target-Machine)),) + Target-Is-Windows = 1 + endif + Use-Windows-Resource := $(Target-Is-Windows) endif ifeq ($(CC), clang) @@ -150,7 +160,7 @@ build-in-debug-mode: build-in-release-mode: CFLAGS += $(CFLAGS_optimization) build-in-release-mode: @echo Starting: Build in RELEASE mode: \'$(CC)\' $(CFLAGS) -o $(ReleaseMode-Target-Name) -ifeq ($(On-Windows), 1) +ifeq ($(Use-Windows-Resource), 1) @if exist src\\res\\chsrc.res del src\\res\\chsrc.res @windres src\\res\\win_res.rc -O coff -o src\\res\\chsrc.res -Iinclude -Ilib -Isrc\\framework -Isrc\\res @$(CC) src\\chsrc-main.c src\\res\\chsrc.res $(CFLAGS) $(_C_Warning_Flags) -o $(ReleaseMode-Target-Name) @@ -163,7 +173,7 @@ endif # CI release mode 的配置在该文件上方 build-in-ci-release-mode: @echo Starting: Build in CI-RELEASE mode: \'$(CC)\' $(CFLAGS) -o $(CIReleaseMode-Target-Name) -ifeq ($(On-Windows), 1) +ifeq ($(Use-Windows-Resource), 1) @windres src\\res\\win_res.rc -O coff -o src\\res\\chsrc.res -Iinclude -Ilib -Isrc\\framework -Isrc\\res @$(CC) src\\chsrc-main.c src\\res\\chsrc.res $(CFLAGS) $(_C_Warning_Flags) -o $(CIReleaseMode-Target-Name) else From cfe850382d4fdbb648ff73fb14e36ed5e62d6dbf Mon Sep 17 00:00:00 2001 From: Mikachu2333 Date: Wed, 15 Oct 2025 14:51:40 +0800 Subject: [PATCH 09/17] =?UTF-8?q?revert(Makefile):=20=E5=BD=BB=E5=BA=95?= =?UTF-8?q?=E5=9B=9E=E9=80=80=EF=BC=8C=E6=9C=AA=E4=BF=9D=E7=95=99=E4=BB=BB?= =?UTF-8?q?=E4=BD=95=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Makefile | 91 +++++++++++--------------------------------------------- 1 file changed, 18 insertions(+), 73 deletions(-) diff --git a/Makefile b/Makefile index 39f290a..5f8ab71 100755 --- a/Makefile +++ b/Makefile @@ -3,13 +3,12 @@ # SPDX-License-Identifier: GPL-3.0-or-later # -------------------------------------------------------------- # Build File : Makefile -# File Authors : Aoran Zeng -# Contributors : Yangmoooo -# | sanchuanhehe -# | Mikachu2333 -# | +# File Authors : Aoran Zeng +# Contributors : Yangmoooo +# | sanchuanhehe +# | # Created On : <2023-08-28> -# Last Modified : <2025-10-11> +# Last Modified : <2025-07-22> # # 请阅读 ./doc/01-开发与构建.md 来使用 # -------------------------------------------------------------- @@ -19,24 +18,17 @@ On-Linux = 0 On-Windows = 0 On-macOS = 0 -# Windows 会定义 OS 或 ComSpec 环境变量 -ifdef ComSpec - On-Windows = 1 -else ifdef OS - ifeq ($(OS), Windows_NT) - On-Windows = 1 - endif +ifeq ($(shell uname), Linux) + On-Linux = 1 endif -# 只在非 Windows 环境下调用 uname -ifneq ($(On-Windows), 1) - UNAME_S := $(shell uname 2>/dev/null || echo unknown) - ifeq ($(UNAME_S), Linux) - On-Linux = 1 - endif - ifeq ($(UNAME_S), Darwin) - On-macOS = 1 - endif +ifeq ($(shell uname), Darwin) + On-macOS = 1 +endif + +# 只有Windows会定义$(OS)变量 +ifeq ($(OS), Windows_NT) + On-Windows = 1 endif #===================================== @@ -44,8 +36,8 @@ endif #======== Default Tooling ============ ifeq ($(On-Windows), 1) - # Windows 环境 - 使用 gcc - CC = gcc + # MSYS2 环境 + CC = cc else ifeq ($(On-macOS), 1) CC = clang else @@ -62,20 +54,10 @@ endif #======== Compilation Config ========== -CFLAGS += -Iinclude -Ilib -Isrc/framework -Isrc/res - -Target-Is-Windows = 0 -Use-Windows-Resource = 0 +CFLAGS += -Iinclude -Ilib ifeq ($(On-Windows), 1) CLANG_FLAGS = -target x86_64-pc-windows-gnu - Target-Machine := $(shell $(CC) -dumpmachine 2>nul || echo unknown) - ifneq ($(findstring mingw,$(Target-Machine)),) - Target-Is-Windows = 1 - else ifneq ($(findstring windows,$(Target-Machine)),) - Target-Is-Windows = 1 - endif - Use-Windows-Resource := $(Target-Is-Windows) endif ifeq ($(CC), clang) @@ -160,25 +142,13 @@ build-in-debug-mode: build-in-release-mode: CFLAGS += $(CFLAGS_optimization) build-in-release-mode: @echo Starting: Build in RELEASE mode: \'$(CC)\' $(CFLAGS) -o $(ReleaseMode-Target-Name) -ifeq ($(Use-Windows-Resource), 1) - @if exist src\\res\\chsrc.res del src\\res\\chsrc.res - @windres src\\res\\win_res.rc -O coff -o src\\res\\chsrc.res -Iinclude -Ilib -Isrc\\framework -Isrc\\res - @$(CC) src\\chsrc-main.c src\\res\\chsrc.res $(CFLAGS) $(_C_Warning_Flags) -o $(ReleaseMode-Target-Name) - @del src\\res\\chsrc.res -else @$(CC) src/chsrc-main.c $(CFLAGS) $(_C_Warning_Flags) -o $(ReleaseMode-Target-Name) -endif @echo Finished: Build in RELEASE mode # CI release mode 的配置在该文件上方 build-in-ci-release-mode: @echo Starting: Build in CI-RELEASE mode: \'$(CC)\' $(CFLAGS) -o $(CIReleaseMode-Target-Name) -ifeq ($(Use-Windows-Resource), 1) - @windres src\\res\\win_res.rc -O coff -o src\\res\\chsrc.res -Iinclude -Ilib -Isrc\\framework -Isrc\\res - @$(CC) src\\chsrc-main.c src\\res\\chsrc.res $(CFLAGS) $(_C_Warning_Flags) -o $(CIReleaseMode-Target-Name) -else @$(CC) src/chsrc-main.c $(CFLAGS) $(_C_Warning_Flags) -o $(CIReleaseMode-Target-Name) -endif @echo Finished: Build in CI-RELEASE mode # 永远重新编译 @@ -193,10 +163,6 @@ test-make-env: @echo "On-macOS: $(On-macOS)" @echo "CC: $(CC)" @echo "CFLAGS: $(CFLAGS)" -ifeq ($(On-Windows), 1) - @echo "USER: $(USERNAME)" - @echo "PWD: $(CURDIR)" -else @echo "USER: $$(whoami)" @echo "PWD: $(shell pwd)" @echo "UID: $$(id -u)" @@ -207,28 +173,17 @@ else else \ echo "HOME: $(HOME)"; \ fi -endif # 这两个测试文件都用 DEBUG mode test-xy: CFLAGS += $(CFLAGS_debug) test-xy: -ifeq ($(On-Windows), 1) - @$(CC) test/xy.c $(CFLAGS) -o xy.exe - @xy.exe -else @$(CC) test/xy.c $(CFLAGS) -o xy @./xy -endif test-fw: CFLAGS += $(CFLAGS_debug) test-fw: -ifeq ($(On-Windows), 1) - @$(CC) test/fw.c $(CFLAGS) -o fw.exe - @fw.exe -else @$(CC) test/fw.c $(CFLAGS) -o fw @./fw -endif check: test @@ -240,25 +195,15 @@ test-cli: $(DevMode-Target-Name) @perl ./test/cli.pl clean: -ifeq ($(On-Windows), 1) - -@if exist *.exe del /Q *.exe 2>nul - -@if exist xy.exe del /Q xy.exe 2>nul - -@if exist fw.exe del /Q fw.exe 2>nul - -@if exist README.md.bak* del /Q README.md.bak* 2>nul - -@if exist chsrc.exe del /Q chsrc.exe 2>nul - -@if exist chsrc-debug.exe del /Q chsrc-debug.exe 2>nul - -@if exist chsrc-release.exe del /Q chsrc-release.exe 2>nul - -@if exist chsrc-ci-release.exe del /Q chsrc-ci-release.exe 2>nul -else -@rm *.exe 2>/dev/null -@rm xy 2>/dev/null -@rm fw 2>/dev/null -@rm README.md.bak* 2>/dev/null + -@rm chsrc 2>/dev/null -@rm chsrc-debug 2>/dev/null -@rm chsrc-release 2>/dev/null -@rm chsrc-ci-release 2>/dev/null -endif # -include pkg/deb/Makefile # 不这么做，因为 pkg/deb/Makefile 需要在 pkg/deb 目录下执行 # 保持动词在前的任务名风格 From 6af3e51566b9997559f67f5f594f0a4903162dc5 Mon Sep 17 00:00:00 2001 From: Mikachu2333 Date: Wed, 15 Oct 2025 16:51:04 +0800 Subject: [PATCH 10/17] =?UTF-8?q?=E4=BF=AE=E5=A4=8DAndroid=E7=B3=BB?= =?UTF-8?q?=E7=BB=9F=E6=A3=80=E6=B5=8B=20(#313)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/xy.h | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/lib/xy.h b/lib/xy.h index 08dda24..a1991cf 100644 --- a/lib/xy.h +++ b/lib/xy.h @@ -1290,18 +1290,21 @@ xy_detect_os () char buf[256] = {0}; fread (buf, 1, sizeof(buf) - 1, fp); fclose (fp); - if (strstr (buf, "Android")) - { - xy.on_android = true; - return; - } - else if (strstr (buf, "Linux")) + if (strstr (buf, "Linux")) { xy.on_linux = true; return; } } + // @consult https://android.googlesource.com/platform/system/core/+/refs/heads/main/rootdir/init.environ.rc.in + char *android_env = getenv ("ANDROID_ROOT"); + if (xy_str_find (android_env, "/system").found) + { + xy.on_android = true; + return; + } + /* 判断 macOS */ DIR *d = opendir ("/System/Applications"); if (d) @@ -1312,6 +1315,7 @@ xy_detect_os () { xy.on_macos = true; closedir (d); + return; } } @@ -1333,6 +1337,7 @@ xy_detect_os () pclose (fp); if (strstr (buf, "BSD") != NULL) xy.on_bsd = true; + return; } if (!(xy.on_windows || xy.on_linux || xy.on_android || xy.on_macos || xy.on_bsd)) From f9268343847da5c0edd573fb4c3820f9081a88ae Mon Sep 17 00:00:00 2001 From: Aoran Zeng Date: Wed, 15 Oct 2025 17:02:43 +0800 Subject: [PATCH 11/17] =?UTF-8?q?=E9=81=BF=E5=85=8DAPI=E4=BD=BF=E7=94=A8?= =?UTF-8?q?=E6=B6=88=E6=9E=81=E7=94=A8=E8=AF=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/xy.h | 33 +++++++++++++++++++++------------ 1 file changed, 21 insertions(+), 12 deletions(-) diff --git a/lib/xy.h b/lib/xy.h index a1991cf..eca9b68 100644 --- a/lib/xy.h +++ b/lib/xy.h @@ -9,7 +9,7 @@ * | BingChunMoLi * | * Created On : <2023-08-28> - * Last Modified : <2025-10-06> + * Last Modified : <2025-10-15> * * * xy: 襄阳、咸阳 @@ -122,15 +122,24 @@ xy = #define assert_str(a, b) assert (xy_streql ((a), (b))) -#define xy_panic(reason) assert(!reason) +#define xy_throw(reason) assert(!reason) -// @flavor Perl, PHP, Raku -#define die xy_panic +/** + * @depreacated 避免消极用语 + * + * @flavor Perl, PHP, Raku + */ +// #define die xy_throw -#define xy_unsupported() xy_panic("Unsuppoted") -#define xy_unimplemented() xy_panic("Unimplemented temporarily") -#define xy_unreached() xy_panic("This code shouldn't be reached") -#define xy_cant_be_null(p) if(!p) xy_panic("This pointer can't be null") +/** + * @depreacated 避免消极用语 + */ +// #define xy_panic xy_throw + +#define xy_unsupported() xy_throw("Unsuppoted") +#define xy_unimplemented() xy_throw("Unimplemented temporarily") +#define xy_unreached() xy_throw("This code shouldn't be reached") +#define xy_cant_be_null(p) if(!p) xy_throw("This pointer can't be null") @@ -164,7 +173,7 @@ static void _xy_println_const_str (const char *str) {printf ("%s\n", str);} bool: _xy_print_bool, \ char *: _xy_print_str, \ const char *: _xy_print_const_str, \ - default: xy_panic("Unsupported type for print()!") \ + default: xy_throw("Unsupported type for print()!") \ )(x) /** @@ -179,7 +188,7 @@ static void _xy_println_const_str (const char *str) {printf ("%s\n", str);} bool: _xy_println_bool, \ char *: _xy_println_str, \ const char *: _xy_println_const_str, \ - default: xy_panic("Unsupported type for println()/say()!") \ + default: xy_throw("Unsupported type for println()/say()!") \ )(x) /* @flavor Raku, Perl */ #define say println @@ -1341,7 +1350,7 @@ xy_detect_os () } if (!(xy.on_windows || xy.on_linux || xy.on_android || xy.on_macos || xy.on_bsd)) - xy_panic ("Unknown operating system"); + xy_throw ("Unknown operating system"); } @@ -1450,7 +1459,7 @@ xy_seq_at (XySeq_t *seq, int n) { xy_cant_be_null (seq); - if (0 == n) xy_panic ("The index must begin from 1, not 0"); + if (0 == n) xy_throw ("The index must begin from 1, not 0"); if (1 == n) return seq->first_item ? seq->first_item->data : NULL; From ebc9e167f268edfe2fb867c116333f147c39c099 Mon Sep 17 00:00:00 2001 From: Aoran Zeng Date: Wed, 15 Oct 2025 18:09:50 +0800 Subject: [PATCH 12/17] Refactor Windows resource compiling --- justfile | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/justfile b/justfile index 3902916..24b659b 100644 --- a/justfile +++ b/justfile @@ -2,12 +2,12 @@ # -------------------------------------------------------------- # SPDX-License-Identifier: GPL-3.0-or-later # -------------------------------------------------------------- -# Build File : justfile -# File Authors : Aoran Zeng -# Contributors : Mikachu2333 -# | +# Build File : justfile +# File Authors : 曾奥然 +# Contributors : Mikachu2333 +# | # Created On : <2025-06-18> -# Last Modified : <2025-10-11> +# Last Modified : <2025-10-15> # # 该文件主要用于在原生Windows上执行项目的基本任务，而不借助于 # GNU make 以及相应的 MSYS2、Cygwin 环境 @@ -53,7 +53,7 @@ CFLAGS_chk_Clang := if os() == 'windows' { } else {''} -CFLAGS_base := '-Iinclude -Ilib -Isrc/framework ' + CFLAGS_chk_Clang +CFLAGS_base := '-Iinclude -Ilib ' + CFLAGS_chk_Clang WARN := '-Wall -Wextra -Wno-unused-variable -Wno-unused-function -Wno-missing-braces -Wno-misleading-indentation' + ' ' + \ '-Wno-missing-field-initializers -Wno-unused-parameter -Wno-sign-compare' @@ -114,12 +114,17 @@ build-in-debug-mode: @echo Finished: Build in DEBUG mode build-in-release-mode: - @echo Starting: Build in RELEASE mode: '{{CC}}' {{CFLAGS_release_mode_prompt}} -o {{ReleaseMode-Target-Name}} - {{ if os() == 'windows' { '@if exist src\\res\\chsrc.res del src\\res\\chsrc.res' } else { '' } }} - {{ if os() == 'windows' { '@windres src\\res\\win_res.rc -O coff -o src\\res\\chsrc.res -Iinclude -Ilib -Isrc\\framework -Isrc\\res' } else { '' } }} - {{ if os() == 'windows' { '@' + CC + ' src/chsrc-main.c src/res/chsrc.res ' + CFLAGS_release_mode + ' -o ' + ReleaseMode-Target-Name } else { '@' + CC + ' src/chsrc-main.c ' + CFLAGS_release_mode + ' -o ' + ReleaseMode-Target-Name } }} - {{ if os() == 'windows' { '@del src\\res\\chsrc.res' } else { '' } }} - @echo Finished: Build in RELEASE mode + @echo Starting: Build in RELEASE mode: '{{CC}}' {{CFLAGS_release_mode_prompt}} -o {{ReleaseMode-Target-Name}} + @{{ if os() == 'windows' { \ + 'if exist chsrc.res del chsrc.res' + \ + ' & windres src/resource/chsrc.rc -O coff -o chsrc.res' \ + } else { '' } }} + @{{ if os() == 'windows' { \ + CC + ' src/chsrc-main.c chsrc.res ' + CFLAGS_release_mode + ' -o ' + ReleaseMode-Target-Name \ + } else { \ + CC + ' src/chsrc-main.c ' + CFLAGS_release_mode + ' -o ' + ReleaseMode-Target-Name \ + } }} + @echo Finished: Build in RELEASE mode debug: build-in-debug-mode @{{DEBUGGER}} {{DebugMode-Target-Name}} From 19d09e537a8322d338f28efa355365a289804d02 Mon Sep 17 00:00:00 2001 From: Aoran Zeng Date: Wed, 15 Oct 2025 18:10:19 +0800 Subject: [PATCH 13/17] Rename directory from `res` to `resource` --- src/{res/win_res.rc => resource/chsrc.rc} | 16 ++++++++-------- src/{res => resource}/logo.ico | Bin 2 files changed, 8 insertions(+), 8 deletions(-) rename src/{res/win_res.rc => resource/chsrc.rc} (66%) rename src/{res => resource}/logo.ico (100%) diff --git a/src/res/win_res.rc b/src/resource/chsrc.rc similarity index 66% rename from src/res/win_res.rc rename to src/resource/chsrc.rc index b2f0414..aaeb5ff 100644 --- a/src/res/win_res.rc +++ b/src/resource/chsrc.rc @@ -2,15 +2,15 @@ // SPDX-License-Identifier: GPL-3.0-or-later #include -#include "version.h" +#include "../framework/version.h" // 图标资源 IDI_ICON1 ICON DISCARDABLE "logo.ico" // 版本信息 VS_VERSION_INFO VERSIONINFO - FILEVERSION CHSRC_VERSION_MAJOR,CHSRC_VERSION_MINOR,CHSRC_VERSION_PATCH,0 - PRODUCTVERSION CHSRC_VERSION_MAJOR,CHSRC_VERSION_MINOR,CHSRC_VERSION_PATCH,0 + FILEVERSION Chsrc_Version_Major,Chsrc_Version_Minor,Chsrc_Version_Patch,0 + PRODUCTVERSION Chsrc_Version_Major,Chsrc_Version_Minor,Chsrc_Version_Patch,0 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK #ifdef _DEBUG FILEFLAGS VS_FF_DEBUG @@ -25,16 +25,16 @@ BEGIN BEGIN BLOCK "040904b0" BEGIN - VALUE "CompanyName", "Github RubyMetric" + VALUE "CompanyName", "RubyMetric" VALUE "FileDescription", "Change Source everywhere for every software" - VALUE "FileVersion", Chsrc_Version + VALUE "FileVersion", Chsrc_Version VALUE "InternalName", "chsrc" VALUE "LegalCopyright", "Copyright (c) 2023-2025 RubyMetric" VALUE "OriginalFilename", "chsrc.exe" VALUE "ProductName", "chsrc" - VALUE "ProductVersion", Chsrc_Release_Date - VALUE "Comments", "MIT License" - VALUE "LegalTrademarks", "" + VALUE "ProductVersion", Chsrc_Version + VALUE "Comments", "Released on " Chsrc_Release_Date " (GPLv3+)" + VALUE "LegalTrademarks", "RubyMetric" END END BLOCK "VarFileInfo" diff --git a/src/res/logo.ico b/src/resource/logo.ico similarity index 100% rename from src/res/logo.ico rename to src/resource/logo.ico From 8ebe5812ed8e946b6f37edfee3afe253d50eed87 Mon Sep 17 00:00:00 2001 From: Aoran Zeng Date: Wed, 15 Oct 2025 18:21:41 +0800 Subject: [PATCH 14/17] Redefine Windows resource script macro --- justfile | 2 +- src/chsrc-main.c | 3 +-- src/framework/version.h | 32 ++++++++++++++++---------------- src/resource/chsrc.rc | 10 +++++++--- 4 files changed, 25 insertions(+), 22 deletions(-) diff --git a/justfile b/justfile index 24b659b..f9de64c 100644 --- a/justfile +++ b/justfile @@ -116,7 +116,7 @@ build-in-debug-mode: build-in-release-mode: @echo Starting: Build in RELEASE mode: '{{CC}}' {{CFLAGS_release_mode_prompt}} -o {{ReleaseMode-Target-Name}} @{{ if os() == 'windows' { \ - 'if exist chsrc.res del chsrc.res' + \ + '(if exist chsrc.res del chsrc.res)' + \ ' & windres src/resource/chsrc.rc -O coff -o chsrc.res' \ } else { '' } }} @{{ if os() == 'windows' { \ diff --git a/src/chsrc-main.c b/src/chsrc-main.c index 0325b75..895adeb 100644 --- a/src/chsrc-main.c +++ b/src/chsrc-main.c @@ -30,11 +30,10 @@ * 然的加入，逐渐成长为互相支持的伙伴。 * ------------------------------------------------------------*/ -#include "version.h" - #define Chsrc_Maintain_URL "https://github.com/RubyMetric/chsrc" #define Chsrc_Maintain_URL2 "https://gitee.com/RubyMetric/chsrc" +#include "framework/version.h" #include "framework/core.c" #include "framework/chef.c" diff --git a/src/framework/version.h b/src/framework/version.h index 4e5181c..e8f65dc 100644 --- a/src/framework/version.h +++ b/src/framework/version.h @@ -1,23 +1,23 @@ /** ------------------------------------------------------------ - * Copyright © 2023-2025 曾奥然, 郭恒 - * SPDX-License-Identifier: MIT + * SPDX-License-Identifier: GPL-3.0-or-later * ------------------------------------------------------------- - * Lib Authors : 曾奥然 - * Contributors : Mikachu2333 + * File Name : version.h + * File Authors : 曾奥然 + * | Mikachu2333 + * Contributors : Nil Null * | * Created On : <2025-10-10> - * Last Modified : <2025-10-10> - - * ！！！警告！！！ - * 发布前请修改此处的内容 + * Last Modified : + * + * 发布新版本前请修改此文件 * ------------------------------------------------------------*/ -#define Chsrc_Version "0.2.3" -#define Chsrc_Release_Date "2025/10/06" +#define Chsrc_Version "0.2.3.1-dev1" -// 以下宏仅用于 Windows -#if defined(_WIN32) || defined(_WIN64) || defined(__CYGWIN__) - #define CHSRC_VERSION_MAJOR 0 - #define CHSRC_VERSION_MINOR 2 - #define CHSRC_VERSION_PATCH 3 -#endif +// 以下四个宏仅用于 resource/chsrc.rc +#define Chsrc_Version_Major 0 +#define Chsrc_Version_Minor 2 +#define Chsrc_Version_Patch 3 +#define Chsrc_Version_Pre 1 + +#define Chsrc_Release_Date "2025/10/15" diff --git a/src/resource/chsrc.rc b/src/resource/chsrc.rc index aaeb5ff..9deb8ac 100644 --- a/src/resource/chsrc.rc +++ b/src/resource/chsrc.rc @@ -9,8 +9,9 @@ IDI_ICON1 ICON DISCARDABLE "logo.ico" // 版本信息 VS_VERSION_INFO VERSIONINFO - FILEVERSION Chsrc_Version_Major,Chsrc_Version_Minor,Chsrc_Version_Patch,0 - PRODUCTVERSION Chsrc_Version_Major,Chsrc_Version_Minor,Chsrc_Version_Patch,0 + FILEVERSION Chsrc_Version_Major,Chsrc_Version_Minor,Chsrc_Version_Patch,Chsrc_Version_Pre + // 经实验，该值会被下面的 ProductVersion 替换 + // PRODUCTVERSION Chsrc_Version_Major,Chsrc_Version_Minor,Chsrc_Version_Patch,Chsrc_Version_Pre FILEFLAGSMASK VS_FFI_FILEFLAGSMASK #ifdef _DEBUG FILEFLAGS VS_FF_DEBUG @@ -27,7 +28,10 @@ BEGIN BEGIN VALUE "CompanyName", "RubyMetric" VALUE "FileDescription", "Change Source everywhere for every software" - VALUE "FileVersion", Chsrc_Version + + // 经实验，该值会被上面的 FILEVERSION 替换 + // VALUE "FileVersion", Chsrc_Version + VALUE "InternalName", "chsrc" VALUE "LegalCopyright", "Copyright (c) 2023-2025 RubyMetric" VALUE "OriginalFilename", "chsrc.exe" From 28d8e4ad0c1b0af646a38430bd7de918b7bac6d7 Mon Sep 17 00:00:00 2001 From: Aoran Zeng Date: Wed, 15 Oct 2025 18:33:21 +0800 Subject: [PATCH 15/17] Only use `$(OS)` to ensure MSYS2 --- Makefile | 13 ++++++++----- justfile | 1 + 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 5f8ab71..1345d17 100755 --- a/Makefile +++ b/Makefile @@ -2,13 +2,13 @@ # -------------------------------------------------------------- # SPDX-License-Identifier: GPL-3.0-or-later # -------------------------------------------------------------- -# Build File : Makefile -# File Authors : Aoran Zeng -# Contributors : Yangmoooo +# Build File : Makefile +# File Authors : 曾奥然 +# Contributors : Yangmoooo # | sanchuanhehe # | # Created On : <2023-08-28> -# Last Modified : <2025-07-22> +# Last Modified : <2025-10-15> # # 请阅读 ./doc/01-开发与构建.md 来使用 # -------------------------------------------------------------- @@ -26,10 +26,12 @@ ifeq ($(shell uname), Darwin) On-macOS = 1 endif -# 只有Windows会定义$(OS)变量 +# 只有 MSYS2 会定义 $(OS) 变量 ifeq ($(OS), Windows_NT) On-Windows = 1 endif +# 注意, 原生 Windows 会定义 $(ComSpec) 变量，且区分大小写 +# 但是 MSYS2 并不会定义 #===================================== @@ -196,6 +198,7 @@ test-cli: $(DevMode-Target-Name) clean: -@rm *.exe 2>/dev/null + -@rm *.res 2>/dev/null -@rm xy 2>/dev/null -@rm fw 2>/dev/null -@rm README.md.bak* 2>/dev/null diff --git a/justfile b/justfile index f9de64c..016986d 100644 --- a/justfile +++ b/justfile @@ -148,6 +148,7 @@ test-cli: clean: -@{{BIN_rm}} *.exe + -@{{BIN_rm}} *.res -@{{BIN_rm}} xy -@{{BIN_rm}} fw -@{{BIN_rm}} chsrc From 1058d3310b87bb4cd5b606a7e636183099162f65 Mon Sep 17 00:00:00 2001 From: Aoran Zeng Date: Mon, 27 Oct 2025 22:05:17 +0800 Subject: [PATCH 16/17] Rename option controlling API to `deny` --- src/framework/chef.c | 6 +++--- src/recipe/lang/Clojure.c | 2 +- src/recipe/lang/Go.c | 2 +- src/recipe/lang/Haskell.c | 2 +- src/recipe/lang/Java.c | 2 +- src/recipe/lang/Lua.c | 2 +- src/recipe/lang/NuGet.c | 4 ++-- src/recipe/lang/OCaml.c | 2 +- src/recipe/lang/PHP.c | 2 +- src/recipe/lang/Perl.c | 2 +- src/recipe/lang/R.c | 2 +- src/recipe/lang/Rust/Cargo.c | 2 +- src/recipe/lang/Rust/rustup.c | 2 +- src/recipe/os/APT/Armbian.c | 4 ++-- src/recipe/os/APT/Debian.c | 4 ++-- src/recipe/os/APT/Kali-Linux.c | 4 ++-- src/recipe/os/APT/Linux-Lite.c | 4 ++-- src/recipe/os/APT/Linux-Mint.c | 4 ++-- src/recipe/os/APT/ROS.c | 4 ++-- src/recipe/os/APT/Raspberry-Pi-OS.c | 4 ++-- src/recipe/os/APT/Termux.c | 4 ++-- src/recipe/os/APT/Trisquel.c | 4 ++-- src/recipe/os/APT/Ubuntu.c | 4 ++-- src/recipe/os/APT/deepin.c | 4 ++-- src/recipe/os/APT/openKylin.c | 4 ++-- src/recipe/os/Alpine-Linux.c | 2 +- src/recipe/os/BSD/FreeBSD.c | 4 ++-- src/recipe/os/BSD/NetBSD.c | 4 ++-- src/recipe/os/BSD/OpenBSD.c | 4 ++-- src/recipe/os/Gentoo-Linux.c | 2 +- src/recipe/os/Solus.c | 2 +- src/recipe/os/Void-Linux.c | 2 +- src/recipe/os/YUM/AlmaLinux.c | 4 ++-- src/recipe/os/YUM/Anolis-OS.c | 4 ++-- src/recipe/os/YUM/Fedora-Linux.c | 4 ++-- src/recipe/os/YUM/Rocky-Linux.c | 4 ++-- src/recipe/os/YUM/openEuler.c | 4 ++-- src/recipe/os/openSUSE.c | 4 ++-- src/recipe/os/pacman/Arch-Linux.c | 8 ++++---- src/recipe/os/pacman/MSYS2.c | 4 ++-- src/recipe/os/pacman/Manjaro-Linux.c | 4 ++-- src/recipe/recipe-template.c | 4 ++-- src/recipe/ware/Anaconda/Anaconda.c | 4 ++-- src/recipe/ware/CocoaPods.c | 2 +- src/recipe/ware/Docker/Docker.c | 2 +- src/recipe/ware/Emacs.c | 4 ++-- src/recipe/ware/Flatpak.c | 2 +- src/recipe/ware/Guix.c | 4 ++-- src/recipe/ware/Homebrew/Homebrew.c | 2 +- src/recipe/ware/Nix.c | 4 ++-- src/recipe/ware/TeX-Live.c | 2 +- src/recipe/ware/WinGet.c | 2 +- 52 files changed, 86 insertions(+), 86 deletions(-) diff --git a/src/framework/chef.c b/src/framework/chef.c index 886fef3..9291ad5 100644 --- a/src/framework/chef.c +++ b/src/framework/chef.c @@ -5,7 +5,7 @@ * File Authors : 曾奥然 * Contributors : BingChunMoLi * Created On : <2025-08-09> - * Last Modified : <2025-08-27> + * Last Modified : <2025-10-27> * * chef DSL: for chefs (recipe makers) to define a target * ------------------------------------------------------------*/ @@ -186,7 +186,7 @@ chef_allow_english (Target_t *target) } void -chef_forbid_english (Target_t *target) +chef_deny_english (Target_t *target) { xy_cant_be_null (target); target->can_english = false; @@ -226,7 +226,7 @@ chef_allow_user_define (Target_t *target) } void -chef_forbid_user_define (Target_t *target) +chef_deny_user_define (Target_t *target) { xy_cant_be_null (target); diff --git a/src/recipe/lang/Clojure.c b/src/recipe/lang/Clojure.c index e052f81..aa345c6 100644 --- a/src/recipe/lang/Clojure.c +++ b/src/recipe/lang/Clojure.c @@ -18,7 +18,7 @@ pl_clojure_prelude () chef_set_sauciers (this, 1, "@hezonglun"); chef_allow_local_mode (this, FullyCan, NULL, NULL); - chef_forbid_english(this); + chef_deny_english(this); chef_allow_user_define(this); def_sources_begin() diff --git a/src/recipe/lang/Go.c b/src/recipe/lang/Go.c index 92990ec..e0f93e3 100644 --- a/src/recipe/lang/Go.c +++ b/src/recipe/lang/Go.c @@ -32,7 +32,7 @@ pl_go_prelude () chef_set_sauciers (this, 2, "@czyt", "@techoc"); chef_allow_local_mode (this, CanNot, NULL, NULL); - chef_forbid_english(this); + chef_deny_english(this); chef_allow_user_define(this); diff --git a/src/recipe/lang/Haskell.c b/src/recipe/lang/Haskell.c index 7d742da..38c688e 100644 --- a/src/recipe/lang/Haskell.c +++ b/src/recipe/lang/Haskell.c @@ -18,7 +18,7 @@ pl_haskell_prelude () chef_set_sauciers (this, 1, "@hezonglun"); chef_allow_local_mode (this, CanNot, NULL, NULL); - chef_forbid_english(this); + chef_deny_english(this); chef_allow_user_define(this); def_sources_begin() diff --git a/src/recipe/lang/Java.c b/src/recipe/lang/Java.c index 1bf4a81..29cae8f 100644 --- a/src/recipe/lang/Java.c +++ b/src/recipe/lang/Java.c @@ -18,7 +18,7 @@ pl_java_prelude () chef_set_sauciers (this, 0); chef_allow_local_mode (this, CanNot, NULL, NULL); - chef_forbid_english(this); + chef_deny_english(this); chef_allow_user_define(this); // 阿里巴巴开源镜像站需要修改为此才能测速 diff --git a/src/recipe/lang/Lua.c b/src/recipe/lang/Lua.c index 52b81f3..6abc620 100644 --- a/src/recipe/lang/Lua.c +++ b/src/recipe/lang/Lua.c @@ -25,7 +25,7 @@ pl_lua_prelude () chef_set_sauciers (this, 1, "@hezonglun"); chef_allow_local_mode (this, CanNot, NULL, NULL); - chef_forbid_english(this); + chef_deny_english(this); chef_allow_user_define(this); def_sources_begin() diff --git a/src/recipe/lang/NuGet.c b/src/recipe/lang/NuGet.c index 19b0bea..401fe1e 100644 --- a/src/recipe/lang/NuGet.c +++ b/src/recipe/lang/NuGet.c @@ -18,8 +18,8 @@ pl_nuget_prelude () chef_set_sauciers (this, 0); chef_allow_local_mode (this, CanNot, NULL, NULL); - chef_forbid_english(this); - chef_forbid_user_define(this); + chef_deny_english(this); + chef_deny_user_define(this); def_sources_begin() {&UpstreamProvider, "https://www.nuget.org/api/v3/", DelegateToUpstream}, diff --git a/src/recipe/lang/OCaml.c b/src/recipe/lang/OCaml.c index 7571548..44da4ab 100644 --- a/src/recipe/lang/OCaml.c +++ b/src/recipe/lang/OCaml.c @@ -18,7 +18,7 @@ pl_ocaml_prelude () chef_set_sauciers (this, 1, "@hezonglun"); chef_allow_local_mode (this, CanNot, NULL, NULL); - chef_forbid_english(this); + chef_deny_english(this); chef_allow_user_define(this); def_sources_begin() diff --git a/src/recipe/lang/PHP.c b/src/recipe/lang/PHP.c index 1fdb212..4cdfade 100644 --- a/src/recipe/lang/PHP.c +++ b/src/recipe/lang/PHP.c @@ -18,7 +18,7 @@ pl_php_prelude () chef_set_sauciers (this, 1, "@hezonglun"); chef_allow_local_mode (this, FullyCan, NULL, NULL); - chef_forbid_english(this); + chef_deny_english(this); chef_allow_user_define(this); def_sources_begin() diff --git a/src/recipe/lang/Perl.c b/src/recipe/lang/Perl.c index c5ccff1..691942f 100644 --- a/src/recipe/lang/Perl.c +++ b/src/recipe/lang/Perl.c @@ -18,7 +18,7 @@ pl_perl_prelude () chef_set_sauciers (this, 2, "@hezonglun", "@Mikachu2333"); chef_allow_local_mode (this, CanNot, NULL, NULL); - chef_forbid_english (this); + chef_deny_english (this); chef_allow_user_define (this); def_sources_begin() diff --git a/src/recipe/lang/R.c b/src/recipe/lang/R.c index 6dac62d..9a0a045 100644 --- a/src/recipe/lang/R.c +++ b/src/recipe/lang/R.c @@ -18,7 +18,7 @@ pl_r_prelude () chef_set_sauciers (this, 1, "@hezonglun"); chef_allow_local_mode (this, CanNot, NULL, NULL); - chef_forbid_english(this); + chef_deny_english(this); chef_allow_user_define(this); // 以下注释的，是不含有bioconductor的镜像站，我们在换cran的同时，也直接帮助用户换bioconductor diff --git a/src/recipe/lang/Rust/Cargo.c b/src/recipe/lang/Rust/Cargo.c index 776a702..5ca237a 100644 --- a/src/recipe/lang/Rust/Cargo.c +++ b/src/recipe/lang/Rust/Cargo.c @@ -18,7 +18,7 @@ pl_rust_cargo_prelude (void) chef_set_sauciers (this, 1, "@happy-game"); chef_allow_local_mode (this, FullyCan, NULL, NULL); - chef_forbid_english (this); + chef_deny_english (this); chef_allow_user_define (this); diff --git a/src/recipe/lang/Rust/rustup.c b/src/recipe/lang/Rust/rustup.c index e152d86..d79c73b 100644 --- a/src/recipe/lang/Rust/rustup.c +++ b/src/recipe/lang/Rust/rustup.c @@ -21,7 +21,7 @@ pl_rust_rustup_prelude (void) chef_set_sauciers (this, 2, "@Yangmoooo", "@Mikachu2333"); chef_allow_local_mode (this, CanNot, NULL, NULL); - chef_forbid_english (this); + chef_deny_english (this); chef_allow_user_define(this); def_sources_begin() diff --git a/src/recipe/os/APT/Armbian.c b/src/recipe/os/APT/Armbian.c index ce8e1d2..8fe2194 100644 --- a/src/recipe/os/APT/Armbian.c +++ b/src/recipe/os/APT/Armbian.c @@ -18,8 +18,8 @@ os_armbian_prelude () chef_set_sauciers (this, 2, "@ccmywish", "@Yangmoooo"); chef_allow_local_mode (this, CanNot, NULL, NULL); - chef_forbid_english(this); - chef_forbid_user_define(this); + chef_deny_english(this); + chef_deny_user_define(this); chef_set_note(this, NULL, NULL); diff --git a/src/recipe/os/APT/Debian.c b/src/recipe/os/APT/Debian.c index 44cd22c..f56ebb5 100644 --- a/src/recipe/os/APT/Debian.c +++ b/src/recipe/os/APT/Debian.c @@ -18,8 +18,8 @@ os_debian_prelude () chef_set_sauciers (this, 1, "@Yangmoooo"); chef_allow_local_mode (this, CanNot, NULL, NULL); - chef_forbid_english(this); - chef_forbid_user_define(this); + chef_deny_english(this); + chef_deny_user_define(this); chef_set_note(this, NULL, NULL); diff --git a/src/recipe/os/APT/Kali-Linux.c b/src/recipe/os/APT/Kali-Linux.c index 7b85209..6ac6749 100644 --- a/src/recipe/os/APT/Kali-Linux.c +++ b/src/recipe/os/APT/Kali-Linux.c @@ -18,8 +18,8 @@ os_kali_prelude () chef_set_sauciers (this, 2, "@Yangmoooo", "@happy-game"); chef_allow_local_mode (this, CanNot, NULL, NULL); - chef_forbid_english(this); - chef_forbid_user_define(this); + chef_deny_english(this); + chef_deny_user_define(this); chef_set_note(this, NULL, NULL); diff --git a/src/recipe/os/APT/Linux-Lite.c b/src/recipe/os/APT/Linux-Lite.c index 5b951a6..23ccc0f 100644 --- a/src/recipe/os/APT/Linux-Lite.c +++ b/src/recipe/os/APT/Linux-Lite.c @@ -18,8 +18,8 @@ os_linuxlite_prelude () chef_set_sauciers (this, 1, "@Yangmoooo"); chef_allow_local_mode (this, CanNot, NULL, NULL); - chef_forbid_english(this); - chef_forbid_user_define(this); + chef_deny_english(this); + chef_deny_user_define(this); chef_set_note(this, NULL, NULL); diff --git a/src/recipe/os/APT/Linux-Mint.c b/src/recipe/os/APT/Linux-Mint.c index 36371cf..794a7c4 100644 --- a/src/recipe/os/APT/Linux-Mint.c +++ b/src/recipe/os/APT/Linux-Mint.c @@ -18,8 +18,8 @@ os_linuxmint_prelude () chef_set_sauciers (this, 1, "@happy-game"); chef_allow_local_mode (this, CanNot, NULL, NULL); - chef_forbid_english(this); - chef_forbid_user_define(this); + chef_deny_english(this); + chef_deny_user_define(this); /* @note 实际上镜像站里的内容和Ubuntu的不太一样 */ diff --git a/src/recipe/os/APT/ROS.c b/src/recipe/os/APT/ROS.c index fa38c24..0ccb50d 100644 --- a/src/recipe/os/APT/ROS.c +++ b/src/recipe/os/APT/ROS.c @@ -18,8 +18,8 @@ os_ros_prelude () chef_set_sauciers (this, 2, "@ccmywish", "@zouri"); chef_allow_local_mode (this, CanNot, NULL, NULL); - chef_forbid_english(this); - chef_forbid_user_define(this); + chef_deny_english(this); + chef_deny_user_define(this); chef_set_note(this, "该换源方案中，URL存在拼凑，因此不能手动使用某URL来换源", "In this switching method, URLs are constructed, so manual URL specification is not supported"); diff --git a/src/recipe/os/APT/Raspberry-Pi-OS.c b/src/recipe/os/APT/Raspberry-Pi-OS.c index 182c51a..7b2162f 100644 --- a/src/recipe/os/APT/Raspberry-Pi-OS.c +++ b/src/recipe/os/APT/Raspberry-Pi-OS.c @@ -20,8 +20,8 @@ os_raspberrypi_prelude () chef_set_sauciers (this, 1, "@Yangmoooo"); chef_allow_local_mode (this, CanNot, NULL, NULL); - chef_forbid_english(this); - chef_forbid_user_define(this); + chef_deny_english(this); + chef_deny_user_define(this); chef_set_note(this, NULL, NULL); diff --git a/src/recipe/os/APT/Termux.c b/src/recipe/os/APT/Termux.c index a0b0eee..e696379 100644 --- a/src/recipe/os/APT/Termux.c +++ b/src/recipe/os/APT/Termux.c @@ -18,8 +18,8 @@ os_termux_prelude () chef_set_sauciers (this, 0); chef_allow_local_mode (this, CanNot, NULL, NULL); - chef_forbid_english(this); - chef_forbid_user_define(this); + chef_deny_english(this); + chef_deny_user_define(this); chef_set_note(this, "该 recipe 存在对应的 bootstrapper", "This recipe has a corresponding bootstrapper"); diff --git a/src/recipe/os/APT/Trisquel.c b/src/recipe/os/APT/Trisquel.c index 3ac2e79..7502f57 100644 --- a/src/recipe/os/APT/Trisquel.c +++ b/src/recipe/os/APT/Trisquel.c @@ -20,8 +20,8 @@ os_trisquel_prelude () chef_set_sauciers (this, 0); chef_allow_local_mode (this, CanNot, NULL, NULL); - chef_forbid_english(this); - chef_forbid_user_define(this); + chef_deny_english(this); + chef_deny_user_define(this); chef_set_note(this, NULL, NULL); diff --git a/src/recipe/os/APT/Ubuntu.c b/src/recipe/os/APT/Ubuntu.c index 9c4f8a5..7a5dff5 100644 --- a/src/recipe/os/APT/Ubuntu.c +++ b/src/recipe/os/APT/Ubuntu.c @@ -19,8 +19,8 @@ os_ubuntu_prelude () chef_set_sauciers (this, 1, "@XUANJI233"); chef_allow_local_mode (this, CanNot, NULL, NULL); - chef_forbid_english(this); - chef_forbid_user_define(this); + chef_deny_english(this); + chef_deny_user_define(this); chef_set_note(this, NULL, NULL); diff --git a/src/recipe/os/APT/deepin.c b/src/recipe/os/APT/deepin.c index 8f01ed1..304d100 100644 --- a/src/recipe/os/APT/deepin.c +++ b/src/recipe/os/APT/deepin.c @@ -18,8 +18,8 @@ os_deepin_prelude () chef_set_sauciers (this, 1, "@Yangmoooo"); chef_allow_local_mode (this, CanNot, NULL, NULL); - chef_forbid_english(this); - chef_forbid_user_define(this); + chef_deny_english(this); + chef_deny_user_define(this); chef_set_note(this, NULL, NULL); diff --git a/src/recipe/os/APT/openKylin.c b/src/recipe/os/APT/openKylin.c index 8d6ddd4..39157bb 100644 --- a/src/recipe/os/APT/openKylin.c +++ b/src/recipe/os/APT/openKylin.c @@ -21,8 +21,8 @@ os_openkylin_prelude () chef_set_sauciers (this, 1, "@ccmywish"); chef_allow_local_mode (this, CanNot, NULL, NULL); - chef_forbid_english(this); - chef_forbid_user_define(this); + chef_deny_english(this); + chef_deny_user_define(this); chef_set_note(this, NULL, NULL); diff --git a/src/recipe/os/Alpine-Linux.c b/src/recipe/os/Alpine-Linux.c index f7e98bd..f1d03c3 100644 --- a/src/recipe/os/Alpine-Linux.c +++ b/src/recipe/os/Alpine-Linux.c @@ -19,7 +19,7 @@ os_alpine_prelude () chef_allow_local_mode (this, CanNot, NULL, NULL); chef_allow_english(this); - chef_forbid_user_define(this); + chef_deny_user_define(this); chef_set_note(this, NULL, NULL); diff --git a/src/recipe/os/BSD/FreeBSD.c b/src/recipe/os/BSD/FreeBSD.c index 05a30e7..6c853e1 100644 --- a/src/recipe/os/BSD/FreeBSD.c +++ b/src/recipe/os/BSD/FreeBSD.c @@ -18,8 +18,8 @@ os_freebsd_prelude () chef_set_sauciers (this, 1, "@hezonglun"); chef_allow_local_mode (this, CanNot, NULL, NULL); - chef_forbid_english(this); - chef_forbid_user_define(this); + chef_deny_english(this); + chef_deny_user_define(this); // 2023-09-24: 以下三个USTC, NJU, Netease 均维护了 freebsd-pkg freebsd-ports diff --git a/src/recipe/os/BSD/NetBSD.c b/src/recipe/os/BSD/NetBSD.c index 9551288..6c4d03d 100644 --- a/src/recipe/os/BSD/NetBSD.c +++ b/src/recipe/os/BSD/NetBSD.c @@ -19,8 +19,8 @@ os_netbsd_prelude () chef_allow_local_mode (this, CanNot, NULL, NULL); - chef_forbid_english(this); - chef_forbid_user_define(this); + chef_deny_english(this); + chef_deny_user_define(this); def_sources_begin() {&UpstreamProvider, "http://ftp.netbsd.org/pub/pkgsrc/packages/NetBSD/", DelegateToUpstream}, diff --git a/src/recipe/os/BSD/OpenBSD.c b/src/recipe/os/BSD/OpenBSD.c index 62acaae..dfc2996 100644 --- a/src/recipe/os/BSD/OpenBSD.c +++ b/src/recipe/os/BSD/OpenBSD.c @@ -18,8 +18,8 @@ os_openbsd_prelude () chef_set_sauciers (this, 1, "@hezonglun"); chef_allow_local_mode (this, CanNot, NULL, NULL); - chef_forbid_english(this); - chef_forbid_user_define(this); + chef_deny_english(this); + chef_deny_user_define(this); def_sources_begin() {&UpstreamProvider, "https://cdn.openbsd.org/pub/OpenBSD/", DelegateToUpstream}, diff --git a/src/recipe/os/Gentoo-Linux.c b/src/recipe/os/Gentoo-Linux.c index 4e25fdb..b13c09f 100644 --- a/src/recipe/os/Gentoo-Linux.c +++ b/src/recipe/os/Gentoo-Linux.c @@ -19,7 +19,7 @@ os_gentoo_prelude () chef_allow_local_mode (this, CanNot, NULL, NULL); chef_allow_english(this); - chef_forbid_user_define(this); + chef_deny_user_define(this); chef_set_note(this, NULL, NULL); diff --git a/src/recipe/os/Solus.c b/src/recipe/os/Solus.c index 989da7b..feaabc1 100644 --- a/src/recipe/os/Solus.c +++ b/src/recipe/os/Solus.c @@ -19,7 +19,7 @@ os_solus_prelude () chef_allow_local_mode (this, CanNot, NULL, NULL); - chef_forbid_english(this); + chef_deny_english(this); chef_allow_user_define(this); chef_set_note(this, NULL, NULL); diff --git a/src/recipe/os/Void-Linux.c b/src/recipe/os/Void-Linux.c index ace7dd6..2254df1 100644 --- a/src/recipe/os/Void-Linux.c +++ b/src/recipe/os/Void-Linux.c @@ -18,7 +18,7 @@ os_voidlinux_prelude () chef_set_sauciers (this, 1, "@Yangmoooo"); chef_allow_local_mode (this, CanNot, NULL, NULL); - chef_forbid_english(this); + chef_deny_english(this); chef_set_note(this, NULL, NULL); diff --git a/src/recipe/os/YUM/AlmaLinux.c b/src/recipe/os/YUM/AlmaLinux.c index 2112c3a..0b1d7f5 100644 --- a/src/recipe/os/YUM/AlmaLinux.c +++ b/src/recipe/os/YUM/AlmaLinux.c @@ -18,8 +18,8 @@ os_almalinux_prelude () chef_set_sauciers (this, 1, "@Yangmoooo"); chef_allow_local_mode (this, CanNot, NULL, NULL); - chef_forbid_english(this); - chef_forbid_user_define(this); + chef_deny_english(this); + chef_deny_user_define(this); chef_set_note(this, NULL, NULL); diff --git a/src/recipe/os/YUM/Anolis-OS.c b/src/recipe/os/YUM/Anolis-OS.c index 6761ef7..e56f696 100644 --- a/src/recipe/os/YUM/Anolis-OS.c +++ b/src/recipe/os/YUM/Anolis-OS.c @@ -18,8 +18,8 @@ os_anolis_prelude () chef_set_sauciers (this, 0); chef_allow_local_mode (this, CanNot, NULL, NULL); - chef_forbid_english(this); - chef_forbid_user_define(this); + chef_deny_english(this); + chef_deny_user_define(this); chef_set_note(this, NULL, NULL); diff --git a/src/recipe/os/YUM/Fedora-Linux.c b/src/recipe/os/YUM/Fedora-Linux.c index 9abbed9..e1c7777 100644 --- a/src/recipe/os/YUM/Fedora-Linux.c +++ b/src/recipe/os/YUM/Fedora-Linux.c @@ -18,8 +18,8 @@ os_fedora_prelude () chef_set_sauciers (this, 1, "@ccmywish"); chef_allow_local_mode (this, CanNot, NULL, NULL); - chef_forbid_english(this); - chef_forbid_user_define(this); + chef_deny_english(this); + chef_deny_user_define(this); chef_set_note(this, NULL, NULL); diff --git a/src/recipe/os/YUM/Rocky-Linux.c b/src/recipe/os/YUM/Rocky-Linux.c index db748d7..7bd28be 100644 --- a/src/recipe/os/YUM/Rocky-Linux.c +++ b/src/recipe/os/YUM/Rocky-Linux.c @@ -18,8 +18,8 @@ os_rockylinux_prelude () chef_set_sauciers (this, 1, "@happy-game"); chef_allow_local_mode (this, CanNot, NULL, NULL); - chef_forbid_english(this); - chef_forbid_user_define(this); + chef_deny_english(this); + chef_deny_user_define(this); def_sources_begin() {&UpstreamProvider, "https://dl.rockylinux.org", DelegateToUpstream}, diff --git a/src/recipe/os/YUM/openEuler.c b/src/recipe/os/YUM/openEuler.c index f7a2517..0263d66 100644 --- a/src/recipe/os/YUM/openEuler.c +++ b/src/recipe/os/YUM/openEuler.c @@ -18,8 +18,8 @@ os_openeuler_prelude () chef_set_sauciers (this, 3, "@ccmywish", "@Yangmoooo", "@happy-game"); chef_allow_local_mode (this, CanNot, NULL, NULL); - chef_forbid_english(this); - chef_forbid_user_define(this); + chef_deny_english(this); + chef_deny_user_define(this); chef_set_note(this, NULL, NULL); diff --git a/src/recipe/os/openSUSE.c b/src/recipe/os/openSUSE.c index bb5052f..e26448c 100644 --- a/src/recipe/os/openSUSE.c +++ b/src/recipe/os/openSUSE.c @@ -18,8 +18,8 @@ os_opensuse_prelude () chef_set_sauciers (this, 0); chef_allow_local_mode (this, CanNot, NULL, NULL); - chef_forbid_english(this); - chef_forbid_user_define(this); + chef_deny_english(this); + chef_deny_user_define(this); chef_set_note(this, NULL, NULL); diff --git a/src/recipe/os/pacman/Arch-Linux.c b/src/recipe/os/pacman/Arch-Linux.c index e77760c..cd92a76 100644 --- a/src/recipe/os/pacman/Arch-Linux.c +++ b/src/recipe/os/pacman/Arch-Linux.c @@ -21,8 +21,8 @@ os_arch_prelude () chef_set_sauciers (this, 2, "@happy-game", "@Young-Lord"); chef_allow_local_mode (this, CanNot, NULL, NULL); - chef_forbid_english(this); - chef_forbid_user_define(this); + chef_deny_english(this); + chef_deny_user_define(this); chef_set_note (this, "可额外使用 chsrc set archlinuxcn 来更换 Arch Linux CN Repository 源", @@ -124,8 +124,8 @@ os_archlinuxcn_prelude () chef_set_sauciers (this, 2, "@happy-game", "@Young-Lord"); chef_allow_local_mode (this, CanNot, NULL, NULL); - chef_forbid_english(this); - chef_forbid_user_define(this); + chef_deny_english(this); + chef_deny_user_define(this); chef_set_note (this, "可额外使用 chsrc set arch 来更换 Arch Linux 源", diff --git a/src/recipe/os/pacman/MSYS2.c b/src/recipe/os/pacman/MSYS2.c index e281d5e..6e031d5 100644 --- a/src/recipe/os/pacman/MSYS2.c +++ b/src/recipe/os/pacman/MSYS2.c @@ -18,8 +18,8 @@ os_msys2_prelude () chef_set_sauciers (this, 2, "@ccmywish", "@hezonglun"); chef_allow_local_mode (this, CanNot, NULL, NULL); - chef_forbid_english(this); - chef_forbid_user_define(this); + chef_deny_english(this); + chef_deny_user_define(this); def_sources_begin() {&UpstreamProvider, "https://mirror.msys2.org/", DelegateToUpstream}, diff --git a/src/recipe/os/pacman/Manjaro-Linux.c b/src/recipe/os/pacman/Manjaro-Linux.c index 1859897..620847b 100644 --- a/src/recipe/os/pacman/Manjaro-Linux.c +++ b/src/recipe/os/pacman/Manjaro-Linux.c @@ -17,8 +17,8 @@ os_manjaro_prelude () chef_set_sauciers (this, 0); chef_allow_local_mode (this, CanNot, NULL, NULL); - chef_forbid_english(this); - chef_forbid_user_define(this); + chef_deny_english(this); + chef_deny_user_define(this); def_sources_begin() {&UpstreamProvider, NULL, DelegateToUpstream} diff --git a/src/recipe/recipe-template.c b/src/recipe/recipe-template.c index 8f75e26..442e030 100644 --- a/src/recipe/recipe-template.c +++ b/src/recipe/recipe-template.c @@ -73,10 +73,10 @@ void chef_allow_local_mode (this, PartiallyCan, "具体说明是否支持项目级换源...", "Tell users the local mode support"); // chef_allow_english(this); // 项目是否支持英文 - chef_forbid_english(this); + chef_deny_english(this); // chef_allow_user_define(this); // 是否支持用户自定义镜像源 - chef_forbid_user_define(this); + chef_deny_user_define(this); chef_set_note ("中文备注说明...", "English note..."); diff --git a/src/recipe/ware/Anaconda/Anaconda.c b/src/recipe/ware/Anaconda/Anaconda.c index d265ff1..36a15d1 100644 --- a/src/recipe/ware/Anaconda/Anaconda.c +++ b/src/recipe/ware/Anaconda/Anaconda.c @@ -20,8 +20,8 @@ wr_anaconda_prelude () chef_set_sauciers (this, 2, "@Yangmoooo", "@xyx1926885268"); chef_allow_local_mode (this, CanNot, NULL, NULL); - chef_forbid_english(this); - chef_forbid_user_define(this); + chef_deny_english(this); + chef_deny_user_define(this); def_sources_begin() {&UpstreamProvider, "https://repo.anaconda.com", DelegateToUpstream}, diff --git a/src/recipe/ware/CocoaPods.c b/src/recipe/ware/CocoaPods.c index 88f4f78..58573ab 100644 --- a/src/recipe/ware/CocoaPods.c +++ b/src/recipe/ware/CocoaPods.c @@ -19,7 +19,7 @@ wr_cocoapods_prelude () chef_allow_local_mode (this, CanNot, NULL, NULL); - chef_forbid_english(this); + chef_deny_english(this); chef_allow_user_define(this); def_sources_begin() diff --git a/src/recipe/ware/Docker/Docker.c b/src/recipe/ware/Docker/Docker.c index 09bba30..dc6784d 100644 --- a/src/recipe/ware/Docker/Docker.c +++ b/src/recipe/ware/Docker/Docker.c @@ -35,7 +35,7 @@ wr_docker_prelude () chef_set_sauciers (this, 0); chef_allow_local_mode (this, CanNot, NULL, NULL); - chef_forbid_english(this); + chef_deny_english(this); chef_allow_user_define(this); def_sources_begin() diff --git a/src/recipe/ware/Emacs.c b/src/recipe/ware/Emacs.c index d0b7e84..9e9ca5b 100644 --- a/src/recipe/ware/Emacs.c +++ b/src/recipe/ware/Emacs.c @@ -25,8 +25,8 @@ wr_emacs_prelude () chef_set_sauciers (this, 0); chef_allow_local_mode (this, CanNot, NULL, NULL); - chef_forbid_english(this); - chef_forbid_user_define(this); + chef_deny_english(this); + chef_deny_user_define(this); chef_set_note (this, "Emacs用户往往只需要一次性换源，只会极少次调用 chsrc，我们只给用户提供文档", "Emacs users typically only need to switch sources once and rarely call chsrc, so we only provide documentation to users"); diff --git a/src/recipe/ware/Flatpak.c b/src/recipe/ware/Flatpak.c index 0163298..902a66f 100644 --- a/src/recipe/ware/Flatpak.c +++ b/src/recipe/ware/Flatpak.c @@ -18,7 +18,7 @@ wr_flatpak_prelude () chef_set_sauciers (this, 1, "@jialinlvcn"); chef_allow_local_mode (this, CanNot, NULL, NULL); - chef_forbid_english(this); + chef_deny_english(this); chef_allow_user_define(this); chef_set_note (this, "对Flathub目标进行测速的文件非常小，测速效果严重失真，若你知道可供测速的URL，欢迎参与贡献: chsrc issue", diff --git a/src/recipe/ware/Guix.c b/src/recipe/ware/Guix.c index a31483a..2546530 100644 --- a/src/recipe/ware/Guix.c +++ b/src/recipe/ware/Guix.c @@ -18,8 +18,8 @@ wr_guix_prelude () chef_set_sauciers (this, 0); chef_allow_local_mode (this, CanNot, NULL, NULL); - chef_forbid_english(this); - chef_forbid_user_define(this); + chef_deny_english(this); + chef_deny_user_define(this); chef_set_note (this, "目前只有一个源, guixcn 的源不知道是否可用", "Currently only one source available, guixcn source availability unknown"); diff --git a/src/recipe/ware/Homebrew/Homebrew.c b/src/recipe/ware/Homebrew/Homebrew.c index 286fdb5..99bcc4d 100644 --- a/src/recipe/ware/Homebrew/Homebrew.c +++ b/src/recipe/ware/Homebrew/Homebrew.c @@ -21,7 +21,7 @@ wr_homebrew_prelude () chef_allow_local_mode (this, CanNot, NULL, NULL); chef_allow_english(this); - chef_forbid_user_define(this); + chef_deny_user_define(this); chef_set_note (this, "该换源通过写入环境变量实现，若多次换源，请手动清理profile文件", "This source switching is implemented by writing environment variables. If switching sources multiple times, please manually clean the profile file"); diff --git a/src/recipe/ware/Nix.c b/src/recipe/ware/Nix.c index b39379c..8656f5d 100644 --- a/src/recipe/ware/Nix.c +++ b/src/recipe/ware/Nix.c @@ -18,8 +18,8 @@ wr_nix_prelude () chef_set_sauciers (this, 0); chef_allow_local_mode (this, CanNot, NULL, NULL); - chef_forbid_english(this); - chef_forbid_user_define(this); + chef_deny_english(this); + chef_deny_user_define(this); def_sources_begin() {&UpstreamProvider, "https://channels.nixos.org/", DelegateToUpstream}, diff --git a/src/recipe/ware/TeX-Live.c b/src/recipe/ware/TeX-Live.c index b267159..c590b6b 100644 --- a/src/recipe/ware/TeX-Live.c +++ b/src/recipe/ware/TeX-Live.c @@ -20,7 +20,7 @@ wr_tex_prelude () chef_set_sauciers (this, 1, "@Mikachu2333"); chef_allow_local_mode (this, CanNot, NULL, NULL); - chef_forbid_english(this); + chef_deny_english(this); chef_allow_user_define(this); def_sources_begin() diff --git a/src/recipe/ware/WinGet.c b/src/recipe/ware/WinGet.c index a05f2a8..a843b0c 100644 --- a/src/recipe/ware/WinGet.c +++ b/src/recipe/ware/WinGet.c @@ -17,7 +17,7 @@ wr_winget_prelude () chef_set_cooks (this, 1, "@ccmywish"); chef_set_sauciers (this, 1, "@Mikachu2333"); - chef_forbid_english(this); + chef_deny_english(this); chef_allow_user_define(this); def_sources_begin() From c6897bd73ece0431ff7e01478233c4d84f59aae5 Mon Sep 17 00:00:00 2001 From: Aoran Zeng Date: Mon, 27 Oct 2025 22:11:34 +0800 Subject: [PATCH 17/17] Remove `free()` in recipes --- src/recipe/lang/Rust/Cargo.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/recipe/lang/Rust/Cargo.c b/src/recipe/lang/Rust/Cargo.c index 5ca237a..d4dbbb1 100644 --- a/src/recipe/lang/Rust/Cargo.c +++ b/src/recipe/lang/Rust/Cargo.c @@ -75,7 +75,6 @@ pl_rust_cargo_getsrc (char *option) char *raw_content = xy_file_read (cargo_config_file); char *formatted_content = xy_str_gsub (raw_content, " ", ""); formatted_content = xy_str_gsub (formatted_content, "'", "\""); - free (raw_content); XyStrFindResult_t result_has_mirror = xy_str_find (formatted_content, "replace-with"); if (result_has_mirror.found) @@ -112,7 +111,6 @@ pl_write_rust_config (const char *path, const char *url) char *content = RAWSTR_pl_rust_cargo_config; content = xy_str_gsub (content, "@url@", url); chsrc_overwrite_file (content, path); - free (content); } /** @@ -172,7 +170,6 @@ pl_rust_cargo_setsrc (char *option) char *final_content = xy_str_gsub (raw_content, mirror_url, xy_2strcat ("sparse+", source.url)); chsrc_overwrite_file (final_content, cargo_config_file); - free (final_content); goto finish; }