Skip to content

Commit 7fd79ea

Browse files
committed
chsrc_view_env 运行时检测系统
1 parent 6418b15 commit 7fd79ea

File tree

3 files changed

+32
-25
lines changed

3 files changed

+32
-25
lines changed

src/framework/core.c

Lines changed: 20 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1648,27 +1648,30 @@ chsrc_view_env (const char *var1, ...)
16481648
bool first = true;
16491649
while (var)
16501650
{
1651-
#ifdef XY_Build_On_Windows
1652-
if (first)
1653-
{
1654-
cmd = xy_strcat (3, "set ", var, " ");
1655-
first = false;
1656-
}
1657-
else
1658-
{
1659-
cmd = xy_strcat (4, cmd, "& set ", var, " ");
1660-
}
1661-
#else
1662-
if (first)
1651+
if (xy.on_windows)
16631652
{
1664-
cmd = xy_strcat (5, "echo ", var, "=$", var, " ");
1665-
first = false;
1653+
if (first)
1654+
{
1655+
cmd = xy_strcat (3, "set ", var, " ");
1656+
first = false;
1657+
}
1658+
else
1659+
{
1660+
cmd = xy_strcat (4, cmd, "& set ", var, " ");
1661+
}
16661662
}
16671663
else
1668-
{
1669-
cmd = xy_strcat (6, cmd, "; echo ", var, "=$", var, " ");
1664+
{
1665+
if (first)
1666+
{
1667+
cmd = xy_strcat (5, "echo ", var, "=$", var, " ");
1668+
first = false;
1669+
}
1670+
else
1671+
{
1672+
cmd = xy_strcat (6, cmd, "; echo ", var, "=$", var, " ");
1673+
}
16701674
}
1671-
#endif
16721675
var = va_arg (vars, const char *);
16731676
}
16741677

src/framework/version.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@
1212
* 发布新版本前请修改此文件
1313
* ------------------------------------------------------------*/
1414

15-
#define Chsrc_Version "0.2.3.4"
15+
#define Chsrc_Version "0.2.4.0-dev"
1616

1717
// 以下四个宏仅用于 resource/chsrc.rc
1818
#define Chsrc_Version_Major 0
1919
#define Chsrc_Version_Minor 2
20-
#define Chsrc_Version_Patch 3
21-
#define Chsrc_Version_Pre 4
20+
#define Chsrc_Version_Patch 4
21+
#define Chsrc_Version_Pre 0
2222

23-
#define Chsrc_Release_Date "2025/12/18"
23+
#define Chsrc_Release_Date "2025/12/29"

test/fw.c

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
/** ------------------------------------------------------------
22
* SPDX-License-Identifier: GPL-3.0-or-later
33
* -------------------------------------------------------------
4-
* File Authors : 曾奥然 <[email protected]>
5-
* Contributors : Mikachu2333 <[email protected]>
4+
* File Authors : @ccmywish
5+
* Contributors : @Mikachu2333
66
* Created On : <2024-12-14>
7-
* Last Modified : <2025-10-06>
7+
* Last Modified : <2025-12-29>
88
*
99
* 该文件最好启用 DEBUG mode 编译
1010
* ------------------------------------------------------------*/
@@ -85,10 +85,14 @@ main (int argc, char const *argv[])
8585

8686
if (xy.on_windows)
8787
{
88-
chsrc_run_as_pwsh_file ("Write-Host \"Hello from PowerShell file\"");
88+
chsrc_view_env ("OS", "windir", NULL);
89+
chsrc_run_as_pwsh_file ("Write-Host \"Hello from PowerShell (v7) file\"");
90+
chsrc_run_as_powershellv5_file ("Write-Host \"Hello from PowerShell v5 file\"");
91+
chsrc_run_as_powershell_file ("Write-Host \"Hello from PowerShell file\"");
8992
}
9093
else
9194
{
95+
chsrc_view_env ("PWD", NULL);
9296
chsrc_run_as_sh_file ("echo Hello from sh file");
9397
chsrc_run_as_bash_file ("echo Hello from Bash file");
9498
}

0 commit comments

Comments
 (0)