resolve #1467: build sswinservice for Windows by default

shadowsocks · Mar 25, 2024 · bc063c3 · bc063c3
1 parent 8b2ff61
commit bc063c3
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 4 deletions.
diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
@@ -42,6 +42,6 @@ jobs:
         run: cargo build --verbose --features "local-http-rustls local-redir local-dns local-tun dns-over-tls dns-over-https stream-cipher aead-cipher-extra aead-cipher-2022 aead-cipher-2022-extra security-replay-attack-detect"
       - name: Build with All Features Enabled (Windows)
         if: ${{ runner.os == 'Windows' }}
-        run: cargo build --verbose --features "local-http-rustls local-dns dns-over-tls dns-over-https stream-cipher aead-cipher-extra aead-cipher-2022 aead-cipher-2022-extra security-replay-attack-detect"
+        run: cargo build --verbose --features "local-http-rustls local-dns dns-over-tls dns-over-https stream-cipher aead-cipher-extra aead-cipher-2022 aead-cipher-2022-extra security-replay-attack-detect winservice"
       - name: Build with All Features Enabled - shadowsocks
         run: cargo build --manifest-path ./crates/shadowsocks/Cargo.toml --verbose --features "stream-cipher aead-cipher-2022"
diff --git a/.github/workflows/build-msrv.yml b/.github/workflows/build-msrv.yml
@@ -34,4 +34,4 @@ jobs:
         run: cargo build --verbose --features "local-http-rustls local-redir local-dns local-tun dns-over-tls dns-over-https stream-cipher aead-cipher-extra aead-cipher-2022 aead-cipher-2022-extra security-replay-attack-detect"
       - name: Build with All Features Enabled (Windows)
         if: ${{ runner.os == 'Windows' }}
-        run: cargo build --verbose --features "local-http-rustls local-dns dns-over-tls dns-over-https stream-cipher aead-cipher-extra aead-cipher-2022 aead-cipher-2022-extra security-replay-attack-detect"
+        run: cargo build --verbose --features "local-http-rustls local-dns dns-over-tls dns-over-https stream-cipher aead-cipher-extra aead-cipher-2022 aead-cipher-2022-extra security-replay-attack-detect winservice"
diff --git a/.github/workflows/build-nightly-release.yml b/.github/workflows/build-nightly-release.yml
@@ -116,7 +116,7 @@ jobs:
 
       - name: Build release
         run: |
-          pwsh ./build/build-host-release.ps1
+          pwsh ./build/build-host-release.ps1 winservice
 
       - name: Upload Artifacts
         uses: actions/upload-artifact@v4

diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml
@@ -58,6 +58,10 @@ jobs:
             compile_features="-f local-redir -f local-tun"
           fi
 
+          if [[ "$compile_target" == *"-windows-"* ]]; then
+            compile_features="-f winservice"
+          fi
+
           if [[ "$compile_target" == "mips-"* || "$compile_target" == "mipsel-"* || "$compile_target" == "mips64-"* || "$compile_target" == "mips64el-"* ]]; then
             sudo apt-get update -y && sudo apt-get install -y upx;
             if [[ "$?" == "0" ]]; then
@@ -139,7 +143,7 @@ jobs:
 
       - name: Build release
         run: |
-          pwsh ./build/build-host-release.ps1
+          pwsh ./build/build-host-release.ps1 winservice
 
       - name: Upload Github Assets
         uses: softprops/action-gh-release@v1

diff --git a/build/build-host-release b/build/build-host-release
@@ -53,6 +53,10 @@ fi
 
 TARGETS=("sslocal${TARGET_SUFFIX}" "ssserver${TARGET_SUFFIX}" "ssurl${TARGET_SUFFIX}" "ssmanager${TARGET_SUFFIX}" "ssservice${TARGET_SUFFIX}")
 
+if [[ "${BUILD_FEATURES}" == *"winservice"* ]]; then
+    TARGETS+=("sswinservice${TARGET_SUFFIX}")
+fi
+
 RELEASE_FOLDER="${ROOT_DIR}/release"
 RELEASE_PACKAGE_NAME="shadowsocks-v${VERSION}.${BUILD_TARGET}"
 

diff --git a/build/build-host-release.ps1 b/build/build-host-release.ps1
@@ -48,6 +48,9 @@ $CompressParam = @{
     LiteralPath     = "sslocal.exe", "ssserver.exe", "ssurl.exe", "ssmanager.exe", "ssservice.exe"
     DestinationPath = "${PackagePath}"
 }
+if (${Features} -contains "winservice") {
+    $CompressParam.LiteralPath += "sswinservice.exe"
+}
 Compress-Archive @CompressParam
 
 Write-Host "Created release packet ${PackagePath}"