Remove doc generation features

Author: GuillaumeGomez

.github/workflows/CI.yml

@@ -65,19 +65,6 @@ jobs:
       - run: ./check_init_asserts ../${{matrix.conf.name}}
         working-directory: checker
         if: matrix.rust == 'nightly' && (matrix.conf.name == 'atk' || matrix.conf.name == 'gdk' || matrix.conf.name == 'gdkx11' || matrix.conf.name == 'gtk')
-      # rustdoc-stripper
-      - name: doc add
-        run: cargo build --manifest-path ${{ matrix.conf.name }}/Cargo.toml --features "dox,embed-lgpl-docs"
-        if: matrix.rust == 'nightly' && matrix.conf.name != 'glib'
-      - name: doc removal
-        run: cargo build --manifest-path ${{ matrix.conf.name }}/Cargo.toml --features "purge-lgpl-docs"
-        if: matrix.rust == 'nightly' && matrix.conf.name != 'glib'
-      - name: glib doc check
-        run: cargo build --manifest-path ${{ matrix.conf.name }}/Cargo.toml --features "dox"
-        if: matrix.rust == 'nightly' && matrix.conf.name == 'glib'
-      - name: check diff
-        run: git diff -R --exit-code
-        if: matrix.rust == 'nightly'
       # tests run
       - name: tests nightly
         run: xvfb-run --auto-servernum cargo test --manifest-path ${{ matrix.conf.name }}/Cargo.toml ${{ matrix.conf.nightly }}

.github/workflows/docs.yml

@@ -22,29 +22,13 @@ jobs:
           override: true
       - working-directory: gir
         run: cargo build --release
-      - run: ./gir/target/release/gir -c ./atk/Gir.toml -d ./gir-files --doc-target-path docs.md -m doc
-      - run: ./gir/target/release/gir -c ./gdk/Gir.toml -d ./gir-files --doc-target-path docs.md -m doc
-      - run: ./gir/target/release/gir -c ./gdk-pixbuf/Gir.toml -d ./gir-files --doc-target-path docs.md -m doc
-      - run: ./gir/target/release/gir -c ./gdkx11/Gir.toml -d ./gir-files --doc-target-path docs.md -m doc
-      - run: ./gir/target/release/gir -c ./gio/Gir.toml -d ./gir-files --doc-target-path docs.md -m doc
-      - run: ./gir/target/release/gir -c ./graphene/Gir.toml -d ./gir-files --doc-target-path docs.md -m doc
-      - run: ./gir/target/release/gir -c ./gtk/Gir.toml -d ./gir-files --doc-target-path docs.md -m doc
-      - run: ./gir/target/release/gir -c ./pango/Gir.toml -d ./gir-files --doc-target-path docs.md -m doc
-      - run: ./gir/target/release/gir -c ./pangocairo/Gir.toml -d ./gir-files --doc-target-path docs.md -m doc
+      - run: rustup component add rustfmt
       - run: cargo install rustdoc-stripper
-      - run: rustdoc-stripper -g -o ./atk/docs.md
-      - run: rustdoc-stripper -g -o ./gdk/docs.md
-      - run: rustdoc-stripper -g -o ./gdk-pixbuf/docs.md
-      - run: rustdoc-stripper -g -o ./gdkx11/docs.md
-      - run: rustdoc-stripper -g -o ./gio/docs.md
-      - run: rustdoc-stripper -g -o ./graphene/docs.md
-      - run: rustdoc-stripper -g -o ./gtk/docs.md
-      - run: rustdoc-stripper -g -o ./pango/docs.md
-      - run: rustdoc-stripper -g -o ./pangocairo/docs.md
+      - run: python3 ./generator.py --embed-docs --yes ./
       - uses: actions-rs/cargo@v1
         with:
           command: doc
-          args: -p atk -p atk-sys -p cairo-rs -p cairo-sys-rs -p gdk -p gdk-sys -p gdk-pixbuf -p gdk-pixbuf-sys -p gdkx11 -p gdkx11-sys -p gio -p gio-sys -p glib -p gobject-sys -p glib-sys -p glib-macros -p graphene-rs -p graphene-sys -p gtk -p gtk3-macros -p gtk-sys -p pango -p pango-sys -p pangocairo -p pangocairo-sys --features "dox,embed-lgpl-docs" --no-deps
+          args: -p atk -p atk-sys -p cairo-rs -p cairo-sys-rs -p gdk -p gdk-sys -p gdk-pixbuf -p gdk-pixbuf-sys -p gdkx11 -p gdkx11-sys -p gio -p gio-sys -p glib -p gobject-sys -p glib-sys -p glib-macros -p graphene-rs -p graphene-sys -p gtk -p gtk3-macros -p gtk-sys -p pango -p pango-sys -p pangocairo -p pangocairo-sys --features dox --no-deps
         env:
           RUSTDOCFLAGS: "--enable-index-page -Zunstable-options"
 

atk/Cargo.toml

@@ -10,7 +10,6 @@ readme = "README.md"
 version = "0.13.0"
 keywords = ["atk", "gtk-rs", "gnome", "accessibility"]
 repository = "https://github.com/gtk-rs/gtk-rs"
-build = "build.rs"
 exclude = [
     "gir-files/*",
 ]
@@ -20,20 +19,13 @@ edition = "2018"
 name = "atk"
 
 [features]
-purge-lgpl-docs = ["gtk-rs-lgpl-docs"]
-embed-lgpl-docs = ["gtk-rs-lgpl-docs"]
 dox = ["ffi/dox"]
 v2_30 = ["ffi/v2_30"]
 v2_32 = ["v2_30", "ffi/v2_32"]
 v2_34 = ["v2_32", "ffi/v2_34"]
 
 [package.metadata.docs.rs]
-features = ["dox", "embed-lgpl-docs"]
-
-[build-dependencies.gtk-rs-lgpl-docs]
-version = "0.1"
-optional = true
-git = "https://github.com/gtk-rs/lgpl-docs"
+features = ["dox"]
 
 [dependencies]
 libc = "0.2"

atk/build.rs

@@ -9,20 +9,17 @@ documentation = "https://gtk-rs.org/docs/cairo/"
 version = "0.13.0"
 description = "Rust bindings for the Cairo library"
 repository = "https://github.com/gtk-rs/gtk-rs"
-build = "build.rs"
 edition = "2018"
 
 [lib]
 name = "cairo"
 
 [features]
-purge-lgpl-docs = ["gtk-rs-lgpl-docs"]
 png = ["ffi/png"]
 pdf = ["ffi/pdf"]
 svg = ["ffi/svg"]
 ps = ["ffi/ps"]
 use_glib = ["glib", "ffi/use_glib"]
-embed-lgpl-docs = ["gtk-rs-lgpl-docs"]
 v1_14 = ["ffi/v1_14"]
 v1_16 = ["v1_14", "ffi/v1_16"]
 default = ["use_glib"]
@@ -34,12 +31,7 @@ dox = ["ffi/dox", "glib/dox", "freetype"]
 win32-surface = ["ffi/win32-surface"]
 
 [package.metadata.docs.rs]
-features = ["dox", "embed-lgpl-docs"]
-
-[build-dependencies.gtk-rs-lgpl-docs]
-version = "0.1.8"
-optional = true
-git = "https://github.com/gtk-rs/lgpl-docs"
+features = ["dox"]
 
 [dependencies.glib]
 optional = true

cairo/Cargo.toml

@@ -25,8 +25,6 @@
 //!
 //! ### Documentation features
 //!
-//! * **embed-lgpl-docs** - Embed API docs locally
-//! * **purge-lgpl-docs** - Remove API docs again (counterpart to `embed-lgpl-docs`)
 //! * **dox** - Used to keep system dependent items in documentation
 //!
 //! ### X Window features

cairo/build.rs

@@ -9,7 +9,6 @@ documentation = "https://gtk-rs.org/docs/gdk_pixbuf/"
 version = "0.13.0"
 description = "Rust bindings for the GdkPixbuf library"
 repository = "https://github.com/gtk-rs/gtk-rs"
-build = "build.rs"
 exclude = [
     "gir-files/*",
 ]
@@ -24,16 +23,9 @@ v2_36 = ["v2_32", "ffi/v2_36"]
 v2_36_8 = ["v2_36", "ffi/v2_36_8"]
 v2_40 = ["v2_36_8", "ffi/v2_40"]
 dox = ["glib/dox", "ffi/dox"]
-purge-lgpl-docs = ["gtk-rs-lgpl-docs"]
-embed-lgpl-docs = ["gtk-rs-lgpl-docs"]
 
 [package.metadata.docs.rs]
-features = ["dox", "embed-lgpl-docs"]
-
-[build-dependencies.gtk-rs-lgpl-docs]
-version = "0.1"
-optional = true
-git = "https://github.com/gtk-rs/lgpl-docs"
+features = ["dox"]
 
 [dependencies]
 libc = "0.2"

cairo/src/lib.rs

@@ -9,7 +9,6 @@ documentation = "https://gtk-rs.org/docs/gdk/"
 version = "0.13.0"
 description = "Rust bindings for the GDK 3 library"
 repository = "https://github.com/gtk-rs/gtk-rs"
-build = "build.rs"
 exclude = [
     "gir-files/*",
 ]
@@ -25,16 +24,9 @@ v3_20 = ["v3_18", "ffi/v3_20"]
 v3_22 = ["v3_20", "ffi/v3_22"]
 v3_24 = ["v3_22", "ffi/v3_24"]
 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 = ["dox", "embed-lgpl-docs"]
-
-[build-dependencies.gtk-rs-lgpl-docs]
-version = "0.1"
-optional = true
-git = "https://github.com/gtk-rs/lgpl-docs"
+features = ["dox"]
 
 [dependencies]
 libc = "0.2"

gdk-pixbuf/Cargo.toml

@@ -9,7 +9,6 @@ documentation = "https://gtk-rs.org/docs/gdkx11/"
 version = "0.13.0"
 description = "Rust bindings for the GDK X11 library"
 repository = "https://github.com/gtk-rs/gtk-rs"
-build = "build.rs"
 exclude = [
     "gir-files/*",
 ]
@@ -19,19 +18,13 @@ edition = "2018"
 name = "gdkx11"
 
 [features]
-purge-lgpl-docs = ["gtk-rs-lgpl-docs", "gdk/purge-lgpl-docs"]
-embed-lgpl-docs = ["gtk-rs-lgpl-docs", "gdk/embed-lgpl-docs"]
 dox = ["gdk/dox", "ffi/dox"]
 v3_16 = ["ffi/v3_16", "gdk/v3_16"]
 v3_22 = ["v3_16", "ffi/v3_22", "gdk/v3_22"]
 v3_24 = ["v3_22", "ffi/v3_24_2"]
 
-[build-dependencies.gtk-rs-lgpl-docs]
-optional = true
-git = "https://github.com/gtk-rs/lgpl-docs"
-
 [package.metadata.docs.rs]
-features = ["dox", "embed-lgpl-docs"]
+features = ["dox"]
 
 [dependencies]
 libc = "0.2"