diff --git a/.travis.yml b/.travis.yml index 6edf074..02515cc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,6 +12,9 @@ addons: - libgtk-3-dev script: - rustc --version + - if [ "$TRAVIS_RUST_VERSION" == "nightly" ] && [ "$GTK" == "3.4" ]; then + make regen_check; + fi - ./check_init_asserts - cargo test --features embed-lgpl-docs --jobs 1 # catch any sneaked in lgpl docs diff --git a/Gir.toml b/Gir.toml index 2b48627..6044553 100644 --- a/Gir.toml +++ b/Gir.toml @@ -6,6 +6,7 @@ min_cfg_version = "3.4" target_path = "." work_mode = "normal" generate_safety_asserts = true +single_version_file = true generate = [ "Gdk.AnchorHints", diff --git a/Makefile b/Makefile index 611e5f5..f785433 100644 --- a/Makefile +++ b/Makefile @@ -5,6 +5,11 @@ GIR_FILES = gir-files/Gdk-3.0.gir # Run `gir` generating the bindings gir : src/auto/mod.rs +regen_check: $(GIR) $(GIR_FILES) + rm src/auto/* + $(GIR) -c Gir.toml + git diff -R --exit-code + src/auto/mod.rs : Gir.toml $(GIR) $(GIR_FILES) $(GIR) -c Gir.toml diff --git a/gir b/gir index 6855214..5ec9961 160000 --- a/gir +++ b/gir @@ -1 +1 @@ -Subproject commit 6855214525b04886f06103cadb238cf274adecde +Subproject commit 5ec99615df5814343d47e1286c404783584dbe26 diff --git a/gir-files b/gir-files index cf55bdc..3fde76b 160000 --- a/gir-files +++ b/gir-files @@ -1 +1 @@ -Subproject commit cf55bdcca114ff9c3dc0aa9dc21edaf5f3d3eaee +Subproject commit 3fde76b3ebf6d26db74dfbabd7d1bca17842b374 diff --git a/src/auto/app_launch_context.rs b/src/auto/app_launch_context.rs index 3a7dcad..0ae9910 100644 --- a/src/auto/app_launch_context.rs +++ b/src/auto/app_launch_context.rs @@ -1,5 +1,5 @@ -// This file was generated by gir (https://github.com/gtk-rs/gir @ 6855214) -// from gir-files (https://github.com/gtk-rs/gir-files @ cf55bdc) +// This file was generated by gir (https://github.com/gtk-rs/gir) +// from gir-files (https://github.com/gtk-rs/gir-files) // DO NOT EDIT use Display; diff --git a/src/auto/cursor.rs b/src/auto/cursor.rs index 961f0a3..ba087fe 100644 --- a/src/auto/cursor.rs +++ b/src/auto/cursor.rs @@ -1,5 +1,5 @@ -// This file was generated by gir (https://github.com/gtk-rs/gir @ 6855214) -// from gir-files (https://github.com/gtk-rs/gir-files @ cf55bdc) +// This file was generated by gir (https://github.com/gtk-rs/gir) +// from gir-files (https://github.com/gtk-rs/gir-files) // DO NOT EDIT use CursorType; diff --git a/src/auto/device.rs b/src/auto/device.rs index 690b941..a5bf2c3 100644 --- a/src/auto/device.rs +++ b/src/auto/device.rs @@ -1,5 +1,5 @@ -// This file was generated by gir (https://github.com/gtk-rs/gir @ 6855214) -// from gir-files (https://github.com/gtk-rs/gir-files @ cf55bdc) +// This file was generated by gir (https://github.com/gtk-rs/gir) +// from gir-files (https://github.com/gtk-rs/gir-files) // DO NOT EDIT use Atom; diff --git a/src/auto/device_manager.rs b/src/auto/device_manager.rs index 7634f88..a9174f9 100644 --- a/src/auto/device_manager.rs +++ b/src/auto/device_manager.rs @@ -1,5 +1,5 @@ -// This file was generated by gir (https://github.com/gtk-rs/gir @ 6855214) -// from gir-files (https://github.com/gtk-rs/gir-files @ cf55bdc) +// This file was generated by gir (https://github.com/gtk-rs/gir) +// from gir-files (https://github.com/gtk-rs/gir-files) // DO NOT EDIT use Device; diff --git a/src/auto/device_pad.rs b/src/auto/device_pad.rs index 5a8c9d3..ccb99da 100644 --- a/src/auto/device_pad.rs +++ b/src/auto/device_pad.rs @@ -1,5 +1,5 @@ -// This file was generated by gir (https://github.com/gtk-rs/gir @ 6855214) -// from gir-files (https://github.com/gtk-rs/gir-files @ cf55bdc) +// This file was generated by gir (https://github.com/gtk-rs/gir) +// from gir-files (https://github.com/gtk-rs/gir-files) // DO NOT EDIT use Device; diff --git a/src/auto/device_tool.rs b/src/auto/device_tool.rs index 73abf6f..bc191da 100644 --- a/src/auto/device_tool.rs +++ b/src/auto/device_tool.rs @@ -1,5 +1,5 @@ -// This file was generated by gir (https://github.com/gtk-rs/gir @ 6855214) -// from gir-files (https://github.com/gtk-rs/gir-files @ cf55bdc) +// This file was generated by gir (https://github.com/gtk-rs/gir) +// from gir-files (https://github.com/gtk-rs/gir-files) // DO NOT EDIT use AxisFlags; diff --git a/src/auto/display.rs b/src/auto/display.rs index fb044f1..64e5f42 100644 --- a/src/auto/display.rs +++ b/src/auto/display.rs @@ -1,5 +1,5 @@ -// This file was generated by gir (https://github.com/gtk-rs/gir @ 6855214) -// from gir-files (https://github.com/gtk-rs/gir-files @ cf55bdc) +// This file was generated by gir (https://github.com/gtk-rs/gir) +// from gir-files (https://github.com/gtk-rs/gir-files) // DO NOT EDIT use AppLaunchContext; diff --git a/src/auto/display_manager.rs b/src/auto/display_manager.rs index 757290c..1e473e8 100644 --- a/src/auto/display_manager.rs +++ b/src/auto/display_manager.rs @@ -1,5 +1,5 @@ -// This file was generated by gir (https://github.com/gtk-rs/gir @ 6855214) -// from gir-files (https://github.com/gtk-rs/gir-files @ cf55bdc) +// This file was generated by gir (https://github.com/gtk-rs/gir) +// from gir-files (https://github.com/gtk-rs/gir-files) // DO NOT EDIT use Display; diff --git a/src/auto/drag_context.rs b/src/auto/drag_context.rs index 4aec5fc..b957ad7 100644 --- a/src/auto/drag_context.rs +++ b/src/auto/drag_context.rs @@ -1,5 +1,5 @@ -// This file was generated by gir (https://github.com/gtk-rs/gir @ 6855214) -// from gir-files (https://github.com/gtk-rs/gir-files @ cf55bdc) +// This file was generated by gir (https://github.com/gtk-rs/gir) +// from gir-files (https://github.com/gtk-rs/gir-files) // DO NOT EDIT use Atom; diff --git a/src/auto/drawing_context.rs b/src/auto/drawing_context.rs index 4c0b3e3..0086628 100644 --- a/src/auto/drawing_context.rs +++ b/src/auto/drawing_context.rs @@ -1,5 +1,5 @@ -// This file was generated by gir (https://github.com/gtk-rs/gir @ 6855214) -// from gir-files (https://github.com/gtk-rs/gir-files @ cf55bdc) +// This file was generated by gir (https://github.com/gtk-rs/gir) +// from gir-files (https://github.com/gtk-rs/gir-files) // DO NOT EDIT #[cfg(any(feature = "v3_22", feature = "dox"))] diff --git a/src/auto/enums.rs b/src/auto/enums.rs index 12176b0..8d97a62 100644 --- a/src/auto/enums.rs +++ b/src/auto/enums.rs @@ -1,5 +1,5 @@ -// This file was generated by gir (https://github.com/gtk-rs/gir @ 6855214) -// from gir-files (https://github.com/gtk-rs/gir-files @ cf55bdc) +// This file was generated by gir (https://github.com/gtk-rs/gir) +// from gir-files (https://github.com/gtk-rs/gir-files) // DO NOT EDIT use ffi; diff --git a/src/auto/event_sequence.rs b/src/auto/event_sequence.rs index 2e18cec..86c9e70 100644 --- a/src/auto/event_sequence.rs +++ b/src/auto/event_sequence.rs @@ -1,5 +1,5 @@ -// This file was generated by gir (https://github.com/gtk-rs/gir @ 6855214) -// from gir-files (https://github.com/gtk-rs/gir-files @ cf55bdc) +// This file was generated by gir (https://github.com/gtk-rs/gir) +// from gir-files (https://github.com/gtk-rs/gir-files) // DO NOT EDIT use ffi; diff --git a/src/auto/flags.rs b/src/auto/flags.rs index cdcf8f2..7e11cdc 100644 --- a/src/auto/flags.rs +++ b/src/auto/flags.rs @@ -1,5 +1,5 @@ -// This file was generated by gir (https://github.com/gtk-rs/gir @ 6855214) -// from gir-files (https://github.com/gtk-rs/gir-files @ cf55bdc) +// This file was generated by gir (https://github.com/gtk-rs/gir) +// from gir-files (https://github.com/gtk-rs/gir-files) // DO NOT EDIT use ffi; diff --git a/src/auto/frame_clock.rs b/src/auto/frame_clock.rs index af93629..60fc74b 100644 --- a/src/auto/frame_clock.rs +++ b/src/auto/frame_clock.rs @@ -1,5 +1,5 @@ -// This file was generated by gir (https://github.com/gtk-rs/gir @ 6855214) -// from gir-files (https://github.com/gtk-rs/gir-files @ cf55bdc) +// This file was generated by gir (https://github.com/gtk-rs/gir) +// from gir-files (https://github.com/gtk-rs/gir-files) // DO NOT EDIT #[cfg(any(feature = "v3_8", feature = "dox"))] diff --git a/src/auto/frame_timings.rs b/src/auto/frame_timings.rs index f174f1f..4635fb0 100644 --- a/src/auto/frame_timings.rs +++ b/src/auto/frame_timings.rs @@ -1,5 +1,5 @@ -// This file was generated by gir (https://github.com/gtk-rs/gir @ 6855214) -// from gir-files (https://github.com/gtk-rs/gir-files @ cf55bdc) +// This file was generated by gir (https://github.com/gtk-rs/gir) +// from gir-files (https://github.com/gtk-rs/gir-files) // DO NOT EDIT use ffi; diff --git a/src/auto/functions.rs b/src/auto/functions.rs index 5190743..65b781a 100644 --- a/src/auto/functions.rs +++ b/src/auto/functions.rs @@ -1,5 +1,5 @@ -// This file was generated by gir (https://github.com/gtk-rs/gir @ 6855214) -// from gir-files (https://github.com/gtk-rs/gir-files @ cf55bdc) +// This file was generated by gir (https://github.com/gtk-rs/gir) +// from gir-files (https://github.com/gtk-rs/gir-files) // DO NOT EDIT use Atom; diff --git a/src/auto/g_l_context.rs b/src/auto/gl_context.rs similarity index 99% rename from src/auto/g_l_context.rs rename to src/auto/gl_context.rs index 09b25ee..538a23a 100644 --- a/src/auto/g_l_context.rs +++ b/src/auto/gl_context.rs @@ -1,5 +1,5 @@ -// This file was generated by gir (https://github.com/gtk-rs/gir @ 6855214) -// from gir-files (https://github.com/gtk-rs/gir-files @ cf55bdc) +// This file was generated by gir (https://github.com/gtk-rs/gir) +// from gir-files (https://github.com/gtk-rs/gir-files) // DO NOT EDIT #[cfg(any(feature = "v3_16", feature = "dox"))] diff --git a/src/auto/mod.rs b/src/auto/mod.rs index 63a67f1..b54a7c7 100644 --- a/src/auto/mod.rs +++ b/src/auto/mod.rs @@ -1,5 +1,5 @@ -// This file was generated by gir (https://github.com/gtk-rs/gir @ 6855214) -// from gir-files (https://github.com/gtk-rs/gir-files @ cf55bdc) +// This file was generated by gir (https://github.com/gtk-rs/gir) +// from gir-files (https://github.com/gtk-rs/gir-files) // DO NOT EDIT mod app_launch_context; @@ -59,11 +59,11 @@ pub use self::frame_clock::FrameClock; pub use self::frame_clock::FrameClockExt; #[cfg(any(feature = "v3_16", feature = "dox"))] -mod g_l_context; +mod gl_context; #[cfg(any(feature = "v3_16", feature = "dox"))] -pub use self::g_l_context::GLContext; +pub use self::gl_context::GLContext; #[cfg(any(feature = "v3_16", feature = "dox"))] -pub use self::g_l_context::GLContextExt; +pub use self::gl_context::GLContextExt; #[cfg(any(feature = "v3_22", feature = "dox"))] mod monitor; diff --git a/src/auto/monitor.rs b/src/auto/monitor.rs index 22a7480..b9eb866 100644 --- a/src/auto/monitor.rs +++ b/src/auto/monitor.rs @@ -1,5 +1,5 @@ -// This file was generated by gir (https://github.com/gtk-rs/gir @ 6855214) -// from gir-files (https://github.com/gtk-rs/gir-files @ cf55bdc) +// This file was generated by gir (https://github.com/gtk-rs/gir) +// from gir-files (https://github.com/gtk-rs/gir-files) // DO NOT EDIT use Display; diff --git a/src/auto/screen.rs b/src/auto/screen.rs index 823b7de..cd470b7 100644 --- a/src/auto/screen.rs +++ b/src/auto/screen.rs @@ -1,5 +1,5 @@ -// This file was generated by gir (https://github.com/gtk-rs/gir @ 6855214) -// from gir-files (https://github.com/gtk-rs/gir-files @ cf55bdc) +// This file was generated by gir (https://github.com/gtk-rs/gir) +// from gir-files (https://github.com/gtk-rs/gir-files) // DO NOT EDIT use Display; diff --git a/src/auto/seat.rs b/src/auto/seat.rs index ab0fab7..3997348 100644 --- a/src/auto/seat.rs +++ b/src/auto/seat.rs @@ -1,5 +1,5 @@ -// This file was generated by gir (https://github.com/gtk-rs/gir @ 6855214) -// from gir-files (https://github.com/gtk-rs/gir-files @ cf55bdc) +// This file was generated by gir (https://github.com/gtk-rs/gir) +// from gir-files (https://github.com/gtk-rs/gir-files) // DO NOT EDIT #[cfg(any(feature = "v3_20", feature = "dox"))] diff --git a/src/auto/versions.txt b/src/auto/versions.txt new file mode 100644 index 0000000..1ab682a --- /dev/null +++ b/src/auto/versions.txt @@ -0,0 +1,4 @@ +All files in this directory +were generated by gir (https://github.com/gtk-rs/gir @ 5ec9961) +from gir-files (https://github.com/gtk-rs/gir-files @ 3fde76b) +DO NOT EDIT THEM diff --git a/src/auto/visual.rs b/src/auto/visual.rs index 1077188..bfacc5d 100644 --- a/src/auto/visual.rs +++ b/src/auto/visual.rs @@ -1,5 +1,5 @@ -// This file was generated by gir (https://github.com/gtk-rs/gir @ 6855214) -// from gir-files (https://github.com/gtk-rs/gir-files @ cf55bdc) +// This file was generated by gir (https://github.com/gtk-rs/gir) +// from gir-files (https://github.com/gtk-rs/gir-files) // DO NOT EDIT use ByteOrder; diff --git a/src/auto/window.rs b/src/auto/window.rs index d8fa41e..b9d915f 100644 --- a/src/auto/window.rs +++ b/src/auto/window.rs @@ -1,5 +1,5 @@ -// This file was generated by gir (https://github.com/gtk-rs/gir @ 6855214) -// from gir-files (https://github.com/gtk-rs/gir-files @ cf55bdc) +// This file was generated by gir (https://github.com/gtk-rs/gir) +// from gir-files (https://github.com/gtk-rs/gir-files) // DO NOT EDIT use Cursor;