ci fix2

Author: boybook

.github/workflows/build.yml

@@ -134,14 +134,8 @@ jobs:
         run: |
           git clone https://github.com/Microsoft/vcpkg.git
           .\vcpkg\bootstrap-vcpkg.bat
-          
-          # 使用经典模式安装依赖包 (fftw3包含所有精度版本)
           .\vcpkg\vcpkg install fftw3:x64-windows boost:x64-windows
-          
-          # 设置vcpkg环境变量
-          echo "VCPKG_ROOT=${{ github.workspace }}\vcpkg" >> $env:GITHUB_ENV
-          echo "CMAKE_TOOLCHAIN_FILE=${{ github.workspace }}\vcpkg\scripts\buildsystems\vcpkg.cmake" >> $env:GITHUB_ENV
-        shell: powershell
+        shell: cmd
 
       - name: Setup Intel Fortran
         if: runner.os == 'Windows'
@@ -183,15 +177,12 @@ jobs:
         if: runner.os == 'Windows'
         run: |
           echo "--- Building with MSVC toolchain ---"
-          if (Test-Path "build") { Remove-Item -Recurse -Force "build" }
-          
-          npx cmake-js compile --arch=${{ matrix.cmake_arch }} `
-            -G "Visual Studio 17 2022" -A x64 `
-            --CDCMAKE_TOOLCHAIN_FILE="$env:CMAKE_TOOLCHAIN_FILE" `
-            --CDVCPKG_MANIFEST_MODE=OFF `
-            --CDVCPKG_MANIFEST_INSTALL=OFF `
+          rmdir /s /q build 2>nul || echo "No build directory to clean"
+          npx cmake-js compile --arch=${{ matrix.cmake_arch }} ^
+            -G "Visual Studio 17 2022" -A x64 ^
+            --CDCMAKE_TOOLCHAIN_FILE=vcpkg\scripts\buildsystems\vcpkg.cmake ^
             --verbose
-        shell: powershell
+        shell: cmd
 
       # 7. 运行测试
       - name: Run tests

package.json

@@ -23,7 +23,7 @@
   "scripts": {
     "build": "npm run build:native && npm run build:ts",
     "build:native": "cmake-js compile",
-    "build:native:win": "cmake-js compile -G \"Visual Studio 17 2022\" -A x64 --CDCMAKE_TOOLCHAIN_FILE=%VCPKG_ROOT%/scripts/buildsystems/vcpkg.cmake --CDVCPKG_MANIFEST_MODE=OFF --CDVCPKG_MANIFEST_INSTALL=OFF",
+    "build:native:win": "cmake-js compile -G \"Visual Studio 17 2022\" -A x64 --CDCMAKE_TOOLCHAIN_FILE=vcpkg/scripts/buildsystems/vcpkg.cmake",
     "build:ts": "tsc",
     "clean": "cmake-js clean && rimraf dist",
     "test": "npm run build && node --test dist/test/wsjtx.basic.test.js",

vcpkg.json

@@ -0,0 +1,10 @@
+{
+  "name": "wsjtx-lib-nodejs",
+  "version": "1.0.0",
+  "description": "WSJTX library Node.js bindings",
+  "dependencies": [
+    "fftw3",
+    "boost"
+  ],
+  "builtin-baseline": "2024.01.12"
+}