Merge pull request #92 from gtk-rs/revert-85-remove-dox

Revert "Remove dox"

Author: sdroege

gdk4-wayland/src/auto/versions.txt

@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ b16d610)
+Generated by gir (https://github.com/gtk-rs/gir @ 694b4b8)
 from gir-files (https://github.com/gtk-rs/gir-files @ ddab3f2)

gdk4-wayland/sys/Cargo.toml

@@ -8,7 +8,7 @@ edition = "2018"
 name = "gtk4-wayland"
 version = "3.94"
 [package.metadata.docs.rs]
-features = []
+features = ["dox"]
 
 [lib]
 name = "gdk4_wayland_sys"
@@ -27,3 +27,4 @@ shell-words = "1.0.0"
 tempfile = "3"
 
 [features]
+dox = []

gdk4-wayland/sys/build.rs

@@ -2,13 +2,13 @@
 // from gir-files (https://github.com/gtk-rs/gir-files)
 // DO NOT EDIT
 
-#[cfg(any(not(doc), doctest))]
+#[cfg(not(feature = "dox"))]
 use std::process;
 
-#[cfg(all(not(doctest), doc))]
+#[cfg(feature = "dox")]
 fn main() {} // prevent linking libraries to avoid documentation failure
 
-#[cfg(any(not(doc), doctest))]
+#[cfg(not(feature = "dox"))]
 fn main() {
     if let Err(s) = system_deps::Config::new().probe() {
         let _ = eprintln!("{}", s);

gdk4-wayland/sys/src/lib.rs

@@ -8,7 +8,7 @@
     clippy::type_complexity,
     clippy::unreadable_literal
 )]
-#![cfg_attr(all(not(doctest), doc), feature(doc_cfg))]
+#![cfg_attr(feature = "dox", feature(doc_cfg))]
 
 use glib_sys as glib;
 

gdk4-wayland/sys/versions.txt

@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ b16d610)
+Generated by gir (https://github.com/gtk-rs/gir @ 694b4b8)
 from gir-files (https://github.com/gtk-rs/gir-files @ ddab3f2)

gdk4-x11/src/auto/versions.txt

@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ b16d610)
+Generated by gir (https://github.com/gtk-rs/gir @ 694b4b8)
 from gir-files (https://github.com/gtk-rs/gir-files @ ddab3f2)

gdk4-x11/sys/Cargo.toml

@@ -8,7 +8,7 @@ build = "build.rs"
 name = "gtk4-x11"
 version = "3.94"
 [package.metadata.docs.rs]
-features = []
+features = ["dox"]
 
 [lib]
 name = "gdk4_x11_sys"
@@ -31,3 +31,4 @@ shell-words = "1.0.0"
 tempfile = "3"
 
 [features]
+dox = []

gdk4-x11/sys/build.rs

@@ -2,13 +2,13 @@
 // from gir-files (https://github.com/gtk-rs/gir-files)
 // DO NOT EDIT
 
-#[cfg(any(not(doc), doctest))]
+#[cfg(not(feature = "dox"))]
 use std::process;
 
-#[cfg(all(not(doctest), doc))]
+#[cfg(feature = "dox")]
 fn main() {} // prevent linking libraries to avoid documentation failure
 
-#[cfg(any(not(doc), doctest))]
+#[cfg(not(feature = "dox"))]
 fn main() {
     if let Err(s) = system_deps::Config::new().probe() {
         let _ = eprintln!("{}", s);

gdk4-x11/sys/src/lib.rs

@@ -8,7 +8,7 @@
     clippy::type_complexity,
     clippy::unreadable_literal
 )]
-#![cfg_attr(all(not(doctest), doc), feature(doc_cfg))]
+#![cfg_attr(feature = "dox", feature(doc_cfg))]
 
 use gdk4_sys as gdk;
 use glib_sys as glib;

gdk4-x11/sys/versions.txt

@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ b16d610)
+Generated by gir (https://github.com/gtk-rs/gir @ 694b4b8)
 from gir-files (https://github.com/gtk-rs/gir-files @ ddab3f2)

gdk4/Cargo.toml

@@ -19,11 +19,12 @@ exclude = [
 name = "gdk4"
 
 [features]
+dox = ["ffi/dox", "glib/dox", "gio/dox", "gdk-pixbuf/dox", "cairo-rs/dox", "pango/dox"]
 purge-lgpl-docs = ["gtk-rs-lgpl-docs", "cairo-rs/purge-lgpl-docs", "gdk-pixbuf/purge-lgpl-docs", "gio/purge-lgpl-docs"]
 embed-lgpl-docs = ["gtk-rs-lgpl-docs", "cairo-rs/embed-lgpl-docs", "gdk-pixbuf/embed-lgpl-docs", "gio/embed-lgpl-docs"]
 
 [package.metadata.docs.rs]
-features = ["embed-lgpl-docs"]
+features = ["dox", "embed-lgpl-docs"]
 
 [build-dependencies.gtk-rs-lgpl-docs]
 version = "0.1.3"

gdk4/src/auto/versions.txt

@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ b16d610)
+Generated by gir (https://github.com/gtk-rs/gir @ 694b4b8)
 from gir-files (https://github.com/gtk-rs/gir-files @ ddab3f2)

gdk4/sys/Cargo.toml

@@ -26,6 +26,9 @@ git = "https://github.com/gtk-rs/gtk-rs"
 shell-words = "1.0.0"
 tempfile = "3"
 
+[features]
+dox = []
+
 [lib]
 name = "gdk4_sys"
 
@@ -41,9 +44,7 @@ repository = "https://github.com/gtk-rs/sys"
 version = "0.1.0"
 edition = "2018"
 [package.metadata.docs.rs]
-features = []
+features = ["dox"]
 [package.metadata.system-deps.gtk4]
 name = "gtk4"
 version = "3.94"
-
-[features]

gdk4/sys/build.rs

@@ -2,13 +2,13 @@
 // from gir-files (https://github.com/gtk-rs/gir-files)
 // DO NOT EDIT
 
-#[cfg(any(not(doc), doctest))]
+#[cfg(not(feature = "dox"))]
 use std::process;
 
-#[cfg(all(not(doctest), doc))]
+#[cfg(feature = "dox")]
 fn main() {} // prevent linking libraries to avoid documentation failure
 
-#[cfg(any(not(doc), doctest))]
+#[cfg(not(feature = "dox"))]
 fn main() {
     if let Err(s) = system_deps::Config::new().probe() {
         let _ = eprintln!("{}", s);

gdk4/sys/src/lib.rs

@@ -8,7 +8,7 @@
     clippy::type_complexity,
     clippy::unreadable_literal
 )]
-#![cfg_attr(all(not(doctest), doc), feature(doc_cfg))]
+#![cfg_attr(feature = "dox", feature(doc_cfg))]
 
 use cairo_sys as cairo;
 use gdk_pixbuf_sys as gdk_pixbuf;

gdk4/sys/versions.txt

@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ b16d610)
+Generated by gir (https://github.com/gtk-rs/gir @ 694b4b8)
 from gir-files (https://github.com/gtk-rs/gir-files @ ddab3f2)

gir

@@ -19,13 +19,14 @@ exclude = [
 name = "gsk4"
 
 [features]
+dox = ["ffi/dox", "gdk/dox", "graphene/dox", "glib/dox", "cairo-rs/dox", "pango/dox"]
 purge-lgpl-docs = ["gtk-rs-lgpl-docs", "gdk/purge-lgpl-docs", "graphene/purge-lgpl-docs", "cairo-rs/purge-lgpl-docs"]
 embed-lgpl-docs = ["gtk-rs-lgpl-docs", "gdk/embed-lgpl-docs", "graphene/embed-lgpl-docs", "cairo-rs/embed-lgpl-docs"]
 vulkan = []
 broadway = []
 
 [package.metadata.docs.rs]
-features = ["embed-lgpl-docs"]
+features = ["dox", "embed-lgpl-docs"]
 
 [build-dependencies.gtk-rs-lgpl-docs]
 version = "0.1.3"

gsk4/Cargo.toml

@@ -11,11 +11,11 @@ pub use self::blur_node::BlurNode;
 mod border_node;
 pub use self::border_node::BorderNode;
 
-#[cfg(any(feature = "broadway", all(not(doctest), doc)))]
-#[cfg_attr(all(not(doctest), doc), doc(cfg(feature = "broadway")))]
+#[cfg(any(feature = "broadway", feature = "dox"))]
+#[cfg_attr(feature = "dox", doc(cfg(feature = "broadway")))]
 mod broadway_renderer;
-#[cfg(any(feature = "broadway", all(not(doctest), doc)))]
-#[cfg_attr(all(not(doctest), doc), doc(cfg(feature = "broadway")))]
+#[cfg(any(feature = "broadway", feature = "dox"))]
+#[cfg_attr(feature = "dox", doc(cfg(feature = "broadway")))]
 pub use self::broadway_renderer::BroadwayRenderer;
 
 mod cairo_node;
@@ -86,11 +86,11 @@ pub use self::texture_node::TextureNode;
 mod transform_node;
 pub use self::transform_node::TransformNode;
 
-#[cfg(any(feature = "vulkan", all(not(doctest), doc)))]
-#[cfg_attr(all(not(doctest), doc), doc(cfg(feature = "vulkan")))]
+#[cfg(any(feature = "vulkan", feature = "dox"))]
+#[cfg_attr(feature = "dox", doc(cfg(feature = "vulkan")))]
 mod vulkan_renderer;
-#[cfg(any(feature = "vulkan", all(not(doctest), doc)))]
-#[cfg_attr(all(not(doctest), doc), doc(cfg(feature = "vulkan")))]
+#[cfg(any(feature = "vulkan", feature = "dox"))]
+#[cfg_attr(feature = "dox", doc(cfg(feature = "vulkan")))]
 pub use self::vulkan_renderer::VulkanRenderer;
 
 mod transform;

gsk4/src/auto/mod.rs

@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ b16d610)
+Generated by gir (https://github.com/gtk-rs/gir @ 694b4b8)
 from gir-files (https://github.com/gtk-rs/gir-files @ ddab3f2)

gsk4/src/auto/versions.txt

@@ -1,7 +1,7 @@
 // Copyright 2013-2018, The Gtk-rs Project Developers.
 // See the COPYRIGHT file at the top-level directory of this distribution.
 // Licensed under the MIT license, see the LICENSE file or <https://opensource.org/licenses/MIT>
-#![cfg_attr(all(not(doctest), doc), feature(doc_cfg))]
+#![cfg_attr(feature = "dox", feature(doc_cfg))]
 #![allow(clippy::let_unit_value)]
 #![allow(clippy::new_without_default)]
 #![allow(clippy::type_complexity)]

gsk4/src/lib.rs

@@ -26,6 +26,9 @@ git = "https://github.com/gtk-rs/gtk-rs"
 shell-words = "1.0.0"
 tempfile = "3"
 
+[features]
+dox = []
+
 [lib]
 name = "gsk4_sys"
 
@@ -41,9 +44,7 @@ repository = "https://github.com/gtk-rs/sys"
 version = "0.1.0"
 edition = "2018"
 [package.metadata.docs.rs]
-features = []
+features = ["dox"]
 [package.metadata.system-deps.gtk4]
 name = "gtk4"
 version = "3.94"
-
-[features]

gsk4/sys/Cargo.toml

@@ -2,13 +2,13 @@
 // from gir-files (https://github.com/gtk-rs/gir-files)
 // DO NOT EDIT
 
-#[cfg(any(not(doc), doctest))]
+#[cfg(not(feature = "dox"))]
 use std::process;
 
-#[cfg(all(not(doctest), doc))]
+#[cfg(feature = "dox")]
 fn main() {} // prevent linking libraries to avoid documentation failure
 
-#[cfg(any(not(doc), doctest))]
+#[cfg(not(feature = "dox"))]
 fn main() {
     if let Err(s) = system_deps::Config::new().probe() {
         let _ = eprintln!("{}", s);

gsk4/sys/build.rs

@@ -8,7 +8,7 @@
     clippy::type_complexity,
     clippy::unreadable_literal
 )]
-#![cfg_attr(all(not(doctest), doc), feature(doc_cfg))]
+#![cfg_attr(feature = "dox", feature(doc_cfg))]
 
 use cairo_sys as cairo;
 use gdk4_sys as gdk;

gsk4/sys/src/lib.rs

@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ b16d610)
+Generated by gir (https://github.com/gtk-rs/gir @ 694b4b8)
 from gir-files (https://github.com/gtk-rs/gir-files @ ddab3f2)

gsk4/sys/versions.txt

@@ -26,9 +26,10 @@ name = "gtk4"
 [features]
 purge-lgpl-docs = ["gtk-rs-lgpl-docs", "gdk/purge-lgpl-docs", "gsk/purge-lgpl-docs"]
 embed-lgpl-docs = ["gtk-rs-lgpl-docs", "gdk/embed-lgpl-docs", "gsk/embed-lgpl-docs"]
+dox = ["gdk/dox", "gsk/dox", "ffi/dox"]
 
 [package.metadata.docs.rs]
-features = ["embed-lgpl-docs"]
+features = ["dox", "embed-lgpl-docs"]
 
 [build-dependencies.gtk-rs-lgpl-docs]
 version = "0.1.3"

gtk4/Cargo.toml

@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ b16d610)
+Generated by gir (https://github.com/gtk-rs/gir @ 694b4b8)
 from gir-files (https://github.com/gtk-rs/gir-files @ ddab3f2)

gtk4/src/auto/versions.txt

@@ -35,6 +35,9 @@ git = "https://github.com/gtk-rs/gtk-rs"
 shell-words = "1.0.0"
 tempfile = "3"
 
+[features]
+dox = []
+
 [lib]
 name = "gtk4_sys"
 
@@ -51,9 +54,7 @@ repository = "https://github.com/gtk-rs/sys"
 version = "0.1.0"
 edition = "2018"
 [package.metadata.docs.rs]
-features = []
+features = ["dox"]
 [package.metadata.system-deps.gtk4]
 name = "gtk4"
 version = "3.94"
-
-[features]

gtk4/sys/Cargo.toml

@@ -2,13 +2,13 @@
 // from gir-files (https://github.com/gtk-rs/gir-files)
 // DO NOT EDIT
 
-#[cfg(any(not(doc), doctest))]
+#[cfg(not(feature = "dox"))]
 use std::process;
 
-#[cfg(all(not(doctest), doc))]
+#[cfg(feature = "dox")]
 fn main() {} // prevent linking libraries to avoid documentation failure
 
-#[cfg(any(not(doc), doctest))]
+#[cfg(not(feature = "dox"))]
 fn main() {
     if let Err(s) = system_deps::Config::new().probe() {
         let _ = eprintln!("{}", s);

gtk4/sys/build.rs

@@ -8,7 +8,7 @@
     clippy::type_complexity,
     clippy::unreadable_literal
 )]
-#![cfg_attr(all(not(doctest), doc), feature(doc_cfg))]
+#![cfg_attr(feature = "dox", feature(doc_cfg))]
 
 use cairo_sys as cairo;
 use gdk4_sys as gdk;

gtk4/sys/src/lib.rs

@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ b16d610)
+Generated by gir (https://github.com/gtk-rs/gir @ 694b4b8)
 from gir-files (https://github.com/gtk-rs/gir-files @ ddab3f2)