diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index 271ff49..199e898 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -60,8 +60,7 @@ representative at an online or offline event. ## Enforcement Instances of abusive, harassing, or otherwise unacceptable behavior may be -reported to the community leaders responsible for enforcement at -[contact@tauri.app](mailto:contact@tauri.app). +reported to the community leaders responsible for enforcement. All complaints will be reviewed and investigated promptly and fairly. All community leaders are obligated to respect the privacy and security of the diff --git a/README.md b/README.md index a8ec348..2d2fffb 100644 --- a/README.md +++ b/README.md @@ -16,21 +16,22 @@ Use CEF in Rust. - Install flatpak runtime & sdk: ``` -TODO +flatpak install flathub dev.crabnebula.Platform +flatpak install flathub dev.crabnebula.Sdk ``` - Setup cargo project for flatpak. See [flatpak-builder-tools](https://github.com/flatpak/flatpak-builder-tools/blob/master/cargo/README.md) for more details. Here are files you will need to have at leaset: - flatpak-cargo-generator.py - - flatpak manifest file (ie. app.tauri.demo) + - flatpak manifest file (ie. app.example.demo.yml) - Build the flatpak application and run: ``` cargo b --example demo -python3 ./flatpak-cargo-generator.py ./quickstart/Cargo.lock -o cargo-sources.json +python3 ./flatpak-cargo-generator.py ./Cargo.lock -o cargo-sources.json touch run.sh -flatpak-builder --user --install --force-clean target app.tauri.demo.yml -flatpak run app.tauri.demo +flatpak-builder --user --install --force-clean target app.example.demo.yml +flatpak run app.example.demo ``` ## Contributing @@ -39,11 +40,10 @@ Please see [CONTRIBUTING.md](CONTRIBUTING.md) for details. ## Roadmap -Welcome to open feature requests if the feature you look for isn't listed below. But please understand that some requests might result into not planned. +Cef-rs is looking for the best approach to use CEF. On Linux, this is achived by using same flatpak runtime. So every application can share the same library. We are looking for the similar methods on macOS and Windows. Welcome to open feature requests if the feature you look for isn't listed below. But please understand that some requests might result into not planned. ### Planned -- Find out the best approach to use CEF in the target we support. - [ ] Add Linux ARM64 target - [ ] Add macOS ARM64 target - [ ] Add Windows x86_64 target diff --git a/app.tauri.demo.yml b/app.example.demo.yml similarity index 91% rename from app.tauri.demo.yml rename to app.example.demo.yml index 9cffdc1..ef6010b 100644 --- a/app.tauri.demo.yml +++ b/app.example.demo.yml @@ -1,7 +1,7 @@ -id: app.tauri.demo -runtime: app.tauri.Platform +id: app.example.demo +runtime: dev.crabnebula.Platform runtime-version: '22.08' -sdk: app.tauri.Sdk +sdk: dev.crabnebula.Sdk sdk-extensions: - org.freedesktop.Sdk.Extension.rust-stable finish-args: diff --git a/examples/demo.rs b/examples/demo.rs index c7858d8..62b37f1 100644 --- a/examples/demo.rs +++ b/examples/demo.rs @@ -1,5 +1,5 @@ use cef::{ - app::App, args::Args, browser::BrowserSettings, client::Client, settings::Settings, + App, args::Args, browser::BrowserSettings, client::Client, Settings, string::CefString, window::WindowInfo, }; @@ -17,10 +17,10 @@ fn main() { unsafe { let args = Args::new(std::env::args()); let app = Application; - dbg!(cef::app::execute_process(&args, Some(app))); + dbg!(cef::execute_process(&args, Some(app))); let settings = Settings::new(); - dbg!(cef::app::initialize(&args, settings, Some(app))); + dbg!(cef::initialize(&args, settings, Some(app))); let window_info = WindowInfo::new(); let browser_settings = BrowserSettings::new(); diff --git a/sys/build.rs b/sys/build.rs index 8087edb..a796e8e 100644 --- a/sys/build.rs +++ b/sys/build.rs @@ -6,7 +6,7 @@ fn main() { Ok(mut val) => { // TODO better path formatting val.push_str( - "/.local/share/flatpak/runtime/app.tauri.Platform/x86_64/22.08/active/files/lib", + "/.local/share/flatpak/runtime/dev.crabnebula.Platform/x86_64/22.08/active/files/lib", ); val }