CLI generator update: windows and upx support

Author: crazywhalecc

docs/.vitepress/components/CliGenerator.vue

@@ -14,7 +14,7 @@
         <label :for="index">{{ index }}</label>
       </div>
     </div>
-    <div class="my-btn" @click="selectCommon">{{ I18N[lang].selectCommon }}</div>
+    <div class="my-btn" v-if="selectedSystem !== 'windows'" @click="selectCommon">{{ I18N[lang].selectCommon }}</div>
     <div class="my-btn" @click="checkedExts = []">{{ I18N[lang].selectNone }}</div>
 
     <details class="details custom-block">
@@ -41,20 +41,24 @@
       <p class="custom-block-title">WARNING</p>
       <p>{{ I18N[lang].microUnavailable }}</p>
     </div>
+    <div v-if="selectedSystem === 'windows' && (checkedTargets.indexOf('fpm') !== -1 || checkedTargets.indexOf('embed') !== -1)" class="warning custom-block">
+      <p class="custom-block-title">WARNING</p>
+      <p>{{ I18N[lang].windowsSAPIUnavailable }}</p>
+    </div>
     <h2>{{ I18N[lang].buildOptions }}</h2>
     <div class="option-line">
       <span class="option-title">{{ I18N[lang].buildEnvironment }}</span>
       <select v-model="selectedEnv">
         <option value="native">{{ I18N[lang].buildEnvNative }}</option>
         <option value="spc">{{ I18N[lang].buildEnvSpc }}</option>
-        <option value="docker">{{ I18N[lang].buildEnvDocker }}</option>
+        <option value="docker" v-if="selectedSystem !== 'windows'">{{ I18N[lang].buildEnvDocker }}</option>
       </select>
     </div>
     <div v-if="selectedEnv === 'spc'" class="option-line">
       <span class="option-title">{{ I18N[lang].selectedArch }}</span>
       <select v-model="selectedArch">
         <option value="x86_64">x86_64 (amd64)</option>
-        <option value="aarch64">aarch64 (arm64)</option>
+        <option value="aarch64" v-if="selectedSystem !== 'windows'">aarch64 (arm64)</option>
       </select>
     </div>
     <div class="option-line">
@@ -87,14 +91,28 @@
       <input type="radio" id="show-download-no" :value="0" v-model="downloadByExt" />
       <label for="show-download-no">{{ I18N[lang].no }}</label>
     </div>
+    <div class="option-line" v-if="selectedSystem !== 'macos'">
+      <span class="option-title">{{ I18N[lang].useUPX }}</span>
+      <input type="radio" id="upx-yes" :value="1" v-model="enableUPX" />
+      <label for="upx-yes">{{ I18N[lang].yes }}</label>
+
+      <input type="radio" id="upx-no" :value="0" v-model="enableUPX" />
+      <label for="upx-no">{{ I18N[lang].no }}</label>
+    </div>
     <h2>{{ I18N[lang].hardcodedINI }}</h2>
     <textarea class="textarea" :placeholder="I18N[lang].hardcodedINIPlacehoder" v-model="hardcodedINIData" rows="5" />
     <h2>{{ I18N[lang].resultShow }}</h2>
     <div v-if="selectedEnv === 'spc'" class="command-container">
       <b>{{ I18N[lang].downloadSPCBinaryCommand }}</b>
-      <div class="command-preview">
+      <div class="command-preview" v-if="selectedSystem !== 'windows'">
         curl -o spc.tgz https://dl.static-php.dev/static-php-cli/spc-bin/nightly/spc-{{ selectedSystem }}-{{ selectedArch }}.tar.gz && tar -zxvf spc.tgz && rm spc.tgz<br>
       </div>
+      <div v-else>
+        <div class="warning custom-block">
+          <p class="custom-block-title">WARNING</p>
+          <p>{{ I18N[lang].windowsDownSPCWarning }}</p>
+        </div>
+      </div>
     </div>
     <div v-if="downloadByExt" class="command-container">
       <b>{{ I18N[lang].downloadExtOnlyCommand }}</b>
@@ -106,7 +124,7 @@
     </div>
     <div class="command-container">
       <b>{{ I18N[lang].compileCommand }}</b>
-      <div class="command-preview">{{ spcCommand }} build {{ buildCommand }} "{{ extList }}"{{ additionalLibs }}{{ debug ? ' --debug' : '' }}{{ zts ? ' --enable-zts' : '' }}{{ displayINI }}</div>
+      <div class="command-preview">{{ spcCommand }} build {{ buildCommand }} "{{ extList }}"{{ additionalLibs }}{{ debug ? ' --debug' : '' }}{{ zts ? ' --enable-zts' : '' }}{{ enableUPX ? ' --with-upx-pack' : '' }}{{ displayINI }}</div>
     </div>
   </div>
 </template>
@@ -137,7 +155,7 @@ defineProps({
 const osList = [
   { os: 'linux', label: 'Linux', disabled: false },
   { os: 'macos', label: 'macOS', disabled: false },
-  { os: 'windows', label: 'Windows', disabled: true },
+  { os: 'windows', label: 'Windows', disabled: false },
 ];
 
 const availablePhpVersions = [
@@ -177,6 +195,9 @@ const I18N = {
     buildLibs: '要构建的库',
     depTips: '选择扩展后，不可选中的项目为必需的依赖，编译的依赖库列表中可选的为现有扩展和依赖库的可选依赖。选择可选依赖后，将生成 --with-libs 参数。',
     microUnavailable: 'micro 不支持 PHP 7.4 及更早版本！',
+    windowsSAPIUnavailable: 'Windows 目前不支持 fpm、embed 构建！',
+    useUPX: '是否开启 UPX 压缩（减小二进制体积）',
+    windowsDownSPCWarning: 'Windows 下请手动下载 spc.exe 二进制文件并解压到当前目录！',
   },
   en: {
     selectExt: 'Select Extensions',
@@ -205,7 +226,10 @@ const I18N = {
     selectedSystem: 'Select Build OS',
     buildLibs: 'Select Dependencies',
     depTips: 'After selecting the extensions, the unselectable items are essential dependencies. In the compiled dependencies list, optional dependencies consist of existing extensions and optional dependencies of libraries. Optional dependencies will be added in --with-libs parameter.',
-    microUnavailable: 'Micro does not support PHP 7.4 and earlier versions!'
+    microUnavailable: 'Micro does not support PHP 7.4 and earlier versions!',
+    windowsSAPIUnavailable: 'Windows does not support fpm and embed build!',
+    useUPX: 'Enable UPX compression (reduce binary size)',
+    windowsDownSPCWarning: 'Please download the spc.exe binary file manually and extract it to the current directory on Windows!',
   }
 };
 
@@ -275,6 +299,9 @@ const zts = ref(0);
 // chosen download by extensions
 const downloadByExt = ref(1);
 
+// chosen upx
+const enableUPX = ref(0);
+
 const hardcodedINIData = ref('');
 
 const selectedSystem = ref('linux');
@@ -286,6 +313,9 @@ const spcCommand = computed(() => {
     case 'native':
       return 'bin/spc';
     case 'spc':
+      if (selectedSystem.value === 'windows') {
+        return '.\\spc.exe';
+      }
       return './spc';
     case 'docker':
       return 'bin/spc-alpine-docker';
@@ -334,6 +364,11 @@ const calculateExtDepends = (input) => {
       if (depends.length === 0) {
         return;
       }
+    } else if (selectedSystem.value === 'windows') {
+      depends = ext.value[node]['ext-depends-windows'] ?? ext.value[node]['ext-depends'] ?? [];
+      if (depends.length === 0) {
+        return;
+      }
     }
 
     depends.forEach((dep) => {
@@ -364,6 +399,11 @@ const calculateExtLibDepends = (input) => {
       if (depends.length === 0) {
         return;
       }
+    } else if (selectedSystem.value === 'windows') {
+      depends = lib.value[node]['lib-depends-windows'] ?? lib.value[node]['lib-depends'] ?? [];
+      if (depends.length === 0) {
+        return;
+      }
     }
 
     depends.forEach((dep) => {
@@ -385,6 +425,11 @@ const calculateExtLibDepends = (input) => {
       if (depends.length === 0) {
         return;
       }
+    } else if (selectedSystem.value === 'windows') {
+      depends = ext.value[node]['lib-depends-windows'] ?? ext.value[node]['lib-depends'] ?? [];
+      if (depends.length === 0) {
+        return;
+      }
     }
 
     depends.forEach((dep) => {

docs/.vitepress/components/DependencyUtil.js

@@ -1,9 +1,12 @@
 export function getMetaList(meta, type, name, list_name) {
   if (meta.os === 'linux') {
-    return meta[type][name][list_name + '-linux'] ?? meta[type][name][list_name + '-unix'] ??meta[type][name][list_name] ?? [];
+    return meta[type][name][list_name + '-linux'] ?? meta[type][name][list_name + '-unix'] ?? meta[type][name][list_name] ?? [];
   }
   if (meta.os === 'macos') {
-    return meta[type][name][list_name + '-macos'] ?? meta[type][name][list_name + '-unix'] ??meta[type][name][list_name] ?? [];
+    return meta[type][name][list_name + '-macos'] ?? meta[type][name][list_name + '-unix'] ?? meta[type][name][list_name] ?? [];
+  }
+  if (meta.os === 'windows') {
+    return meta[type][name][list_name + '-windows'] ?? meta[type][name][list_name] ?? [];
   }
   return [];
 }

docs/en/guide/cli-generator.md

@@ -5,8 +5,8 @@ import CliGenerator from "../../.vitepress/components/CliGenerator.vue";
 # CLI Build Command Generator
 
 ::: tip
-There is currently no `spc` binary for Windows systems, so there is no Windows option yet.
-To compile on Windows, use static-php-cli from git source.
+The extensions selected below may contain extensions that are not supported by the selected operating system, 
+which may cause compilation to fail. Please check [Supported Extensions](./extensions) first.
 :::
 
 <cli-generator lang="en" />

docs/zh/guide/cli-generator.md

@@ -5,7 +5,7 @@ import CliGenerator from "../../.vitepress/components/CliGenerator.vue";
 # CLI 编译命令生成器
 
 ::: tip
-目前未提供 Windows 系统的 `spc` 二进制，所以暂未提供 Windows 的选项。要在 Windows 编译，请从源码使用 static-php-cli。
+下面选择扩展可能包含所选操作系统不支持的扩展，这可能导致编译失败。请先查阅 [支持的扩展](./extensions)。
 :::
 
 <cli-generator lang="zh" />