Merge branch 'main' into fix/icurel

docs/.vitepress/components/CliGenerator.vue

@@ -177,6 +177,12 @@
         {{ buildCommandString }}
       </div>
     </div>
+    <div class="command-container">
+        <b>craft.yml</b>
+        <div id="craft-cmd" class="command-preview pre">
+          {{ craftCommandString }}
+        </div>
+    </div>
   </div>
 </template>
 
@@ -509,6 +515,38 @@ const buildCommandString = computed(() => {
   return `${spcCommand.value} build ${buildCommand.value} "${extList.value}"${additionalLibs.value}${debug.value ? ' --debug' : ''}${zts.value ? ' --enable-zts' : ''}${enableUPX.value ? ' --with-upx-pack' : ''}${displayINI.value}`;
 });
 
+const craftCommandString = computed(() => {
+    let str = `php-version: ${selectedPhpVersion.value}\n`;
+    str += `extensions: "${extList.value}"\n`;
+    if (checkedTargets.value.join(',') === 'all') {
+        str += 'sapi: ' + ['cli', 'fpm', 'micro', 'embed'].join(',') + '\n';
+    } else {
+        str += `sapi: ${checkedTargets.value.join(',')}\n`;
+    }
+    if (additionalLibs.value) {
+        str += `libs: ${additionalLibs.value.replace('--with-libs="', '').replace('"', '').trim()}\n`;
+    }
+    if (debug.value) {
+        str += 'debug: true\n';
+    }
+    str += '{{position_hold}}';
+    if (enableUPX.value) {
+        str += '  with-upx-pack: true\n';
+    }
+    if (zts.value) {
+        str += '  enable-zts: true\n';
+    }
+    if (preBuilt.value) {
+        str += '  prefer-pre-built: true\n';
+    }
+    if (!str.endsWith('{{position_hold}}')) {
+        str = str.replace('{{position_hold}}', 'build-options:\n');
+    } else {
+        str = str.replace('{{position_hold}}', '');
+    }
+    return str;
+});
+
 const calculateExtLibDepends = (input) => {
   const result = new Set();
 
@@ -627,6 +665,12 @@ h2 {
   overflow-wrap: break-word;
 }
 
+.pre {
+    white-space: pre-wrap;
+    word-break: break-word;
+    overflow-wrap: break-word;
+}
+
 .option-line {
   padding: 4px 8px;
 }

docs/.vitepress/sidebar.en.ts

@@ -1,56 +1,57 @@
 export default {
-  '/en/guide/': [
-    {
-      text: 'Basic Build Guides',
-      items: [
-        {text: 'Guide', link: '/en/guide/'},
-        {text: 'Build (Local)', link: '/en/guide/manual-build'},
-        {text: 'Build (CI)', link: '/en/guide/action-build'},
-        {text: 'Supported Extensions', link: '/en/guide/extensions'},
-        {text: 'Extension Notes', link: '/en/guide/extension-notes'},
-        {text: 'Build Command Generator', link: '/en/guide/cli-generator'},
-        {text: 'Environment Variables', link: '/en/guide/env-vars', collapsed: true,},
-        {text: 'Dependency Table', link: '/en/guide/deps-map'},
-      ]
-    },
-    {
-      text: 'Extended Build Guides',
-      items: [
-        {text: 'Troubleshooting', link: '/en/guide/troubleshooting'},
-        {text: 'Build on Windows', link: '/en/guide/build-on-windows'},
-        {text: 'Build with GNU libc', link: '/en/guide/build-with-glibc'},
-      ],
-    }
-  ],
-  '/en/develop/': [
-    {
-      text: 'Development',
-      items: [
-        {text: 'Get Started', link: '/en/develop/'},
-        {text: 'Project Structure', link: '/en/develop/structure'},
-        {text: 'PHP Source Modification', link: '/en/develop/php-src-changes'},
-      ],
-    },
-    {
-      text: 'Module',
-      items: [
-        {text: 'Doctor ', link: '/en/develop/doctor-module'},
-        {text: 'Source', link: '/en/develop/source-module'},
-      ]
-    },
-    {
-      text: 'Extra',
-      items: [
-        {text: 'Compilation Tools', link: '/en/develop/system-build-tools'},
-      ]
-    }
-  ],
-  '/en/contributing/': [
-    {
-      text: 'Contributing',
-      items: [
-        {text: 'Contributing', link: '/en/contributing/'},
-      ],
-    }
-  ],
+    '/en/guide/': [
+        {
+            text: 'Basic Build Guides',
+            items: [
+                {text: 'Guide', link: '/en/guide/'},
+                {text: 'Build (Local)', link: '/en/guide/manual-build'},
+                {text: 'Build (CI)', link: '/en/guide/action-build'},
+                {text: 'Supported Extensions', link: '/en/guide/extensions'},
+                {text: 'Extension Notes', link: '/en/guide/extension-notes'},
+                {text: 'Build Command Generator', link: '/en/guide/cli-generator'},
+                {text: 'Environment Variables', link: '/en/guide/env-vars', collapsed: true,},
+                {text: 'Dependency Table', link: '/en/guide/deps-map'},
+            ]
+        },
+        {
+            text: 'Extended Build Guides',
+            items: [
+                {text: 'Troubleshooting', link: '/en/guide/troubleshooting'},
+                {text: 'Build on Windows', link: '/en/guide/build-on-windows'},
+                {text: 'Build with GNU libc', link: '/en/guide/build-with-glibc'},
+            ],
+        }
+    ],
+    '/en/develop/': [
+        {
+            text: 'Development',
+            items: [
+                {text: 'Get Started', link: '/en/develop/'},
+                {text: 'Project Structure', link: '/en/develop/structure'},
+                {text: 'PHP Source Modification', link: '/en/develop/php-src-changes'},
+            ],
+        },
+        {
+            text: 'Module',
+            items: [
+                {text: 'Doctor ', link: '/en/develop/doctor-module'},
+                {text: 'Source', link: '/en/develop/source-module'},
+            ]
+        },
+        {
+            text: 'Extra',
+            items: [
+                {text: 'Compilation Tools', link: '/en/develop/system-build-tools'},
+                {text: 'craft.yml Configuration', link: '/zh/develop/craft-yml'},
+            ]
+        }
+    ],
+    '/en/contributing/': [
+        {
+            text: 'Contributing',
+            items: [
+                {text: 'Contributing', link: '/en/contributing/'},
+            ],
+        }
+    ],
 };

docs/.vitepress/sidebar.zh.ts

@@ -1,56 +1,57 @@
 export default {
-  '/zh/guide/': [
-    {
-      text: '构建指南',
-      items: [
-        {text: '指南', link: '/zh/guide/'},
-        {text: '本地构建', link: '/zh/guide/manual-build'},
-        {text: 'Actions 构建', link: '/zh/guide/action-build'},
-        {text: '扩展列表', link: '/zh/guide/extensions'},
-        {text: '扩展注意事项', link: '/zh/guide/extension-notes'},
-        {text: '编译命令生成器', link: '/zh/guide/cli-generator'},
-        {text: '环境变量列表', link: '/zh/guide/env-vars'},
-        {text: '依赖关系图表', link: '/zh/guide/deps-map'},
-      ]
-    },
-    {
-      text: '扩展构建指南',
-      items: [
-        {text: '故障排除', link: '/zh/guide/troubleshooting'},
-        {text: '在 Windows 上构建', link: '/zh/guide/build-on-windows'},
-        {text: '构建 GNU libc 兼容的二进制', link: '/zh/guide/build-with-glibc'},
-      ],
-    }
-  ],
-  '/zh/develop/': [
-    {
-      text: '开发指南',
-      items: [
-        { text: '开发简介', link: '/zh/develop/' },
-        { text: '项目结构简介', link: '/zh/develop/structure' },
-        {text: '对 PHP 源码的修改', link: '/zh/develop/php-src-changes'},
-      ],
-    },
-    {
-      text: '模块',
-      items: [
-        { text: 'Doctor 环境检查工具', link: '/zh/develop/doctor-module' },
-        { text: '资源模块', link: '/zh/develop/source-module' },
-      ]
-    },
-    {
-      text: '其他',
-      items: [
-        {text: '系统编译工具', link: '/zh/develop/system-build-tools'},
-      ]
-    }
-  ],
-  '/zh/contributing/': [
-    {
-      text: '贡献指南',
-      items: [
-        {text: '贡献指南', link: '/zh/contributing/'},
-      ],
-    }
-  ],
+    '/zh/guide/': [
+        {
+            text: '构建指南',
+            items: [
+                {text: '指南', link: '/zh/guide/'},
+                {text: '本地构建', link: '/zh/guide/manual-build'},
+                {text: 'Actions 构建', link: '/zh/guide/action-build'},
+                {text: '扩展列表', link: '/zh/guide/extensions'},
+                {text: '扩展注意事项', link: '/zh/guide/extension-notes'},
+                {text: '编译命令生成器', link: '/zh/guide/cli-generator'},
+                {text: '环境变量列表', link: '/zh/guide/env-vars'},
+                {text: '依赖关系图表', link: '/zh/guide/deps-map'},
+            ]
+        },
+        {
+            text: '扩展构建指南',
+            items: [
+                {text: '故障排除', link: '/zh/guide/troubleshooting'},
+                {text: '在 Windows 上构建', link: '/zh/guide/build-on-windows'},
+                {text: '构建 GNU libc 兼容的二进制', link: '/zh/guide/build-with-glibc'},
+            ],
+        }
+    ],
+    '/zh/develop/': [
+        {
+            text: '开发指南',
+            items: [
+                {text: '开发简介', link: '/zh/develop/'},
+                {text: '项目结构简介', link: '/zh/develop/structure'},
+                {text: '对 PHP 源码的修改', link: '/zh/develop/php-src-changes'},
+            ],
+        },
+        {
+            text: '模块',
+            items: [
+                {text: 'Doctor 环境检查工具', link: '/zh/develop/doctor-module'},
+                {text: '资源模块', link: '/zh/develop/source-module'},
+            ]
+        },
+        {
+            text: '其他',
+            items: [
+                {text: '系统编译工具', link: '/zh/develop/system-build-tools'},
+                {text: 'craft.yml 配置详解', link: '/zh/develop/craft-yml'},
+            ]
+        }
+    ],
+    '/zh/contributing/': [
+        {
+            text: '贡献指南',
+            items: [
+                {text: '贡献指南', link: '/zh/contributing/'},
+            ],
+        }
+    ],
 };