From dc34c4d00c8294c48282b8f198ecb429c63907e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=89=8B=E7=93=9C=E4=B8=80=E5=8D=81=E9=9B=AA?=
 <nanaeonn@outlook.com>
Date: Fri, 3 May 2024 21:22:16 +0800
Subject: [PATCH] fix

---
 .github/workflows/release.yml |  6 ++-
 vite.config.ts                | 75 +++++++++++++++--------------------
 2 files changed, 36 insertions(+), 45 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 4e8871cd..1ffbfa3e 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -36,7 +36,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        target_platform: [linux,darwin]
+        target_platform: [linux]
         target_arch: [x64, arm64]
     steps:
     - name: Clone Main Repository
@@ -53,6 +53,8 @@ jobs:
 
     - name: Build NuCat Linux
       run: |
+          export NAPCAT_BUILDSYS=${{ matrix.target_platform }} 
+          export NAPCAT_BUILDARCH=${{ matrix.target_arch }} 
           npm i --arch=${{ matrix.target_arch }} --platform=${{ matrix.target_platform }} 
           npm run build:prod
           cd dist
@@ -87,6 +89,8 @@ jobs:
           
         - name: Build NuCat Linux
           run: |
+                export NAPCAT_BUILDSYS=${{ matrix.target_platform }} 
+                export NAPCAT_BUILDARCH=${{ matrix.target_arch }} 
                 npm i --arch=${{ matrix.target_arch }} --platform=${{ matrix.target_platform }} 
                 npm run build:prod
                 cd dist
diff --git a/vite.config.ts b/vite.config.ts
index a07bc005..426025e4 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -20,55 +20,42 @@ const nodeModules = [...builtinModules, builtinModules.map(m => `node:${m}`)].fl
 function genCpModule(module: string) {
   return { src: `./node_modules/${module}`, dest: `dist/node_modules/${module}`, flatten: false };
 }
-const systemPlatform = os.platform();
 let startScripts: string[] | undefined = undefined;
-let baseConfigPlugin: PluginOption[] | undefined = undefined;
-if (systemPlatform == "linux") {
+let MoeHooModule: any = [];
+if (process.env.NAPCAT_BUILDSYS == "linux") {
+  if (process.env.NAPCAT_BUILDARCH == "x64") {
+    MoeHooModule = [{ src: './src/core.lib/MoeHoo-linux-x64.node', dest: 'dist' }];
+  }
   startScripts = ['./script/napcat.sh'];
-  baseConfigPlugin = [
-    // PreprocessorDirectives(),
-    cp({
-      targets: [
-        // ...external.map(genCpModule),
-        { src: './src/napcat.json', dest: 'dist/config/' },
-        { src: './src/onebot11/onebot11.json', dest: 'dist/config/' },
-        { src: './package.json', dest: 'dist' },
-        { src: './README.md', dest: 'dist' },
-        { src: './logo.png', dest: 'dist/logs' },
-        { src: './src/core.lib/MoeHoo-linux-x64.node', dest: 'dist' },
-        ...(startScripts.map((startScript) => {
-          return { src: startScript, dest: 'dist' };
-        })),
-      ]
-    }),
-    nodeResolve(),
-    commonjs(),
-  ];
-} else {
+} else if (process.env.NAPCAT_BUILDSYS == "win32") {
+  if (process.env.NAPCAT_BUILDARCH == "x64") {
+    MoeHooModule = [{ src: './src/core.lib/MoeHoo-win32-x64.node', dest: 'dist' }];
+  }
   startScripts = ['./script/napcat.ps1', './script/napcat.bat', './script/napcat-utf8.bat', './script/napcat-utf8.ps1', './script/napcat-log.ps1'];
-  baseConfigPlugin = [
-    // PreprocessorDirectives(),
-    cp({
-      targets: [
-        // ...external.map(genCpModule),
-        { src: './src/napcat.json', dest: 'dist/config/' },
-        { src: './src/onebot11/onebot11.json', dest: 'dist/config/' },
-        { src: './package.json', dest: 'dist' },
-        { src: './README.md', dest: 'dist' },
-        { src: './logo.png', dest: 'dist/logs' },
-        { src: './src/core.lib/MoeHoo-win32-x64.node', dest: 'dist' },
-        ...(startScripts.map((startScript) => {
-          return { src: startScript, dest: 'dist' };
-        })),
-      ]
-    }),
-    nodeResolve(),
-    commonjs(),
-  ];
-
+} else {
+  MoeHooModule = [{ src: './src/core.lib/MoeHoo-win32-x64.node', dest: 'dist' }, { src: './src/core.lib/MoeHoo-linux-x64.node', dest: 'dist' }];
+  startScripts = ['./script/napcat.sh', './script/napcat.ps1', './script/napcat.bat', './script/napcat-utf8.bat', './script/napcat-utf8.ps1', './script/napcat-log.ps1'];
 }
 
-
+let baseConfigPlugin: PluginOption[] = [
+  // PreprocessorDirectives(),
+  cp({
+    targets: [
+      // ...external.map(genCpModule),
+      { src: './src/napcat.json', dest: 'dist/config/' },
+      { src: './src/onebot11/onebot11.json', dest: 'dist/config/' },
+      { src: './package.json', dest: 'dist' },
+      { src: './README.md', dest: 'dist' },
+      { src: './logo.png', dest: 'dist/logs' },
+      ...MoeHooModule,
+      ...(startScripts.map((startScript) => {
+        return { src: startScript, dest: 'dist' };
+      })),
+    ]
+  }),
+  nodeResolve(),
+  commonjs(),
+];
 // if (os.platform() !== 'win32') {
 //   startScripts = ['./script/napcat.sh'];
 // }