Add Cargo Packager support

.github/workflows/publish_nightly.yml

@@ -0,0 +1,157 @@
+name: Continuous Deployment
+
+on:
+  push:
+    branches:
+      - "*"
+  schedule:
+    - cron: "0 0 * * *"
+
+jobs:
+
+  draft:
+    runs-on: ubuntu-latest
+    environment: "Init Workflow"
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: create draft release
+        uses: crabnebula-dev/cloud-release@v0.1.0
+        with:
+          command: release draft test-verso 0.0.1 --framework packager
+          api-key: ${{ secrets.CN_API_KEY }}
+
+  build-linux:
+    name: Build [linux]
+    needs: draft
+    runs-on: ubuntu-latest # We may want this to be older for wider libc compatibility
+    environment: "Init Workflow"
+    steps:
+      - name: Checkout the repository
+        uses: actions/checkout@v4
+
+      - name: Install Rust stable
+        uses: actions-rust-lang/setup-rust-toolchain@v1
+        with:
+          toolchain: stable
+          cache: true
+
+      - name: Set env
+        run: echo "LIBCLANG_PATH=/usr/lib/llvm-14/lib" >> $GITHUB_ENV
+
+      - name: Install dependencies
+        run: |
+          sudo apt-get update
+          sudo apt install build-essential python3-pip ccache clang cmake curl \
+            g++ git gperf libdbus-1-dev libfreetype6-dev libgl1-mesa-dri \
+            libgles2-mesa-dev libglib2.0-dev libgstreamer-plugins-base1.0-dev \
+            gstreamer1.0-plugins-good libgstreamer-plugins-good1.0-dev \
+            gstreamer1.0-plugins-bad libgstreamer-plugins-bad1.0-dev \
+            gstreamer1.0-plugins-ugly gstreamer1.0-plugins-base \
+            libgstreamer-plugins-base1.0-dev gstreamer1.0-libav \
+            libgstrtspserver-1.0-dev gstreamer1.0-tools libges-1.0-dev \
+            libharfbuzz-dev liblzma-dev libunwind-dev libunwind-dev libvulkan1 \
+            libx11-dev libxcb-render0-dev libxcb-shape0-dev libxcb-xfixes0-dev \
+            libxmu-dev libxmu6 libegl1-mesa-dev llvm-dev m4 xorg-dev
+
+      - name: Install Cargo Packager
+        run: cargo install cargo-packager --locked
+
+      - name: Package the App
+        run: cargo packager --release --verbose
+
+      - name: Move assets to workdir
+        run: |
+          mv target/release/* .
+
+      - name: upload assets
+        uses: crabnebula-dev/cloud-release@v0.1.0
+        with:
+          command: release upload test-verso 0.0.1 --framework packager
+          api-key: ${{ secrets.CN_API_KEY }}
+
+
+  build-windows:
+    name: Build [windows]
+    needs: draft
+    runs-on: windows-latest
+    environment: "Init Workflow"
+    steps:
+      - name: Checkout the repository
+        uses: actions/checkout@v4
+
+      - name: Install Rust stable
+        uses: actions-rust-lang/setup-rust-toolchain@v1
+        with:
+          toolchain: stable
+          cache: true
+
+      - name: Install scroop
+        uses: MinoruSekine/setup-scoop@v3
+
+      - name: Install dependencies
+        run: scoop install git python llvm cmake curl
+
+      - name: Install Cargo Packager
+        run: cargo install cargo-packager --locked
+
+      - name: Package the App
+        run: cargo packager --release --verbose
+
+      - name: Move assets to workdir
+        run: |
+          mv target/release/* .
+
+      - name: upload assets
+        uses: crabnebula-dev/cloud-release@v0.1.0
+        with:
+          command: release upload test-verso 0.0.1 --framework packager
+          api-key: ${{ secrets.CN_API_KEY }}
+
+  build-macos:
+    name: Build [macos]
+    needs: draft
+    runs-on: macos-latest
+    environment: "Init Workflow"
+    steps:
+      - name: Checkout the repository
+        uses: actions/checkout@v4
+
+      - name: Install Rust stable
+        uses: actions-rust-lang/setup-rust-toolchain@v1
+        with:
+          toolchain: stable
+          cache: true
+
+      - name: Install dependencies
+        run: brew install cmake pkg-config
+
+      - name: Install Cargo Packager
+        run: cargo install cargo-packager --locked
+
+      - name: Package the App
+        run: cargo packager --release --verbose
+
+      - name: Move assets to workdir
+        run: |
+          mv target/release/* .
+
+      - name: upload assets
+        uses: crabnebula-dev/cloud-release@v0.1.0
+        with:
+          command: release upload test-verso 0.0.1 --framework packager
+          api-key: ${{ secrets.CN_API_KEY }}
+
+  publish:
+    needs: [build-linux, build-windows, build-macos]
+
+    runs-on: ubuntu-latest
+    environment: "Init Workflow"
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: publish release
+        uses: crabnebula-dev/cloud-release@v0.1.0
+        with:
+          command: release publish test-verso 0.0.1 --framework packager
+          api-key: ${{ secrets.CN_API_KEY }}

Cargo.toml

@@ -8,7 +8,7 @@ edition = "2021"
 license = "Apache-2.0 OR MIT"
 description = "A web browser"
 readme = "README.md"
-repository = "https://github.com/wusyong/verso"
+repository = "https://github.com/european-browser/verso"
 documentation = "https://docs.rs/verso"
 categories = ["Web programming"]
 
@@ -19,9 +19,26 @@ targets = [
   "x86_64-apple-darwin",
 ]
 
+[package.metadata.packager]
+name = "verso"
+product-name = "verso"
+identifier = "com.eu-browser.verso"
+version = "0.0.1"
+before-each-package-command = "cargo build --release --features packager"
+out-dir = "target/release"
+resources = [
+  "resources",
+  "demo.html"
+]
+icons=[
+  "resources/icons/icon256x256.png",
+  "resources/icons/icon.ico"
+]
+
 [features]
 default = []
-
+# Exclusively for cargo packager command.
+packager = ["dep:cargo-packager-resource-resolver"]
 
 [build-dependencies]
 cfg_aliases = "0.1"
@@ -37,6 +54,8 @@ crossbeam-channel = "0.5"
 getopts = "0.2.17"
 surfman = { version = "0.9", features = ["chains", "sm-angle", "sm-angle-default", "sm-x11", "sm-raw-window-handle"] }
 winit = { version = "0.29", features = ["rwh_05"] }
+# Cargo Packager
+cargo-packager-resource-resolver = { version = "0.1", features = ["auto-detect-format"], optional = true }
 
 [target."cfg(any(target_os = \"ios\", target_os = \"macos\"))".dependencies]
 block = "0.1"

src/app.rs

@@ -17,6 +17,9 @@ use winit::{
 
 use crate::{prefs, resources, webview::WebView};
 
+#[cfg(feature = "packager")]
+use cargo_packager_resource_resolver::{current_format, resources_dir};
+
 /// Status of webview.
 #[derive(Clone, Copy, Debug, Default)]
 pub enum Status {
@@ -58,7 +61,14 @@ impl Verso {
             CompositeTarget::Fbo,
         );
 
+        #[cfg(not(feature = "packager"))]
         let demo_path = std::env::current_dir().unwrap().join("demo.html");
+        // For production builds, use Resourse Resolver for demo file
+        #[cfg(feature = "packager")]
+        let demo_path = resources_dir(current_format().unwrap())
+            .unwrap()
+            .join("demo.html");
+
         let url = ServoUrl::from_file_path(demo_path.to_str().unwrap()).unwrap();
         init_servo
             .servo

src/lib.rs

@@ -1,6 +1,6 @@
 //! Verso Web Browser
 //!
-//! This is the documentation of Verso's types and items. See [Github page](https://github.com/wusyong/Verso) for more general introduction.
+//! This is the documentation of Verso's types and items. See [Github page](https://github.com/european-browser/verso) for more general introduction.
 
 #![deny(missing_docs)]
 

src/main.rs

@@ -1,5 +1,5 @@
-use winit::{dpi::PhysicalSize, event_loop::EventLoop, window::WindowBuilder};
 use verso::{Result, Status, Verso};
+use winit::{dpi::PhysicalSize, event_loop::EventLoop, window::WindowBuilder};
 
 /* window decoration */
 #[cfg(target_os = "macos")]

src/resources.rs

@@ -1,9 +1,15 @@
-use std::{env, fs, path::PathBuf};
+use std::{fs, path::PathBuf};
+
+#[cfg(not(feature = "packager"))]
+use std::env;
 
 use servo::embedder_traits::resources::{self, Resource, ResourceReaderMethods};
 
 struct ResourceReader(PathBuf);
 
+#[cfg(feature = "packager")]
+use cargo_packager_resource_resolver::{current_format, resources_dir};
+
 /// Initialize resource files. We currently read from `resources` directory only.
 pub fn init() {
     resources::set(Box::new(ResourceReader(resources_dir_path())));
@@ -25,6 +31,15 @@ impl ResourceReaderMethods for ResourceReader {
     }
 }
 
+#[cfg(feature = "packager")]
+fn resources_dir_path() -> PathBuf {
+    // For Cargo Packager builds, use Resourse Resolver
+    return resources_dir(current_format().unwrap())
+        .unwrap()
+        .join("resources");
+}
+
+#[cfg(not(feature = "packager"))]
 fn resources_dir_path() -> PathBuf {
     // Try ./resources relative to the directory containing the
     // canonicalised executable path, then each of its ancestors.

tests/general.rs

@@ -1,5 +1,5 @@
-use winit::event_loop::EventLoopWindowTarget;
 use verso::verso_test;
+use winit::event_loop::EventLoopWindowTarget;
 
 fn smoke(_elwt: &EventLoopWindowTarget<()>) {}
 fn other_smoke(_elwt: &EventLoopWindowTarget<()>) {}