From 7a5941de98d276980456282d00ad339921bfa1bb Mon Sep 17 00:00:00 2001 From: rustdesk Date: Sun, 2 Feb 2025 20:31:44 +0800 Subject: [PATCH] remove devcontainer since not maintained yet --- res/.devcontainer/Dockerfile | 50 ------------------- res/.devcontainer/build.sh | 75 ----------------------------- res/.devcontainer/devcontainer.json | 34 ------------- res/.devcontainer/setup.sh | 23 --------- 4 files changed, 182 deletions(-) delete mode 100644 res/.devcontainer/Dockerfile delete mode 100755 res/.devcontainer/build.sh delete mode 100644 res/.devcontainer/devcontainer.json delete mode 100755 res/.devcontainer/setup.sh diff --git a/res/.devcontainer/Dockerfile b/res/.devcontainer/Dockerfile deleted file mode 100644 index 93fd92ecb..000000000 --- a/res/.devcontainer/Dockerfile +++ /dev/null @@ -1,50 +0,0 @@ -FROM mcr.microsoft.com/devcontainers/base:ubuntu-22.04 -ENV HOME=/home/vscode -ENV WORKDIR=$HOME/rustdesk - -WORKDIR $HOME -RUN sudo apt update -y && sudo apt install -y g++ gcc 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 unzip zip sudo libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev -WORKDIR / - -RUN git clone https://github.com/microsoft/vcpkg -WORKDIR vcpkg -RUN git checkout 2023.04.15 -RUN /vcpkg/bootstrap-vcpkg.sh -disableMetrics -ENV VCPKG_ROOT=/vcpkg -RUN $VCPKG_ROOT/vcpkg --disable-metrics install libvpx libyuv opus aom - -WORKDIR / -RUN wget https://github.com/rustdesk/doc.rustdesk.com/releases/download/console/dep.tar.gz && tar xzf dep.tar.gz - - -USER vscode -WORKDIR $HOME -RUN wget https://raw.githubusercontent.com/c-smile/sciter-sdk/master/bin.lnx/x64/libsciter-gtk.so -RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs > rustup.sh -RUN chmod +x rustup.sh -RUN $HOME/rustup.sh -y -RUN $HOME/.cargo/bin/rustup target add aarch64-linux-android -RUN $HOME/.cargo/bin/cargo install cargo-ndk - -# Install Flutter -RUN wget https://storage.googleapis.com/flutter_infra_release/releases/stable/linux/flutter_linux_3.10.1-stable.tar.xz -RUN tar xf flutter_linux_3.10.1-stable.tar.xz && rm flutter_linux_3.10.1-stable.tar.xz -ENV PATH="$PATH:$HOME/flutter/bin" -RUN dart pub global activate ffigen 5.0.1 - - -# Install packages -RUN sudo apt-get install -y libclang-dev -RUN sudo apt install -y gcc-multilib - -WORKDIR $WORKDIR -ENV ANDROID_NDK_HOME=/opt/android/ndk/22.1.7171670 - -# Somehow try to automate flutter pub get -# https://rustdesk.com/docs/en/dev/build/android/ -# Put below steps in entrypoint.sh -# cd flutter -# wget https://github.com/rustdesk/doc.rustdesk.com/releases/download/console/so.tar.gz -# tar xzf so.tar.gz - -# own /opt/android diff --git a/res/.devcontainer/build.sh b/res/.devcontainer/build.sh deleted file mode 100755 index df87aace7..000000000 --- a/res/.devcontainer/build.sh +++ /dev/null @@ -1,75 +0,0 @@ -#!/bin/bash - -set -e - -MODE=${1:---debug} -TYPE=${2:-linux} -MODE=${MODE/*-/} - - -build(){ - pwd - $WORKDIR/entrypoint $1 -} - -build_arm64(){ - CWD=$(pwd) - cd $WORKDIR/flutter - flutter pub get - cd $WORKDIR - $WORKDIR/flutter/ndk_arm64.sh - cp $WORKDIR/target/aarch64-linux-android/release/liblibrustdesk.so $WORKDIR/flutter/android/app/src/main/jniLibs/arm64-v8a/librustdesk.so - cd $CWD -} - -build_apk(){ - cd $WORKDIR/flutter - MODE=$1 $WORKDIR/flutter/build_android.sh - cd $WORKDIR -} - -key_gen(){ - if [ ! -f $WORKDIR/flutter/android/key.properties ] - then - if [ ! -f $HOME/upload-keystore.jks ] - then - $WORKDIR/.devcontainer/setup.sh key - fi - read -r -p "enter the password used to generate $HOME/upload-keystore.jks\n" password - echo -e "storePassword=${password}\nkeyPassword=${password}\nkeyAlias=upload\nstoreFile=$HOME/upload-keystore.jks" > $WORKDIR/flutter/android/key.properties - else - echo "Believing storeFile is created ref: $WORKDIR/flutter/android/key.properties" - fi -} - -android_build(){ - if [ ! -d $WORKDIR/flutter/android/app/src/main/jniLibs/arm64-v8a ] - then - $WORKDIR/.devcontainer/setup.sh android - fi - build_arm64 - case $1 in - debug) - build_apk debug - ;; - release) - key_gen - build_apk release - ;; - esac -} - -case "$MODE:$TYPE" in - "debug:linux") - build - ;; - "release:linux") - build --release - ;; - "debug:android") - android_build debug - ;; - "release:android") - android_build release - ;; -esac diff --git a/res/.devcontainer/devcontainer.json b/res/.devcontainer/devcontainer.json deleted file mode 100644 index 953196eb3..000000000 --- a/res/.devcontainer/devcontainer.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "name": "rustdesk", - "build": { - "dockerfile": "./Dockerfile", - "context": "." - }, - "workspaceMount": "source=${localWorkspaceFolder},target=/home/vscode/rustdesk,type=bind,consistency=cache", - "workspaceFolder": "/home/vscode/rustdesk", - "postStartCommand": ".devcontainer/build.sh", - "features": { - "ghcr.io/devcontainers/features/java:1": {}, - "ghcr.io/akhildevelops/devcontainer-features/android-cli:latest": { - "PACKAGES": "platform-tools,ndk;23.2.8568313" - } - }, - "customizations": { - "vscode": { - "extensions": [ - "vadimcn.vscode-lldb", - "mutantdino.resourcemonitor", - "rust-lang.rust-analyzer", - "tamasfe.even-better-toml", - "serayuzgur.crates", - "mhutchie.git-graph", - "eamodio.gitlens" - ], - "settings": { - "files.watcherExclude": { - "**/target/**": true - } - } - } - } -} diff --git a/res/.devcontainer/setup.sh b/res/.devcontainer/setup.sh deleted file mode 100755 index c972f47b2..000000000 --- a/res/.devcontainer/setup.sh +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/bash -set -e -case $1 in - android) - # install deps - cd $WORKDIR/flutter - flutter pub get - wget https://github.com/rustdesk/doc.rustdesk.com/releases/download/console/so.tar.gz - tar xzf so.tar.gz - rm so.tar.gz - sudo chown -R $(whoami) $ANDROID_HOME - echo "Setup is Done." - ;; - linux) - echo "Linux Setup" - ;; - key) - echo -e "\n$HOME/upload-keystore.jks is not created.\nLet's create it.\nRemember the password you enter in keytool!" - keytool -genkey -v -keystore $HOME/upload-keystore.jks -keyalg RSA -keysize 2048 -validity 10000 -alias upload - ;; -esac - - \ No newline at end of file