Skip to content

Commit cf5e8f6

Browse files
committed
allow building from master
1 parent 937906f commit cf5e8f6

File tree

2 files changed

+15
-3
lines changed

2 files changed

+15
-3
lines changed

.github/workflows/generator-android.yml

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -442,9 +442,15 @@ jobs:
442442
cp ${ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/aarch64-linux-android/libc++_shared.so ./flutter/android/app/src/main/jniLibs/arm64-v8a/
443443
cp ./target/${{ matrix.job.target }}/release/liblibrustdesk.so ./flutter/android/app/src/main/jniLibs/arm64-v8a/librustdesk.so
444444
echo -n "${{ env.CUSTOM }}" | cat > ./flutter/assets/custom.txt
445-
sed -i '/^ - assets\//a\ - assets/custom.txt' ./flutter/pubspec.yaml
445+
#sed -i '/^ - assets\//a\ - assets/custom.txt' ./flutter/pubspec.yaml
446446
if [[ "${{ inputs.iconlink }}" != "false" ]]; then
447+
mv ./flutter/assets/icon.svg ./flutter/assets/icon.svg.bak
447448
convert ./res/icon.png ./flutter/assets/icon.svg
449+
convert ./res/128x128.png -resize 200% ./flutter/assets/128x128@2x.png
450+
convert ./res/icon.png ./res/scalable.svg
451+
pushd ./flutter
452+
flutter pub run flutter_launcher_icons
453+
popd
448454
fi
449455
# build flutter
450456
pushd flutter
@@ -466,9 +472,15 @@ jobs:
466472
cp ${ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/x86_64-linux-android/libc++_shared.so ./flutter/android/app/src/main/jniLibs/x86_64/
467473
cp ./target/${{ matrix.job.target }}/release/liblibrustdesk.so ./flutter/android/app/src/main/jniLibs/x86_64/librustdesk.so
468474
echo -n "${{ env.CUSTOM }}" | cat > ./flutter/assets/custom.txt
469-
sed -i '/^ - assets\//a\ - assets/custom.txt' ./flutter/pubspec.yaml
475+
#sed -i '/^ - assets\//a\ - assets/custom.txt' ./flutter/pubspec.yaml
470476
if [[ "${{ inputs.iconlink }}" != "false" ]]; then
477+
mv ./flutter/assets/icon.svg ./flutter/assets/icon.svg.bak
471478
convert ./res/icon.png ./flutter/assets/icon.svg
479+
convert ./res/128x128.png -resize 200% ./flutter/assets/128x128@2x.png
480+
convert ./res/icon.png ./res/scalable.svg
481+
pushd ./flutter
482+
flutter pub run flutter_launcher_icons
483+
popd
472484
fi
473485
# build flutter
474486
pushd flutter

rdgenerator/templates/generator.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ <h2><i class="fas fa-desktop"></i> Select Platform</h2>
120120
</div>
121121
<select name="platform" id="id_platform">
122122
<option value="windows" selected>Windows</option>
123-
<option value="linux">Linux (testing, will likely have issues)</option>
123+
<option value="linux">Linux</option>
124124
<option value="android">Android (testing, will likely have issues)</option>
125125
</select>
126126
<label for="{{ form.version.id_for_label }}">Rustdesk Version:</label>

0 commit comments

Comments
 (0)