Merge branch 'dev' into fix/free_hwnd

Author: ccmywish

.gitignore

@@ -22,7 +22,7 @@
 *.dll
 *.out
 *.exe
-
+*.res
 
 
 ##############################

Makefile

@@ -2,13 +2,13 @@
 # --------------------------------------------------------------
 # SPDX-License-Identifier: GPL-3.0-or-later
 # --------------------------------------------------------------
-# Build File    :   Makefile
-# File Authors  :  Aoran Zeng  <[email protected]>
-# Contributors  :  Yangmoooo   <[email protected]>
+# Build File    : Makefile
+# File Authors  : 曾奥然 <[email protected]>
+# Contributors  : Yangmoooo <[email protected]>
 #								| sanchuanhehe <[email protected]>
 #								|
 # 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

doc/01-开发与构建.md

@@ -3,11 +3,11 @@
  ! -------------------------------------------------------------
  ! Doc Type      : Markdown
  ! Doc Name      : 01-开发与构建.md
- ! Doc Authors   : 曾奥然 <[email protected]>
- ! Contributors  : Nul None <[email protected]>
+ ! Doc Authors   : 曾奥然       <[email protected]>
+ ! Contributors  : Mikachu2333  <[email protected]>
  !               |
  ! Created On    : <2024-12-27>
- ! Last Modified : <2025-08-22>
+ ! Last Modified : <2025-10-11>
  ! ---------------------------------------------------------- -->
 
 # 开发 chsrc

doc/image/chsrc.svg

@@ -2,12 +2,12 @@
 # --------------------------------------------------------------
 # SPDX-License-Identifier: GPL-3.0-or-later
 # --------------------------------------------------------------
-# Build File    :  justfile
-# File Authors  : Aoran Zeng <[email protected]>
-# Contributors  :  Nul None  <[email protected]>
-#								|
+# Build File    : justfile
+# File Authors  : 曾奥然      <[email protected]>
+# Contributors  : Mikachu2333 <[email protected]>
+#               |
 # Created On    : <2025-06-18>
-# Last Modified : <2025-07-21>
+# Last Modified : <2025-10-15>
 #
 # 该文件主要用于在原生Windows上执行项目的基本任务，而不借助于
 # GNU make 以及相应的 MSYS2、Cygwin 环境
@@ -104,19 +104,27 @@ 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}}
 	@{{CC}} src/chsrc-main.c {{CFLAGS_debug_mode}} -o {{DebugMode-Target-Name}}
 	@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}}
-	@{{CC}} src/chsrc-main.c {{CFLAGS_release_mode}} -o {{ReleaseMode-Target-Name}}
-	@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}}
@@ -140,6 +148,7 @@ test-cli:
 
 clean:
 	-@{{BIN_rm}} *.exe
+	-@{{BIN_rm}} *.res
 	-@{{BIN_rm}} xy
 	-@{{BIN_rm}} fw
 	-@{{BIN_rm}} chsrc

justfile

@@ -9,7 +9,7 @@
  *               | BingChunMoLi <[email protected]>
  *               |
  * Created On    : <2023-08-28>
- * Last Modified : <2025-10-07>
+ * 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
@@ -1332,18 +1341,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)
@@ -1354,6 +1366,7 @@ xy_detect_os ()
         {
           xy.on_macos = true;
           closedir (d);
+          return;
         }
     }
 
@@ -1376,10 +1389,11 @@ 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))
-    xy_panic ("Unknown operating system");
+    xy_throw ("Unknown operating system");
 }
 
 
@@ -1488,7 +1502,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;
 

lib/xy.h

@@ -30,11 +30,10 @@
  * 然的加入，逐渐成长为互相支持的伙伴。
  * ------------------------------------------------------------*/
 
-#define Chsrc_Version        "0.2.3"
-#define Chsrc_Release_Date   "2025/10/06"
 #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"
 

src/chsrc-main.c

@@ -5,7 +5,7 @@
  * File Authors  : 曾奥然 <[email protected]>
  * Contributors  : BingChunMoLi <[email protected]>
  * 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);
 

src/framework/chef.c

@@ -0,0 +1,23 @@
+/** ------------------------------------------------------------
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ * -------------------------------------------------------------
+ * File Name     : version.h
+ * File Authors  : 曾奥然      <[email protected]>
+ *               | Mikachu2333 <[email protected]>
+ * Contributors  : Nil Null    <[email protected]>
+ *               |
+ * Created On    : <2025-10-10>
+ * Last Modified : <See 'Chsrc_Release_Date'>
+ *
+ * 发布新版本前请修改此文件
+ * ------------------------------------------------------------*/
+
+#define Chsrc_Version        "0.2.3.1-dev1"
+
+// 以下四个宏仅用于 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"

src/framework/version.h

@@ -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()