From 6c5f0aecb40d6b85281ca2d63d18bf7a6be2700d Mon Sep 17 00:00:00 2001 From: deep-soft Date: Fri, 1 Sep 2023 16:11:23 +0300 Subject: [PATCH 1/7] Update flutter-build.yml --- .github/workflows/flutter-build.yml | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/.github/workflows/flutter-build.yml b/.github/workflows/flutter-build.yml index 69f7df67b..d0dd8470b 100644 --- a/.github/workflows/flutter-build.yml +++ b/.github/workflows/flutter-build.yml @@ -96,6 +96,18 @@ jobs: VCPKG_ROOT: C:\rustdesk_thirdpary_lib\vcpkg run: python3 .\build.py --portable --hwcodec --flutter --feature IddDriver + - name: find Runner.res + # Windows: find Runner.res (compiled from ./flutter/windows/runner/Runner.rc), copy to ./Runner.res + # Runner.rc does not contain actual version, but Runner.res does + continue-on-error: true + shell: bash + run: | + runner_res=$(find . -name Runner.res) + if [ runner_res != '' ]; then + echo "Runner.res: $runner_res" + cp $runner.res ./Runner.res + fi + - name: Sign rustdesk files uses: GermanBluefox/code-sign-action@v7 if: env.UPLOAD_ARTIFACT == 'true' @@ -198,6 +210,18 @@ jobs: 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: find Runner.res + # Windows: find Runner.res (compiled from ./flutter/windows/runner/Runner.rc), copy to ./Runner.res + # Runner.rc does not contain actual version, but Runner.res does + continue-on-error: true + shell: bash + run: | + runner_res=$(find . -name Runner.res) + if [ runner_res != '' ]; then + echo "Runner.res: $runner_res" + cp $runner.res ./Runner.res + fi + - name: Sign rustdesk files uses: GermanBluefox/code-sign-action@v7 if: env.UPLOAD_ARTIFACT == 'true' From e83a97349f63ec19e85bd81996ae45c334a0d753 Mon Sep 17 00:00:00 2001 From: deep-soft Date: Fri, 1 Sep 2023 16:12:13 +0300 Subject: [PATCH 2/7] Update build.rs # if Runner.res not found compile icon.rc --- libs/portable/build.rs | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/libs/portable/build.rs b/libs/portable/build.rs index 2450e16cd..697af3d45 100644 --- a/libs/portable/build.rs +++ b/libs/portable/build.rs @@ -1,5 +1,10 @@ extern crate embed_resource; +use std::fs; fn main() { - embed_resource::compile("icon.rc", embed_resource::NONE); + let runner_res_path = "./Runner.res"; + match fs::metadata(runner_res_path) { + Ok(_) => println!("cargo:rustc-link-lib=dylib:+verbatim=./Runner.res"), + Err(_) => embed_resource::compile("icon.rc", embed_resource::NONE), + } } From 0c6eacb14130768ffd78d855fe7ebe3b3c4caace Mon Sep 17 00:00:00 2001 From: deep-soft Date: Fri, 1 Sep 2023 16:13:21 +0300 Subject: [PATCH 3/7] Update Runner.rc --- flutter/windows/runner/Runner.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flutter/windows/runner/Runner.rc b/flutter/windows/runner/Runner.rc index 32d01bf44..03776ded4 100644 --- a/flutter/windows/runner/Runner.rc +++ b/flutter/windows/runner/Runner.rc @@ -93,7 +93,7 @@ BEGIN VALUE "FileDescription", "rustdesk" "\0" VALUE "FileVersion", VERSION_AS_STRING "\0" VALUE "InternalName", "rustdesk" "\0" - VALUE "LegalCopyright", "Copyright (C) 2022 com.carriez. All rights reserved." "\0" + VALUE "LegalCopyright", "Copyright (C) 2023 com.carriez. All rights reserved." "\0" VALUE "OriginalFilename", "rustdesk.exe" "\0" VALUE "ProductName", "rustdesk" "\0" VALUE "ProductVersion", VERSION_AS_STRING "\0" From 4fe33db4f397c7680c41cd81e73b13968a9959b4 Mon Sep 17 00:00:00 2001 From: deep-soft Date: Fri, 1 Sep 2023 19:29:10 +0300 Subject: [PATCH 4/7] Update flutter-build.yml --- .github/workflows/flutter-build.yml | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/.github/workflows/flutter-build.yml b/.github/workflows/flutter-build.yml index d0dd8470b..050cfe787 100644 --- a/.github/workflows/flutter-build.yml +++ b/.github/workflows/flutter-build.yml @@ -102,10 +102,12 @@ jobs: continue-on-error: true shell: bash run: | - runner_res=$(find . -name Runner.res) - if [ runner_res != '' ]; then + runner_res=$(find . -name "Runner.res") + if [ $runner_res == '' ]; then + echo "Runner.res: not found" + else echo "Runner.res: $runner_res" - cp $runner.res ./Runner.res + cp $runner_res ./Runner.res fi - name: Sign rustdesk files @@ -216,10 +218,12 @@ jobs: continue-on-error: true shell: bash run: | - runner_res=$(find . -name Runner.res) - if [ runner_res != '' ]; then + runner_res=$(find . -name "Runner.res") + if [ $runner_res == '' ]; then + echo "Runner.res: not found" + else echo "Runner.res: $runner_res" - cp $runner.res ./Runner.res + cp $runner_res ./Runner.res fi - name: Sign rustdesk files From c9caa5687ac22fde4ad98d0db5d837add6d30678 Mon Sep 17 00:00:00 2001 From: deep-soft Date: Sat, 2 Sep 2023 14:29:03 +0300 Subject: [PATCH 5/7] Update flutter-build.yml fix find Runner.res --- .github/workflows/flutter-build.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/flutter-build.yml b/.github/workflows/flutter-build.yml index 050cfe787..310607c7b 100644 --- a/.github/workflows/flutter-build.yml +++ b/.github/workflows/flutter-build.yml @@ -103,11 +103,13 @@ jobs: shell: bash run: | runner_res=$(find . -name "Runner.res") - if [ $runner_res == '' ]; then + if [ "$runner_res" == "" ]; then echo "Runner.res: not found" else echo "Runner.res: $runner_res" cp $runner_res ./Runner.res + echo "list ./Runner.res" + ls -l ./Runner.res fi - name: Sign rustdesk files @@ -219,11 +221,13 @@ jobs: shell: bash run: | runner_res=$(find . -name "Runner.res") - if [ $runner_res == '' ]; then + if [ "$runner_res" == "" ]; then echo "Runner.res: not found" else echo "Runner.res: $runner_res" cp $runner_res ./Runner.res + echo "list ./Runner.res" + ls -l ./Runner.res fi - name: Sign rustdesk files From 3fab42b8d1cb3a8290328b0a47d59db55f4cef7c Mon Sep 17 00:00:00 2001 From: deep-soft Date: Sat, 2 Sep 2023 20:52:07 +0300 Subject: [PATCH 6/7] Update build.rs --- libs/portable/build.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/portable/build.rs b/libs/portable/build.rs index 697af3d45..4f33273f5 100644 --- a/libs/portable/build.rs +++ b/libs/portable/build.rs @@ -2,9 +2,9 @@ extern crate embed_resource; use std::fs; fn main() { - let runner_res_path = "./Runner.res"; + let runner_res_path = "Runner.res"; match fs::metadata(runner_res_path) { - Ok(_) => println!("cargo:rustc-link-lib=dylib:+verbatim=./Runner.res"), + Ok(_) => println!("cargo:rustc-link-lib=dylib:+verbatim=./libs/portable/Runner.res"), Err(_) => embed_resource::compile("icon.rc", embed_resource::NONE), } } From 8ce1bb1b0b3d1091c91fcc70372fc119fef1a089 Mon Sep 17 00:00:00 2001 From: deep-soft Date: Sat, 2 Sep 2023 20:52:29 +0300 Subject: [PATCH 7/7] Update flutter-build.yml --- .github/workflows/flutter-build.yml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/flutter-build.yml b/.github/workflows/flutter-build.yml index 310607c7b..f9faa554e 100644 --- a/.github/workflows/flutter-build.yml +++ b/.github/workflows/flutter-build.yml @@ -102,14 +102,14 @@ jobs: continue-on-error: true shell: bash run: | - runner_res=$(find . -name "Runner.res") + runner_res=$(find . -name "Runner.res"); if [ "$runner_res" == "" ]; then - echo "Runner.res: not found" + echo "Runner.res: not found"; else - echo "Runner.res: $runner_res" - cp $runner_res ./Runner.res - echo "list ./Runner.res" - ls -l ./Runner.res + echo "Runner.res: $runner_res"; + cp $runner_res ./libs/portable/Runner.res; + echo "list ./libs/portable/Runner.res"; + ls -l ./libs/portable/Runner.res; fi - name: Sign rustdesk files @@ -220,14 +220,14 @@ jobs: continue-on-error: true shell: bash run: | - runner_res=$(find . -name "Runner.res") + runner_res=$(find . -name "Runner.res"); if [ "$runner_res" == "" ]; then - echo "Runner.res: not found" + echo "Runner.res: not found"; else - echo "Runner.res: $runner_res" - cp $runner_res ./Runner.res - echo "list ./Runner.res" - ls -l ./Runner.res + echo "Runner.res: $runner_res"; + cp $runner_res ./libs/portable/Runner.res; + echo "list ./libs/portable/Runner.res"; + ls -l ./libs/portable/Runner.res; fi - name: Sign rustdesk files