ci: 修复 win 不能正常编译 angel-lsp

Author: Wing-summer

CMakeLists.txt

@@ -717,7 +717,8 @@ if(WINGHEX_ANGEL_LSP)
     endif()
 
     set(SRC_JS "${NODE_SUBDIR}/src/server.ts")
-    set(DIST_JS "${BUILD_BIN_BUILD_DIR}/dist/angelscript-language-server.js")
+    set(DIST_DIR "${BUILD_BIN_BUILD_DIR}/dist")
+    set(DIST_JS "${DIST_DIR}/angelscript-language-server.js")
     set(OUT_BIN "${BUILD_BIN_DIR}/${OUT_NAME}")
 
     find_program(NODE_EXE NAMES node)
@@ -746,8 +747,7 @@ if(WINGHEX_ANGEL_LSP)
     endif()
 
     set(ESBUILD_CMD
-        ${NPX_EXE}
-        esbuild
+        ${NPX_EXE} esbuild
         "${SRC_JS}"
         --bundle
         --platform=node
@@ -756,61 +756,58 @@ if(WINGHEX_ANGEL_LSP)
         --minify)
 
     set(PKG_CMD
-        ${NPX_EXE}
-        pkg
+        ${NPX_EXE} pkg
         "${DIST_JS}"
         --targets
         ${PKG_TARGET}
         --output
         "${OUT_BIN}")
 
+    # Build JS bundle (ensure dist directory exists, run npm ci and esbuild)
     add_custom_command(
-        OUTPUT ${DIST_JS}
-        WORKING_DIRECTORY ${NODE_SUBDIR}
+        OUTPUT "${DIST_JS}"
+        COMMAND ${CMAKE_COMMAND} -E make_directory "${DIST_DIR}"
         COMMAND ${CMAKE_COMMAND} -E echo "[1] npm ci (local deps)"
-        COMMAND ${NPM_EXE} ci --silent
-        COMMAND ${CMAKE_COMMAND} -E echo "[2] building with esbuild"
-        COMMAND ${NPX_EXE} tsc
-        COMMAND ${ESBUILD_CMD}
+        COMMAND ${CMAKE_COMMAND} -E chdir "${NODE_SUBDIR}" ${NPM_EXE} ci --silent
+        COMMAND ${CMAKE_COMMAND} -E echo "[2] building with tsc + esbuild"
+        COMMAND ${CMAKE_COMMAND} -E chdir "${NODE_SUBDIR}" ${NPX_EXE} tsc
+        COMMAND ${CMAKE_COMMAND} -E chdir "${NODE_SUBDIR}" ${ESBUILD_CMD}
+        BYPRODUCTS "${DIST_JS}"
+        DEPENDS "${NODE_SUBDIR}/src/server.ts" "${NODE_SUBDIR}/package.json"
         COMMENT "Building JS bundle with esbuild -> ${DIST_JS}"
         VERBATIM)
 
+    # Packaging to native binary
     if(WIN32)
         add_custom_command(
-            OUTPUT ${OUT_BIN}
-            DEPENDS ${DIST_JS}
-            WORKING_DIRECTORY ${NODE_SUBDIR}
+            OUTPUT "${OUT_BIN}"
+            DEPENDS "${DIST_JS}"
             COMMAND ${CMAKE_COMMAND} -E make_directory "${BUILD_BIN_DIR}"
             COMMAND ${CMAKE_COMMAND} -E make_directory "${BUILD_BIN_BUILD_DIR}"
-            COMMAND ${CMAKE_COMMAND} -E echo
-                    "[3] packaging with pkg/npm exec/npx"
-            COMMAND ${PKG_CMD}
+            COMMAND ${CMAKE_COMMAND} -E echo "[3] packaging with pkg/npm exec/npx"
+            COMMAND ${CMAKE_COMMAND} -E chdir "${NODE_SUBDIR}" ${PKG_CMD}
             COMMAND ${CMAKE_COMMAND} -E echo "[4] Packaging with pkg"
-            COMMAND ${CMAKE_COMMAND} -E copy "${NODE_ROOT_SUBDIR}/package.json"
-                    "${BUILD_BIN_DIR}"
-            COMMAND ${CMAKE_COMMAND} -E copy "${NODE_SUBDIR}/modIcon_win.js"
-                    "${BUILD_BIN_DIR}"
-            COMMAND ${CMAKE_COMMAND} -E copy "${NODE_SUBDIR}/icon.ico"
-                    "${BUILD_BIN_DIR}"
+            COMMAND ${CMAKE_COMMAND} -E copy "${NODE_ROOT_SUBDIR}/package.json" "${BUILD_BIN_DIR}"
+            COMMAND ${CMAKE_COMMAND} -E copy "${NODE_SUBDIR}/modIcon_win.js" "${BUILD_BIN_DIR}"
+            COMMAND ${CMAKE_COMMAND} -E copy "${NODE_SUBDIR}/icon.ico" "${BUILD_BIN_DIR}"
             COMMAND ${NODE_EXE} "${BUILD_BIN_DIR}/modIcon_win.js"
-            COMMAND ${CMAKE_COMMAND} -E remove "${BUILD_BIN_DIR}/modIcon_win.js"
-                    "${BUILD_BIN_DIR}/icon.ico" "${BUILD_BIN_DIR}/package.json"
+            COMMAND ${CMAKE_COMMAND} -E remove "${BUILD_BIN_DIR}/modIcon_win.js" "${BUILD_BIN_DIR}/icon.ico" "${BUILD_BIN_DIR}/package.json"
             COMMAND ${CMAKE_COMMAND} -E echo "[5] Modifying exe icon"
+            BYPRODUCTS "${OUT_BIN}"
             VERBATIM)
     else()
         add_custom_command(
-            OUTPUT ${OUT_BIN}
-            DEPENDS ${DIST_JS}
-            WORKING_DIRECTORY ${NODE_SUBDIR}
+            OUTPUT "${OUT_BIN}"
+            DEPENDS "${DIST_JS}"
             COMMAND ${CMAKE_COMMAND} -E make_directory "${BUILD_BIN_DIR}"
             COMMAND ${CMAKE_COMMAND} -E make_directory "${BUILD_BIN_BUILD_DIR}"
-            COMMAND ${CMAKE_COMMAND} -E echo
-                    "[3] packaging with pkg/npm exec/npx"
-            COMMAND ${PKG_CMD}
+            COMMAND ${CMAKE_COMMAND} -E echo "[3] packaging with pkg/npm exec/npx"
+            COMMAND ${CMAKE_COMMAND} -E chdir "${NODE_SUBDIR}" ${PKG_CMD}
             COMMAND ${CMAKE_COMMAND} -E echo "[4] Packaging with pkg"
+            BYPRODUCTS "${OUT_BIN}"
             VERBATIM)
     endif()
 
-    add_custom_target(build_angel_lsp ALL DEPENDS ${OUT_BIN})
+    add_custom_target(build_angel_lsp ALL DEPENDS "${OUT_BIN}")
     add_dependencies(WingHexExplorer2 build_angel_lsp)
 endif()