Merge branch 'alvr-org:master' into pinch-gestures

alvr-org · Jul 6, 2023 · 37d615d · 37d615d
2 parents 4dbad7a + 00a19bf
commit 37d615d
Show file tree

Hide file tree

Showing 34 changed files with 1,287 additions and 890 deletions.
diff --git a/.github/workflows/prepare-release.yml b/.github/workflows/prepare-release.yml
@@ -119,6 +119,42 @@ jobs:
           asset_name: alvr_streamer_windows.zip
           asset_content_type: application/zip
 
+  build_windows_launcher:
+    runs-on: windows-2019
+    needs: [prepare_release]
+    env:
+      # For bindgen to find libclang.dll, we need to give it the path to the Visual Studio package.
+      # This is specific to the GitHub windows-2019 runner.
+      LIBCLANG_PATH: 'C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Tools\Llvm\x64\bin'
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          ref: ${{ needs.prepare_release.outputs.release_ref }}
+      - uses: actions-rs/toolchain@v1
+        with:
+          toolchain: stable
+          override: true
+
+      - uses: crazy-max/ghaction-chocolatey@v1
+        with:
+          args: install zip wixtoolset
+
+      - name: Build and package ALVR
+        id: build
+        env:
+          RUST_BACKTRACE: 1
+        run: cargo xtask package-launcher
+
+      - name: Upload portable launcher for Windows
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ needs.prepare_release.outputs.upload_url }}
+          asset_path: ./build/alvr_launcher_windows.zip
+          asset_name: alvr_launcher_windows.zip
+          asset_content_type: application/zip
+
   build_linux_streamer:
     runs-on: ubuntu-latest
     needs: [prepare_release]
@@ -136,16 +172,16 @@ jobs:
           RUST_BACKTRACE: 1
         run: |
           sudo apt-get update
-          sudo apt-get install libfuse2 build-essential pkg-config nasm libva-dev libdrm-dev libvulkan-dev libx264-dev libx265-dev cmake libasound2-dev libjack-jackd2-dev libxrandr-dev libunwind-dev libffmpeg-nvenc-dev nvidia-cuda-toolkit
+          sudo apt-get install libfuse2 build-essential pkg-config nasm libva-dev libdrm-dev libvulkan-dev libx264-dev libx265-dev cmake libasound2-dev libjack-jackd2-dev libxrandr-dev libunwind-dev libffmpeg-nvenc-dev nvidia-cuda-toolkit libgtk-3-dev
           cp alvr/xtask/deb/cuda.pc /usr/share/pkgconfig
           cargo xtask prepare-deps --platform linux
           
       - name: Build and package ALVR (.tar.gz)
         id: build
         env:
           RUST_BACKTRACE: 1
-        run: |
-          cargo xtask package-streamer
+        run: cargo xtask package-streamer
+
       - name: Upload streamer for Linux
         uses: actions/upload-release-asset@v1
         env:
@@ -160,8 +196,8 @@ jobs:
         id: build_portable
         env:
           RUST_BACKTRACE: 1
-        run: |
-          cargo xtask package-streamer --appimage --zsync
+        run: cargo xtask package-streamer --appimage --zsync
+
       - name: Upload portable streamer for Linux
         uses: actions/upload-release-asset@v1
         env:
@@ -181,6 +217,41 @@ jobs:
           asset_name: ALVR-x86_64.AppImage.zsync
           asset_content_type: application/octet-stream
 
+  build_linux_launcher:
+    runs-on: ubuntu-latest
+    needs: [prepare_release]
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          ref: ${{ needs.prepare_release.outputs.release_ref }}
+      - uses: actions-rs/toolchain@v1
+        with:
+          toolchain: stable
+          override: true
+
+      - name: Build and install dependencies
+        env:
+          RUST_BACKTRACE: 1
+        run: |
+          sudo apt-get update
+          sudo apt-get install build-essential libgtk-3-dev
+          
+      - name: Build .tar.gz
+        id: build
+        env:
+          RUST_BACKTRACE: 1
+        run: cargo xtask package-launcher
+
+      - name: Upload launcher for Linux
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ needs.prepare_release.outputs.upload_url }}
+          asset_path: ./build/alvr_launcher_linux.tar.gz
+          asset_name: alvr_launcher_linux.tar.gz
+          asset_content_type: application/gzip
+
   build_android_client:
     runs-on: ubuntu-latest
     needs: [prepare_release]

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -49,7 +49,7 @@ jobs:
           RUST_BACKTRACE: 1
         run: |
           sudo apt update
-          sudo apt install build-essential pkg-config nasm libva-dev libdrm-dev libvulkan-dev libx264-dev libx265-dev cmake libasound2-dev libjack-jackd2-dev libxrandr-dev libunwind-dev
+          sudo apt install build-essential pkg-config nasm libva-dev libdrm-dev libvulkan-dev libx264-dev libx265-dev cmake libasound2-dev libjack-jackd2-dev libxrandr-dev libunwind-dev libgtk-3-dev
           cargo xtask prepare-deps --platform linux --no-nvidia
 
       - uses: actions-rs/clippy-check@v1
@@ -99,7 +99,7 @@ jobs:
         with:
           command: install
           args: cargo-apk
-        
+
         # Create folder without content to make the build succeed
       - run: |
           mkdir -p deps/android_openxr/arm64-v8a
@@ -121,6 +121,8 @@ jobs:
           override: true
       - uses: Swatinem/rust-cache@v1
 
+      - run: sudo apt install libgtk-3-dev
+
       - name: Run tests
         uses: actions-rs/cargo@v1
         with:

diff --git a/.gitignore b/.gitignore
@@ -61,3 +61,6 @@ deps
 node_modules
 
 # The .gitignore for android is project folder.
+
+# flatpak
+.flatpak*