[WIP] wayland-rs-0.20.0

.rustfmt.toml

@@ -1,10 +1 @@
-error_on_line_overflow = false
-fn_args_density = "Compressed"
-fn_args_layout = "Visual"
-fn_arg_intent = "Tabbed"
-reorder_imports = true
-reorder_imported_names = true
-report_todo = "Never"
-report_fixme = "Never"
-use_try_shorthand = true
 max_width = 110

.travis.yml

@@ -4,13 +4,7 @@ cache: cargo
 
 dist: trusty
 
-addons:
-  apt:
-    sources:
-      - sourceline: 'ppa:wayland.admin/daily-builds'
-    packages:
-      - libssl-dev
-      - libwayland-dev
+sudo: required
 
 rust:
   - 1.20.0
@@ -21,6 +15,13 @@ rust:
 matrix:
   allow_failures:
     - rust: nightly
+  include:
+    - rust: stable
+      env: BUILD_FMT=1
+    - rust: stable
+      env: TARPAULIN=1
+    - rust: stable
+      env: BUILD_DOC=1
 
 branches:
   only:
@@ -31,29 +32,40 @@ before_script:
   - mkdir $(pwd)/socket
   - export XDG_RUNTIME_DIR="$(pwd)/socket"
   - |
-      if [ $TRAVIS_RUST_VERSION = "nightly" ]; then
-        cargo install rustfmt-nightly --force
+      if [ -n "$BUILD_FMT" ]; then
+        rustup component add rustfmt-preview
+      elif [ -n "$TARPAULIN" ]; then
+        bash <(curl https://raw.githubusercontent.com/xd009642/tarpaulin/master/travis-install.sh)
+      elif [ -n "$BUILD_DOC" ]; then
+        echo "Building doc, nothing to install..."
+      else
+        # Building & running tests, we need to install the wayland lib
+        ./travis_install_wayland.sh "1.12.0"
       fi
-  - which cargo-tarpaulin || cargo install cargo-tarpaulin
-  - which cargo-install-update || cargo install cargo-update
-  - cargo install-update -a
 
 os:
   - linux
 
 script:
   - |
-      if [ $TRAVIS_RUST_VERSION = "nightly" ]; then
+      if [ -n "$BUILD_FMT" ]; then
         cargo fmt --all -- --write-mode=diff
+      elif [ -n "$TARPAULIN" ]; then
+        cargo tarpaulin --ignore-tests --out Xml
+      elif [ -n "$BUILD_DOC" ]; then
+        cargo doc --all --no-deps --all-features
+      else
+        env LD_LIBRARY_PATH=~/install/lib:$LD_LIBRARY_PATH cargo test --all --all-features
       fi
-  - cargo build --all --all-features
-  - cargo test --all --all-features
-  - cargo tarpaulin --ignore-tests --ciserver travis-ci --coveralls $TRAVIS_JOB_ID
-  - cargo doc --all --no-deps --all-features
 
 after_success:
-  - cp ./doc_index.html ./target/doc/index.html
-  - cp ./rust.css ./target/doc/rust.css
+  - |
+      if [ -n "$TARPAULIN" ]; then
+        bash <(curl -s https://codecov.io/bash)
+      elif [ -n "$BUILD_DOC" ]; then
+        cp ./doc_index.html ./target/doc/index.html
+        cp ./rust.css ./target/doc/rust.css
+      fi
 
 deploy:
   provider: pages
@@ -63,6 +75,7 @@ deploy:
   on:
     branch: master
     rust: stable
+    env: BUILD_DOC=1
 
 notifications:
     webhooks:

Cargo.toml

@@ -5,12 +5,12 @@ publish = false
 
 [dependencies]
 wayland-scanner = { path = "./wayland-scanner" }
-wayland-client = { path = "./wayland-client", default-features = false, features = ["cursor"] }
-wayland-server = { path = "./wayland-server" }
+wayland-client = { path = "./wayland-client", default-features = false, features = ["cursor", "dlopen"] }
+wayland-server = { path = "./wayland-server", features = ["dlopen"] }
 wayland-protocols = { path = "./wayland-protocols", features = ["client", "server", "unstable_protocols"] }
 
 [dev-dependencies]
 difference = "1.0"
 
 [workspace]
-members = [ "wayland-sys", "wayland-scanner", "wayland-client", "wayland-server", "wayland-protocols" ]
+members = [ "wayland-sys", "wayland-scanner", "wayland-client", "wayland-server", "wayland-protocols", "wayland-commons" ]