feat: add llvm 32bit for sciter

.github/workflows/flutter-nightly.yml

@@ -153,6 +153,8 @@ jobs:
   build-for-windows-sciter:
     name: ${{ matrix.job.target }} (${{ matrix.job.os }})
     runs-on: ${{ matrix.job.os }}
+    # Temporarily disable this action due to additional test is needed.
+    if: false 
     strategy:
       fail-fast: false
       matrix:
@@ -165,13 +167,22 @@ jobs:
       - name: Checkout source code
         uses: actions/checkout@v3
 
+      - name: Install LLVM and Clang
+        uses: Kingtous/install-llvm-action-32bit@master
+        with:
+          version: ${{ env.LLVM_VERSION }}
+
       - name: Install Rust toolchain
         uses: actions-rs/toolchain@v1
         with:
-          toolchain: stable
+          toolchain: stable-${{ matrix.job.target }}
           target: ${{ matrix.job.target }}
           override: true
           profile: minimal # minimal component installation (ie, no documentation)
+      
+      - name: Set Rust toolchain to the target
+        run: |
+          rustup default stable-${{ matrix.job.target }}
 
       - uses: Swatinem/rust-cache@v2
         with:
@@ -195,10 +206,10 @@ jobs:
           python3 res/inline-sciter.py
           # Replace the link for the ico.
           rm res/icon.ico && cp flutter/windows/runner/resources/app_icon.ico res/icon.ico
-          cargo build --features inline --target=${{ matrix.job.target }} --release --bins
+          cargo build --features inline --release --bins
           mkdir -p ./Release
-          mv ./target/${{ matrix.job.target }}/release/rustdesk.exe ./Release/rustdesk.exe
+          mv ./target/release/rustdesk.exe ./Release/rustdesk.exe
-          wget -O ./Release/sciter.dll https://github.com/c-smile/sciter-sdk/raw/master/bin.win/x32/sciter.dll
+          curl -LJ -o ./Release/sciter.dll https://github.com/c-smile/sciter-sdk/raw/master/bin.win/x32/sciter.dll
           echo "output_folder=./Release" >> $GITHUB_OUTPUT
 
       - name: Sign rustdesk files
@@ -216,10 +227,11 @@ jobs:
         shell: bash
         run: |
           pushd ./libs/portable
+          pip3 install -r requirements.txt
           python3 ./generate.py -f ../../Release/ -o . -e ../../Release/rustdesk.exe
           popd
           mkdir -p ./SignOutput
-          mv ./target/release/rustdesk-portable-packer.exe ./SignOutput/rustdesk-${{ env.VERSION }}-${{ matrix.job.target }}.exe
+          mv ./target/release/rustdesk-portable-packer.exe ./SignOutput/rustdesk-${{ env.VERSION }}-${{ matrix.job.target }}-sciter.exe
       
       - name: Sign rustdesk self-extracted file
         uses: GermanBluefox/code-sign-action@v7
@@ -992,7 +1004,7 @@ jobs:
         run: |
           for name in rustdesk*??.deb; do
               # use cp to duplicate deb files to fit other packages.
-              cp "$name" "${name%%.deb}-${{ matrix.job.target }}-${{ matrix.job.os }}.deb"
+              cp "$name" "${name%%.deb}-${{ matrix.job.target }}-${{ matrix.job.os }}-sciter.deb"
           done
 
       - name: Publish debian package
@@ -1002,14 +1014,14 @@ jobs:
           prerelease: true
           tag_name: ${{ env.TAG_NAME }}
           files: |
-            rustdesk-${{ env.VERSION }}-${{ matrix.job.target }}-${{ matrix.job.os }}.deb
+            rustdesk-${{ env.VERSION }}-${{ matrix.job.target }}-${{ matrix.job.os }}-sciter.deb
 
       - name: Upload Artifact
         uses: actions/upload-artifact@master
         if: ${{ contains(matrix.job.extra-build-features, 'flatpak') }}
         with:
-          name: rustdesk-${{ env.VERSION }}-${{ matrix.job.target }}-${{ matrix.job.os }}.deb
+          name: rustdesk-${{ env.VERSION }}-${{ matrix.job.target }}-${{ matrix.job.os }}-sciter.deb
-          path: rustdesk-${{ env.VERSION }}-${{ matrix.job.target }}-${{ matrix.job.os }}.deb
+          path: rustdesk-${{ env.VERSION }}-${{ matrix.job.target }}-${{ matrix.job.os }}-sciter.deb
 
   build-rustdesk-linux-arm:
     needs: [build-rustdesk-lib-linux-arm]

Cross.toml

@@ -1,21 +0,0 @@
-[build]
-build-std = false                              # do not build the std library. has precedence over xargo
-xargo = true                                   # enable the use of xargo by default
-# zig = false                                    # do not use zig cc for the builds
-default-target = "x86_64-unknown-linux-gnu"    # use this target if none is explicitly provided
-
-[build.env]
-volumes = ["VCPKG_ROOT"] # "VOL2_ARG=/path/to/volume"
-passthrough = ["VCPKG_ROOT"]
-
-[target.aarch64-unknown-linux-gnu]
-# pre-build = ["env ARCH=arm64 ./res/install-rust-deps.sh"]
-# build-std = false          # always build the std library. has precedence over xargo
-# xargo = false              # disable the use of xargo
-# image = "test-image"       # use a different image for the target
-# runner = "qemu-user"       # wrapper to run the binary (must be `qemu-system`, `qemu-user`, or `native`).
-
-[target.arm-unknown-linux-gnueabihf]
-pre-build = "./res/install-rust-deps-arm.sh"
-# volumes = ["VCPKG_ROOT"] # "VOL2_ARG=/path/to/volume"
-# passthrough = ["VCPKG_ROOT"]

res/install-rust-deps-arm.sh

@@ -1,11 +0,0 @@
-#!/usr/bin/env bash
-# apt-get install -y git curl wget nasm yasm libgtk-3-dev clang libxcb-randr0-dev libxdo-dev libxfixes-dev libxcb-shape0-dev libxcb-xfixes0-dev libasound2-dev libpulse-dev cmake libclang-dev ninja-build libappindicator3-dev libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev libvdpau-dev libva-dev libclang-dev llvm-dev pkg-config g++ gcc libvpx-dev
-
-# For developers in China, we use sources from ustc.
-# sed -i 's/archive.archive.ubuntu.com/mirrors.ustc.edu.cn/g' /etc/apt/sources.list
-# sed -i 's/security.archive.ubuntu.com/mirrors.ustc.edu.cn/g' /etc/apt/sources.list
-
-dpkg --add-architecture armhf
-
-apt update -y
-apt install -y libdbus-1-dev:armhf pkg-config nasm yasm libglib2.0-dev:armhf libxcb-randr0-dev:armhf libxdo-dev:armhf libxfixes-dev:armhf libxcb-shape0-dev:armhf libxcb-xfixes0-dev:armhf libasound2-dev:armhf libpulse-dev:armhf libgstreamer1.0-dev:armhf libgstreamer-plugins-base1.0-dev:armhf libappindicator3-dev:armhf libvpx-dev:armhf libvdpau-dev:armhf libva-dev:armhf libgtk-3-dev:armhf clang gcc libclang-dev

src/ui.rs

@@ -62,7 +62,7 @@ pub fn start(args: &mut [String]) {
             if sciter_dll_path.exists() {
                 // Try to set the sciter dll.
                 let p = sciter_dll_path.to_string_lossy().to_string();
-                println!("Found dll:{}, \n {:?}", p, sciter::set_library(&p));
+                log::debug!("Found dll:{}, \n {:?}", p, sciter::set_library(&p));
             }
         }
     }